diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile index 9a6f4fbee9..e6976c43b9 100644 --- a/webkit-gtk/Makefile +++ b/webkit-gtk/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.126 2017/05/03 08:38:45 jperkin Exp $ -DISTNAME= webkitgtk-2.16.1 +DISTNAME= webkitgtk-2.16.2 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} CATEGORIES= www MASTER_SITES= http://www.webkitgtk.org/releases/ diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST index 13f1df1fbf..e090fff5bf 100644 --- a/webkit-gtk/PLIST +++ b/webkit-gtk/PLIST @@ -190,10 +190,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.8 +lib/libjavascriptcoregtk-4.0.so.18.5.9 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.19.4 +lib/libwebkit2gtk-4.0.so.37.19.5 lib/pkgconfig/javascriptcoregtk-4.0.pc lib/pkgconfig/webkit2gtk-4.0.pc lib/pkgconfig/webkit2gtk-web-extension-4.0.pc diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo index 4d44e2bd55..bb59e40c32 100644 --- a/webkit-gtk/distinfo +++ b/webkit-gtk/distinfo @@ -1,11 +1,10 @@ $NetBSD: distinfo,v 1.95 2017/04/25 10:37:26 wiz Exp $ -SHA1 (webkitgtk-2.16.1.tar.xz) = d0b367ca1ac89da57b7068aa37efcc101aeb97f8 -RMD160 (webkitgtk-2.16.1.tar.xz) = 82e198ac35993d0e5a2ff9a76755b1c33849458f -SHA512 (webkitgtk-2.16.1.tar.xz) = 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 -Size (webkitgtk-2.16.1.tar.xz) = 14675996 bytes +SHA1 (webkitgtk-2.16.2.tar.xz) = 076cd31c5c4ab7239ae770d8c8355c4cdebdeedc +RMD160 (webkitgtk-2.16.2.tar.xz) = ea68eed084e98cdcb81a9d3cc78a218e58c165bf +SHA512 (webkitgtk-2.16.2.tar.xz) = 0bd16f663dffd41d713a53e2186576c4a7c42e7f872605a1688c80e8b55408b5f96f1274a1fe24624b4974240e901df5b11d1ff27a03fa2d9950575f1260abc8 +Size (webkitgtk-2.16.2.tar.xz) = 14650116 bytes SHA1 (patch-CMakeLists.txt) = 07293fd11d19b6f09120a89a08ff612c36644649 -SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 419425db19f685335eab01099d0a941614a2a99c SHA1 (patch-Source_JavaScriptCore_CMakeLists.txt) = 1b3485f72d809b2a1d6ec047b36331a6489fd10d SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4 @@ -20,8 +19,7 @@ SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea SHA1 (patch-Source_WebKit2_CMakeLists.txt) = 10a3fca678095ad04ce43e6d291e3907a44f67b4 SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 2b38628e1e617ef87b20faabbbcd8be8b2cbc058 -SHA1 (patch-Source_WebKit2_Shared_API_c_WKString.cpp) = 0a735e069ad6412e5c7850067ade0abe24487c1f SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d -SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 459bf361b03b8f4be57813d146423064adc47d8f +SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 383e9e2785bbe0ed6278ea735e3b5e5705431927 SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2 diff --git a/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake index 4a4b1f7886..ea23b04f05 100644 --- a/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake +++ b/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake @@ -14,9 +14,9 @@ o Do not conflict with CMAKE_MODULE_PATH during the linking phase of o Disable DatabaseProcess and IndexedDB support. o Do not use --version-script on SunOS ---- Source/cmake/OptionsGTK.cmake.orig 2017-04-04 07:31:58.000000000 +0000 +--- Source/cmake/OptionsGTK.cmake.orig 2017-05-09 07:47:09.000000000 +0000 +++ Source/cmake/OptionsGTK.cmake -@@ -6,12 +6,6 @@ set(PROJECT_VERSION_MICRO 1) +@@ -6,12 +6,6 @@ set(PROJECT_VERSION_MICRO 2) set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) set(WEBKITGTK_API_VERSION 4.0) @@ -28,8 +28,8 @@ o Do not use --version-script on SunOS - # Libtool library version, not to be confused with API version. # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html - CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 56 4 19) -@@ -123,8 +117,8 @@ if (DEVELOPER_MODE) + CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 56 5 19) +@@ -122,8 +116,8 @@ if (DEVELOPER_MODE) else () WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF) @@ -40,7 +40,7 @@ o Do not use --version-script on SunOS endif () endif () -@@ -160,12 +154,12 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ +@@ -159,12 +153,12 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)