Sat Aug 15 15:34:32 2015 UTC ()
Update www/webkit-gtk to webkit-gtk-2.8.5.
ok bsiegert@, wiz@

Changes:
=================
WebKitGTK+  2.8.5
=================

What's new in WebKitGTK+ 2.8.5?

  - Fix the window size reported when the web view isn't realized yet. This fixes the layout of
    some websites when opening new tabs in the browser and anchor links when opened in new tabs too.
  - Prevent clipboard contents from being lost when web process finishes.
  - Always allow font matching for strong aliases.
  - Move GStreamer missing plugins installer to the UI process.
  - Fix a crash when spell checker returns no guesses.
  - Fix a crash when SoupSession is destroyed in exit handler.
  - Fix a crash closing a page when default context menu is open.
  - Several crashes and rendering issues fixed.
  - Translation updates: Swedish.


(leot)
diff -r1.95 -r1.96 pkgsrc/www/webkit-gtk/Makefile
diff -r1.48 -r1.49 pkgsrc/www/webkit-gtk/Makefile.common
diff -r1.24 -r1.25 pkgsrc/www/webkit-gtk/PLIST
diff -r1.79 -r1.80 pkgsrc/www/webkit-gtk/distinfo
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
cvs diff -r1.95 -r1.96 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2015/07/14 18:46:07 1.95
+++ pkgsrc/www/webkit-gtk/Makefile 2015/08/15 15:34:32 1.96
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.95 2015/07/14 18:46:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.96 2015/08/15 15:34:32 leot Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 5PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
6PKGREVISION= 1 
7 6
8COMMENT= GTK port of the WebKit browser engine 7COMMENT= GTK port of the WebKit browser engine
9 8
10BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 9BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
11 10
12# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 11# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
13NOT_FOR_PLATFORM= NetBSD-[1-6]*-* 12NOT_FOR_PLATFORM= NetBSD-[1-6]*-*
14 13
15#introspection support 14#introspection support
16BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.17nb3 15BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.17nb3
17.include "../../x11/gtk2/buildlink3.mk" 16.include "../../x11/gtk2/buildlink3.mk"
18.include "../../x11/gtk3/buildlink3.mk" 17.include "../../x11/gtk3/buildlink3.mk"
19.include "../../graphics/cairo-gobject/buildlink3.mk" 18.include "../../graphics/cairo-gobject/buildlink3.mk"
cvs diff -r1.48 -r1.49 pkgsrc/www/webkit-gtk/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Attic/Makefile.common 2015/07/23 11:10:49 1.48
+++ pkgsrc/www/webkit-gtk/Attic/Makefile.common 2015/08/15 15:34:32 1.49
@@ -1,56 +1,55 @@ @@ -1,56 +1,55 @@
1# $NetBSD: Makefile.common,v 1.48 2015/07/23 11:10:49 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.49 2015/08/15 15:34:32 leot Exp $
2# used by www/webkit-gtk/Makefile 2# used by www/webkit-gtk/Makefile
3 3
4DISTNAME= webkitgtk-2.8.4 4DISTNAME= webkitgtk-2.8.5
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.webkitgtk.org/releases/ 6MASTER_SITES= http://www.webkitgtk.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.webkitgtk.org/ 10HOMEPAGE= http://www.webkitgtk.org/
11LICENSE= 2-clause-bsd AND gnu-lgpl-v2 11LICENSE= 2-clause-bsd AND gnu-lgpl-v2
12 12
13DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo
14PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches 14PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches
15 15
16USE_CMAKE= yes 16USE_CMAKE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18#USE_LIBTOOL= yes 18#USE_LIBTOOL= yes
19USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt 19USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt
20 20
21# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3 21# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3
22GCC_REQD+= 4.8 22GCC_REQD+= 4.8
23 23
24PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in 24PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in
25PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk.pc.in 25PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk.pc.in
26PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk-web-extension.pcin 26PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk-web-extension.pc.in
27 27
28CMAKE_ARGS+= -DPORT=GTK 28CMAKE_ARGS+= -DPORT=GTK
29CMAKE_ARGS+= -DENABLE_X11_TARGET=ON 29CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
30CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON 30CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \ 34REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
35 Source/WebCore/bindings/scripts/*.pl \ 35 Source/WebCore/bindings/scripts/*.pl \
36 Source/WebCore/bindings/scripts/InFilesCompiler.pm \ 36 Source/WebCore/bindings/scripts/InFilesCompiler.pm \
37 Source/WebCore/bindings/scripts/InFilesParser.pm \ 37 Source/WebCore/bindings/scripts/InFilesParser.pm \
38 Source/WebCore/css/*.pl \ 38 Source/WebCore/css/*.pl \
39 Source/WebCore/dom/*.pl \ 39 Source/WebCore/dom/*.pl \
40 Source/WebCore/make-hash-tools.pl 40 Source/WebCore/make-hash-tools.pl
41 41
42REPLACE_PYTHON+= Tools/gtk/*.py \ 42REPLACE_PYTHON+= Tools/gtk/*.py \
43 Tools/gtk/generate-feature-defines-files \ 
44 Tools/gtk/generate-gtkdoc 43 Tools/gtk/generate-gtkdoc
45 44
46.include "../../lang/ruby/rubyversion.mk" 45.include "../../lang/ruby/rubyversion.mk"
47BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} 46BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
48CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY} 47CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
49 48
50PYTHON_FOR_BUILD_ONLY= yes 49PYTHON_FOR_BUILD_ONLY= yes
51PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2 50PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2
52.include "../../lang/python/application.mk" 51.include "../../lang/python/application.mk"
53CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN} 52CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
54 53
55CXXFLAGS.SunOS+= -fpermissive 54CXXFLAGS.SunOS+= -fpermissive
56 55
cvs diff -r1.24 -r1.25 pkgsrc/www/webkit-gtk/PLIST (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/PLIST 2015/07/12 21:50:12 1.24
+++ pkgsrc/www/webkit-gtk/PLIST 2015/08/15 15:34:32 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.24 2015/07/12 21:50:12 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.25 2015/08/15 15:34:32 leot Exp $
2bin/MiniBrowser 2bin/MiniBrowser
3bin/jsc 3bin/jsc
4include/webkitgtk-4.0/JavaScriptCore/JSBase.h 4include/webkitgtk-4.0/JavaScriptCore/JSBase.h
5include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h 5include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
6include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h 6include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
7include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h 7include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h 8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h 9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h 10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
11include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h 11include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
12include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h 12include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
13include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h 13include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
14include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h 14include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
@@ -264,30 +264,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO @@ -264,30 +264,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
264include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h 264include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
265include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h 265include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h
266include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h 266include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
267include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h 267include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
268include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h 268include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
269include/webkitgtk-4.0/webkitdom/webkitdom.h 269include/webkitgtk-4.0/webkitdom/webkitdom.h
270include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h 270include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h
271include/webkitgtk-4.0/webkitdom/webkitdomdefines.h 271include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
272lib/girepository-1.0/JavaScriptCore-4.0.typelib 272lib/girepository-1.0/JavaScriptCore-4.0.typelib
273lib/girepository-1.0/WebKit2-4.0.typelib 273lib/girepository-1.0/WebKit2-4.0.typelib
274lib/girepository-1.0/WebKit2WebExtension-4.0.typelib 274lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
275lib/libjavascriptcoregtk-4.0.so 275lib/libjavascriptcoregtk-4.0.so
276lib/libjavascriptcoregtk-4.0.so.18 276lib/libjavascriptcoregtk-4.0.so.18
277lib/libjavascriptcoregtk-4.0.so.18.1.11 277lib/libjavascriptcoregtk-4.0.so.18.1.12
278lib/libwebkit2gtk-4.0.so 278lib/libwebkit2gtk-4.0.so
279lib/libwebkit2gtk-4.0.so.37 279lib/libwebkit2gtk-4.0.so.37
280lib/libwebkit2gtk-4.0.so.37.6.7 280lib/libwebkit2gtk-4.0.so.37.6.8
281lib/pkgconfig/javascriptcoregtk-4.0.pc 281lib/pkgconfig/javascriptcoregtk-4.0.pc
282lib/pkgconfig/webkit2gtk-4.0.pc 282lib/pkgconfig/webkit2gtk-4.0.pc
283lib/pkgconfig/webkit2gtk-web-extension-4.0.pc 283lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
284lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so 284lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
285libexec/webkit2gtk-4.0/WebKitNetworkProcess 285libexec/webkit2gtk-4.0/WebKitNetworkProcess
286libexec/webkit2gtk-4.0/WebKitPluginProcess 286libexec/webkit2gtk-4.0/WebKitPluginProcess
287libexec/webkit2gtk-4.0/WebKitPluginProcess2 287libexec/webkit2gtk-4.0/WebKitPluginProcess2
288libexec/webkit2gtk-4.0/WebKitWebProcess 288libexec/webkit2gtk-4.0/WebKitWebProcess
289share/gir-1.0/JavaScriptCore-4.0.gir 289share/gir-1.0/JavaScriptCore-4.0.gir
290share/gir-1.0/WebKit2-4.0.gir 290share/gir-1.0/WebKit2-4.0.gir
291share/gir-1.0/WebKit2WebExtension-4.0.gir 291share/gir-1.0/WebKit2WebExtension-4.0.gir
292share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo 292share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
293share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo 293share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
cvs diff -r1.79 -r1.80 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2015/07/23 11:10:49 1.79
+++ pkgsrc/www/webkit-gtk/distinfo 2015/08/15 15:34:32 1.80
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.79 2015/07/23 11:10:49 joerg Exp $ 1$NetBSD: distinfo,v 1.80 2015/08/15 15:34:32 leot Exp $
2 2
3SHA1 (webkitgtk-2.8.4.tar.xz) = 127ee45bab6bbd9da1a9f63ec070d8cc06b40652 3SHA1 (webkitgtk-2.8.5.tar.xz) = ff983e38b8632aec283c918da2ae0153a465efcb
4RMD160 (webkitgtk-2.8.4.tar.xz) = 4ad3b443a44275cac65d812ef3e53a355847f890 4RMD160 (webkitgtk-2.8.5.tar.xz) = 4497190cd2044a78abe52a174492f240772b2410
5Size (webkitgtk-2.8.4.tar.xz) = 10446180 bytes 5Size (webkitgtk-2.8.5.tar.xz) = 10455256 bytes
6SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1f4a4be3593f9aa9ae6b41a2be8ae9d8bb27dcbb 6SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1f4a4be3593f9aa9ae6b41a2be8ae9d8bb27dcbb
7SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 2b7e69b8e6aff9bd5f65190f8eb1afdbb993857f 7SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 2b7e69b8e6aff9bd5f65190f8eb1afdbb993857f
8SHA1 (patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp) = 7daa228f96db55227a664dba3abc692b71e7ad18 8SHA1 (patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp) = 7daa228f96db55227a664dba3abc692b71e7ad18
9SHA1 (patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp) = c86f461f67a6a31b7eb59c9b6a8d0c87ea7e98e5 9SHA1 (patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp) = c86f461f67a6a31b7eb59c9b6a8d0c87ea7e98e5
10SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 10SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
11SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 925d653feaa204b5128d389959328cdf559f26d3 11SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 925d653feaa204b5128d389959328cdf559f26d3
12SHA1 (patch-Source_WTF_wtf_Platform.h) = 2d2bd30ded91c8572e0c220c432ac4094289371b 12SHA1 (patch-Source_WTF_wtf_Platform.h) = 2d2bd30ded91c8572e0c220c432ac4094289371b
13SHA1 (patch-Source_WTF_wtf_Stopwatch.h) = 25bc1552a10a5724cbf261d05c0202c153fd69f7 13SHA1 (patch-Source_WTF_wtf_Stopwatch.h) = 25bc1552a10a5724cbf261d05c0202c153fd69f7
14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 3707a87994d941d5f147f797d7d0be1b45bea591 14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 3707a87994d941d5f147f797d7d0be1b45bea591
15SHA1 (patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp) = 14dc3ca4a4831d8f26a878be42310648713feead 15SHA1 (patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp) = 14dc3ca4a4831d8f26a878be42310648713feead
 16SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 89d70b11c9fc6dd7bde2262f2df5d78a152fd421
16SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 599ed6188b632e78774fd833e3ea9e1a1acf8a2d 17SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 599ed6188b632e78774fd833e3ea9e1a1acf8a2d
17SHA1 (patch-ai) = 4b02898c650564fbf7b586652a13a1775a4d4748 18SHA1 (patch-ai) = 4b02898c650564fbf7b586652a13a1775a4d4748
18SHA1 (patch-aj) = 84b0928c17460848fb51f255f6f68057ef768574 19SHA1 (patch-aj) = 84b0928c17460848fb51f255f6f68057ef768574
19SHA1 (patch-am) = 2061b7a88fe019d21f7eba8a69a16f5f74810666 20SHA1 (patch-am) = 2061b7a88fe019d21f7eba8a69a16f5f74810666
File Added: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.1 2015/08/15 15:34:32 leot Exp $

Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.

--- Source/cmake/OptionsCommon.cmake.orig	2015-08-06 08:21:28.000000000 +0000
+++ Source/cmake/OptionsCommon.cmake
@@ -17,10 +17,10 @@ endif ()
 
 execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
 if ("${AR_VERSION}" MATCHES "^GNU ar")
-    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cru <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cru <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ru <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ru <TARGET> <LINK_FLAGS> <OBJECTS>")
 endif ()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)