diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-01-20 22:55:13 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-01-20 22:55:13 +0000 |
| commit | 36bd71cc4f93001da07cc6ea03552beb34b792d2 (patch) | |
| tree | b8940f9851f39300d5d2e89c5796e8fe82f4a305 /www/webkit2-gtk3 | |
| parent | 681931cafa040955f2ac23439f6395fd9beb57f3 (diff) | |
| download | ports-36bd71cc4f93001da07cc6ea03552beb34b792d2.tar.gz ports-36bd71cc4f93001da07cc6ea03552beb34b792d2.zip | |
Update webkit2gtk to 2.6.5.
Notes
Notes:
svn path=/head/; revision=377553
Diffstat (limited to 'www/webkit2-gtk3')
| -rw-r--r-- | www/webkit2-gtk3/Makefile | 2 | ||||
| -rw-r--r-- | www/webkit2-gtk3/distinfo | 4 | ||||
| -rw-r--r-- | www/webkit2-gtk3/files/patch-bug136018 | 54 | ||||
| -rw-r--r-- | www/webkit2-gtk3/pkg-plist | 4 |
4 files changed, 5 insertions, 59 deletions
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 8a418cca6846..1e235c066512 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.6.4 +PORTVERSION= 2.6.5 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo index 6e730a0ef31a..35eda7d431b3 100644 --- a/www/webkit2-gtk3/distinfo +++ b/www/webkit2-gtk3/distinfo @@ -1,2 +1,2 @@ -SHA256 (webkitgtk-2.6.4.tar.xz) = beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b -SIZE (webkitgtk-2.6.4.tar.xz) = 9996524 +SHA256 (webkitgtk-2.6.5.tar.xz) = b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593 +SIZE (webkitgtk-2.6.5.tar.xz) = 10000124 diff --git a/www/webkit2-gtk3/files/patch-bug136018 b/www/webkit2-gtk3/files/patch-bug136018 deleted file mode 100644 index ddcd481e79f0..000000000000 --- a/www/webkit2-gtk3/files/patch-bug136018 +++ /dev/null @@ -1,54 +0,0 @@ - 2014-10-15 Ting-Wei Lan <lantw44@gmail.com> - -+ [GTK] Use LD_LIBRARY_PATH to make g-ir-scanner use the newly-built -+ version of libraries when running the temporary executable -+ https://bugs.webkit.org/show_bug.cgi?id=136018 -+ -+ Reviewed by NOBODY (OOPS!). -+ -+ This patch modifies LD_LIBRARY_PATH to make sure the dynamic linker -+ find the correct version of libraries when running the temporary -+ executable to generate the .gir file. -+ -+ * PlatformGTK.cmake: -+ -+2014-10-15 Ting-Wei Lan <lantw44@gmail.com> -+ - [GTK] LDFLAGS is ignored when running g-ir-scanner - https://bugs.webkit.org/show_bug.cgi?id=136018 - ---- Source/WebKit2/PlatformGTK.cmake -+++ Source/WebKit2/PlatformGTK.cmake -@@ -731,11 +731,24 @@ foreach (linker_flag ${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}) - endif () - endforeach (linker_flag) - -+# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH -+string(COMPARE EQUAL "$ENV{LD_LIBRARY_PATH}" "" ld_library_path_not_exist) -+if (ld_library_path_does_not_exist) -+ set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH -+ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" -+ ) -+else () -+ set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH -+ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}" -+ ) -+endif () -+ - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir - DEPENDS WebKit2 - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= -+ LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" - ${INTROSPECTION_SCANNER} - --quiet - --warn-all -@@ -775,6 +788,7 @@ add_custom_command( - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= -+ LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" - ${INTROSPECTION_SCANNER} - --quiet - --warn-all diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist index 4149910a920f..3ead866ea609 100644 --- a/www/webkit2-gtk3/pkg-plist +++ b/www/webkit2-gtk3/pkg-plist @@ -259,10 +259,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.0.8 +lib/libjavascriptcoregtk-4.0.so.18.0.9 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.2.5 +lib/libwebkit2gtk-4.0.so.37.2.6 libdata/pkgconfig/javascriptcoregtk-4.0.pc libdata/pkgconfig/webkit2gtk-4.0.pc libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc |