Sat Sep 26 10:16:38 2015 UTC ()
Update www/webkit-gtk to webkit-gtk-2.10.0.

pkgsrc changes:
 o Unify Makefile.common in Makefile: newer webkit-gtk releases could not be
   split in a -gtk3 version, no more need for a Makefile.common (no functional
   changes intended).
 o Get rid of obsolete options (no functional changes intended)
 o Bump GCC_REQD to 4.9 (gcc>=4.9 is required for IndexedDB support, #145211)
 o For the moment disable two new options: Geolocation support (needs
   geography/geoclue) and Hyphenation support (needs libhyphen, not available at
   the moment in pkgsrc).

Changes:
=================
WebKitGTK+ 2.10.0
=================

What's new in WebKitGTK+ 2.10.0?

  - Disable ACCELERATED_2D_CANVAS by default.
  - Fix a crash in debug build due to an invalid assert.
  - Do not try to use the primary clipboard in Wayland.

=================
WebKitGTK+ 2.9.92
=================

What's new in WebKitGTK+ 2.9.92?

  - Data URLs are now decoded in the Web Process instead of the Network Process.
  - Fix Web Process crash recovery.
  - Fix a crash when sqlite3_initialize() is called from multiple threads.
  - Fix the volume bar in media controls.
  - Fix JavaScriptCore build with GCC 5.
  - Fix the build when accelerated 2D canvas is enabled but cairo was built without GLX.
  - Fix everal memory leaks.
  - Translation updates: Bulgarian, Gujarati, Polish, Slovenian, Spanish, Tamil, Turkish.

=================
WebKitGTK+ 2.9.91
=================

What's new in WebKitGTK+ 2.9.91?

  - Fix performance regression introduced in previous release when scaling images.
  - Fix runtime critical warning when there are missing media plugins.
  - Fix the build on systems with GTK+ compiled with an old version of wayland.

=================
WebKitGTK+ 2.9.90
=================

What's new in WebKitGTK+ 2.9.90?

  - Add API to request permission before showing PackageKit codec installation notifications.
  - Fix a crash closing a page when a context menu is open.
  - Fix DNS prefetch when using the network process.
  - Improve image quality when using newer versions of cairo/pixman.
  - Fix a crash when the web view is destroyed while the screensaver DBus proxy is being created.

=================
WebKitGTK+  2.9.5
=================

What's new in WebKitGTK+ 2.9.5?

  - Add API to set the maximum number of web processes per WebKitWebContext.
  - Add API to allow executing editing commands that require an argument.
  - 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 empty space in popup menus when first item is selected.
  - Fix a crash when SoupSession is destroyed in exit handler.
  - Disable NPAPI plugins when running on Wayland.
  - Translation updates: Swedish.

=================
WebKitGTK+  2.9.4
=================

What's new in WebKitGTK+ 2.9.4?

  - 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.
  - Add API to be notified about editor state changes.
  - Add selection-changed signal to the Web Extensions API.
  - Add initial WebKitWebsiteDataManager API for process configuration options.
  - Make WebSQL work by using a default quota instead of always failing in openDatabase
    with DOM Exception 18.
  - Correctly restore accelerated compositing after a WebProcess crash.
  - Only enable the input methods filter when there's an editable element focused.
  - Fix a crash on memory allocation using bmalloc on 32bit systems.
  - Allow to build with X11 and Wayland targets at the same time.
  - Fix a crash when spell checker returns no guesses.
  - Update and optimize some of the web inspector icons.
  - Translation updates: Swedish.

=================
WebKitGTK+  2.9.3
=================

What's new in WebKitGTK+ 2.9.3?

  - Inhibit screen saver when playing full screen video.
  - Fix DOCUMENT_VIEWER cache model to actually disable the memory cache.
  - Fix a regression that prevented the WebKitWebView::context-menu signal
    from being emitted.
  - Update web inspector icon so Rendering Frames timeline distinguish between
    layout and painting.
  - Ensure fragment identifier part of URI is not removed for custom URI scheme
    requests.
  - Improve performance of keyboard events handling.
  - Expose element tag name as an object attribute to accessibility.
  - Fix the build with Wayland target enabled.

=================
WebKitGTK+  2.9.2
=================

What's new in WebKitGTK+ 2.9.2?

  - Add IndexedDB support using a dedicated database process.
  - Add construct property to WebKitWebContext to set the IndexedDB database directory.
  - Add allow-file-access-from-file-urls to WebKitSettings.
  - Improve network process disk cache performance by mapping cached resources in the
    web process instead of sending the resources data via IPC.
  - Prevent WorkQueue objects from being leaked and ensure its worker thread always exits.
  - webkit_dom_html_element_get_children() has been deprecated in favor of
    webkit_dom_element_get_children() to match the DOM spec.
  - ARIA menu items no longer have anonymous block children.
  - Map pre element to ATK_ROLE_SECTION instead of ATK_ROLE_PANEL.
  - Always include rows in the tree of accessible tables.
  - Fix the build with Netscape plugins disabled.
  - Fix XPixmaps leaked by GLContext when using EGL on X11.
  - Translation updates: Catalan.

=================
WebKitGTK+  2.9.1
=================

What's new in WebKitGTK+ 2.9.1?

  - New disk cache implementation when using the network process.
  - Web inspector UI has been redesigned.
  - Add support for automatic hyphenation using libhyphen when it's available.
  - Fix network redirection to a non HTTP destination.


(leot)
diff -r1.97 -r1.98 pkgsrc/www/webkit-gtk/Makefile
diff -r1.50 -r0 pkgsrc/www/webkit-gtk/Makefile.common
diff -r1.25 -r1.26 pkgsrc/www/webkit-gtk/PLIST
diff -r1.80 -r1.81 pkgsrc/www/webkit-gtk/distinfo
diff -r1.9 -r1.10 pkgsrc/www/webkit-gtk/options.mk
diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Stopwatch.h
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp
diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-aj
diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
diff -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/patch-ai
diff -r1.3 -r0 pkgsrc/www/webkit-gtk/patches/patch-am

cvs diff -r1.97 -r1.98 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2015/08/23 14:30:42 1.97
+++ pkgsrc/www/webkit-gtk/Makefile 2015/09/26 10:16:37 1.98
@@ -1,21 +1,109 @@ @@ -1,21 +1,109 @@
1# $NetBSD: Makefile,v 1.97 2015/08/23 14:30:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.98 2015/09/26 10:16:37 leot Exp $
2 
3PKGREVISION= 1 
4.include "Makefile.common" 
5 2
 3DISTNAME= webkitgtk-2.10.0
6PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
 5CATEGORIES= www
 6MASTER_SITES= http://www.webkitgtk.org/releases/
 7EXTRACT_SUFX= .tar.xz
7 8
 9MAINTAINER= pkgsrc-users@NetBSD.org
 10HOMEPAGE= http://www.webkitgtk.org/
8COMMENT= GTK port of the WebKit browser engine 11COMMENT= GTK port of the WebKit browser engine
9 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
10BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 
11 13
12# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
13NOT_FOR_PLATFORM= NetBSD-[1-6]*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6]*-*
14 16
15#introspection support 17BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
 18
 19USE_CMAKE= yes
 20USE_LANGUAGES= c c++
 21#USE_LIBTOOL= yes
 22USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt
 23
 24# GCC >= 4.9 or Clang >= 3.3
 25GCC_REQD+= 4.9
 26
 27# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
 28# versions of ld.gold.
 29CMAKE_ARGS+= -DUSE_LD_GOLD=OFF
 30
 31PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in
 32PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk.pc.in
 33PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk-web-extension.pc.in
 34
 35CMAKE_ARGS+= -DPORT=GTK
 36CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
 37CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
 38CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
 39CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
 40
 41REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
 42 Source/WebCore/bindings/scripts/*.pl \
 43 Source/WebCore/bindings/scripts/InFilesCompiler.pm \
 44 Source/WebCore/bindings/scripts/InFilesParser.pm \
 45 Source/WebCore/css/*.pl \
 46 Source/WebCore/dom/*.pl \
 47 Source/WebCore/make-hash-tools.pl
 48
 49REPLACE_PYTHON+= Tools/gtk/*.py \
 50 Tools/gtk/generate-gtkdoc
 51
 52.include "../../lang/ruby/rubyversion.mk"
 53BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 54CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
 55
 56PYTHON_FOR_BUILD_ONLY= yes
 57PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2
 58.include "../../lang/python/application.mk"
 59CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
 60
 61CXXFLAGS.SunOS+= -fpermissive
 62
 63.include "../../mk/compiler.mk"
 64.if !empty(PKGSRC_COMPILER:Mclang)
 65CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing
 66.endif
 67
 68.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
 69CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON # XXX: not completely sure (was --disable-fast-malloc)
 70.endif
 71
 72.include "options.mk"
 73
 74BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 75.include "../../devel/glib2/buildlink3.mk"
 76BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
 77BUILDLINK_DEPMETHOD.gobject-introspection+= build
 78.include "../../devel/gobject-introspection/buildlink3.mk"
 79CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
 80.include "../../devel/zlib/buildlink3.mk"
 81.include "../../databases/sqlite3/buildlink3.mk"
 82# A correct Webkit build requires flex 2.5.33
 83.include "../../devel/flex/buildlink3.mk"
 84.include "../../devel/gperf/buildlink3.mk"
 85.include "../../devel/pango/buildlink3.mk"
 86.include "../../graphics/cairo-gobject/buildlink3.mk"
 87.include "../../graphics/freetype2/buildlink3.mk"
 88.include "../../graphics/libwebp/buildlink3.mk"
 89.include "../../mk/jpeg.buildlink3.mk"
 90BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
 91.include "../../graphics/png/buildlink3.mk"
 92BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3
 93.include "../../multimedia/gstreamer1/buildlink3.mk"
 94BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
 95.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 96BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
 97.include "../../net/libsoup/buildlink3.mk"
 98.include "../../security/libsecret/buildlink3.mk"
 99.include "../../security/gnutls/buildlink3.mk"
 100.include "../../sysutils/libnotify/buildlink3.mk"
 101.include "../../textproc/icu/buildlink3.mk"
 102.include "../../textproc/libxslt/buildlink3.mk"
16BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.17nb3 103BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.17nb3
17.include "../../x11/gtk2/buildlink3.mk" 104.include "../../x11/gtk2/buildlink3.mk"
18.include "../../x11/gtk3/buildlink3.mk" 105.include "../../x11/gtk3/buildlink3.mk"
19.include "../../graphics/cairo-gobject/buildlink3.mk" 106.include "../../x11/libXdamage/buildlink3.mk"
20.include "../../sysutils/libnotify/buildlink3.mk" 107.include "../../x11/libXt/buildlink3.mk"
 108.include "../../mk/pthread.buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 109.include "../../mk/bsd.pkg.mk"

File Deleted: pkgsrc/www/webkit-gtk/Attic/Makefile.common

cvs diff -r1.25 -r1.26 pkgsrc/www/webkit-gtk/PLIST (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/PLIST 2015/08/15 15:34:32 1.25
+++ pkgsrc/www/webkit-gtk/PLIST 2015/09/26 10:16:37 1.26
@@ -1,75 +1,79 @@ @@ -1,75 +1,79 @@
1@comment $NetBSD: PLIST,v 1.25 2015/08/15 15:34:32 leot Exp $ 1@comment $NetBSD: PLIST,v 1.26 2015/09/26 10:16:37 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
15include/webkitgtk-4.0/webkit2/WebKitContextMenu.h 15include/webkitgtk-4.0/webkit2/WebKitContextMenu.h
16include/webkitgtk-4.0/webkit2/WebKitContextMenuActions.h 16include/webkitgtk-4.0/webkit2/WebKitContextMenuActions.h
17include/webkitgtk-4.0/webkit2/WebKitContextMenuItem.h 17include/webkitgtk-4.0/webkit2/WebKitContextMenuItem.h
18include/webkitgtk-4.0/webkit2/WebKitCookieManager.h 18include/webkitgtk-4.0/webkit2/WebKitCookieManager.h
19include/webkitgtk-4.0/webkit2/WebKitCredential.h 19include/webkitgtk-4.0/webkit2/WebKitCredential.h
20include/webkitgtk-4.0/webkit2/WebKitDefines.h 20include/webkitgtk-4.0/webkit2/WebKitDefines.h
21include/webkitgtk-4.0/webkit2/WebKitDownload.h 21include/webkitgtk-4.0/webkit2/WebKitDownload.h
22include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h 22include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h
 23include/webkitgtk-4.0/webkit2/WebKitEditorState.h
23include/webkitgtk-4.0/webkit2/WebKitEnumTypes.h 24include/webkitgtk-4.0/webkit2/WebKitEnumTypes.h
24include/webkitgtk-4.0/webkit2/WebKitError.h 25include/webkitgtk-4.0/webkit2/WebKitError.h
25include/webkitgtk-4.0/webkit2/WebKitFaviconDatabase.h 26include/webkitgtk-4.0/webkit2/WebKitFaviconDatabase.h
26include/webkitgtk-4.0/webkit2/WebKitFileChooserRequest.h 27include/webkitgtk-4.0/webkit2/WebKitFileChooserRequest.h
27include/webkitgtk-4.0/webkit2/WebKitFindController.h 28include/webkitgtk-4.0/webkit2/WebKitFindController.h
28include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h 29include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h
29include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h 30include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h
30include/webkitgtk-4.0/webkit2/WebKitFrame.h 31include/webkitgtk-4.0/webkit2/WebKitFrame.h
31include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h 32include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h
32include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h 33include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h
 34include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
33include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h 35include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
34include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h 36include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
35include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h 37include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
36include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h 38include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
37include/webkitgtk-4.0/webkit2/WebKitNotification.h 39include/webkitgtk-4.0/webkit2/WebKitNotification.h
38include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h 40include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
39include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h 41include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
40include/webkitgtk-4.0/webkit2/WebKitPlugin.h 42include/webkitgtk-4.0/webkit2/WebKitPlugin.h
41include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h 43include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
42include/webkitgtk-4.0/webkit2/WebKitPrintOperation.h 44include/webkitgtk-4.0/webkit2/WebKitPrintOperation.h
43include/webkitgtk-4.0/webkit2/WebKitResponsePolicyDecision.h 45include/webkitgtk-4.0/webkit2/WebKitResponsePolicyDecision.h
44include/webkitgtk-4.0/webkit2/WebKitScriptDialog.h 46include/webkitgtk-4.0/webkit2/WebKitScriptDialog.h
45include/webkitgtk-4.0/webkit2/WebKitScriptWorld.h 47include/webkitgtk-4.0/webkit2/WebKitScriptWorld.h
46include/webkitgtk-4.0/webkit2/WebKitSecurityManager.h 48include/webkitgtk-4.0/webkit2/WebKitSecurityManager.h
47include/webkitgtk-4.0/webkit2/WebKitSettings.h 49include/webkitgtk-4.0/webkit2/WebKitSettings.h
48include/webkitgtk-4.0/webkit2/WebKitURIRequest.h 50include/webkitgtk-4.0/webkit2/WebKitURIRequest.h
49include/webkitgtk-4.0/webkit2/WebKitURIResponse.h 51include/webkitgtk-4.0/webkit2/WebKitURIResponse.h
50include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h 52include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h
51include/webkitgtk-4.0/webkit2/WebKitUserContent.h 53include/webkitgtk-4.0/webkit2/WebKitUserContent.h
52include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h 54include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h
53include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h 55include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h
54include/webkitgtk-4.0/webkit2/WebKitVersion.h 56include/webkitgtk-4.0/webkit2/WebKitVersion.h
55include/webkitgtk-4.0/webkit2/WebKitWebContext.h 57include/webkitgtk-4.0/webkit2/WebKitWebContext.h
 58include/webkitgtk-4.0/webkit2/WebKitWebEditor.h
56include/webkitgtk-4.0/webkit2/WebKitWebExtension.h 59include/webkitgtk-4.0/webkit2/WebKitWebExtension.h
57include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h 60include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
58include/webkitgtk-4.0/webkit2/WebKitWebInspector.h 61include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
59include/webkitgtk-4.0/webkit2/WebKitWebPage.h 62include/webkitgtk-4.0/webkit2/WebKitWebPage.h
60include/webkitgtk-4.0/webkit2/WebKitWebResource.h 63include/webkitgtk-4.0/webkit2/WebKitWebResource.h
61include/webkitgtk-4.0/webkit2/WebKitWebView.h 64include/webkitgtk-4.0/webkit2/WebKitWebView.h
62include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h 65include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
 66include/webkitgtk-4.0/webkit2/WebKitWebsiteDataManager.h
63include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h 67include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h
64include/webkitgtk-4.0/webkit2/webkit-web-extension.h 68include/webkitgtk-4.0/webkit2/webkit-web-extension.h
65include/webkitgtk-4.0/webkit2/webkit2.h 69include/webkitgtk-4.0/webkit2/webkit2.h
66include/webkitgtk-4.0/webkitdom/WebKitDOMAttr.h 70include/webkitgtk-4.0/webkitdom/WebKitDOMAttr.h
67include/webkitgtk-4.0/webkitdom/WebKitDOMAttrUnstable.h 71include/webkitgtk-4.0/webkitdom/WebKitDOMAttrUnstable.h
68include/webkitgtk-4.0/webkitdom/WebKitDOMAudioTrack.h 72include/webkitgtk-4.0/webkitdom/WebKitDOMAudioTrack.h
69include/webkitgtk-4.0/webkitdom/WebKitDOMAudioTrackList.h 73include/webkitgtk-4.0/webkitdom/WebKitDOMAudioTrackList.h
70include/webkitgtk-4.0/webkitdom/WebKitDOMBarProp.h 74include/webkitgtk-4.0/webkitdom/WebKitDOMBarProp.h
71include/webkitgtk-4.0/webkitdom/WebKitDOMBatteryManager.h 75include/webkitgtk-4.0/webkitdom/WebKitDOMBatteryManager.h
72include/webkitgtk-4.0/webkitdom/WebKitDOMBlob.h 76include/webkitgtk-4.0/webkitdom/WebKitDOMBlob.h
73include/webkitgtk-4.0/webkitdom/WebKitDOMBlobUnstable.h 77include/webkitgtk-4.0/webkitdom/WebKitDOMBlobUnstable.h
74include/webkitgtk-4.0/webkitdom/WebKitDOMCDATASection.h 78include/webkitgtk-4.0/webkitdom/WebKitDOMCDATASection.h
75include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRule.h 79include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRule.h
@@ -197,34 +201,36 @@ include/webkitgtk-4.0/webkitdom/WebKitDO @@ -197,34 +201,36 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
197include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElement.h 201include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElement.h
198include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElementUnstable.h 202include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElementUnstable.h
199include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableRowElement.h 203include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableRowElement.h
200include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableSectionElement.h 204include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableSectionElement.h
201include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElement.h 205include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElement.h
202include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElementUnstable.h 206include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElementUnstable.h
203include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTitleElement.h 207include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTitleElement.h
204include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLUListElement.h 208include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLUListElement.h
205include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLVideoElement.h 209include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLVideoElement.h
206include/webkitgtk-4.0/webkitdom/WebKitDOMHistory.h 210include/webkitgtk-4.0/webkitdom/WebKitDOMHistory.h
207include/webkitgtk-4.0/webkitdom/WebKitDOMKeyboardEvent.h 211include/webkitgtk-4.0/webkitdom/WebKitDOMKeyboardEvent.h
208include/webkitgtk-4.0/webkitdom/WebKitDOMLocation.h 212include/webkitgtk-4.0/webkitdom/WebKitDOMLocation.h
209include/webkitgtk-4.0/webkitdom/WebKitDOMMediaController.h 213include/webkitgtk-4.0/webkitdom/WebKitDOMMediaController.h
 214include/webkitgtk-4.0/webkitdom/WebKitDOMMediaDevices.h
210include/webkitgtk-4.0/webkitdom/WebKitDOMMediaError.h 215include/webkitgtk-4.0/webkitdom/WebKitDOMMediaError.h
211include/webkitgtk-4.0/webkitdom/WebKitDOMMediaList.h 216include/webkitgtk-4.0/webkitdom/WebKitDOMMediaList.h
212include/webkitgtk-4.0/webkitdom/WebKitDOMMediaQueryList.h 217include/webkitgtk-4.0/webkitdom/WebKitDOMMediaQueryList.h
213include/webkitgtk-4.0/webkitdom/WebKitDOMMessagePort.h 218include/webkitgtk-4.0/webkitdom/WebKitDOMMessagePort.h
214include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEvent.h 219include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEvent.h
215include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEventUnstable.h 220include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEventUnstable.h
216include/webkitgtk-4.0/webkitdom/WebKitDOMNamedNodeMap.h 221include/webkitgtk-4.0/webkitdom/WebKitDOMNamedNodeMap.h
217include/webkitgtk-4.0/webkitdom/WebKitDOMNavigator.h 222include/webkitgtk-4.0/webkitdom/WebKitDOMNavigator.h
 223include/webkitgtk-4.0/webkitdom/WebKitDOMNavigatorMediaDevices.h
218include/webkitgtk-4.0/webkitdom/WebKitDOMNode.h 224include/webkitgtk-4.0/webkitdom/WebKitDOMNode.h
219include/webkitgtk-4.0/webkitdom/WebKitDOMNodeFilter.h 225include/webkitgtk-4.0/webkitdom/WebKitDOMNodeFilter.h
220include/webkitgtk-4.0/webkitdom/WebKitDOMNodeIterator.h 226include/webkitgtk-4.0/webkitdom/WebKitDOMNodeIterator.h
221include/webkitgtk-4.0/webkitdom/WebKitDOMNodeList.h 227include/webkitgtk-4.0/webkitdom/WebKitDOMNodeList.h
222include/webkitgtk-4.0/webkitdom/WebKitDOMNodeUnstable.h 228include/webkitgtk-4.0/webkitdom/WebKitDOMNodeUnstable.h
223include/webkitgtk-4.0/webkitdom/WebKitDOMObject.h 229include/webkitgtk-4.0/webkitdom/WebKitDOMObject.h
224include/webkitgtk-4.0/webkitdom/WebKitDOMPerformance.h 230include/webkitgtk-4.0/webkitdom/WebKitDOMPerformance.h
225include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceEntry.h 231include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceEntry.h
226include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceEntryList.h 232include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceEntryList.h
227include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceNavigation.h 233include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceNavigation.h
228include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceTiming.h 234include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceTiming.h
229include/webkitgtk-4.0/webkitdom/WebKitDOMProcessingInstruction.h 235include/webkitgtk-4.0/webkitdom/WebKitDOMProcessingInstruction.h
230include/webkitgtk-4.0/webkitdom/WebKitDOMRange.h 236include/webkitgtk-4.0/webkitdom/WebKitDOMRange.h
@@ -264,34 +270,35 @@ include/webkitgtk-4.0/webkitdom/WebKitDO @@ -264,34 +270,35 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
264include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h 270include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
265include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h 271include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h
266include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h 272include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
267include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h 273include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
268include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h 274include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
269include/webkitgtk-4.0/webkitdom/webkitdom.h 275include/webkitgtk-4.0/webkitdom/webkitdom.h
270include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h 276include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h
271include/webkitgtk-4.0/webkitdom/webkitdomdefines.h 277include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
272lib/girepository-1.0/JavaScriptCore-4.0.typelib 278lib/girepository-1.0/JavaScriptCore-4.0.typelib
273lib/girepository-1.0/WebKit2-4.0.typelib 279lib/girepository-1.0/WebKit2-4.0.typelib
274lib/girepository-1.0/WebKit2WebExtension-4.0.typelib 280lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
275lib/libjavascriptcoregtk-4.0.so 281lib/libjavascriptcoregtk-4.0.so
276lib/libjavascriptcoregtk-4.0.so.18 282lib/libjavascriptcoregtk-4.0.so.18
277lib/libjavascriptcoregtk-4.0.so.18.1.12 283lib/libjavascriptcoregtk-4.0.so.18.2.8
278lib/libwebkit2gtk-4.0.so 284lib/libwebkit2gtk-4.0.so
279lib/libwebkit2gtk-4.0.so.37 285lib/libwebkit2gtk-4.0.so.37
280lib/libwebkit2gtk-4.0.so.37.6.8 286lib/libwebkit2gtk-4.0.so.37.11.3
281lib/pkgconfig/javascriptcoregtk-4.0.pc 287lib/pkgconfig/javascriptcoregtk-4.0.pc
282lib/pkgconfig/webkit2gtk-4.0.pc 288lib/pkgconfig/webkit2gtk-4.0.pc
283lib/pkgconfig/webkit2gtk-web-extension-4.0.pc 289lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
284lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so 290lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 291libexec/webkit2gtk-4.0/WebKitDatabaseProcess
285libexec/webkit2gtk-4.0/WebKitNetworkProcess 292libexec/webkit2gtk-4.0/WebKitNetworkProcess
286libexec/webkit2gtk-4.0/WebKitPluginProcess 293libexec/webkit2gtk-4.0/WebKitPluginProcess
287libexec/webkit2gtk-4.0/WebKitPluginProcess2 294libexec/webkit2gtk-4.0/WebKitPluginProcess2
288libexec/webkit2gtk-4.0/WebKitWebProcess 295libexec/webkit2gtk-4.0/WebKitWebProcess
289share/gir-1.0/JavaScriptCore-4.0.gir 296share/gir-1.0/JavaScriptCore-4.0.gir
290share/gir-1.0/WebKit2-4.0.gir 297share/gir-1.0/WebKit2-4.0.gir
291share/gir-1.0/WebKit2WebExtension-4.0.gir 298share/gir-1.0/WebKit2WebExtension-4.0.gir
292share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo 299share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
293share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo 300share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
294share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo 301share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo
295share/locale/ca/LC_MESSAGES/WebKit2GTK-4.0.mo 302share/locale/ca/LC_MESSAGES/WebKit2GTK-4.0.mo
296share/locale/cs/LC_MESSAGES/WebKit2GTK-4.0.mo 303share/locale/cs/LC_MESSAGES/WebKit2GTK-4.0.mo
297share/locale/de/LC_MESSAGES/WebKit2GTK-4.0.mo 304share/locale/de/LC_MESSAGES/WebKit2GTK-4.0.mo
@@ -322,16 +329,17 @@ share/locale/nl/LC_MESSAGES/WebKit2GTK-4 @@ -322,16 +329,17 @@ share/locale/nl/LC_MESSAGES/WebKit2GTK-4
322share/locale/or/LC_MESSAGES/WebKit2GTK-4.0.mo 329share/locale/or/LC_MESSAGES/WebKit2GTK-4.0.mo
323share/locale/pa/LC_MESSAGES/WebKit2GTK-4.0.mo 330share/locale/pa/LC_MESSAGES/WebKit2GTK-4.0.mo
324share/locale/pl/LC_MESSAGES/WebKit2GTK-4.0.mo 331share/locale/pl/LC_MESSAGES/WebKit2GTK-4.0.mo
325share/locale/pt/LC_MESSAGES/WebKit2GTK-4.0.mo 332share/locale/pt/LC_MESSAGES/WebKit2GTK-4.0.mo
326share/locale/pt_BR/LC_MESSAGES/WebKit2GTK-4.0.mo 333share/locale/pt_BR/LC_MESSAGES/WebKit2GTK-4.0.mo
327share/locale/ro/LC_MESSAGES/WebKit2GTK-4.0.mo 334share/locale/ro/LC_MESSAGES/WebKit2GTK-4.0.mo
328share/locale/ru/LC_MESSAGES/WebKit2GTK-4.0.mo 335share/locale/ru/LC_MESSAGES/WebKit2GTK-4.0.mo
329share/locale/sl/LC_MESSAGES/WebKit2GTK-4.0.mo 336share/locale/sl/LC_MESSAGES/WebKit2GTK-4.0.mo
330share/locale/sr/LC_MESSAGES/WebKit2GTK-4.0.mo 337share/locale/sr/LC_MESSAGES/WebKit2GTK-4.0.mo
331share/locale/sr@latin/LC_MESSAGES/WebKit2GTK-4.0.mo 338share/locale/sr@latin/LC_MESSAGES/WebKit2GTK-4.0.mo
332share/locale/sv/LC_MESSAGES/WebKit2GTK-4.0.mo 339share/locale/sv/LC_MESSAGES/WebKit2GTK-4.0.mo
333share/locale/ta/LC_MESSAGES/WebKit2GTK-4.0.mo 340share/locale/ta/LC_MESSAGES/WebKit2GTK-4.0.mo
334share/locale/te/LC_MESSAGES/WebKit2GTK-4.0.mo 341share/locale/te/LC_MESSAGES/WebKit2GTK-4.0.mo
 342share/locale/tr/LC_MESSAGES/WebKit2GTK-4.0.mo
335share/locale/uk/LC_MESSAGES/WebKit2GTK-4.0.mo 343share/locale/uk/LC_MESSAGES/WebKit2GTK-4.0.mo
336share/locale/vi/LC_MESSAGES/WebKit2GTK-4.0.mo 344share/locale/vi/LC_MESSAGES/WebKit2GTK-4.0.mo
337share/locale/zh_CN/LC_MESSAGES/WebKit2GTK-4.0.mo 345share/locale/zh_CN/LC_MESSAGES/WebKit2GTK-4.0.mo

cvs diff -r1.80 -r1.81 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2015/08/15 15:34:32 1.80
+++ pkgsrc/www/webkit-gtk/distinfo 2015/09/26 10:16:37 1.81
@@ -1,20 +1,16 @@ @@ -1,20 +1,16 @@
1$NetBSD: distinfo,v 1.80 2015/08/15 15:34:32 leot Exp $ 1$NetBSD: distinfo,v 1.81 2015/09/26 10:16:37 leot Exp $
2 2
3SHA1 (webkitgtk-2.8.5.tar.xz) = ff983e38b8632aec283c918da2ae0153a465efcb 3SHA1 (webkitgtk-2.10.0.tar.xz) = 64c8e5c18ed5a2e6d6297bce6bc3c11a1ec9ea94
4RMD160 (webkitgtk-2.8.5.tar.xz) = 4497190cd2044a78abe52a174492f240772b2410 4RMD160 (webkitgtk-2.10.0.tar.xz) = 31e281288f3e663638d268c2dc5f2a0e0cbdba63
5Size (webkitgtk-2.8.5.tar.xz) = 10455256 bytes 5Size (webkitgtk-2.10.0.tar.xz) = 11036516 bytes
6SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1f4a4be3593f9aa9ae6b41a2be8ae9d8bb27dcbb 6SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae
7SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 2b7e69b8e6aff9bd5f65190f8eb1afdbb993857f 7SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 9b36b50f28bcb9421ac8b0ed17bba02de6d34e16
8SHA1 (patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp) = 7daa228f96db55227a664dba3abc692b71e7ad18 8SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = f8244c0f22bdb1ad29cb9abcfe0654173cedbe04
9SHA1 (patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp) = c86f461f67a6a31b7eb59c9b6a8d0c87ea7e98e5 
10SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 9SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
11SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 925d653feaa204b5128d389959328cdf559f26d3 10SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75
12SHA1 (patch-Source_WTF_wtf_Platform.h) = 2d2bd30ded91c8572e0c220c432ac4094289371b 11SHA1 (patch-Source_WTF_wtf_Platform.h) = cbf239e3b05909b63a33fbe5ced4f8b8743ce4aa
13SHA1 (patch-Source_WTF_wtf_Stopwatch.h) = 25bc1552a10a5724cbf261d05c0202c153fd69f7 12SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3
14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 3707a87994d941d5f147f797d7d0be1b45bea591 13SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29
15SHA1 (patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp) = 14dc3ca4a4831d8f26a878be42310648713feead 14SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 0c9a3685ce2a5c908b4418c38bf76e93c980f217
16SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 89d70b11c9fc6dd7bde2262f2df5d78a152fd421 15SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968
17SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 599ed6188b632e78774fd833e3ea9e1a1acf8a2d 16SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
18SHA1 (patch-ai) = 4b02898c650564fbf7b586652a13a1775a4d4748 
19SHA1 (patch-aj) = 84b0928c17460848fb51f255f6f68057ef768574 
20SHA1 (patch-am) = 2061b7a88fe019d21f7eba8a69a16f5f74810666 

cvs diff -r1.9 -r1.10 pkgsrc/www/webkit-gtk/options.mk (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/options.mk 2015/07/12 00:44:46 1.9
+++ pkgsrc/www/webkit-gtk/options.mk 2015/09/26 10:16:37 1.10
@@ -1,55 +1,49 @@ @@ -1,55 +1,49 @@
1# $NetBSD: options.mk,v 1.9 2015/07/12 00:44:46 wiz Exp $ 1# $NetBSD: options.mk,v 1.10 2015/09/26 10:16:37 leot Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk 4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
5PKG_SUPPORTED_OPTIONS= enchant opengl webkit-jit 5PKG_SUPPORTED_OPTIONS= enchant opengl webkit-jit
6PKG_SUGGESTED_OPTIONS= enchant opengl 6PKG_SUGGESTED_OPTIONS= enchant opengl
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10# XXX JIT produces invalid code 10# XXX JIT produces invalid code
11# it's also entirely unsupported on powerpc and sparc 11# it's also entirely unsupported on powerpc and sparc
12.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \ 12.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
13 && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \ 13 && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \
14 && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) \ 14 && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) \
15 && empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) \ 15 && empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) \
16 && empty(MACHINE_PLATFORM:MNetBSD-*-sparc) \ 16 && empty(MACHINE_PLATFORM:MNetBSD-*-sparc) \
17 && empty(MACHINE_PLATFORM:MSunOS-*) 17 && empty(MACHINE_PLATFORM:MSunOS-*)
18PKG_SUGGESTED_OPTIONS+= webkit-jit 18PKG_SUGGESTED_OPTIONS+= webkit-jit
19.endif 19.endif
20 20
21.include "../../mk/bsd.options.mk" 21.include "../../mk/bsd.options.mk"
22 22
23# 23#
24# JIT support 24# JIT support
25# 25#
26.if !empty(PKG_OPTIONS:Mwebkit-jit) 26.if !empty(PKG_OPTIONS:Mwebkit-jit)
27CMAKE_ARGS+= -DENABLE_JIT=ON 27CMAKE_ARGS+= -DENABLE_JIT=ON
28CMAKE_ARGS+= -DENABLE_LLINT_C_LOOP=ON 
29.else 28.else
30CMAKE_ARGS+= -DENABLE_JIT=OFF 29CMAKE_ARGS+= -DENABLE_JIT=OFF
31CMAKE_ARGS+= -DENABLE_LLINT_C_LOOP=OFF 
32.endif 30.endif
33 31
34# 32#
35# OpenGL support: enable support for GLX, WebGL and accelerated compositing 33# OpenGL support: enable support for GLX, WebGL and accelerated compositing
36# 34#
37# TODO: should we split them in multiple options? 
38# 
39.if !empty(PKG_OPTIONS:Mopengl) 35.if !empty(PKG_OPTIONS:Mopengl)
40CMAKE_ARGS+= -DENABLE_3D_RENDERING=ON 
41CMAKE_ARGS+= -DENABLE_WEBGL=ON 36CMAKE_ARGS+= -DENABLE_WEBGL=ON
42.else 37.else
43CMAKE_ARGS+= -DENABLE_3D_RENDERING=OFF 
44CMAKE_ARGS+= -DENABLE_WEBGL=OFF 38CMAKE_ARGS+= -DENABLE_WEBGL=OFF
45.endif 39.endif
46 40
47# 41#
48# Spellcheck support using enchant 42# Spellcheck support using enchant
49# 43#
50.if !empty(PKG_OPTIONS:Menchant) 44.if !empty(PKG_OPTIONS:Menchant)
51CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON 45CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON
52.include "../../textproc/enchant/buildlink3.mk" 46.include "../../textproc/enchant/buildlink3.mk"
53.else 47.else
54CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF 48CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF
55.endif 49.endif

cvs diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp 2015/07/12 00:44:46 1.3
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp 2015/09/26 10:16:38 1.4
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.3 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.4 2015/09/26 10:16:38 leot Exp $
2 2
3--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2015-03-04 14:25:16.000000000 +0000 3--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2015-09-21 07:29:46.000000000 +0000
4+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp 4+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
5@@ -38,6 +38,8 @@ 5@@ -38,6 +38,8 @@
6 #include <unistd.h> 6 #include <unistd.h>
7 #include <elf.h> 7 #include <elf.h>
8 #include <asm/hwcap.h> 8 #include <asm/hwcap.h>
9+#elif OS(NETBSD) 9+#elif OS(NETBSD)
10+#include <sys/sysctl.h> 10+#include <sys/sysctl.h>
11 #endif 11 #endif
12  12
13 namespace JSC { 13 namespace JSC {
14@@ -58,6 +60,16 @@ static bool isVFPPresent() 14@@ -57,6 +59,16 @@ static bool isVFPPresent()
 15 close(fd);
15 } 16 }
16 #endif // OS(LINUX) 17 #endif // OS(LINUX)
17  18+
18+#if OS(NETBSD) 19+#if OS(NETBSD)
19+ size_t len; 20+ size_t len;
20+ int flag; 21+ int flag;
21+ 22+
22+ len = sizeof(flag); 23+ len = sizeof(flag);
23+ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) { 24+ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) {
24+ return flag == 1; 25+ return flag == 1;
25+ } 26+ }
26+#endif // OS(NETBSD) 27+#endif // OS(NETBSD)
27+ 28
28 #if (COMPILER(GCC) && defined(__VFP_FP__)) 29 #if (COMPILER(GCC_OR_CLANG) && defined(__VFP_FP__))
29 return true; 30 return true;
30 #else 

cvs diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h 2015/07/12 00:44:46 1.3
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h 2015/09/26 10:16:38 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.3 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.4 2015/09/26 10:16:38 leot Exp $
2 2
3--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2015-03-23 08:08:04.000000000 +0000 3--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2015-09-21 07:29:46.000000000 +0000
4+++ Source/JavaScriptCore/dfg/DFGNode.h 4+++ Source/JavaScriptCore/dfg/DFGNode.h
5@@ -190,7 +190,7 @@ struct OpInfo { 5@@ -221,7 +221,7 @@ struct OpInfo {
6 OpInfo() : m_value(0) { } 6 OpInfo() : m_value(0) { }
7 explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { } 7 explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
8 explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { } 8 explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }
9-#if OS(DARWIN) || USE(JSVALUE64) 9-#if OS(DARWIN) || USE(JSVALUE64)
10+#if OS(DARWIN) || (CPU(ARM) && OS(NETBSD)) || USE(JSVALUE64) 10+#if OS(DARWIN) || (CPU(ARM) && OS(NETBSD)) || USE(JSVALUE64)
11 explicit OpInfo(size_t value) : m_value(static_cast<uintptr_t>(value)) { } 11 explicit OpInfo(size_t value) : m_value(static_cast<uintptr_t>(value)) { }
12 #endif 12 #endif
13 explicit OpInfo(void* value) : m_value(reinterpret_cast<uintptr_t>(value)) { } 13 explicit OpInfo(void* value) : m_value(reinterpret_cast<uintptr_t>(value)) { }

cvs diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp 2015/07/12 00:44:46 1.3
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp 2015/09/26 10:16:38 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.3 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.4 2015/09/26 10:16:38 leot Exp $
2 2
3--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2015-03-04 14:25:17.000000000 +0000 3--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2015-09-21 07:29:46.000000000 +0000
4+++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 4+++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
5@@ -59,6 +59,8 @@ JSValue JSInspectorFrontendHost::platfor 5@@ -59,6 +59,8 @@ JSValue JSInspectorFrontendHost::platfor
6 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux"))); 6 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux")));
7 #elif OS(FREEBSD) 7 #elif OS(FREEBSD)
8 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd"))); 8 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd")));
9+#elif OS(NETBSD) 9+#elif OS(NETBSD)
10+ DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd"))); 10+ DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd")));
11 #elif OS(OPENBSD) 11 #elif OS(OPENBSD)
12 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd"))); 12 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd")));
13 #elif OS(SOLARIS) 13 #elif OS(SOLARIS)

File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp

File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp

File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_Stopwatch.h

File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp

File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_Options.cpp
$NetBSD: patch-Source_JavaScriptCore_runtime_Options.cpp,v 1.1 2015/09/26 10:16:38 leot Exp $

--- Source/JavaScriptCore/runtime/Options.cpp.orig	2015-09-21 07:29:46.000000000 +0000
+++ Source/JavaScriptCore/runtime/Options.cpp
@@ -610,7 +610,7 @@ bool Option::operator==(const Option& ot
     case Options::Type::unsignedType:
         return m_entry.unsignedVal == other.m_entry.unsignedVal;
     case Options::Type::doubleType:
-        return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
+        return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
     case Options::Type::int32Type:
         return m_entry.int32Val == other.m_entry.int32Val;
     case Options::Type::optionRangeType:

cvs diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_MathExtras.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_MathExtras.h 2015/07/12 00:44:46 1.4
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_MathExtras.h 2015/09/26 10:16:38 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.4 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.5 2015/09/26 10:16:38 leot Exp $
2 2
3Avoid broken section for SunOS/gcc. 3Avoid broken section for SunOS/gcc.
4 4
5--- Source/WTF/wtf/MathExtras.h.orig 2015-03-23 08:08:04.000000000 +0000 5--- Source/WTF/wtf/MathExtras.h.orig 2015-09-14 07:08:10.000000000 +0000
6+++ Source/WTF/wtf/MathExtras.h 6+++ Source/WTF/wtf/MathExtras.h
7@@ -84,7 +84,7 @@ inline double wtf_ceil(double x) { retur 7@@ -75,7 +75,7 @@ const double sqrtOfTwoDouble = M_SQRT2;
8  8 const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2);
9 #endif 9 #endif
10  10
11-#if OS(SOLARIS) 11-#if OS(SOLARIS)
12+#if OS(notSOLARIS) 12+#if OS(notSOLARIS)
13  13
14 namespace std { 14 namespace std {
15  15

cvs diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-aj 2015/07/12 00:44:46 1.4
+++ pkgsrc/www/webkit-gtk/patches/patch-aj 2015/09/26 10:16:38 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aj,v 1.4 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-aj,v 1.5 2015/09/26 10:16:38 leot Exp $
2 2
3--- Source/WTF/wtf/InlineASM.h.orig 2015-03-04 07:19:42.000000000 +0000 3--- Source/WTF/wtf/InlineASM.h.orig 2015-07-22 12:37:57.000000000 +0000
4+++ Source/WTF/wtf/InlineASM.h 4+++ Source/WTF/wtf/InlineASM.h
5@@ -40,7 +40,7 @@ 5@@ -40,7 +40,7 @@
6 #define THUMB_FUNC_PARAM(name) 6 #define THUMB_FUNC_PARAM(name)
7 #endif 7 #endif
8  8
9-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64) 9-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
10+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))  10+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))
11 #define GLOBAL_REFERENCE(name) #name "@plt" 11 #define GLOBAL_REFERENCE(name) #name "@plt"
12 #elif CPU(X86) && COMPILER(MINGW) 12 #elif CPU(X86) && COMPILER(MINGW)
13 #define GLOBAL_REFERENCE(name) "@" #name "@4" 13 #define GLOBAL_REFERENCE(name) "@" #name "@4"

cvs diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_Platform.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_Platform.h 2015/07/14 00:02:34 1.6
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_Platform.h 2015/09/26 10:16:38 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.6 2015/07/14 00:02:34 khorben Exp $ 1$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.7 2015/09/26 10:16:38 leot Exp $
2 2
3--- Source/WTF/wtf/Platform.h.orig 2015-03-23 08:08:04.000000000 +0000 3--- Source/WTF/wtf/Platform.h.orig 2015-09-21 07:29:46.000000000 +0000
4+++ Source/WTF/wtf/Platform.h 4+++ Source/WTF/wtf/Platform.h
5@@ -632,6 +632,11 @@ 5@@ -667,6 +667,11 @@
6 #define USE_SYSTEM_MALLOC 1 6 #define USE_SYSTEM_MALLOC 1
7 #endif 7 #endif
8  8
9+/* Workaround an alignment issue with fastMalloc on NetBSD/arm */ 9+/* Workaround an alignment issue with fastMalloc on NetBSD/arm */
10+#if OS(NETBSD) && CPU(ARM) 10+#if OS(NETBSD) && CPU(ARM)
11+#define USE_SYSTEM_MALLOC 1 11+#define USE_SYSTEM_MALLOC 1
12+#endif 12+#endif
13+ 13+
14 #define ENABLE_DEBUG_WITH_BREAKPOINT 0 14 #define ENABLE_DEBUG_WITH_BREAKPOINT 0
15 #define ENABLE_SAMPLING_COUNTERS 0 15 #define ENABLE_SAMPLING_COUNTERS 0
16 #define ENABLE_SAMPLING_FLAGS 0 16 #define ENABLE_SAMPLING_FLAGS 0

cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake 2015/08/15 15:34:32 1.1
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake 2015/09/26 10:16:38 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.1 2015/08/15 15:34:32 leot Exp $ 1$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.2 2015/09/26 10:16:38 leot Exp $
2 2
3Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it. 3Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
4 4
5--- Source/cmake/OptionsCommon.cmake.orig 2015-08-06 08:21:28.000000000 +0000 5--- Source/cmake/OptionsCommon.cmake.orig 2015-09-21 07:29:46.000000000 +0000
6+++ Source/cmake/OptionsCommon.cmake 6+++ Source/cmake/OptionsCommon.cmake
7@@ -17,10 +17,10 @@ endif () 7@@ -17,10 +17,10 @@ endif ()
8  8
9 execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION) 9 execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
10 if ("${AR_VERSION}" MATCHES "^GNU ar") 10 if ("${AR_VERSION}" MATCHES "^GNU ar")
11- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>") 11- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
12- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>") 12- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
13- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>") 13- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
14- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>") 14- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
15+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cru <TARGET> <LINK_FLAGS> <OBJECTS>") 15+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
16+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cru <TARGET> <LINK_FLAGS> <OBJECTS>") 16+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
17+ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ru <TARGET> <LINK_FLAGS> <OBJECTS>") 17+ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
18+ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ru <TARGET> <LINK_FLAGS> <OBJECTS>") 18+ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
19 endif () 19 endif ()
20  20
21 set_property(GLOBAL PROPERTY USE_FOLDERS ON) 21 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_cmake_OptionsGTK.cmake (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_cmake_OptionsGTK.cmake 2015/07/12 00:44:46 1.1
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_cmake_OptionsGTK.cmake 2015/09/26 10:16:38 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.1 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.2 2015/09/26 10:16:38 leot Exp $
2 2
3Do not conflict with CMAKE_MODULE_PATH during the linking phase of 3Do not conflict with CMAKE_MODULE_PATH during the linking phase of
4libwebkit2gtk-4.0.so: 4libwebkit2gtk-4.0.so:
5 5
6 Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so 6 Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so
7 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script 7 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script
8 [...] 8 [...]
9 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script 9 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script
10 Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed 10 Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed
11 [...] 11 [...]
12 12
13--- Source/cmake/OptionsGTK.cmake.orig 2015-03-23 09:45:19.000000000 +0000 13--- Source/cmake/OptionsGTK.cmake.orig 2015-09-21 08:37:26.000000000 +0000
14+++ Source/cmake/OptionsGTK.cmake 14+++ Source/cmake/OptionsGTK.cmake
15@@ -143,7 +143,7 @@ if (DEVELOPER_MODE) 15@@ -103,7 +103,7 @@ if (DEVELOPER_MODE)
16 else () 16 else ()
17 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER OFF) 17 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
18 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF) 18 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
19- set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter") 19- set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
20+ set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/cmake/gtksymbols.filter") 20+ set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/cmake/gtksymbols.filter")
21 endif () 21 endif ()
22  22
23 if (CMAKE_SYSTEM_NAME MATCHES "Linux") 23 if (CMAKE_SYSTEM_NAME MATCHES "Linux")

cvs diff -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-ai 2015/07/12 00:44:46 1.5
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-ai 2015/09/26 10:16:38 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ai,v 1.5 2015/07/12 00:44:46 wiz Exp $ 1$NetBSD: patch-ai,v 1.6 2015/09/26 10:16:38 leot Exp $
2 2
3--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2014-08-08 18:05:15.000000000 +0000 3--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2015-09-14 07:08:10.000000000 +0000
4+++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp 4+++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp
5@@ -39,6 +39,12 @@ 5@@ -39,6 +39,12 @@
6 #if OS(HURD) 6 #if OS(HURD)
7 // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here. 7 // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
8 #define PTHREAD_KEYS_MAX 1024 8 #define PTHREAD_KEYS_MAX 1024
9+#elif OS(NETBSD)  9+#elif OS(NETBSD)
10+#include <limits.h> 10+#include <limits.h>
11+// PTHREAD_KEYS_MAX is not defined in 5.x 11+// PTHREAD_KEYS_MAX is not defined in 5.x
12+#ifndef PTHREAD_KEYS_MAX 12+#ifndef PTHREAD_KEYS_MAX
13+#define PTHREAD_KEYS_MAX 256 13+#define PTHREAD_KEYS_MAX 256
14+#endif  14+#endif
15 #else 15 #else
16 #include <limits.h> 16 #include <limits.h>

File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-am