diff options
| author | leot <leot@pkgsrc.org> | 2015-09-26 10:16:37 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2015-09-26 10:16:37 +0000 |
| commit | 5f3be3682e2cf86419869589370246f73fe3f90a (patch) | |
| tree | db9c73d6b6ae5ceae46e48ae5b16067c90de1a89 /www/webkit-gtk | |
| parent | 143e818becf26e04379149d6b3ac107a3330d6b2 (diff) | |
| download | pkgsrc-5f3be3682e2cf86419869589370246f73fe3f90a.tar.gz | |
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.
Diffstat (limited to 'www/webkit-gtk')
20 files changed, 174 insertions, 280 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 183f3954a84..872479b18e9 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,21 +1,109 @@ -# $NetBSD: Makefile,v 1.97 2015/08/23 14:30:42 wiz Exp $ - -PKGREVISION= 1 -.include "Makefile.common" +# $NetBSD: Makefile,v 1.98 2015/09/26 10:16:37 leot Exp $ +DISTNAME= webkitgtk-2.10.0 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} +CATEGORIES= www +MASTER_SITES= http://www.webkitgtk.org/releases/ +EXTRACT_SUFX= .tar.xz +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.webkitgtk.org/ COMMENT= GTK port of the WebKit browser engine - -BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools +LICENSE= 2-clause-bsd AND gnu-lgpl-v2 # shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 NOT_FOR_PLATFORM= NetBSD-[1-6]*-* -#introspection support +BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools + +USE_CMAKE= yes +USE_LANGUAGES= c c++ +#USE_LIBTOOL= yes +USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt + +# GCC >= 4.9 or Clang >= 3.3 +GCC_REQD+= 4.9 + +# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy +# versions of ld.gold. +CMAKE_ARGS+= -DUSE_LD_GOLD=OFF + +PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in +PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk.pc.in +PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk-web-extension.pc.in + +CMAKE_ARGS+= -DPORT=GTK +CMAKE_ARGS+= -DENABLE_X11_TARGET=ON +CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON +CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF +CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF + +REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \ + Source/WebCore/bindings/scripts/*.pl \ + Source/WebCore/bindings/scripts/InFilesCompiler.pm \ + Source/WebCore/bindings/scripts/InFilesParser.pm \ + Source/WebCore/css/*.pl \ + Source/WebCore/dom/*.pl \ + Source/WebCore/make-hash-tools.pl + +REPLACE_PYTHON+= Tools/gtk/*.py \ + Tools/gtk/generate-gtkdoc + +.include "../../lang/ruby/rubyversion.mk" +BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} +CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY} + +PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2 +.include "../../lang/python/application.mk" +CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN} + +CXXFLAGS.SunOS+= -fpermissive + +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing +.endif + +.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) +CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON # XXX: not completely sure (was --disable-fast-malloc) +.endif + +.include "options.mk" + +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 +.include "../../devel/glib2/buildlink3.mk" +BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 +BUILDLINK_DEPMETHOD.gobject-introspection+= build +.include "../../devel/gobject-introspection/buildlink3.mk" +CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON +.include "../../devel/zlib/buildlink3.mk" +.include "../../databases/sqlite3/buildlink3.mk" +# A correct Webkit build requires flex 2.5.33 +.include "../../devel/flex/buildlink3.mk" +.include "../../devel/gperf/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../graphics/cairo-gobject/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08 +.include "../../graphics/png/buildlink3.mk" +BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3 +.include "../../multimedia/gstreamer1/buildlink3.mk" +BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3 +.include "../../multimedia/gst-plugins1-base/buildlink3.mk" +BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 +.include "../../net/libsoup/buildlink3.mk" +.include "../../security/libsecret/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" +.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.17nb3 .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" -.include "../../graphics/cairo-gobject/buildlink3.mk" -.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../x11/libXdamage/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common deleted file mode 100644 index 3e6d07f5feb..00000000000 --- a/www/webkit-gtk/Makefile.common +++ /dev/null @@ -1,98 +0,0 @@ -# $NetBSD: Makefile.common,v 1.50 2015/09/06 06:56:15 dsainty Exp $ -# used by www/webkit-gtk/Makefile - -DISTNAME= webkitgtk-2.8.5 -CATEGORIES= www -MASTER_SITES= http://www.webkitgtk.org/releases/ -EXTRACT_SUFX= .tar.xz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.webkitgtk.org/ -LICENSE= 2-clause-bsd AND gnu-lgpl-v2 - -DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo -PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches - -USE_CMAKE= yes -USE_LANGUAGES= c c++ -#USE_LIBTOOL= yes -USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt - -# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3 -GCC_REQD+= 4.8 - -# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy -# versions of ld.gold. -CMAKE_ARGS+= -DUSE_LD_GOLD=OFF - -PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in -PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk.pc.in -PKGCONFIG_OVERRIDE+= Source/WebKit2/webkit2gtk-web-extension.pc.in - -CMAKE_ARGS+= -DPORT=GTK -CMAKE_ARGS+= -DENABLE_X11_TARGET=ON -CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON - -.include "options.mk" - -REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \ - Source/WebCore/bindings/scripts/*.pl \ - Source/WebCore/bindings/scripts/InFilesCompiler.pm \ - Source/WebCore/bindings/scripts/InFilesParser.pm \ - Source/WebCore/css/*.pl \ - Source/WebCore/dom/*.pl \ - Source/WebCore/make-hash-tools.pl - -REPLACE_PYTHON+= Tools/gtk/*.py \ - Tools/gtk/generate-gtkdoc - -.include "../../lang/ruby/rubyversion.mk" -BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} -CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY} - -PYTHON_FOR_BUILD_ONLY= yes -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2 -.include "../../lang/python/application.mk" -CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN} - -CXXFLAGS.SunOS+= -fpermissive - -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing -.endif - -.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) -CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON # XXX: not completely sure (was --disable-fast-malloc) -.endif - -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 -.include "../../devel/glib2/buildlink3.mk" -BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 -BUILDLINK_DEPMETHOD.gobject-introspection+= build -.include "../../devel/gobject-introspection/buildlink3.mk" -CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON -.include "../../devel/zlib/buildlink3.mk" -.include "../../databases/sqlite3/buildlink3.mk" -.include "../../devel/flex/buildlink3.mk" -.include "../../devel/gperf/buildlink3.mk" -.include "../../devel/pango/buildlink3.mk" -# A correct Webkit build requires flex 2.5.33 -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/libwebp/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08 -.include "../../graphics/png/buildlink3.mk" -BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3 -.include "../../multimedia/gstreamer1/buildlink3.mk" -BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3 -.include "../../multimedia/gst-plugins1-base/buildlink3.mk" -BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 -.include "../../net/libsoup/buildlink3.mk" -.include "../../security/libsecret/buildlink3.mk" -.include "../../security/gnutls/buildlink3.mk" -.include "../../textproc/icu/buildlink3.mk" -.include "../../textproc/libxslt/buildlink3.mk" -.include "../../x11/libXdamage/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST index 4e749502de8..6e554457f16 100644 --- a/www/webkit-gtk/PLIST +++ b/www/webkit-gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2015/08/15 15:34:32 leot Exp $ +@comment $NetBSD: PLIST,v 1.26 2015/09/26 10:16:37 leot Exp $ bin/MiniBrowser bin/jsc include/webkitgtk-4.0/JavaScriptCore/JSBase.h @@ -20,6 +20,7 @@ include/webkitgtk-4.0/webkit2/WebKitCredential.h include/webkitgtk-4.0/webkit2/WebKitDefines.h include/webkitgtk-4.0/webkit2/WebKitDownload.h include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h +include/webkitgtk-4.0/webkit2/WebKitEditorState.h include/webkitgtk-4.0/webkit2/WebKitEnumTypes.h include/webkitgtk-4.0/webkit2/WebKitError.h include/webkitgtk-4.0/webkit2/WebKitFaviconDatabase.h @@ -30,6 +31,7 @@ include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h include/webkitgtk-4.0/webkit2/WebKitFrame.h include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h +include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h @@ -53,6 +55,7 @@ include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitVersion.h include/webkitgtk-4.0/webkit2/WebKitWebContext.h +include/webkitgtk-4.0/webkit2/WebKitWebEditor.h include/webkitgtk-4.0/webkit2/WebKitWebExtension.h include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h include/webkitgtk-4.0/webkit2/WebKitWebInspector.h @@ -60,6 +63,7 @@ include/webkitgtk-4.0/webkit2/WebKitWebPage.h include/webkitgtk-4.0/webkit2/WebKitWebResource.h include/webkitgtk-4.0/webkit2/WebKitWebView.h include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h +include/webkitgtk-4.0/webkit2/WebKitWebsiteDataManager.h include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h include/webkitgtk-4.0/webkit2/webkit-web-extension.h include/webkitgtk-4.0/webkit2/webkit2.h @@ -207,6 +211,7 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMHistory.h include/webkitgtk-4.0/webkitdom/WebKitDOMKeyboardEvent.h include/webkitgtk-4.0/webkitdom/WebKitDOMLocation.h include/webkitgtk-4.0/webkitdom/WebKitDOMMediaController.h +include/webkitgtk-4.0/webkitdom/WebKitDOMMediaDevices.h include/webkitgtk-4.0/webkitdom/WebKitDOMMediaError.h include/webkitgtk-4.0/webkitdom/WebKitDOMMediaList.h include/webkitgtk-4.0/webkitdom/WebKitDOMMediaQueryList.h @@ -215,6 +220,7 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEvent.h include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEventUnstable.h include/webkitgtk-4.0/webkitdom/WebKitDOMNamedNodeMap.h include/webkitgtk-4.0/webkitdom/WebKitDOMNavigator.h +include/webkitgtk-4.0/webkitdom/WebKitDOMNavigatorMediaDevices.h include/webkitgtk-4.0/webkitdom/WebKitDOMNode.h include/webkitgtk-4.0/webkitdom/WebKitDOMNodeFilter.h include/webkitgtk-4.0/webkitdom/WebKitDOMNodeIterator.h @@ -274,14 +280,15 @@ 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.1.12 +lib/libjavascriptcoregtk-4.0.so.18.2.8 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.6.8 +lib/libwebkit2gtk-4.0.so.37.11.3 lib/pkgconfig/javascriptcoregtk-4.0.pc lib/pkgconfig/webkit2gtk-4.0.pc lib/pkgconfig/webkit2gtk-web-extension-4.0.pc lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so +libexec/webkit2gtk-4.0/WebKitDatabaseProcess libexec/webkit2gtk-4.0/WebKitNetworkProcess libexec/webkit2gtk-4.0/WebKitPluginProcess libexec/webkit2gtk-4.0/WebKitPluginProcess2 @@ -332,6 +339,7 @@ share/locale/sr@latin/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/sv/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/ta/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/te/LC_MESSAGES/WebKit2GTK-4.0.mo +share/locale/tr/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/uk/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/vi/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/zh_CN/LC_MESSAGES/WebKit2GTK-4.0.mo diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 2e01e121461..257d60b6019 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,20 +1,16 @@ -$NetBSD: distinfo,v 1.80 2015/08/15 15:34:32 leot Exp $ +$NetBSD: distinfo,v 1.81 2015/09/26 10:16:37 leot Exp $ -SHA1 (webkitgtk-2.8.5.tar.xz) = ff983e38b8632aec283c918da2ae0153a465efcb -RMD160 (webkitgtk-2.8.5.tar.xz) = 4497190cd2044a78abe52a174492f240772b2410 -Size (webkitgtk-2.8.5.tar.xz) = 10455256 bytes -SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1f4a4be3593f9aa9ae6b41a2be8ae9d8bb27dcbb -SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 2b7e69b8e6aff9bd5f65190f8eb1afdbb993857f -SHA1 (patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp) = 7daa228f96db55227a664dba3abc692b71e7ad18 -SHA1 (patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp) = c86f461f67a6a31b7eb59c9b6a8d0c87ea7e98e5 +SHA1 (webkitgtk-2.10.0.tar.xz) = 64c8e5c18ed5a2e6d6297bce6bc3c11a1ec9ea94 +RMD160 (webkitgtk-2.10.0.tar.xz) = 31e281288f3e663638d268c2dc5f2a0e0cbdba63 +Size (webkitgtk-2.10.0.tar.xz) = 11036516 bytes +SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae +SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 9b36b50f28bcb9421ac8b0ed17bba02de6d34e16 +SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = f8244c0f22bdb1ad29cb9abcfe0654173cedbe04 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 -SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 925d653feaa204b5128d389959328cdf559f26d3 -SHA1 (patch-Source_WTF_wtf_Platform.h) = 2d2bd30ded91c8572e0c220c432ac4094289371b -SHA1 (patch-Source_WTF_wtf_Stopwatch.h) = 25bc1552a10a5724cbf261d05c0202c153fd69f7 -SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 3707a87994d941d5f147f797d7d0be1b45bea591 -SHA1 (patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp) = 14dc3ca4a4831d8f26a878be42310648713feead -SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 89d70b11c9fc6dd7bde2262f2df5d78a152fd421 -SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 599ed6188b632e78774fd833e3ea9e1a1acf8a2d -SHA1 (patch-ai) = 4b02898c650564fbf7b586652a13a1775a4d4748 -SHA1 (patch-aj) = 84b0928c17460848fb51f255f6f68057ef768574 -SHA1 (patch-am) = 2061b7a88fe019d21f7eba8a69a16f5f74810666 +SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75 +SHA1 (patch-Source_WTF_wtf_Platform.h) = cbf239e3b05909b63a33fbe5ced4f8b8743ce4aa +SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3 +SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29 +SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 0c9a3685ce2a5c908b4418c38bf76e93c980f217 +SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968 +SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982 diff --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk index b9e117d4c1b..76e7f240f95 100644 --- a/www/webkit-gtk/options.mk +++ b/www/webkit-gtk/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2015/07/12 00:44:46 wiz Exp $ +# $NetBSD: options.mk,v 1.10 2015/09/26 10:16:37 leot Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk @@ -25,22 +25,16 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit # .if !empty(PKG_OPTIONS:Mwebkit-jit) CMAKE_ARGS+= -DENABLE_JIT=ON -CMAKE_ARGS+= -DENABLE_LLINT_C_LOOP=ON .else CMAKE_ARGS+= -DENABLE_JIT=OFF -CMAKE_ARGS+= -DENABLE_LLINT_C_LOOP=OFF .endif # # OpenGL support: enable support for GLX, WebGL and accelerated compositing # -# TODO: should we split them in multiple options? -# .if !empty(PKG_OPTIONS:Mopengl) -CMAKE_ARGS+= -DENABLE_3D_RENDERING=ON CMAKE_ARGS+= -DENABLE_WEBGL=ON .else -CMAKE_ARGS+= -DENABLE_3D_RENDERING=OFF CMAKE_ARGS+= -DENABLE_WEBGL=OFF .endif diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp index 4f77dcc1928..fbce27d9add 100644 --- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp +++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.3 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.4 2015/09/26 10:16:38 leot Exp $ ---- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2015-03-04 14:25:16.000000000 +0000 +--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2015-09-21 07:29:46.000000000 +0000 +++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -38,6 +38,8 @@ #include <unistd.h> @@ -11,10 +11,11 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.3 2015/ #endif namespace JSC { -@@ -58,6 +60,16 @@ static bool isVFPPresent() +@@ -57,6 +59,16 @@ static bool isVFPPresent() + close(fd); } #endif // OS(LINUX) - ++ +#if OS(NETBSD) + size_t len; + int flag; @@ -24,7 +25,6 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.3 2015/ + return flag == 1; + } +#endif // OS(NETBSD) -+ - #if (COMPILER(GCC) && defined(__VFP_FP__)) + + #if (COMPILER(GCC_OR_CLANG) && defined(__VFP_FP__)) return true; - #else diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h index 6ae18c32225..ad8f1e29150 100644 --- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h +++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h @@ -1,8 +1,8 @@ -$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.3 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.4 2015/09/26 10:16:38 leot Exp $ ---- Source/JavaScriptCore/dfg/DFGNode.h.orig 2015-03-23 08:08:04.000000000 +0000 +--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2015-09-21 07:29:46.000000000 +0000 +++ Source/JavaScriptCore/dfg/DFGNode.h -@@ -190,7 +190,7 @@ struct OpInfo { +@@ -221,7 +221,7 @@ struct OpInfo { OpInfo() : m_value(0) { } explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { } explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { } diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp deleted file mode 100644 index 31c5cb95117..00000000000 --- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-Source_JavaScriptCore_llint_LLIntEntrypoint.cpp,v 1.1 2015/07/23 11:10:49 joerg Exp $ - ---- Source/JavaScriptCore/llint/LLIntEntrypoint.cpp.orig 2015-07-22 11:57:53.000000000 +0000 -+++ Source/JavaScriptCore/llint/LLIntEntrypoint.cpp -@@ -28,6 +28,7 @@ - #include "CodeBlock.h" - #include "HeapInlines.h" - #include "JITCode.h" -+#include "JSCellInlines.h" - #include "JSObject.h" - #include "LLIntThunks.h" - #include "LowLevelInterpreter.h" diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp deleted file mode 100644 index a24bc64b594..00000000000 --- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-Source_JavaScriptCore_runtime_FunctionExecutableDump.cpp,v 1.1 2015/07/23 11:10:49 joerg Exp $ - ---- Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp.orig 2015-07-22 11:57:35.000000000 +0000 -+++ Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp -@@ -25,6 +25,7 @@ - - #include "config.h" - #include "FunctionExecutableDump.h" -+#include "JSCellInlines.h" - - #include "CodeBlock.h" - diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp new file mode 100644 index 00000000000..d82577debcd --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp @@ -0,0 +1,13 @@ +$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: diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h index c8bfb679236..a16e526754b 100644 --- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h +++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h @@ -1,11 +1,11 @@ -$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.4 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.5 2015/09/26 10:16:38 leot Exp $ Avoid broken section for SunOS/gcc. ---- Source/WTF/wtf/MathExtras.h.orig 2015-03-23 08:08:04.000000000 +0000 +--- Source/WTF/wtf/MathExtras.h.orig 2015-09-14 07:08:10.000000000 +0000 +++ Source/WTF/wtf/MathExtras.h -@@ -84,7 +84,7 @@ inline double wtf_ceil(double x) { retur - +@@ -75,7 +75,7 @@ const double sqrtOfTwoDouble = M_SQRT2; + const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2); #endif -#if OS(SOLARIS) diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h index ec77694fcbe..f2406b3fa24 100644 --- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h +++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h @@ -1,8 +1,8 @@ -$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.6 2015/07/14 00:02:34 khorben Exp $ +$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.7 2015/09/26 10:16:38 leot Exp $ ---- Source/WTF/wtf/Platform.h.orig 2015-03-23 08:08:04.000000000 +0000 +--- Source/WTF/wtf/Platform.h.orig 2015-09-21 07:29:46.000000000 +0000 +++ Source/WTF/wtf/Platform.h -@@ -632,6 +632,11 @@ +@@ -667,6 +667,11 @@ #define USE_SYSTEM_MALLOC 1 #endif diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Stopwatch.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Stopwatch.h deleted file mode 100644 index 2e6595351df..00000000000 --- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Stopwatch.h +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-Source_WTF_wtf_Stopwatch.h,v 1.1 2015/07/12 00:44:46 wiz Exp $ - ---- Source/WTF/wtf/Stopwatch.h.orig 2015-03-04 14:25:16.000000000 +0000 -+++ Source/WTF/wtf/Stopwatch.h -@@ -44,7 +44,7 @@ public: - - double elapsedTime(); - -- bool isActive() const { return !isnan(m_lastStartTime); } -+ bool isActive() const { return !std::isnan(m_lastStartTime); } - private: - Stopwatch() { reset(); } - -@@ -60,14 +60,14 @@ inline void Stopwatch::reset() - - inline void Stopwatch::start() - { -- ASSERT_WITH_MESSAGE(isnan(m_lastStartTime), "Tried to start the stopwatch, but it is already running."); -+ ASSERT_WITH_MESSAGE(std::isnan(m_lastStartTime), "Tried to start the stopwatch, but it is already running."); - - m_lastStartTime = monotonicallyIncreasingTime(); - } - - inline void Stopwatch::stop() - { -- ASSERT_WITH_MESSAGE(!isnan(m_lastStartTime), "Tried to stop the stopwatch, but it is not running."); -+ ASSERT_WITH_MESSAGE(!std::isnan(m_lastStartTime), "Tried to stop the stopwatch, but it is not running."); - - m_elapsedTime += monotonicallyIncreasingTime() - m_lastStartTime; - m_lastStartTime = NAN; -@@ -75,7 +75,7 @@ inline void Stopwatch::stop() - - inline double Stopwatch::elapsedTime() - { -- bool shouldSuspend = !isnan(m_lastStartTime); -+ bool shouldSuspend = !std::isnan(m_lastStartTime); - if (shouldSuspend) - stop(); - diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp index 9a78f5c51c1..e23dadf1e0f 100644 --- a/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp +++ b/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.3 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.4 2015/09/26 10:16:38 leot Exp $ ---- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2015-03-04 14:25:17.000000000 +0000 +--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2015-09-21 07:29:46.000000000 +0000 +++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp @@ -59,6 +59,8 @@ JSValue JSInspectorFrontendHost::platfor DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux"))); diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp deleted file mode 100644 index 3c853d5360b..00000000000 --- a/www/webkit-gtk/patches/patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-Source_WebCore_editing_InsertNodeBeforeCommand.cpp,v 1.1 2015/07/23 11:10:49 joerg Exp $ - ---- Source/WebCore/editing/InsertNodeBeforeCommand.cpp.orig 2015-07-22 12:33:49.000000000 +0000 -+++ Source/WebCore/editing/InsertNodeBeforeCommand.cpp -@@ -29,6 +29,7 @@ - #include "AXObjectCache.h" - #include "Document.h" - #include "ExceptionCodePlaceholder.h" -+#include "RenderElement.h" - #include "htmlediting.h" - - namespace WebCore { diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake index 7d48b879ace..68b5acfdbb0 100644 --- a/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake +++ b/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake @@ -1,21 +1,21 @@ -$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.1 2015/08/15 15:34:32 leot Exp $ +$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.2 2015/09/26 10:16:38 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.orig 2015-09-21 07:29:46.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>") +- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") +- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") +- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>") +- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>") ++ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") ++ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") ++ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>") ++ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>") endif () set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake index 9d68e897bd8..50d58ea1803 100644 --- a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake +++ b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake @@ -1,4 +1,4 @@ -$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.1 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.2 2015/09/26 10:16:38 leot Exp $ Do not conflict with CMAKE_MODULE_PATH during the linking phase of libwebkit2gtk-4.0.so: @@ -10,12 +10,12 @@ libwebkit2gtk-4.0.so: Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed [...] ---- Source/cmake/OptionsGTK.cmake.orig 2015-03-23 09:45:19.000000000 +0000 +--- Source/cmake/OptionsGTK.cmake.orig 2015-09-21 08:37:26.000000000 +0000 +++ Source/cmake/OptionsGTK.cmake -@@ -143,7 +143,7 @@ if (DEVELOPER_MODE) +@@ -103,7 +103,7 @@ if (DEVELOPER_MODE) else () - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER OFF) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF) - set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter") + set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/cmake/gtksymbols.filter") endif () diff --git a/www/webkit-gtk/patches/patch-ai b/www/webkit-gtk/patches/patch-ai index b0adb27acdf..d34d1c94c78 100644 --- a/www/webkit-gtk/patches/patch-ai +++ b/www/webkit-gtk/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.5 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-ai,v 1.6 2015/09/26 10:16:38 leot Exp $ ---- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2014-08-08 18:05:15.000000000 +0000 +--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2015-09-14 07:08:10.000000000 +0000 +++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp @@ -39,6 +39,12 @@ #if OS(HURD) diff --git a/www/webkit-gtk/patches/patch-aj b/www/webkit-gtk/patches/patch-aj index 42f5a1b3804..82f29a4c6ff 100644 --- a/www/webkit-gtk/patches/patch-aj +++ b/www/webkit-gtk/patches/patch-aj @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.4 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-aj,v 1.5 2015/09/26 10:16:38 leot Exp $ ---- Source/WTF/wtf/InlineASM.h.orig 2015-03-04 07:19:42.000000000 +0000 +--- Source/WTF/wtf/InlineASM.h.orig 2015-07-22 12:37:57.000000000 +0000 +++ Source/WTF/wtf/InlineASM.h @@ -40,7 +40,7 @@ #define THUMB_FUNC_PARAM(name) diff --git a/www/webkit-gtk/patches/patch-am b/www/webkit-gtk/patches/patch-am deleted file mode 100644 index 37e1f7c3177..00000000000 --- a/www/webkit-gtk/patches/patch-am +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-am,v 1.3 2015/07/12 00:44:46 wiz Exp $ - ---- Source/WTF/wtf/RAMSize.cpp.orig 2015-03-04 14:25:16.000000000 +0000 -+++ Source/WTF/wtf/RAMSize.cpp -@@ -27,7 +27,7 @@ - #include "RAMSize.h" - - #include "StdLibExtras.h" --#if OS(DARWIN) -+#if OS(DARWIN) || OS(NETBSD) - #include <sys/param.h> - #include <sys/types.h> - #include <sys/sysctl.h> -@@ -43,13 +43,17 @@ static const size_t ramSizeGuess = 128 * - - static size_t computeRAMSize() - { --#if OS(DARWIN) -+#if OS(DARWIN) || OS(NETBSD) - int mib[2]; - uint64_t ramSize; - size_t length; - - mib[0] = CTL_HW; -+#if OS(DARWIN) - mib[1] = HW_MEMSIZE; -+#else -+ mib[1] = HW_PHYSMEM64; -+#endif - length = sizeof(int64_t); - int sysctlResult = sysctl(mib, 2, &ramSize, &length, 0, 0); - if (sysctlResult == -1) |