Update to 2.4.4, the latest stable release. Based on work by

Leonardo Taccari in wip.

Changes:

=================
WebKitGTK+  2.4.4
=================

What's new in WebKitGTK+ 2.4.4?

  - Fix annoying popup shown when visiting 8tracks.com.
  - Expose links rendered as blocks to accessibility.
  - Make text inside "span" block in "a" block accessible.
  - Implement windowed plugins visibility.
  - Fix the GObject introspection annotations of webkit_web_resource_get_data_finish().
  - Fix a crash in TSymbolTableLevel::~TSymbolTableLevel when WebKit
    is built with GCC 4.9.
  - Fix a crash when playing a video in facebook.
  - Several user agent changes to fix Google Maps and a few other issues.
  - Allo to include WebKitVersion.h from web extensions API too.
  - Fix web process leak when closing pages with network process enabled.
  - Fix the build with --disable-webgl --disable-accelerated-compositing.

=================
WebKitGTK+  2.4.3
=================

What's new in WebKitGTK+ 2.4.3?

  - Fix video playback rate used when resuming in GStreamer media backend.
  - Use GstMetaVideo as announced by WebKitVideoSink to fix some
    decoders and filters that rely on buffer's meta rather that in the
    caps structures.
  - Do not pass a valid pointer as redirected-response parameter to
    WebKitWebPage::send-request signal when not redirecting.
  - Add missing files to the build required for building in Windows.

=================
WebKitGTK+  2.4.2
=================

What's new in WebKitGTK+ 2.4.2?

  - Correctly handle TLS errors in case of a server redirection.
  - Fix a crash when submitting a form.
  - Fix several JavaScriptCore crashes when browsing facebook.
  - Fix a crash when closing a page with windowed plugins.
  - Fix a crash after getting web view context property with g_object_get.
  - Fix a new[] delete[] mismatch in SocketStreamHandleSoup.

=================
WebKitGTK+  2.4.1
=================

What's new in WebKitGTK+ 2.4.1?

  - Add CORS support for media elements to GStreamer media backend.
  - Fix wrong flags used in fcntl call that failed in FreeBSD.
  - Correctly handle HTTP authentication for cross-origin requests.
  - Correctly handle cookies for cross-origin requests.
  - Fix a crash in the plugin process with some plugins that redefine
    NPN functions.
  - Fix acceletared video when the video format has an alpha component.
  - Fix sites using geolocation after reloading when using Geoclue2.
  - Append Safari version to UserAgent to fix redirections in
    www.globalforestwatch.org.

=================
WebKitGTK+  2.4.0
=================

What's new in WebKitGTK+ 2.4.0?

  - Fix infinite loop in WebProcess due to a race condition that can
    happen when the socket event source is cancelled.
  - Fix more runtime critical warnings about main loop sources not found
    when trying to remove them.
  - Lower the timeout used when waiting for the ShoulTerminate reply
    in the WebProcess to release unused processes earlier.
  - Fix the build for non X11 platforms.

=================
WebKitGTK+ 2.3.92
=================

What's new in WebKitGTK+ 2.3.92?

  - Add support for Geoclue2.
  - Always finalize the soup session object when the networking
    process finishes.
  - Make sure the web process doesn't finish if there's an ongoing
    print operation.
  - Fix runtime critical warnings about main loop sources not found
    when trying to remove them.
  - Fixed several crashes in JavaScriptCore when visiting facebook.
  - Improve CSS properties performance.
  - Fix web process leak when the WebView is leaked by the application.
  - Fix the build when using vala bindings due to UI and web process
    main headers included together.

=================
WebKitGTK+ 2.3.91
=================

What's new in WebKitGTK+ 2.3.91?

  - Use a persistent cache for plugins metadata to avoid blocking the
    UI while scanning plugins during page loads.
  - Make the web inspector always load in multiprocess mode.
  - Add a pkg-config file for WebKit2 web process extensions API.
  - Fix the generation of g_return macros for GObject DOM bindings in
    some cases where non pointer parameters were handled as pointers.
  - Enable DFG_JIT on FreeBSD.
  - Use system default compiler instead of gcc when building DOM
    generated sources.
  - Several build fixes for FreeBSD.
  - Fix the build with wayland support enabled.

=================
WebKitGTK+ 2.3.90
=================

What's new in WebKitGTK+ 2.3.90?

  - Add initial touch support to WebKit2.
  - Add API to create a WebKitWebView related to another one to share
    the same Web Process.
  - Create the inspector view using the same web process as the
    inspected page.
  - Fix wrong mix of fcntl commands and flags in WebKit2.
  - Fix marshaller used in WebKitWebPage::document-loaded signal.
  - Fix a crash in GStreamer media backend when playback rate is too high.
  - Fix the build on FreeBSD.

=================
WebKitGTK+  2.3.5
=================

What's new in WebKitGTK+ 2.3.5?

  - Add API to allow setting a multiple web process model.
  - Add API to pass initialization user data from the UI process to
    the web extensions.
  - Implement languages support with network process.
  - Implement custom URI schemes with network process.
  - Disable MemoryCache when the DOCUMENT_VIEWER cache model is set.
  - Expose aria-describedby with ATK_RELATION_DESCRIBED_BY.
  - Fix a bug that prevented from entering fullscreen again in HTML5
    videos after fullscreen was left with ESC.
  - Set playback rate when pipeline is not ready in GStreamer media backend.
  - Fix a lockup when playing Icecast radio in GStreamer media backend.
  - Fix a web process crash when a download is cancelled.
  - Fix several crashes when printing via JavaScript.

=================
WebKitGTK+  2.3.4
=================

What's new in WebKitGTK+ 2.3.4?

  - Add API to WebKitResponsePolicyDecision to check if the MIME type
    can be shown.
  - Enable fullscreen API by default.
  - Fix handling of HTTP certificates with the network process enabled.
  - Fix downloads with the network process enabled.
  - Fix handling of cookies when network process is enabled.
  - Remove the partial file downloaded when the download operation
    fails or is cancelled.
  - Make WebKitWebPage::send-request signal work after a redirect.
  - Add xdg.origin.url extended attribute to downloads in WebKit2.
  - Fix WebGL with GLES.
  - Translation updates: Dutch, Brazilian Portuguese.

=================
WebKitGTK+  2.3.3
=================

What's new in WebKitGTK+ 2.3.3?

  - Initial Network Process support disabled by default.
  - CSS regions are now enabled by default.
  - Support right-side attachment of the inspector in WebKit2.
  - Add spatial navigation setting to WebKit2 GTK+ API.
  - Add media source setting to both WebKit1 and WebKit2.
  - Support custom types for drag and drop data.
  - Avoid extra copy when drawing images in cairo backend.
  - Fix scrolling in combo boxes when the dropdown menu is larger than
    the screen.
  - Render AC layers also when using GTK+ 2 in WebKit1.
  - Fix return value of webkit_web_view_get_view_source_mode() in
    WebKit1.
  - Emit stream-start, caps and segment events in webkitwebaudiosrc
    element.
  - Fix seeking on media content provided by servers not supporting
    range requests.
  - Fix a crash when using media source in GStreamer media backend.
  - Fix an X11 error when the backing store surface is destroyed.
  - Expose splitter elements with ATK_ROLE_SEPARATOR to accessibility.
  - Expose accessibility objects WAI-ARIA landmark roles.
  - Expose accessibility objects with ATK_ROLE_ARTICLE.
  - Expose accessibility objects with ATK_ROLE_CHECK_MENU_ITEM.
  - Remove support for GStreamer 0.10.
  - Memory leak due to incorrect use of gst_tag_list_merge in
    TextCombinerGStreamer.
  - Translation updates: Brazilian Portuguese.

=================
WebKitGTK+  2.3.2
=================

What's new in WebKitGTK+ 2.3.2?

  - Add enable-media-stream setting to WebKit2 GTK+ API.
  - Fix a crash when load fails due to SSL errors in WebKit2.
  - Fix a crash when printing via JavaScript in WebKit2.
  - Add support audio and video tracks to GStreamer media backend.
  - Properly expose video and audio elements to accessibility.
  - Fix invalid cairo matrix when drawing too small surfaces.
  - Avoid extra copy when drawing images using cairo.
  - Do not omit playback rate when seeking in GStreamer media backend.
  - Several build fixes on non-linux platforms.

=================
WebKitGTK+  2.3.1
=================

What's new in WebKitGTK+ 2.3.1?

  - Add WebKit2 API for TLS errors.
  - Make EventTarget interface introspectable in GObject DOM bindings.
  - Expose WheelEvent in the GObject DOM bindings API.
  - Generate API documentation for GObject DOM bindings.
  - Respect image orientation by default.
  - Enable text edition undo/redo operations support in WebKit2.
  - Add suppport for blob URLs to GStreamer media backend.
  - Add support for subtitles.
  - Allow running the web process with an arbitrary prefix command in
    debug builds.
  - Expose image links properly to accessibility.
  - Expose title and alternative text for links in image maps to
    accessibility.
  - Cancel the current active WebKitAuthenticationRequest on load
    fail.
  - Fix several memory leaks.

=================
WebKitGTK+  2.1.4
=================

What's new in WebKitGTK+ 2.1.4?

  - Add WebKitWebView::authenticate signal to WebKit2 GTK API.
  - Expose KeyboardEvent in GObject DOM bindings.
  - Implement attributesOfChildren() for AccessibilityUIElement.
  - Implement allAttributes() for AccessibilityUIElement.
  - Fix issues with edge cases when getting offsets for a text range
    in AtkText.
  - Remote inspector server now notifies about errors when loading
    resurces.
  - Disable HTTP request "Accept-Encoding:" header field on gstreamer
    source element to avoid receiving the wrong size when retrieving
    data.
  - Fix the final position when receiving several seek calls in a row,
    in GStreamer media backend.
  - When rendering accelerated video, upload onto the texture only the
    buffer to be painted.
  - Fix response property definition of WebKitResponsePolicyDecision.
  - Fix a crash in WebKit1 when the WebView is created and destroyed
    too fast.
  - Fix a crash in UI process when the web process crashes.
  - Fix a crash in WebKit2 when a context menu item is selected after
    the page has been closed.
  - Fix a crash when getting the editor command for a key event
    initiated by the web inspector.
  - Fix the build when building with GTK+ 2.
  - Fix several memory leaks.

=================
WebKitGTK+  2.1.3
=================

What's new in WebKitGTK+ 2.1.3?

  - Add support for preload="metadata" to GStreamer media backend.
  - Do not expose '\n' for wrapped lines with ATK_TEXT_BOUNDARY_CHAR.
  - Fix potential race condition in GStreamer media backend when
    getting the video sink caps.
  - Fix performance issues rendering a page with animations.
  - Several fixes and improvements in GStreamer video accelerated
    compositing support.
  - Adjust internal size on GStreamer HTTP source element when
    receiving data if necessary.
  - Actually disable the memory cache when DOCUMENT_VIEWER cache model
    is used in WebKit1.
  - Fix runtime critical warning in WebKit2 when unloading a module
    that failed to load.
  - Fix several memory leaks.

=================
WebKitGTK+  2.1.2
=================

What's new in WebKitGTK+ 2.1.2?

  - Set the subresources load priority using new libsoup API available
    in 2.43.
  - Do not use X11 WidgetBackingStore implementation in Wayland.
  - Support using GLContext from multiple threads.
  - Make sure gstreamer source element is thread-safe.
  - Prevent race condition when pad caps is set on gstreamer player.
  - Invalidate the ProcessLauncher when the process is terminated
    before it has finished launching
  - Use custom cairo code instead of Pango API for highlighting
    misspelled words.
  - Respect PKG_CONFIG env variable when generating gtk-doc.
  - Fix a crash due to an assert in gstreamer backend when seeking.
  - Fix memory leak when web process is terminated.
  - Translation updates: Telugu, Hindi, Kannada, Odia.

=================
WebKitGTK+  2.1.1
=================

What's new in WebKitGTK+ 2.1.1?

  - Add webkit_uri_scheme_request_finish_error to WebKit2 GTK+ API.
  - Add a setting to control whether or not accelerated 2D canvas is
    enabled in WebKit2.
  - Add a setting to WebKit2 to allow sending console log messages to
    stdout.
  - Always use EGL to create the GL context when running on Wayland.
  - Fix rendering of WebKitWebView child widgets with recent GTK+.
  - Notify the web process in WebKitURISchemeRequest when we fail to read
    from the user InputStream.
  - Fixed race conditions closing the socket descriptor when the web
    process crashes.
  - Add video accelerated compositing support to the GStreamer backend.
  - Add support for audio/speex MIME type to the GStreamer backend.
  - Fix seek after video finished in GStreamer backend.
  - Initialize WebKitWebPlugin path to prevent double-free in WebKit1.
  - Fix several GObject instrospection warnings.
  - Fixed several memory leaks.
This commit is contained in:
wiz 2014-08-03 22:30:05 +00:00
parent eac55c7061
commit 4e416d7477
35 changed files with 678 additions and 1085 deletions

View file

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.85 2014/06/09 14:18:09 ryoon Exp $
# $NetBSD: Makefile,v 1.86 2014/08/03 22:30:05 wiz Exp $
.include "Makefile.common"
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
PKGREVISION= 17
COMMENT= GTK2 port of the WebKit browser engine

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile.common,v 1.32 2014/05/09 07:37:26 wiz Exp $
# $NetBSD: Makefile.common,v 1.33 2014/08/03 22:30:05 wiz Exp $
# used by www/webkit-gtk/Makefile
# used by www/webkit-gtk3/Makefile
DISTNAME= webkitgtk-1.10.2
DISTNAME= webkitgtk-2.4.4
CATEGORIES= www
MASTER_SITES= http://www.webkitgtk.org/releases/
EXTRACT_SUFX= .tar.xz
@ -15,29 +14,37 @@ PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= bison gmake perl:build pkg-config msgfmt
USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt
# GCC >= 4.7 or Clang >= 3.3
GCC_REQD=4.8
PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in
MAKE_FILE= GNUmakefile
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-target=x11 \
--with-font-backend=freetype
CONFIGURE_ARGS+= --disable-geolocation
CONFIGURE_ARGS+= --enable-x11-target \
--disable-geolocation \
--disable-optimizations \
--disable-gtk-doc-html
.include "options.mk"
REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
Source/WebCore/bindings/scripts/generate-bindings.pl \
Source/WebCore/bindings/scripts/*.pl \
Source/WebCore/bindings/scripts/InFilesCompiler.pm \
Source/WebCore/bindings/scripts/InFilesParser.pm \
Source/WebCore/platform/text/mac/make-charset-table.pl \
Source/WebCore/css/*.pl \
Source/WebCore/dom/*.pl \
Source/WebCore/inspector/xxd.pl \
Source/WebCore/make-hash-tools.pl \
Source/WebCore/platform/text/mac/*.pl
REPLACE_PYTHON+= Tools/gtk/*.py \
Tools/gtk/generate-feature-defines-files \
Tools/gtk/generate-gtkdoc \
Tools/gtk/generate-webkitdom-doc-files
.include "../../lang/ruby/rubyversion.mk"
BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
CONFIGURE_ENV+= RUBY=${RUBY}
@ -72,15 +79,17 @@ CONFIGURE_ARGS+= --enable-introspection
#.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"
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.30
.include "../../multimedia/gst-plugins0.10-base/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.libsoup24+= libsoup24>=2.42.2nb3
.include "../../net/libsoup24/buildlink3.mk"
.include "../../textproc/enchant/buildlink3.mk"
.include "../../security/libsecret/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"

File diff suppressed because it is too large Load diff

View file

@ -1,23 +1,30 @@
# $NetBSD: buildlink3.mk,v 1.42 2014/06/10 12:34:09 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.43 2014/08/03 22:30:05 wiz Exp $
BUILDLINK_TREE+= webkit-gtk
.if !defined(WEBKIT_GTK_BUILDLINK3_MK)
WEBKIT_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=1.1.3
BUILDLINK_ABI_DEPENDS.webkit-gtk+= webkit-gtk>=1.10.2nb14<2
BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.0
BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk
pkgbase := webkit-gtk
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant)
.include "../../textproc/enchant/buildlink3.mk"
.endif
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gperf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../net/libsoup24/buildlink3.mk"
.include "../../textproc/enchant/buildlink3.mk"
.include "../../security/libsecret/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"

View file

@ -1,34 +1,17 @@
$NetBSD: distinfo,v 1.65 2013/08/14 22:16:54 jmcneill Exp $
$NetBSD: distinfo,v 1.66 2014/08/03 22:30:05 wiz Exp $
SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630
RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e
Size (webkitgtk-1.10.2.tar.xz) = 8633640 bytes
SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 448d9a096d87c3ecd22899ab66f45587cf8d1a65
SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = c48648f62466f47dbb37d20bee01c1d0caa54b00
SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 08f9ca5a4adbecf7f1aea9fcbc0de17ddc125259
SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703
SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372
SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 7b96aea5a81016b8a63c7f44839704261b39cd0d
SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ce9766427bebd4aac0b8c7fc2c12cc0ed75150d5
SHA1 (patch-Source_WTF_wtf_Atomics.h) = 3cc890798e7e956b75c2a181eca4a4d05cb545fc
SHA1 (patch-Source_WTF_wtf_Compiler.h) = 9e80acdbb57be1844103fe647a017ad7e46cc513
SHA1 (patch-Source_WTF_wtf_MathExtras.h) = f922736410d49e7d7d1a459bffd3dffd0364e85a
SHA1 (patch-Source_WTF_wtf_Platform.h) = 9e8f4b17619da4aa89e672c9d62a567f2f98b4bd
SHA1 (patch-Source_WTF_wtf_RefCountedLeakCounter.h) = 3cdf53f9735675bff83b48a81db59c3512f306e3
SHA1 (patch-Source_WTF_wtf_ThreadSafeRefCounted.h) = c068f8b248b8864eeaa582fa096eca279f06890e
SHA1 (patch-Source_WebCore_Modules_webaudio_AudioContext.h) = 121b67efd25af6982f02a19d0b9e1e26be89e782
SHA1 (patch-Source_WebCore_Modules_webaudio_AudioNode.h) = 1d22889087504d8fd42f38f72bde777850a4e767
SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = b331ad70a9c6a133c854b65452bad4ae3558e2e6
SHA1 (patch-Source_WebCore_editing_Editor.h) = 43562577dd6432a86fd8ee0a1e7bb0db31f07d2d
SHA1 (patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp) = 76e6e3e662edcfb7e327f2e475709a105d146e50
SHA1 (patch-Source_WebCore_platform_network_DNSResolveQueue.h) = ba2960eeda95189a85744112b2533e66599eb4b7
SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 0f33b188b242166584d5725060c5c430a819be61
SHA1 (patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp) = 92f4016fe65fc6162b7f6dfcdc4c6ea2f5204b02
SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 816cecbcb8ddf4af65265f5e76745b93f1055904
SHA1 (patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp) = 36013247ccbc2df274762acb49304511c06cb0f7
SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c
SHA1 (patch-aj) = 930d1b5d73028b2f2e5abb33c15f72befadc64ce
SHA1 (patch-ak) = 64ad843164f1c12968e933080e0966a9019abfdf
SHA1 (patch-al) = e2041fda38ad0a4d8d5e4c31f184a812f5332b6b
SHA1 (patch-am) = 9516994b630b43c7c234f61debf8d762cf7aee97
SHA1 (patch-configure) = 448caea068344fe987e566f73b3f567dad7b93ed
SHA1 (webkitgtk-2.4.4.tar.xz) = 0f7690bbaef69946c64793c8aa23cd2f00eac9ae
RMD160 (webkitgtk-2.4.4.tar.xz) = ce454ad56b9a62217beaf33c0815e3ec09c10539
Size (webkitgtk-2.4.4.tar.xz) = 9844048 bytes
SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6
SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = fdd31fcf6c745394499570397c82fe3dfce02e1d
SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 67f66ca254f958c0650249485a64982b40f92621
SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
SHA1 (patch-Source_WTF_wtf_Platform.h) = 5ff82e77d1d5dea5514adbeede14fd4a8923dc9c
SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f
SHA1 (patch-aj) = d35a4b26e2104cdf7f3be81b020aabb4779dfaad
SHA1 (patch-ak) = 477fd5c05abee8f47842a6ad5aba00e3e4628c45
SHA1 (patch-am) = e0a350feb14d739010000e3887971bd535a647a7
SHA1 (patch-configure) = 37322b62ab8f42ecf230c4be8cc27d453c8d688f

View file

@ -1,27 +1,58 @@
# $NetBSD: options.mk,v 1.4 2014/05/22 07:09:26 wiz Exp $
# $NetBSD: options.mk,v 1.5 2014/08/03 22:30:05 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
PKG_SUPPORTED_OPTIONS= webkit-jit debug
PKG_SUGGESTED_OPTIONS=
PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit
PKG_SUGGESTED_OPTIONS= enchant opengl
.include "../../mk/bsd.prefs.mk"
# XXX JIT produces invalid code on NetBSD/i386
# XXX JIT produces invalid code on NetBSD/i386 and NetBSD/amd64
.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
PKG_SUGGESTED_OPTIONS+= webkit-jit
.endif
.include "../../mk/bsd.options.mk"
#
# JIT support
#
.if !empty(PKG_OPTIONS:Mwebkit-jit)
CONFIGURE_ARGS+= --enable-jit
.else
CONFIGURE_ARGS+= --disable-jit
.endif
#
# debug support
#
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug
.else
CONFIGURE_ARGS+= --disable-debug
.endif
#
# OpenGL support: enable support for GLX, WebGL and accelerated compositing
#
# TODO: should we split them in multiple options?
#
.if !empty(PKG_OPTIONS:Mopengl)
CONFIGURE_ARGS+= --enable-glx
CONFIGURE_ARGS+= --enable-webgl
CONFIGURE_ARGS+= --enable-accelerated-compositing
.else
CONFIGURE_ARGS+= --disable-glx
CONFIGURE_ARGS+= --disable-webgl
CONFIGURE_ARGS+= --disable-accelerated-compositing
.endif
#
# Spellcheck support using enchant
#
.if !empty(PKG_OPTIONS:Menchant)
CONFIGURE_ARGS+= --enable-spellcheck
.include "../../textproc/enchant/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-spellcheck
.endif

View file

@ -1,27 +0,0 @@
$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
--- ./Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2012-11-23 20:12:15.000000000 +0000
+++ ./Source/JavaScriptCore/assembler/ARMAssembler.h
@@ -27,6 +27,10 @@
#ifndef ARMAssembler_h
#define ARMAssembler_h
+#if OS(NETBSD)
+#include <machine/sysarch.h>
+#endif
+
#if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
#include "AssemblerBufferWithConstantPool.h"
@@ -1041,6 +1045,11 @@ namespace JSC {
UNUSED_PARAM(size);
#elif OS(QNX)
msync(code, size, MS_INVALIDATE_ICACHE);
+#elif OS(NETBSD)
+ struct arm_sync_icache_args args;
+ args.addr = reinterpret_cast<uintptr_t>(code);
+ args.len = size;
+ sysarch(ARM_SYNC_ICACHE, &args);
#else
#error "The cacheFlush support is missing on this platform."
#endif

View file

@ -1,8 +1,8 @@
$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.2 2014/08/03 22:30:05 wiz Exp $
--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2012-11-23 20:12:15.000000000 +0000
--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2014-03-19 11:10:05.000000000 +0000
+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -37,6 +37,8 @@
@@ -42,6 +42,8 @@
#include <unistd.h>
#include <elf.h>
#include <asm/hwcap.h>
@ -11,9 +11,9 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/
#endif
namespace JSC {
@@ -57,6 +59,16 @@ static bool isVFPPresent()
@@ -62,6 +64,16 @@ static bool isVFPPresent()
}
#endif
#endif // OS(LINUX)
+#if OS(NETBSD)
+ size_t len;
@ -23,8 +23,8 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/
+ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) {
+ return flag == 1;
+ }
+#endif
+#endif // OS(NETBSD)
+
#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
#if (COMPILER(GCC) && defined(__VFP_FP__))
return true;
#else

View file

@ -1,8 +1,8 @@
$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.2 2014/08/03 22:30:05 wiz Exp $
--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2012-11-23 20:12:15.000000000 +0000
--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2014-04-14 06:40:44.000000000 +0000
+++ Source/JavaScriptCore/dfg/DFGNode.h
@@ -65,7 +65,7 @@ struct StructureTransitionData {
@@ -146,7 +146,7 @@ struct SwitchData {
struct OpInfo {
explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }

View file

@ -1,6 +1,6 @@
$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/30 12:46:30 drochner Exp $
$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.3 2014/08/03 22:30:05 wiz Exp $
--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2012-10-16 15:22:38.000000000 +0000
--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2014-04-14 06:40:44.000000000 +0000
+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -20,6 +20,9 @@
*/
@ -23,7 +23,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/3
#include <thread.h>
#else
#include <pthread.h>
@@ -313,6 +320,7 @@ typedef pthread_attr_t PlatformThreadReg
@@ -310,6 +317,7 @@ typedef pthread_attr_t PlatformThreadReg
#error Need a thread register struct for this platform
#endif
@ -31,7 +31,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/3
static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
{
#if OS(DARWIN)
@@ -379,6 +387,7 @@ static size_t getPlatformThreadRegisters
@@ -363,6 +371,7 @@ static size_t getPlatformThreadRegisters
#error Need a way to get thread registers on this platform
#endif
}
@ -39,15 +39,15 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/3
static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
{
@@ -442,6 +451,7 @@ static inline void* otherThreadStackPoin
@@ -425,6 +434,7 @@ static inline void* otherThreadStackPoin
#endif
}
+#if !OS(SOLARIS)
static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
{
#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
@@ -450,20 +460,36 @@ static void freePlatformThreadRegisters(
#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
@@ -433,20 +443,36 @@ static void freePlatformThreadRegisters(
UNUSED_PARAM(regs);
#endif
}

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_JavaScriptCore_wtf_Threading.h,v 1.3 2012/10/30 12:46:30 drochner Exp $
--- Source/WTF/wtf/Threading.h.orig 2012-08-27 19:05:10.000000000 +0000
+++ Source/WTF/wtf/Threading.h
@@ -112,6 +112,8 @@ using WTF::createThread;
using WTF::currentThread;
using WTF::detachThread;
using WTF::waitForThreadCompletion;
+#if !OS(SOLARIS)
using WTF::yield;
+#endif
#endif // Threading_h

View file

@ -1,12 +0,0 @@
$NetBSD: patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y,v 1.1 2013/08/01 06:14:54 wiz Exp $
--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2012-11-23 20:12:16.000000000 +0000
+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
%expect 1 /* One shift reduce conflict because of if | else */
%pure-parser
%parse-param {TParseContext* context}
+%lex-param {TParseContext* context}
%union {
struct {

View file

@ -1,6 +1,6 @@
$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2 2013/05/09 14:04:42 joerg Exp $
$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.3 2014/08/03 22:30:05 wiz Exp $
--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2012-05-12 19:43:43.000000000 +0000
--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2013-09-09 09:20:59.000000000 +0000
+++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
@@ -35,6 +35,7 @@
@ -10,7 +10,7 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2
// The user can define the following macros in the build script to
// control Google Test's behavior. If the user doesn't define a macro
@@ -173,6 +174,7 @@
@@ -175,6 +176,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@ -18,7 +18,7 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2
#ifndef _WIN32_WCE
#include <sys/stat.h>
#endif // !_WIN32_WCE
@@ -443,7 +445,14 @@
@@ -448,7 +450,14 @@
// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
// not conform to the TR1 spec, which requires the header to be <tuple>.
@ -27,9 +27,9 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2
+#include <tuple>
+namespace std {
+ namespace tr1 {
+ using ::std::tuple;
+ using ::std::tuple;
+ }
+}
+}
+#elif !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
// Until version 4.3.2, gcc has a bug that causes <tr1/functional>,
// which is #included by <tr1/tuple>, to not compile when RTTI is

View file

@ -1,45 +0,0 @@
$NetBSD: patch-Source_WTF_wtf_Atomics.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WTF/wtf/Atomics.h.orig 2012-11-23 20:12:16.000000000 +0000
+++ Source/WTF/wtf/Atomics.h
@@ -72,7 +72,10 @@
#elif OS(ANDROID)
#include <sys/atomics.h>
#elif COMPILER(GCC)
-#if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))) && !defined(__LSB_VERSION__)
+#include <ciso646>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <atomic>
+#elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))) && !defined(__LSB_VERSION__)
#include <ext/atomicity.h>
#else
#include <bits/atomicity.h>
@@ -112,6 +115,11 @@ inline int atomicDecrement(int volatile*
inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
+#elif defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+inline int atomicIncrement(std::atomic<int> * addend) { return *addend++; }
+inline int atomicDecrement(std::atomic<int> * addend) { return *addend--; }
+
#elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
@@ -227,9 +235,16 @@ inline void memoryBarrierBeforeUnlock()
#endif
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+typedef std::atomic<int> atomic_int;
+#else
+typedef int volatile atomic_int;
+#endif
+
} // namespace WTF
#if USE(LOCKFREE_THREADSAFEREFCOUNTED)
+using WTF::atomic_int;
using WTF::atomicDecrement;
using WTF::atomicIncrement;
#endif

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_WTF_wtf_Compiler.h,v 1.1 2013/05/12 06:11:17 richard Exp $
--- Source/WTF/wtf/Compiler.h.orig 2012-11-23 20:12:16.000000000 +0000
+++ Source/WTF/wtf/Compiler.h
@@ -122,7 +122,7 @@
/* Specific compiler features */
#if COMPILER(GCC) && !COMPILER(CLANG)
-#if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
+#if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L
#define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1

View file

@ -1,15 +0,0 @@
$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.1 2013/02/22 23:54:07 jperkin Exp $
Remove bogus Solaris check.
--- Source/WTF/wtf/MathExtras.h.orig 2012-10-16 15:22:38.000000000 +0000
+++ Source/WTF/wtf/MathExtras.h
@@ -288,7 +288,7 @@ inline bool isWithinIntRange(float x)
return x > static_cast<float>(std::numeric_limits<int>::min()) && x < static_cast<float>(std::numeric_limits<int>::max());
}
-#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS)
+#if !COMPILER(MSVC) && !COMPILER(RVCT)
using std::isfinite;
#if !COMPILER_QUIRK(GCC11_GLOBAL_ISINF_ISNAN)
using std::isinf;

View file

@ -1,8 +1,8 @@
$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2014/08/03 22:30:05 wiz Exp $
--- Source/WTF/wtf/Platform.h.orig 2012-11-23 20:12:16.000000000 +0000
--- Source/WTF/wtf/Platform.h.orig 2014-04-14 06:40:45.000000000 +0000
+++ Source/WTF/wtf/Platform.h
@@ -484,6 +484,11 @@
@@ -618,6 +618,11 @@
#define USE_SYSTEM_MALLOC 1
#endif
@ -11,6 +11,6 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp
+#define USE_SYSTEM_MALLOC 1
+#endif
+
#if PLATFORM(BLACKBERRY)
#define WTF_USE_MERSENNE_TWISTER_19937 1
#define WTF_USE_SKIA 1
#if !defined(ENABLE_GLOBAL_FASTMALLOC_NEW)
#define ENABLE_GLOBAL_FASTMALLOC_NEW 1
#endif

View file

@ -1,17 +0,0 @@
$NetBSD: patch-Source_WTF_wtf_RefCountedLeakCounter.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WTF/wtf/RefCountedLeakCounter.h.orig 2013-05-08 07:48:32.000000000 +0000
+++ Source/WTF/wtf/RefCountedLeakCounter.h
@@ -38,11 +38,7 @@ namespace WTF {
#ifndef NDEBUG
private:
-#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
- int m_count;
-#else
- volatile int m_count;
-#endif
+ atomic_int m_count;
const char* m_description;
#endif
};

View file

@ -1,22 +0,0 @@
$NetBSD: patch-Source_WTF_wtf_ThreadSafeRefCounted.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WTF/wtf/ThreadSafeRefCounted.h.orig 2013-05-08 07:46:55.000000000 +0000
+++ Source/WTF/wtf/ThreadSafeRefCounted.h
@@ -96,7 +96,7 @@ public:
#if !USE(LOCKFREE_THREADSAFEREFCOUNTED)
MutexLocker locker(m_mutex);
#endif
- return static_cast<int const volatile &>(m_refCount);
+ return m_refCount;
}
protected:
@@ -123,7 +123,7 @@ protected:
}
private:
- int m_refCount;
+ atomic_int m_refCount;
#if !USE(LOCKFREE_THREADSAFEREFCOUNTED)
mutable Mutex m_mutex;
#endif

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_WebCore_Modules_webaudio_AudioContext.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WebCore/Modules/webaudio/AudioContext.h.orig 2013-05-08 08:53:03.000000000 +0000
+++ Source/WebCore/Modules/webaudio/AudioContext.h
@@ -333,7 +333,7 @@ private:
enum { MaxNumberOfChannels = 32 };
// Number of AudioBufferSourceNodes that are active (playing).
- int m_activeSourceCount;
+ atomic_int m_activeSourceCount;
};
} // WebCore

View file

@ -1,15 +0,0 @@
$NetBSD: patch-Source_WebCore_Modules_webaudio_AudioNode.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WebCore/Modules/webaudio/AudioNode.h.orig 2013-05-08 08:53:26.000000000 +0000
+++ Source/WebCore/Modules/webaudio/AudioNode.h
@@ -178,8 +178,8 @@ private:
double m_lastNonSilentTime;
// Ref-counting
- volatile int m_normalRefCount;
- volatile int m_connectionRefCount;
+ atomic_int m_normalRefCount;
+ atomic_int m_connectionRefCount;
bool m_isMarkedForDeletion;
bool m_isDisabled;

View file

@ -1,13 +1,13 @@
$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.1 2013/02/02 16:59:35 jmcneill Exp $
$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.2 2014/08/03 22:30:05 wiz Exp $
--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2012-10-16 15:22:38.000000000 +0000
--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2014-04-14 06:40:45.000000000 +0000
+++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
@@ -61,6 +61,8 @@ JSValue JSInspectorFrontendHost::platfor
DEFINE_STATIC_LOCAL(const String, platform, ("linux"));
DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux")));
#elif OS(FREEBSD)
DEFINE_STATIC_LOCAL(const String, platform, ("freebsd"));
DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd")));
+#elif OS(NETBSD)
+ DEFINE_STATIC_LOCAL(const String, platform, ("netbsd"));
+ DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd")));
#elif OS(OPENBSD)
DEFINE_STATIC_LOCAL(const String, platform, ("openbsd"));
DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd")));
#elif OS(SOLARIS)

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_WebCore_editing_Editor.h,v 1.2 2012/10/30 12:46:30 drochner Exp $
--- Source/WebCore/editing/Editor.h.orig 2012-10-16 15:22:38.000000000 +0000
+++ Source/WebCore/editing/Editor.h
@@ -398,7 +398,7 @@ public:
Vector<String> dictationAlternativesForMarker(const DocumentMarker*);
void applyDictationAlternativelternative(const String& alternativeString);
private:
- virtual void willDetachPage() OVERRIDE;
+ virtual void willDetachPage();
OwnPtr<DeleteButtonController> m_deleteButtonController;
RefPtr<CompositeEditCommand> m_lastEditCommand;

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WebCore/platform/gtk/FileSystemGtk.cpp.orig 2012-11-23 20:12:17.000000000 +0000
+++ Source/WebCore/platform/gtk/FileSystemGtk.cpp
@@ -222,7 +222,7 @@ CString sharedResourcesPath()
GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
#else
- GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
+ GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
#endif
cachedPath = dataPath.get();

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_WebCore_platform_network_DNSResolveQueue.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WebCore/platform/network/DNSResolveQueue.h.orig 2013-05-08 08:52:14.000000000 +0000
+++ Source/WebCore/platform/network/DNSResolveQueue.h
@@ -56,7 +56,7 @@ private:
void fired();
HashSet<String> m_names;
- int m_requestsInFlight;
+ atomic_int m_requestsInFlight;
};
}

View file

@ -1,15 +0,0 @@
$NetBSD: patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp,v 1.1 2012/11/07 12:21:46 jperkin Exp $
Fix "error: 'yield' was not declared in this scope"
--- Source/WebCore/platform/sql/SQLiteDatabase.cpp.orig Wed Nov 7 07:59:38 2012
+++ Source/WebCore/platform/sql/SQLiteDatabase.cpp Wed Nov 7 07:59:58 2012
@@ -125,7 +125,7 @@
if (!m_db)
return;
sqlite3_interrupt(m_db);
- yield();
+ WTF::yield();
}
m_lockingMutex.unlock();

View file

@ -1,13 +0,0 @@
$NetBSD: patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp.orig 2013-05-08 08:54:13.000000000 +0000
+++ Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -118,7 +118,7 @@ void handleDidGetPlugins(uint64_t reques
static uint64_t generateRequestID()
{
- static int uniqueID;
+ static atomic_int uniqueID;
return atomicIncrement(&uniqueID);
}

View file

@ -1,12 +1,12 @@
$NetBSD: patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
$NetBSD: patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp,v 1.2 2014/08/03 22:30:05 wiz Exp $
--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig 2012-11-23 20:12:19.000000000 +0000
--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig 2014-04-14 06:40:46.000000000 +0000
+++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -46,6 +46,7 @@
#include "WorkQueueItem.h"
@@ -47,6 +47,7 @@
#include <JavaScriptCore/JavaScript.h>
#include <WebCore/platform/network/soup/GUniquePtrSoup.h>
#include <cassert>
+#include <clocale>
+#include <clocate>
#include <cstdlib>
#include <cstring>
#include <getopt.h>

View file

@ -1,21 +0,0 @@
$NetBSD: patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
--- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig 2013-05-02 21:03:34.000000000 +0000
+++ Tools/DumpRenderTree/gtk/ImageDiff.cpp
@@ -30,6 +30,7 @@
#include <algorithm>
#include <cmath>
#include <cstdio>
+#include <cstdlib>
#include <cstring>
#include <gdk/gdk.h>
@@ -157,7 +158,7 @@ void printImage(GdkPixbuf* image)
return; // Don't bail out, as we can still use the percentage output.
}
- printf("Content-Length: %"G_GSIZE_FORMAT"\n", bufferSize);
+ printf("Content-Length: %" G_GSIZE_FORMAT "\n", bufferSize);
fwrite(buffer, 1, bufferSize, stdout);
}

View file

@ -1,17 +1,17 @@
$NetBSD: patch-ai,v 1.3 2012/10/30 12:46:30 drochner Exp $
$NetBSD: patch-ai,v 1.4 2014/08/03 22:30:05 wiz Exp $
--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2012-04-24 01:38:21.000000000 +0000
--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2013-08-03 16:10:38.000000000 +0000
+++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp
@@ -39,6 +39,12 @@
#if OS(ANDROID) || OS(HURD)
#if OS(HURD)
// PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
#define PTHREAD_KEYS_MAX 1024
+#elif OS(NETBSD)
+#elif OS(NETBSD)
+#include <limits.h>
+// PTHREAD_KEYS_MAX is not defined in 5.x
+#ifndef PTHREAD_KEYS_MAX
+#define PTHREAD_KEYS_MAX 256
+#endif
+#endif
#else
#include <limits.h>
#endif

View file

@ -1,13 +1,13 @@
$NetBSD: patch-aj,v 1.2 2012/10/30 12:46:30 drochner Exp $
$NetBSD: patch-aj,v 1.3 2014/08/03 22:30:05 wiz Exp $
--- Source/WTF/wtf/InlineASM.h.orig 2012-10-16 15:22:38.000000000 +0000
--- Source/WTF/wtf/InlineASM.h.orig 2014-04-14 06:40:45.000000000 +0000
+++ Source/WTF/wtf/InlineASM.h
@@ -42,7 +42,7 @@
#define THUMB_FUNC_PARAM(name)
#endif
-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))
+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))
#define GLOBAL_REFERENCE(name) #name "@plt"
#elif CPU(X86) && COMPILER(MINGW)
#define GLOBAL_REFERENCE(name) "@" #name "@4"

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ak,v 1.3 2012/10/30 12:46:30 drochner Exp $
$NetBSD: patch-ak,v 1.4 2014/08/03 22:30:05 wiz Exp $
--- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig 2012-09-01 14:54:54.000000000 +0000
--- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig 2014-04-14 06:40:44.000000000 +0000
+++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h
@@ -16,6 +16,7 @@
#define ANGLE_OS_WIN

View file

@ -1,30 +0,0 @@
$NetBSD: patch-al,v 1.4 2013/05/12 06:11:17 richard Exp $
--- GNUmakefile.in.orig 2012-12-09 18:20:20.000000000 +0000
+++ GNUmakefile.in
@@ -21156,7 +21156,6 @@ Programs_minidom_CPPFLAGS = \
$(javascriptcore_cppflags)
Programs_minidom_CFLAGS = \
- -ansi \
-fno-strict-aliasing \
$(global_cflags) \
$(GLOBALDEPS_CFLAGS)
@@ -79732,6 +79731,8 @@ doc-maintainer-clean-local: clean
-@rmdir Documentation
install-data-local:
+
+xinstall-data-local:
@installfiles=`echo ./Documentation/webkitgtk/html/*`; \
if test "$$installfiles" = './Documentation/webkitgtk/html/*'; \
then echo 1>&2 'No documentation to install' ; \
@@ -79772,7 +79773,7 @@ install-data-local:
@ENABLE_WEBKIT2_TRUE@ $${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
@ENABLE_WEBKIT2_TRUE@ fi; \
@ENABLE_WEBKIT2_TRUE@ fi
- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
+# @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
uninstall-local:
@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \

View file

@ -1,6 +1,6 @@
$NetBSD: patch-am,v 1.1 2012/10/30 12:46:30 drochner Exp $
$NetBSD: patch-am,v 1.2 2014/08/03 22:30:05 wiz Exp $
--- Source/WTF/wtf/RAMSize.cpp.orig 2012-10-19 13:44:57.000000000 +0000
--- Source/WTF/wtf/RAMSize.cpp.orig 2014-03-19 11:10:06.000000000 +0000
+++ Source/WTF/wtf/RAMSize.cpp
@@ -27,7 +27,7 @@
#include "RAMSize.h"
@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.1 2012/10/30 12:46:30 drochner Exp $
#include <sys/param.h>
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -45,13 +45,17 @@ static const size_t ramSizeGuess = 128 *
@@ -43,13 +43,17 @@ static const size_t ramSizeGuess = 128 *
static size_t computeRAMSize()
{

View file

@ -1,33 +1,73 @@
$NetBSD: patch-configure,v 1.5 2012/10/30 12:46:30 drochner Exp $
$NetBSD: patch-configure,v 1.6 2014/08/03 22:30:05 wiz Exp $
--- configure.orig 2012-10-16 22:11:45.000000000 +0000
--- configure.orig 2014-05-12 06:05:21.000000000 +0000
+++ configure
@@ -18587,10 +18587,6 @@ install-data-am: install-gsettings-schem
@@ -4703,7 +4703,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -4749,7 +4749,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -4773,7 +4773,7 @@ rm -f core conftest.err conftest.$ac_obj
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -4818,7 +4818,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -4842,7 +4842,7 @@ rm -f core conftest.err conftest.$ac_obj
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -17312,10 +17312,13 @@ int
main ()
{
unsigned int major, minor, micro;
+ char *tmp_version;
.SECONDARY: $(gsettings_SCHEMAS)
fclose (fopen ("conf.glibtest", "w"));
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
@@ -18598,7 +18594,7 @@ install-gsettings-schemas: $(gsettings_S
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
+ done | \
while read files; do \
echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
@@ -22297,7 +22293,7 @@ fi
fi
if test "$with_acceleration_backend" = "opengl"; then
- OPENGL_LIBS="-lGL -ldl"
+ OPENGL_LIBS="-lGL"
fi
- if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_glib_version");
+ if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_glib_version");
exit(1);
}
@@ -21110,7 +21113,7 @@ fi
# On some Linux/Unix platforms, shm_* may only be available if linking against librt
- if test "$os_win32" = "no"; then
+ if test "$os_win32" = "no" && test "$os_openbsd" = "no" && test "$os_netbsd" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
$as_echo_n "checking for library containing shm_open... " >&6; }
if ${ac_cv_search_shm_open+:} false; then :