diff options
| author | kwm <kwm@FreeBSD.org> | 2017-05-27 15:14:30 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2017-05-27 15:14:30 +0800 |
| commit | 06ae6ecd60f2dcb2db8e871bc76673c68c8aa5ba (patch) | |
| tree | e372349f759f73f53ca81ae752d28441dab6c51b /www | |
| parent | a5c01e86860b04540b3d8724ac231a163310cec3 (diff) | |
| download | freebsd-ports-gnome-06ae6ecd60f2dcb2db8e871bc76673c68c8aa5ba.tar.gz freebsd-ports-gnome-06ae6ecd60f2dcb2db8e871bc76673c68c8aa5ba.tar.zst freebsd-ports-gnome-06ae6ecd60f2dcb2db8e871bc76673c68c8aa5ba.zip | |
Update webkit2-gtk3 to 2.16.3.
* Fix the build when using port compile and binutils is installed. It
seems Cmake picks up ar and ranlib from localbase when using a compiler
from ports, but the compiler uses ld from base for linking. Base ld
doesn't understand some features newer ar and ranlib from localbase
are using. So tell the build to always use ar and ranlib from base. [1]
* Fix build failure on armv6 [2]
PR: 219161 [1], 219495 [2]
Submitted by: mikael.urankar@gmail.com [2]
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit2-gtk3/Makefile | 10 | ||||
| -rw-r--r-- | www/webkit2-gtk3/distinfo | 6 | ||||
| -rw-r--r-- | www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h | 10 | ||||
| -rw-r--r-- | www/webkit2-gtk3/pkg-plist | 4 |
4 files changed, 22 insertions, 8 deletions
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 2f9c3ebb7658..2e49d465f893 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.16.2 -PORTREVISION= 1 +PORTVERSION= 2.16.3 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 @@ -70,7 +69,12 @@ DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE:STRING=Debug \ -DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \ -DCMAKE_LINKER=${LOCALBASE}/bin/ld DEBUG_CXXFLAGS= -B${LOCALBASE}/bin -DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE:STRING=Release + +DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_AR=/usr/bin/ar \ + -DCMAKE_RANLIB=/usr/bin/ranlib \ + -DCMAKE_LINKER=/usr/bin/ld +DEBUG_CXXFLAGS_OFF= -B/usr/bin DEBUG_CFLAGS_OFF= -DNDEBUG GEOIP_CMAKE_BOOL= ENABLE_GEOLOCATION diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo index 05e10c396458..c94c5c0636c3 100644 --- a/www/webkit2-gtk3/distinfo +++ b/www/webkit2-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494324844 -SHA256 (webkitgtk-2.16.2.tar.xz) = 5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 -SIZE (webkitgtk-2.16.2.tar.xz) = 14650116 +TIMESTAMP = 1495791669 +SHA256 (webkitgtk-2.16.3.tar.xz) = 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 +SIZE (webkitgtk-2.16.3.tar.xz) = 14652068 diff --git a/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h new file mode 100644 index 000000000000..151678ea45fa --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h @@ -0,0 +1,10 @@ +--- Source/bmalloc/bmalloc/BPlatform.h.orig 2017-05-24 07:01:14 UTC ++++ Source/bmalloc/bmalloc/BPlatform.h +@@ -108,6 +108,7 @@ + #elif defined(__ARM_ARCH_6__) \ + || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) \ ++|| defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6T2__) \ diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist index a847f872303b..5cf155e42360 100644 --- a/www/webkit2-gtk3/pkg-plist +++ b/www/webkit2-gtk3/pkg-plist @@ -191,10 +191,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib lib/girepository-1.0/WebKit2WebExtension-4.0.typelib lib/libjavascriptcoregtk-4.0.so lib/libjavascriptcoregtk-4.0.so.18 -lib/libjavascriptcoregtk-4.0.so.18.5.9 +lib/libjavascriptcoregtk-4.0.so.18.5.10 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.19.5 +lib/libwebkit2gtk-4.0.so.37.19.6 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-4.0.pc libdata/pkgconfig/webkit2gtk-4.0.pc |