pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
webkit-gtk: Remove, used to update www/webkit-gtk
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Wed Oct 24 23:43:56 2018 +0200
Changeset: 478a8e6e6114d62fd65ec5f5d369f91909678fb6
Modified Files:
Makefile
Removed Files:
webkit-gtk/COMMIT_MSG
webkit-gtk/DESCR
webkit-gtk/Makefile
webkit-gtk/PLIST
webkit-gtk/TODO
webkit-gtk/buildlink3.mk
webkit-gtk/distinfo
webkit-gtk/hacks.mk
webkit-gtk/options.mk
webkit-gtk/patches/patch-CMakeLists.txt
webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp
webkit-gtk/patches/patch-Source_WebCore_platform_FileSystem.cpp
webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_RasterShape.cpp
webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt
webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
webkit-gtk/patches/patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp
webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
webkit-gtk/patches/patch-aj
Log Message:
webkit-gtk: Remove, used to update www/webkit-gtk
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=478a8e6e6114d62fd65ec5f5d369f91909678fb6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
webkit-gtk/COMMIT_MSG | 62 -----
webkit-gtk/DESCR | 7 -
webkit-gtk/Makefile | 132 ----------
webkit-gtk/PLIST | 276 ---------------------
webkit-gtk/TODO | 13 -
webkit-gtk/buildlink3.mk | 40 ---
webkit-gtk/distinfo | 28 ---
webkit-gtk/hacks.mk | 16 --
webkit-gtk/options.mk | 78 ------
webkit-gtk/patches/patch-CMakeLists.txt | 28 ---
...-Source_JavaScriptCore_assembler_ARMAssembler.h | 30 ---
..._JavaScriptCore_assembler_MacroAssemblerARM.cpp | 32 ---
...atch-Source_JavaScriptCore_heap_MarkedSpace.cpp | 15 --
...urce_JavaScriptCore_jit_ExecutableAllocator.cpp | 19 --
...-Source_JavaScriptCore_runtime_MachineContext.h | 121 ---------
...Party_gtest_include_gtest_internal_gtest-port.h | 36 ---
webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h | 73 ------
.../patches/patch-Source_WTF_wtf_StackBounds.cpp | 14 --
...rce_WebCore_inspector_InspectorFrontendHost.cpp | 15 --
.../patch-Source_WebCore_platform_FileSystem.cpp | 16 --
...Core_platform_graphics_filters_FEMorphology.cpp | 15 --
...Source_WebCore_rendering_shapes_RasterShape.cpp | 15 --
.../patches/patch-Source_WebKit_CMakeLists.txt | 17 --
...NetworkProcess_cache_NetworkCacheFileSystem.cpp | 52 ----
.../patches/patch-Source_WebKit_PlatformGTK.cmake | 15 --
...rce_WebKit_Platform_IPC_unix_ConnectionUnix.cpp | 24 --
...classifier_ResourceLoadStatisticsClassifier.cpp | 15 --
.../patch-Source_bmalloc_bmalloc_BPlatform.h | 17 --
.../patch-Source_bmalloc_bmalloc_VMAllocate.h | 24 --
.../patches/patch-Source_cmake_OptionsCommon.cmake | 21 --
webkit-gtk/patches/patch-aj | 15 --
32 files changed, 1282 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index b84bffa9f0..9f24485cf4 100644
--- a/Makefile
+++ b/Makefile
@@ -4708,7 +4708,6 @@ SUBDIR+= wbox
SUBDIR+= weatherman
SUBDIR+= webbrowser
SUBDIR+= webcleaner
-SUBDIR+= webkit-gtk
SUBDIR+= weland
SUBDIR+= weplab
SUBDIR+= west
diff --git a/webkit-gtk/COMMIT_MSG b/webkit-gtk/COMMIT_MSG
deleted file mode 100644
index 14b445e392..0000000000
--- a/webkit-gtk/COMMIT_MSG
+++ /dev/null
@@ -1,62 +0,0 @@
-webkit-gtk: Update www/webkit-gtk to 2.22.2
-
-pkgsrc changes:
- - Bump GCC_REQD to 6.0 (now gcc 6.0.0 or newer is needed)
- - Add NetBSD support for JavaScript JIT on x86_64, i386, arm,
- aarch64 and mips
- - Add WebKitWebProcess and jsc to NOT_PAX_MPROTECT_SAFE.
- At least on NetBSD/amd64, running SunSpider 1.0.2 JavaScript Benchmark
- (<https://webkit.org/perf/sunspider/sunspider.html>) with MiniBrowser
- before `paxctl +m'-ing them needed:
- Total: 1006.9ms +/- 0.7%
- ...while after `paxctl +m'-ing them:
- Total: 322.3ms +/- 3.0%
- (Probably EACCESS due PaX MPROTECT are handled gracefully and
- silently instead of failing hard at runtime.)
- Please also note that webkit-gtk browsers should not need any
- NOT_PAX_MPROTECT_SAFE because WebKitWebProcess is used and already
- have that.
- - Improve handling of `webkit-jit' by introducing a
- WEBKIT_JIT_MACHINE_PLATFORMS list that contain all MACHINE_PLATFORMs
- triplets that have `webkit-jit' option as suggested one.
- - Always use OS(...) and BOS(...) macros instead of __Os__ macros for
- consistency with webkit code.
- - Add definition for BOS(SOLARIS) and OS(SOLARIS) and add it to the
- OS(UNIX) OSes list.
- - Limit patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp to
- OpenBSD. It is no longer present in FreeBSD ports and it is not
- problematic in NetBSD.
- - Remove no longer needed patch-Source_WTF_wtf_ThreadSpecific.h:
- NetBSD 5.x was already part of NOT_FOR_PLATFORM.
- - Sync patch-CMakeLists.txt with FreeBSD ports.
- Please note that this also removes WTF_CPU_SPARC64 definition that was
- unused.
- - madvise(2) on {Free,DragonFly,Net,Open}BSD supports MADV_FREE and
- MADV_DONTNEED flags. Define the corresponding HAVE_* via
- patch-Source_WTF_wtf_Platform.h.
- - Use globbing for REPLACE_{PERL,PYTHON} where possible.
-
-Changes:
-WebKitGTK+ 2.22.2
-=================
- - Several fixes for video playback with media source extensions (MSE).
- This allows using WebM support for YouTube, which no longer works through
- regular video source. Note that MSE is still disabled by default and
- webkit_settings_set_enable_mediasource() has to be used to enable the
- feature.
- - Fix the build when only Wayland support is enabled and X11 headers are
- not available.
-
-WebKitGTK+ 2.22.1
-=================
- - Fix printing in landscape.
- - Fix the build in several platforms: s390x, ppc64le, armv7hl.
- - Fix the build with a11y disabled.
- - Fix the build with video disabled.
- - Fix several crashes and rendering issues.
-
-WebKitGTK+ 2.22.0
-==================
- - Add warn_unused_result attribute to some JavaScriptCore GLib APIs.
- - Make pinch to zoom scale the page without changing the layout.
- - Fix the build in mips64.
diff --git a/webkit-gtk/DESCR b/webkit-gtk/DESCR
deleted file mode 100644
index 8f5106660f..0000000000
--- a/webkit-gtk/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-WebKit is an open source web browser engine. WebKit is also the name of
-the Mac OS X system framework version of the engine that's used by
-Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
-and JavaScript code began as a branch of the KHTML and KJS libraries
-from KDE.
-
-This is the GTK port of the engine.
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
deleted file mode 100644
index 18bc40ca36..0000000000
--- a/webkit-gtk/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-# $NetBSD: Makefile,v 1.144 2018/08/22 09:47:59 wiz Exp $
-
-DISTNAME= webkitgtk-2.22.2
-PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
-CATEGORIES= www
-MASTER_SITES= https://www.webkitgtk.org/releases/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.webkitgtk.org/
-COMMENT= GTK port of the WebKit browser engine
-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]*-*
-
-TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
-
-USE_CMAKE= yes
-USE_LANGUAGES= c c++11
-USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt
-
-GCC_REQD+= 6.0
-
-# 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/WebKit/gtk/webkit2gtk-web-extension.pc.in
-PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk.pc.in
-
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DPORT=GTK
-CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
-CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
-CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
-CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
-CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
-#CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON # XXX: needs adjustements for sysinfo() stuffs in Source/WTF/wtf/RAMSize.cpp
-
-REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
-REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl
-REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm
-REPLACE_PERL+= Source/WebCore/css/*.pl
-REPLACE_PERL+= Source/WebCore/dom/*.pl
-REPLACE_PERL+= Source/WebCore/make-hash-tools.pl
-
-REPLACE_PYTHON+= Source/JavaScriptCore/Scripts/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/Scripts/builtins/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/generate-bytecode-files
-REPLACE_PYTHON+= Source/JavaScriptCore/inspector/scripts/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/inspector/scripts/codegen/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/wasm/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/yarr/create_regex_tables
-REPLACE_PYTHON+= Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode
-REPLACE_PYTHON+= Source/ThirdParty/gtest/*.py
-REPLACE_PYTHON+= Source/ThirdParty/gtest/scripts/*.py
-REPLACE_PYTHON+= Source/ThirdParty/gtest/test/*.py
-REPLACE_PYTHON+= Source/ThirdParty/gtest/xcode/Scripts/*.py
-REPLACE_PYTHON+= Source/WebCore/PAL/*.py
-REPLACE_PYTHON+= Source/WebCore/css/*.py
-REPLACE_PYTHON+= Source/WebCore/html/parser/create-html-entity-table
-REPLACE_PYTHON+= Source/WebCore/platform/network/create-http-header-name-table
-REPLACE_PYTHON+= Source/WebKit/Scripts/*.py
-REPLACE_PYTHON+= Tools/glib/*.py
-REPLACE_PYTHON+= Tools/gtk/*.py
-REPLACE_PYTHON+= Tools/gtk/generate-gtkdoc
-
-SUBST_CLASSES+= python
-SUBST_FILES.python+= Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-SUBST_SED.python+= -e 's,\(.\)python.;,\1${PYTHONBIN}\1;,'
-SUBST_STAGE.python= pre-configure
-SUBST_MESSAGE.python= Fixing path to python binary.
-
-.include "../../lang/ruby/rubyversion.mk"
-TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
-CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
-
-PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 2.22.2
-.include "../../lang/python/application.mk"
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
-
-CXXFLAGS.SunOS+= -fpermissive
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+= -Wno-c++11-narrowing
-.endif
-
-# This does not disable optimisations, merely avoids #error if there are none.
-CFLAGS+= -DRELEASE_WITHOUT_OPTIMIZATIONS
-
-NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/WebKitWebProcess
-NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/jsc
-
-.include "options.mk"
-
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
-.include "../../devel/glib2/buildlink3.mk"
-.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 "../../fonts/woff2/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 "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST
deleted file mode 100644
index 8404e1fb62..0000000000
--- a/webkit-gtk/PLIST
+++ /dev/null
@@ -1,276 +0,0 @@
-@comment $NetBSD$
-bin/WebKitWebDriver
-include/webkitgtk-4.0/JavaScriptCore/JSBase.h
-include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
-include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
-include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
-include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
-include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
-include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
-include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
-include/webkitgtk-4.0/jsc/JSCAutocleanups.h
-include/webkitgtk-4.0/jsc/JSCClass.h
-include/webkitgtk-4.0/jsc/JSCContext.h
-include/webkitgtk-4.0/jsc/JSCDefines.h
-include/webkitgtk-4.0/jsc/JSCException.h
-include/webkitgtk-4.0/jsc/JSCValue.h
-include/webkitgtk-4.0/jsc/JSCVersion.h
-include/webkitgtk-4.0/jsc/JSCVirtualMachine.h
-include/webkitgtk-4.0/jsc/JSCWeakValue.h
-include/webkitgtk-4.0/jsc/jsc.h
-include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
-include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
-include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
-include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
-include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
-include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
-include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
-include/webkitgtk-4.0/webkit2/WebKitConsoleMessage.h
-include/webkitgtk-4.0/webkit2/WebKitContextMenu.h
-include/webkitgtk-4.0/webkit2/WebKitContextMenuActions.h
-include/webkitgtk-4.0/webkit2/WebKitContextMenuItem.h
-include/webkitgtk-4.0/webkit2/WebKitCookieManager.h
-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
-include/webkitgtk-4.0/webkit2/WebKitFileChooserRequest.h
-include/webkitgtk-4.0/webkit2/WebKitFindController.h
-include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h
-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
-include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
-include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
-include/webkitgtk-4.0/webkit2/WebKitNotification.h
-include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
-include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
-include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
-include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
-include/webkitgtk-4.0/webkit2/WebKitPlugin.h
-include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
-include/webkitgtk-4.0/webkit2/WebKitPrintCustomWidget.h
-include/webkitgtk-4.0/webkit2/WebKitPrintOperation.h
-include/webkitgtk-4.0/webkit2/WebKitResponsePolicyDecision.h
-include/webkitgtk-4.0/webkit2/WebKitScriptDialog.h
-include/webkitgtk-4.0/webkit2/WebKitScriptWorld.h
-include/webkitgtk-4.0/webkit2/WebKitSecurityManager.h
-include/webkitgtk-4.0/webkit2/WebKitSecurityOrigin.h
-include/webkitgtk-4.0/webkit2/WebKitSettings.h
-include/webkitgtk-4.0/webkit2/WebKitURIRequest.h
-include/webkitgtk-4.0/webkit2/WebKitURIResponse.h
-include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h
-include/webkitgtk-4.0/webkit2/WebKitUserContent.h
-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/WebKitWebExtensionAutocleanups.h
-include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
-include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
-include/webkitgtk-4.0/webkit2/WebKitWebPage.h
-include/webkitgtk-4.0/webkit2/WebKitWebProcessEnumTypes.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/WebKitWebViewSessionState.h
-include/webkitgtk-4.0/webkit2/WebKitWebsiteData.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
-include/webkitgtk-4.0/webkitdom/WebKitDOMAttr.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMBlob.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCDATASection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRule.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRuleList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDeclaration.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMImplementation.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMSelection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMTokenList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindow.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindowUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDeprecated.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDocument.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentFragment.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentFragmentUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentType.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMElementUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMEventTarget.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMFile.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMFileList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAnchorElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAppletElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAreaElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBRElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBaseElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBodyElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLButtonElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLCanvasElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLCollection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDListElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDirectoryElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDivElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDocument.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLElementUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLEmbedElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFieldSetElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFontElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFormElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFrameElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFrameSetElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHRElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHeadElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHeadingElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHtmlElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLIFrameElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLImageElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLInputElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLIElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLabelElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLegendElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLinkElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMapElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMarqueeElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMenuElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMetaElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLModElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOListElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLObjectElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptGroupElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionsCollection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLParagraphElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLParamElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLPreElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLQuoteElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLScriptElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLSelectElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLStyleElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableCaptionElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableCellElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableColElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableRowElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableSectionElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTitleElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLUListElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMKeyboardEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMediaList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNamedNodeMap.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNode.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNodeFilter.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNodeIterator.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNodeList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMObject.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMProcessingInstruction.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMRange.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMRangeUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMStyleSheet.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMStyleSheetList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMText.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTreeWalker.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
-include/webkitgtk-4.0/webkitdom/webkitdom.h
-include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
-include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
-${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
-${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
-${PLIST.introspection}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.11.3
-lib/libwebkit2gtk-4.0.so
-lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.33.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/MiniBrowser
-libexec/webkit2gtk-4.0/WebKitNetworkProcess
-libexec/webkit2gtk-4.0/WebKitPluginProcess
-libexec/webkit2gtk-4.0/WebKitPluginProcess2
-libexec/webkit2gtk-4.0/WebKitStorageProcess
-libexec/webkit2gtk-4.0/WebKitWebProcess
-libexec/webkit2gtk-4.0/jsc
-${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
-${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
-${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
-share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/ca/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/cs/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/de/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/el/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/en_CA/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/en_GB/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/eo/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/es/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/et/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/eu/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/fi/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/fr/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/gl/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/gu/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/he/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/hi/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/hu/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/id/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/it/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/ja/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/kn/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/ko/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/lt/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/lv/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/ml/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/mr/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/nb/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/nl/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/or/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/pa/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/pl/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/pt/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/pt_BR/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/ro/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/ru/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/sl/LC_MESSAGES/WebKit2GTK-4.0.mo
-share/locale/sr/LC_MESSAGES/WebKit2GTK-4.0.mo
-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/webkit-gtk/TODO b/webkit-gtk/TODO
deleted file mode 100644
index 74aec1fb8c..0000000000
--- a/webkit-gtk/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-- Review JIT support for NetBSD:
- * patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
- * patches/patch-Source_WTF_wtf_Platform.h
- Only amd64 and i386 was actually tested and it would be nice if arm, arm64
- and mips can get some testing.
-- Could the NetBSD logic in
- patches/patch-Source_JavaScriptCore_runtime_MachineContext.h be rewritten
- using ucontext(2) _UC_MACHINE_* macros instead?
-- Would it be useful to define HAVE_BACKTRACE and HAVE_BACKTRACE_SYMBOLS?
- (these are not probably per-OS but just a matter of include devel/libexecinfo
- and adjust Source/WTF/wtf/Platform.h)
-- Possible other HAVE_* that we can define in Source/WTF/wtf/Platform.h:
- #define HAVE_READLINE 1 (add readline(3) support to jsc)
diff --git a/webkit-gtk/buildlink3.mk b/webkit-gtk/buildlink3.mk
deleted file mode 100644
index 453b3a2c62..0000000000
--- a/webkit-gtk/buildlink3.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.66 2018/07/20 03:33:58 ryoon Exp $
-
-BUILDLINK_TREE+= webkit-gtk
-
-.if !defined(WEBKIT_GTK_BUILDLINK3_MK)
-WEBKIT_GTK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.8
-BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.22.2
-BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../wip/webkit-gtk
-
-# This is necessary to match the package requirement.
-GCC_REQD+= 6.0
-
-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 "../../graphics/libwebp/buildlink3.mk"
-.include "../../multimedia/gstreamer1/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
-.include "../../security/libsecret/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.endif # WEBKIT_GTK_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -webkit-gtk
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
deleted file mode 100644
index 7e51e662c1..0000000000
--- a/webkit-gtk/distinfo
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: distinfo,v 1.105 2018/08/19 19:59:12 wiz Exp $
-
-SHA1 (webkitgtk-2.22.2.tar.xz) = ff0c40e81e240aa0743f7e6483f175defebd1417
-RMD160 (webkitgtk-2.22.2.tar.xz) = f8f16a72800debdf9b74a03151299f16f69fcc1c
-SHA512 (webkitgtk-2.22.2.tar.xz) = 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
-Size (webkitgtk-2.22.2.tar.xz) = 16769120 bytes
-SHA1 (patch-CMakeLists.txt) = 2f05f3682bda601c99544dafd8e79bd622dfc5a5
-SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = bae08310572c2e23c69cbf6aa9760a67345dcfe3
-SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = ab75ef8714e5071fcd094735717a2f5d0321c747
-SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
-SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 36d29a5db03c2413ae93224ac391f3ff248983e8
-SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012
-SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 5cf36cf7cca8a39d75a788ca988758927b421d95
-SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
-SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
-SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec
-SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
-SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
-SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
-SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 810dfbd5be6a6a2fd2c70795ed257d973fc3e4fe
-SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 91a7e63ebeac06cca21547aa7025a55a4d174b6d
-SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
-SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
-SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = ad6c6f93732a4bb355ac2b65bff8968aae0460ba
-SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 7bbf23f5ac92173dcce9743c5a115bdf0bf7c0ea
-SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
-SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431
diff --git a/webkit-gtk/hacks.mk b/webkit-gtk/hacks.mk
deleted file mode 100644
index e0d28b8494..0000000000
--- a/webkit-gtk/hacks.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2015/10/05 16:25:30 leot Exp $
-
-.if !defined(WEBKIT_GTK_HACKS_MK)
-WEBKIT_GTK_HACKS_MK= defined
-
-# [Sat Oct 3 16:44:53 CEST 2015 : leot]
-# On i386 archs -latomic is added during the build phase when linking
-# libwebkit2gtk-4.0.so for atomic operations.
-# Forcing -march=i586 (or better) avoids that (i[56]86 provide required
-# 64-bit compare-and-swap instruction).
-.if ${MACHINE_ARCH} == "i386"
-PKG_HACKS+= i386-atomicops
-CXXFLAGS+= -march=i586
-.endif
-
-.endif # WEBKIT_GTK_HACKS_MK
diff --git a/webkit-gtk/options.mk b/webkit-gtk/options.mk
deleted file mode 100644
index 094122cf34..0000000000
--- a/webkit-gtk/options.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-# $NetBSD: options.mk,v 1.12 2018/04/09 08:33:48 wiz Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit
-PKG_SUGGESTED_OPTIONS= enchant introspection opengl
-
-PLIST_VARS= introspection
-
-.include "../../mk/bsd.prefs.mk"
-
-#
-# Platforms that support the webkit-jit option
-#
-WEBKIT_JIT_MACHINE_PLATFORMS+= Darwin-*-*
-WEBKIT_JIT_MACHINE_PLATFORMS+= DragonFly-*-*
-WEBKIT_JIT_MACHINE_PLATFORMS+= FreeBSD-*-x86_64 FreeBSD-*-i386 FreeBSD-*-arm*
-WEBKIT_JIT_MACHINE_PLATFORMS+= FreeBSD-*-aarch64 FreeBSD-*-mips*
-WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-x86_64 Linux-*-i386 Linux-*-arm*
-WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-aarch64 Linux-*-mips*
-WEBKIT_JIT_MACHINE_PLATFORMS+= NetBSD-*-x86_64 NetBSD-*-i386 NetBSD-*-arm*
-WEBKIT_JIT_MACHINE_PLATFORMS+= NetBSD-*-aarch64 NetBSD-*-mips*
-
-.if !empty(WEBKIT_JIT_MACHINE_PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
-PKG_SUGGESTED_OPTIONS+= webkit-jit
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-#
-# JIT support
-#
-.if !empty(PKG_OPTIONS:Mwebkit-jit)
-CMAKE_ARGS+= -DENABLE_JIT=ON
-.else
-CMAKE_ARGS+= -DENABLE_JIT=OFF
-.endif
-
-#
-# OpenGL support: enable support for GLX, WebGL and accelerated compositing
-#
-.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DENABLE_WEBGL=ON
-.else
-CMAKE_ARGS+= -DENABLE_WEBGL=OFF
-.endif
-
-#
-# Spellcheck support using enchant
-#
-.if !empty(PKG_OPTIONS:Menchant)
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON
-.include "../../textproc/enchant/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF
-.endif
-
-#
-# Debug build
-#
-.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
-.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-.endif
-
-#
-# Introspection
-#
-.if !empty(PKG_OPTIONS:Mintrospection)
-PLIST.introspection= yes
-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
-.else
-CMAKE_ARGS+= -DENABLE_INTROSPECTION=OFF
-.endif
diff --git a/webkit-gtk/patches/patch-CMakeLists.txt b/webkit-gtk/patches/patch-CMakeLists.txt
deleted file mode 100644
index 939b890419..0000000000
--- a/webkit-gtk/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
-
-- Fix support for arm
-- Fix support for ppc, from FreeBSD.
-
---- CMakeLists.txt.orig 2018-09-06 11:51:31.000000000 +0000
-+++ CMakeLists.txt
-@@ -85,6 +85,8 @@ else ()
- endif ()
- if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
- set(WTF_CPU_ARM 1)
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm")
-+ set(WTF_CPU_ARM 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
- set(WTF_CPU_ARM64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-@@ -95,9 +97,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
- set(WTF_CPU_X86_64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
- set(WTF_CPU_X86 1)
--elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
- set(WTF_CPU_PPC 1)
--elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
- set(WTF_CPU_PPC64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
- set(WTF_CPU_PPC64LE 1)
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
deleted file mode 100644
index 27c9515134..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.6 2016/01/21 13:42:33 leot Exp $
-
-Add support for NetBSD.
-
---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2016-01-20 12:12:59.000000000 +0000
-+++ Source/JavaScriptCore/assembler/ARMAssembler.h
-@@ -29,6 +29,11 @@
-
- #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
-
-+#if OS(NETBSD)
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#endif
-+
- #include "AssemblerBufferWithConstantPool.h"
- #include "JITCompilationEffort.h"
- #include <wtf/Assertions.h>
-@@ -1128,6 +1133,11 @@ namespace JSC {
- linuxPageFlush(current, current + page);
-
- linuxPageFlush(current, end);
-+#elif OS(NETBSD)
-+ struct arm_sync_icache_args arg;
-+ arg.addr = reinterpret_cast<uintptr_t>(code);
-+ arg.len = size;
-+ sysarch(ARM_SYNC_ICACHE, (void *)&arg);
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
deleted file mode 100644
index 148cc8cf2f..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.5 2016/01/21 13:42:33 leot Exp $
-
-Add support for NetBSD.
-
---- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2016-01-20 12:12:59.000000000 +0000
-+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
-@@ -38,6 +38,8 @@
- #include <unistd.h>
- #include <elf.h>
- #include <asm/hwcap.h>
-+#elif OS(NETBSD)
-+#include <sys/sysctl.h>
- #endif
-
- namespace JSC {
-@@ -57,6 +59,16 @@ static bool isVFPPresent()
- close(fd);
- }
- #endif // OS(LINUX)
-+
-+#if OS(NETBSD)
-+ size_t len;
-+ int flag;
-+
-+ len = sizeof(flag);
-+ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) {
-+ return flag == 1;
-+ }
-+#endif // OS(NETBSD)
-
- #if (COMPILER(GCC_OR_CLANG) && defined(__VFP_FP__))
- return true;
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp b/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
deleted file mode 100644
index e78ae52f4e..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_heap_MarkedSpace.cpp,v 1.1 2018/06/15 09:17:02 jperkin Exp $
-
-Avoid ambiguous function call.
-
---- Source/JavaScriptCore/heap/MarkedSpace.cpp.orig 2018-02-20 11:01:51.000000000 +0000
-+++ Source/JavaScriptCore/heap/MarkedSpace.cpp
-@@ -29,6 +29,8 @@
- #include "MarkedBlockInlines.h"
- #include <wtf/ListDump.h>
-
-+using std::pow;
-+
- namespace JSC {
-
- std::array<size_t, MarkedSpace::numSizeClasses> MarkedSpace::s_sizeClassForSizeStep;
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
deleted file mode 100644
index 3514e87196..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v 1.1 2018/04/09 08:33:48 wiz Exp $
-
-Avoid to (pre)allocate 1GB of memory on OpenBSD:
-
- <https://bugs.webkit.org/show_bug.cgi?id=61137>
-
-From OpenBSD ports.
-
---- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2017-08-09 09:13:42.000000000 +0000
-+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
-@@ -88,7 +88,7 @@ static const size_t fixedExecutableMemor
- static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
- #elif CPU(ARM64)
- static const size_t fixedExecutableMemoryPoolSize = 64 * 1024 * 1024;
--#elif CPU(X86_64)
-+#elif CPU(X86_64) && !OS(OPENBSD)
- static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
- #else
- static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
deleted file mode 100644
index 193faba963..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD$
-
-Add support for NetBSD.
-
---- Source/JavaScriptCore/runtime/MachineContext.h.orig 2018-08-21 16:06:10.000000000 +0000
-+++ Source/JavaScriptCore/runtime/MachineContext.h
-@@ -188,6 +188,22 @@ static inline void*& stackPointerImpl(mc
- #error Unknown Architecture
- #endif
-
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_UESP]);
-+#elif CPU(X86_64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSP]);
-+#elif CPU(ARM)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
-+#elif CPU(ARM64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
-+#elif CPU(MIPS)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-
- #if CPU(X86)
-@@ -335,6 +351,22 @@ static inline void*& framePointerImpl(mc
- #error Unknown Architecture
- #endif
-
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EBP]);
-+#elif CPU(X86_64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RBP]);
-+#elif CPU(ARM)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
-+#elif CPU(ARM64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
-+#elif CPU(MIPS)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_S8]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
-@@ -482,6 +514,22 @@ static inline void*& instructionPointerI
- #error Unknown Architecture
- #endif
-
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EIP]);
-+#elif CPU(X86_64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RIP]);
-+#elif CPU(ARM)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
-+#elif CPU(ARM64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
-+#elif CPU(MIPS)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EPC]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
-@@ -639,6 +687,22 @@ inline void*& argumentPointer<1>(mcontex
- #error Unknown Architecture
- #endif
-
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EDX]);
-+#elif CPU(X86_64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSI]);
-+#elif CPU(ARM)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]);
-+#elif CPU(ARM64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X1]);
-+#elif CPU(MIPS)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_A1]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
-@@ -756,6 +820,22 @@ inline void*& llintInstructionPointer(mc
- #error Unknown Architecture
- #endif
-
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_ESI]);
-+#elif CPU(X86_64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
-+#elif CPU(ARM)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
-+#elif CPU(ARM64)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]);
-+#elif CPU(MIPS)
-+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_T4]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
diff --git a/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h b/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
deleted file mode 100644
index 5c27d6844e..0000000000
--- a/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
+++ /dev/null
@@ -1,36 +0,0 @@
-$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 2013-09-09 09:20:59.000000000 +0000
-+++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
-@@ -35,6 +35,7 @@
-
- #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
- #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-+#include <ciso646>
-
- // 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
-@@ -175,6 +176,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- #ifndef _WIN32_WCE
- #include <sys/stat.h>
- #endif // !_WIN32_WCE
-@@ -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>.
-
--#if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
-+#if defined(_LIBCPP_VERSION)
-+#include <tuple>
-+namespace std {
-+ namespace tr1 {
-+ 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
- // disabled. _TR1_FUNCTIONAL is the header guard for
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
deleted file mode 100644
index fe9b0580c1..0000000000
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD$
-
-- Add OS(SOLARIS) definition and add them to Unix systems.
-- Avoid flock() on SunOS, not supported on older platforms.
-- madvise(2) on {Free,Net,OpenBSD} support both MADV_DONTNEED and
- MADV_FREE.
-- Add support for NetBSD.
-
---- Source/WTF/wtf/Platform.h.orig 2018-09-21 19:59:47.000000000 +0000
-+++ Source/WTF/wtf/Platform.h
-@@ -410,6 +410,11 @@
- #define WTF_OS_OPENBSD 1
- #endif
-
-+/* OS(SOLARIS) - Solaris and derivatives */
-+#ifdef __sun
-+#define WTF_OS_SOLARIS 1
-+#endif
-+
- /* OS(WINDOWS) - Any version of Windows */
- #if defined(WIN32) || defined(_WIN32)
- #define WTF_OS_WINDOWS 1
-@@ -427,6 +432,7 @@
- || OS(LINUX) \
- || OS(NETBSD) \
- || OS(OPENBSD) \
-+ || OS(SOLARIS) \
- || defined(unix) \
- || defined(__unix) \
- || defined(__unix__)
-@@ -567,8 +573,10 @@
- #define USE_HARFBUZZ 1
- #define USE_SOUP 1
- #define USE_WEBP 1
-+#if !OS(SOLARIS)
- #define USE_FILE_LOCK 1
- #endif
-+#endif
-
- #if PLATFORM(GTK)
- #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
-@@ -693,11 +701,16 @@
-
- #endif /* OS(DARWIN) */
-
-+#if OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD)
-+#define HAVE_MADV_FREE 1
-+#define HAVE_MADV_DONTNEED 1
-+#endif
-+
- #if PLATFORM(COCOA)
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
- #endif
-
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
- #define HAVE_MACHINE_CONTEXT 1
- #endif
-
-@@ -786,11 +799,11 @@
-
- #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
- /* Enable the DFG JIT on X86 and X86_64. */
--#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD) || OS(WINDOWS))
-+#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(HURD) || OS(WINDOWS))
- #define ENABLE_DFG_JIT 1
- #endif
- /* Enable the DFG JIT on ARMv7. Only tested on iOS, Linux, and FreeBSD. */
--#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD))
-+#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD))
- #define ENABLE_DFG_JIT 1
- #endif
- /* Enable the DFG JIT on ARM. */
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp b/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
deleted file mode 100644
index c048d11c38..0000000000
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_StackBounds.cpp,v 1.1 2018/05/16 18:55:45 jperkin Exp $
-
-SunOS does not have pthread_getattr_np.
-
---- Source/WTF/wtf/StackBounds.cpp.orig 2018-02-19 07:45:30.000000000 +0000
-+++ Source/WTF/wtf/StackBounds.cpp
-@@ -131,6 +131,7 @@ StackBounds StackBounds::newThreadStackB
- #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
- // e.g. on FreeBSD 5.4, neundorf%kde.org@localhost
- pthread_attr_get_np(thread, &sattr);
-+#elif OS(SOLARIS)
- #else
- // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
- pthread_getattr_np(thread, &sattr);
diff --git a/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp b/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp
deleted file mode 100644
index 79e3a45ba8..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Add support for NetBSD.
-
---- Source/WebCore/inspector/InspectorFrontendHost.cpp.orig 2018-08-06 14:07:41.000000000 +0000
-+++ Source/WebCore/inspector/InspectorFrontendHost.cpp
-@@ -279,6 +279,8 @@ String InspectorFrontendHost::platform()
- return "freebsd"_s;
- #elif OS(OPENBSD)
- return "openbsd"_s;
-+#elif OS(NETBSD)
-+ return "netbsd"_s;
- #else
- return "unknown"_s;
- #endif
diff --git a/webkit-gtk/patches/patch-Source_WebCore_platform_FileSystem.cpp b/webkit-gtk/patches/patch-Source_WebCore_platform_FileSystem.cpp
deleted file mode 100644
index f01c457261..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_platform_FileSystem.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_FileSystem.cpp,v 1.1 2017/04/13 16:58:14 jperkin Exp $
-
-Support MAP_FILE if unavailable.
-
---- Source/WebCore/platform/FileSystem.cpp.orig 2016-08-22 12:21:08.000000000 +0000
-+++ Source/WebCore/platform/FileSystem.cpp
-@@ -189,6 +189,9 @@ MappedFileData::MappedFileData(const Str
- return;
- }
-
-+#ifndef MAP_FILE
-+#define MAP_FILE 0
-+#endif
- void* data = mmap(0, size, PROT_READ, MAP_FILE | MAP_SHARED, fd, 0);
- close(fd);
-
diff --git a/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp b/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
deleted file mode 100644
index dfe5bbb353..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp,v 1.1 2018/06/15 09:17:02 jperkin Exp $
-
-Avoid ambiguous function call.
-
---- Source/WebCore/platform/graphics/filters/FEMorphology.cpp.orig 2018-02-19 11:04:38.000000000 +0000
-+++ Source/WebCore/platform/graphics/filters/FEMorphology.cpp
-@@ -32,6 +32,8 @@
- #include <wtf/Vector.h>
- #include <wtf/text/TextStream.h>
-
-+using std::sqrt;
-+
- namespace WebCore {
-
- FEMorphology::FEMorphology(Filter& filter, MorphologyOperatorType type, float radiusX, float radiusY)
diff --git a/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_RasterShape.cpp b/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_RasterShape.cpp
deleted file mode 100644
index 23109a78ef..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_RasterShape.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_rendering_shapes_RasterShape.cpp,v 1.1 2017/04/13 16:58:14 jperkin Exp $
-
-Avoid ambiguous function call.
-
---- Source/WebCore/rendering/shapes/RasterShape.cpp.orig 2016-04-11 06:18:44.000000000 +0000
-+++ Source/WebCore/rendering/shapes/RasterShape.cpp
-@@ -142,7 +142,7 @@ const RasterShapeIntervals& RasterShape:
- return *m_intervals;
-
- int shapeMarginInt = clampToPositiveInteger(ceil(shapeMargin()));
-- int maxShapeMarginInt = std::max(m_marginRectSize.width(), m_marginRectSize.height()) * sqrt(2);
-+ int maxShapeMarginInt = std::max(m_marginRectSize.width(), m_marginRectSize.height()) * sqrt((double)2);
- if (!m_marginIntervals)
- m_marginIntervals = m_intervals->computeShapeMarginIntervals(std::min(shapeMarginInt, maxShapeMarginInt));
-
diff --git a/webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt b/webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt
deleted file mode 100644
index 28c10a9fca..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WebKit_CMakeLists.txt,v 1.1 2018/05/16 18:55:45 jperkin Exp $
-
-SunOS requires libsocket.
-
---- Source/WebKit/CMakeLists.txt.orig 2018-03-05 08:47:55.000000000 +0000
-+++ Source/WebKit/CMakeLists.txt
-@@ -808,6 +808,10 @@ if (UNIX)
- endif ()
- endif ()
-
-+if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
-+ list(APPEND WebKit_LIBRARIES socket)
-+endif ()
-+
- macro(ADD_WEBKIT_PREFIX_HEADER _target)
- if (WebKit_USE_PREFIX_HEADER)
- get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
diff --git a/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp b/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
deleted file mode 100644
index ca60216d4c..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.1 2018/05/16 18:55:45 jperkin Exp $
-
-SunOS does not support DT_{DIR,REG}
-
---- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2018-07-25 11:56:32.000000000 +0000
-+++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
-@@ -54,6 +54,12 @@ namespace NetworkCache {
- static DirectoryEntryType directoryEntryType(uint8_t dtype)
- {
- #if !OS(WINDOWS)
-+#ifndef DT_DIR
-+#define DT_DIR S_IFDIR
-+#endif
-+#ifndef DT_REG
-+#define DT_REG S_IFREG
-+#endif
- switch (dtype) {
- case DT_DIR:
- return DirectoryEntryType::Directory;
-@@ -71,12 +77,20 @@ static DirectoryEntryType directoryEntry
- void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
- {
- #if !OS(WINDOWS)
-+#if OS(SOLARIS)
-+ struct stat s;
-+#endif
- DIR* dir = opendir(WebCore::FileSystem::fileSystemRepresentation(path).data());
- if (!dir)
- return;
- dirent* dp;
- while ((dp = readdir(dir))) {
-+#if OS(SOLARIS)
-+ stat(dp->d_name, &s);
-+ if (s.st_mode != S_IFDIR && s.st_mode != S_IFREG)
-+#else
- if (dp->d_type != DT_DIR && dp->d_type != DT_REG)
-+#endif
- continue;
- const char* name = dp->d_name;
- if (!strcmp(name, ".") || !strcmp(name, ".."))
-@@ -84,7 +98,11 @@ void traverseDirectory(const String& pat
- auto nameString = String::fromUTF8(name);
- if (nameString.isNull())
- continue;
-+#if OS(SOLARIS)
-+ function(nameString, directoryEntryType(s.st_mode));
-+#else
- function(nameString, directoryEntryType(dp->d_type));
-+#endif
- }
- closedir(dir);
- #else
diff --git a/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake b/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
deleted file mode 100644
index 1b081fb60b..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebKit_PlatformGTK.cmake,v 1.1 2018/05/16 18:55:45 jperkin Exp $
-
-SunOS ld does not support --version-script.
-
---- Source/WebKit/PlatformGTK.cmake.orig 2018-08-21 16:06:11.000000000 +0000
-+++ Source/WebKit/PlatformGTK.cmake
-@@ -22,7 +22,7 @@ add_definitions(-DPKGLIBEXECDIR="${LIBEX
- add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
- add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
-
--if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
- WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")
- endif ()
-
diff --git a/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp b/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
deleted file mode 100644
index 39875f3b0b..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.1 2018/04/09 08:33:48 wiz Exp $
-
-On NetBSD we see ""Error sending IPC message: Message too long" due to
-the use of sendmsg with a large message body (EMSGSIZE).
-
-WebKit already uses shared memory to communicate the message body when
-the message is too large, so force it to always use this method to avoid
-encountering EMSGSIZE.
-
---- Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp.orig 2017-08-09 09:13:52.000000000 +0000
-+++ Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp
-@@ -380,8 +380,12 @@ bool Connection::sendOutgoingMessage(std
- return false;
- }
-
-+#if 0
- size_t messageSizeWithBodyInline = sizeof(MessageInfo) + (outputMessage.attachments().size() * sizeof(AttachmentInfo)) + outputMessage.bodySize();
- if (messageSizeWithBodyInline > messageMaxSize && outputMessage.bodySize()) {
-+#else
-+ {
-+#endif
- RefPtr<WebKit::SharedMemory> oolMessageBody = WebKit::SharedMemory::allocate(encoder->bufferSize());
- if (!oolMessageBody)
- return false;
diff --git a/webkit-gtk/patches/patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp b/webkit-gtk/patches/patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp
deleted file mode 100644
index 7da485db18..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp,v 1.1 2018/05/16 18:55:45 jperkin Exp $
-
-Avoid ambiguous function call.
-
---- Source/WebKit/Platform/classifier/ResourceLoadStatisticsClassifier.cpp.orig 2018-02-20 07:38:30.000000000 +0000
-+++ Source/WebKit/Platform/classifier/ResourceLoadStatisticsClassifier.cpp
-@@ -29,6 +29,8 @@
- #include "Logging.h"
- #include <WebCore/ResourceLoadStatistics.h>
-
-+using std::sqrt;
-+
- namespace WebKit {
- using namespace WebCore;
-
diff --git a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
deleted file mode 100644
index 795f991c60..0000000000
--- a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Add BOS(SOLARIS) definition.
-
---- Source/bmalloc/bmalloc/BPlatform.h.orig 2018-07-25 11:56:32.000000000 +0000
-+++ Source/bmalloc/bmalloc/BPlatform.h
-@@ -48,6 +48,10 @@
- #define BOS_LINUX 1
- #endif
-
-+#ifdef __sun
-+#define BOS_SOLARIS 1
-+#endif
-+
- #if defined(WIN32) || defined(_WIN32)
- #define BOS_WINDOWS 1
- #endif
diff --git a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
deleted file mode 100644
index e0dfebef4b..0000000000
--- a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.1 2018/05/16 18:55:45 jperkin Exp $
-
-Use posix_madvise on SunOS.
-
---- Source/bmalloc/bmalloc/VMAllocate.h.orig 2018-02-19 07:45:33.000000000 +0000
-+++ Source/bmalloc/bmalloc/VMAllocate.h
-@@ -198,6 +198,8 @@ inline void vmDeallocatePhysicalPages(vo
- vmValidatePhysical(p, vmSize);
- #if BOS(DARWIN)
- SYSCALL(madvise(p, vmSize, MADV_FREE_REUSABLE));
-+#elif BOS(SOLARIS)
-+ SYSCALL(posix_madvise(p, vmSize, MADV_DONTNEED));
- #else
- SYSCALL(madvise(p, vmSize, MADV_DONTNEED));
- #if BOS(LINUX)
-@@ -211,6 +213,8 @@ inline void vmAllocatePhysicalPages(void
- vmValidatePhysical(p, vmSize);
- #if BOS(DARWIN)
- SYSCALL(madvise(p, vmSize, MADV_FREE_REUSE));
-+#elif BOS(SOLARIS)
-+ SYSCALL(posix_madvise(p, vmSize, MADV_NORMAL));
- #else
- SYSCALL(madvise(p, vmSize, MADV_NORMAL));
- #if BOS(LINUX)
diff --git a/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake b/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
deleted file mode 100644
index 73f47f0099..0000000000
--- a/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.4 2018/04/09 08:33:48 wiz Exp $
-
-Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
-
---- Source/cmake/OptionsCommon.cmake.orig 2017-02-27 07:11:15.000000000 +0000
-+++ Source/cmake/OptionsCommon.cmake
-@@ -27,10 +27,10 @@ option(USE_THIN_ARCHIVES "Produce all st
- if (USE_THIN_ARCHIVES)
- execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
- if ("${AR_VERSION}" MATCHES "^GNU ar")
-- 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 ()
- endif ()
-
diff --git a/webkit-gtk/patches/patch-aj b/webkit-gtk/patches/patch-aj
deleted file mode 100644
index d6695c8d01..0000000000
--- a/webkit-gtk/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2018/04/09 08:33:48 wiz Exp $
-
-Add support for NetBSD, OpenBSD and Solaris.
-
---- Source/WTF/wtf/InlineASM.h.orig 2017-02-20 16:20:15.000000000 +0000
-+++ Source/WTF/wtf/InlineASM.h
-@@ -40,7 +40,7 @@
- #define THUMB_FUNC_PARAM(name)
- #endif
-
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if ((OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || 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"
Home |
Main Index |
Thread Index |
Old Index