summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorLandry Breuil <landry@rhaalovely.net>2014-03-07 12:42:21 +0100
committerLandry Breuil <landry@rhaalovely.net>2014-03-07 12:42:21 +0100
commit8fe45c44874dba5510640be32df4740dba1ace18 (patch)
tree965108c8069cbd4a595b35099ed08755ca11ca49 /patches
parent3bbedb2178014c22ef24335f62be346f410b846f (diff)
WIP update to 2.3.90, working on amd64 (this time for real)
Diffstat (limited to 'patches')
-rw-r--r--patches/patch-GNUmakefile_in109
-rw-r--r--patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h18
-rw-r--r--patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp8
-rw-r--r--patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h6
-rw-r--r--patches/patch-Source_JavaScriptCore_llint_LLIntOfflineAsmConfig_h8
-rw-r--r--patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm10
-rw-r--r--patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm17
-rw-r--r--patches/patch-Source_WTF_wtf_Atomics_h23
-rw-r--r--patches/patch-Source_WTF_wtf_DisallowCType_h8
-rw-r--r--patches/patch-Source_WTF_wtf_MathExtras_h6
-rw-r--r--patches/patch-Source_WTF_wtf_Platform_h65
-rw-r--r--patches/patch-Source_WTF_wtf_RAMSize_cpp6
-rw-r--r--patches/patch-Source_WTF_wtf_dtoa_utils_h8
-rw-r--r--patches/patch-Source_WebCore_plugins_PluginDatabase_cpp6
-rw-r--r--patches/patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp15
-rw-r--r--patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp3
-rw-r--r--patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp4
-rw-r--r--patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp38
-rw-r--r--patches/patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp14
-rw-r--r--patches/patch-Tools_MiniBrowser_gtk_main_c6
-rw-r--r--patches/patch-configure56
21 files changed, 159 insertions, 275 deletions
diff --git a/patches/patch-GNUmakefile_in b/patches/patch-GNUmakefile_in
index 986a5a3..9e35808 100644
--- a/patches/patch-GNUmakefile_in
+++ b/patches/patch-GNUmakefile_in
@@ -1,16 +1,16 @@
$OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
-- chunk 1,2 : install GtkLauncher, remove silent build lines
-- chunk 5 : install gtk-doc in a versionned dir to avoid conflicts
-- chunk 6 : dont rebase doc, python process fails
-- chunk 4 : dont rerun make within make during install, gmake blows
-- chunk 3 : append extra -O0 cflags for sparc64 which otherwise result in overoptimization
+- chunk 1->4 : remove silent build lines
+- chunk 5 : install GtkLauncher
+- chunk 7 : dont rerun make within make during install, gmake blows
+- chunk 8 : append extra -O0 cflags for sparc64 which otherwise result in overoptimization
by emitting a fdtox %r8, %r7 call, whose second operand isn't even and thus invalid.
(on Source/JavaScriptCore/runtime/NumberPrototype.cpp)
-- chunk 7 & 8 : https://bugs.webkit.org/show_bug.cgi?id=118732
---- GNUmakefile.in.orig Tue Jan 21 12:41:49 2014
-+++ GNUmakefile.in Mon Jan 27 10:24:55 2014
-@@ -11304,11 +11304,11 @@ am__v_P_0 = false
+- chunk 9->12 : fix variable quoting to properly install doc in a versionned dir
+
+--- GNUmakefile.in.orig Mon Feb 17 10:58:28 2014
++++ GNUmakefile.in Wed Feb 19 22:12:36 2014
+@@ -12409,11 +12409,11 @@ am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
@@ -24,7 +24,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/Source/autotools/depcomp
-@@ -11318,7 +11318,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -12423,7 +12423,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
@@ -33,7 +33,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -11326,13 +11326,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
+@@ -12431,13 +12431,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
@@ -49,7 +49,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
am__v_CXX_1 =
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-@@ -11340,7 +11340,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
+@@ -12445,7 +12445,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
@@ -58,16 +58,16 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
am__v_CXXLD_1 =
SOURCES = $(Libraries_WebExtensions_libWebExtensionTest_la_SOURCES) \
$(Libraries_WebExtensions_libWebProcessTest_la_SOURCES) \
-@@ -11860,7 +11860,7 @@ pkgconfigdir := $(libdir)/pkgconfig
- libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
+@@ -12979,7 +12979,7 @@ libwebkitgtkincludedir := $(prefix)/include/webkitgtk-
+ INSPECTOR_SCRIPTS_DIR := $(JavaScriptCore)/inspector/scripts
# Libraries and support components
-bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
+bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) Programs/GtkLauncher$(EXEEXT)
- noinst_DATA := $(am__append_44) \
- Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
+ noinst_DATA := DerivedSources/webkitdom/webkitdom.symbols \
+ $(am__append_31) $(am__append_92)
noinst_HEADERS :=
-@@ -69854,7 +69854,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
+@@ -72723,7 +72723,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo `test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp
Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo: Source/JavaScriptCore/runtime/NumberPrototype.cpp
@@ -76,8 +76,8 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/JavaScriptCore/runtime/NumberPrototype.cpp' object='Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -77713,14 +77713,12 @@ installdirs:
- for dir in "$(DESTDIR)$(injectedbundledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(webresourcesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtkincludedir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtkincludedir)" "$(DESTDIR)$(libwebkitdomincludedir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"; do \
+@@ -80991,14 +80991,12 @@ installdirs:
+ for dir in "$(DESTDIR)$(injectedbundledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(webresourcesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkitdomincludedir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: $(BUILT_SOURCES)
@@ -93,32 +93,49 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
installcheck: installcheck-am
install-strip:
-@@ -79023,7 +79021,7 @@ install-data-local:
- @ENABLE_WEBKIT1_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \
- @ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(DOC_MODULE_VERSION)"; \
+@@ -82300,8 +82298,8 @@ install-data-local:
+ @ENABLE_WEBKIT1_TRUE@ then echo 1>&2 'No documentation to install' ; \
+ @ENABLE_WEBKIT1_TRUE@ else \
+ @ENABLE_WEBKIT1_TRUE@ DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
+-@ENABLE_WEBKIT1_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \
+-@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(DOC_MODULE_VERSION)"; \
++@ENABLE_WEBKIT1_TRUE@ if test -n "$${DOC_MODULE_VERSION}"; then \
++@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$${DOC_MODULE_VERSION}"; \
@ENABLE_WEBKIT1_TRUE@ else \
--@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
-+@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(WEBKITGTK_API_VERSION)"; \
+ @ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
@ENABLE_WEBKIT1_TRUE@ fi; \
- @ENABLE_WEBKIT1_TRUE@ $(mkinstalldirs) $${installdir} ; \
- @ENABLE_WEBKIT1_TRUE@ for i in $$installfiles; do \
-@@ -79224,7 +79222,8 @@ $(plugin_process_for_dep): $(plugin_process_for_dep_li
- WebCoreLayerGtk2.a: $(webcore_layer_gtk2_deps)
- $(AM_V_GEN)
- $(AM_V_at)$(shell rm -f $@)
-- $(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
-+ $(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell ar t $(archive) | while read f ; do find . -name $$f ; done | xargs -n50 ar cru $@))
-+ ln $@ libWebCoreLayerGtk2.a
-
- $(GENSOURCES_WEBKIT2)/BrowserMarshal.h: stamp-mini-browser-marshal.h
- @true
-@@ -79257,7 +79256,8 @@ DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTes
- WebCoreLayer.a: $(webcore_layer_deps)
- $(AM_V_GEN)
- $(AM_V_at)$(shell rm -f $@)
-- $(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
-+ $(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell ar t $(archive) | while read f ; do find . -name $$f ; done | xargs -n50 ar cru $@))
-+ ln $@ libWebCoreLayer.a
-
- Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource: Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml)
- $(AM_V_at)mkdir -p ${GENPROGRAMS}/TestWebKitAPI/WebKit2Gtk/resources
+@@ -82310,9 +82308,9 @@ install-data-local:
+ @ENABLE_WEBKIT1_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \
+ @ENABLE_WEBKIT1_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \
+ @ENABLE_WEBKIT1_TRUE@ done; \
+-@ENABLE_WEBKIT1_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \
++@ENABLE_WEBKIT1_TRUE@ if test -n "$${DOC_MODULE_VERSION}"; then \
+ @ENABLE_WEBKIT1_TRUE@ mv -f $${installdir}/webkitgtk.devhelp2 \
+-@ENABLE_WEBKIT1_TRUE@ $${installdir}/webkitgtk-$(DOC_MODULE_VERSION).devhelp2; \
++@ENABLE_WEBKIT1_TRUE@ $${installdir}/webkitgtk-$${DOC_MODULE_VERSION}.devhelp2; \
+ @ENABLE_WEBKIT1_TRUE@ fi; \
+ @ENABLE_WEBKIT1_TRUE@ fi
+ @ENABLE_WEBKIT2_TRUE@ @installfiles=`echo ./Documentation/webkit2gtk/html/*`; \
+@@ -82340,8 +82338,8 @@ install-data-local:
+ then echo 1>&2 'No documentation to install' ; \
+ else \
+ DOC_MODULE_VERSION=`cat ./Documentation/webkitdomgtk/version.xml`; \
+- if test -n "$(DOC_MODULE_VERSION)"; then \
+- installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk-$(DOC_MODULE_VERSION)"; \
++ if test -n "$${DOC_MODULE_VERSION}"; then \
++ installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk-$${DOC_MODULE_VERSION}"; \
+ else \
+ installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk"; \
+ fi; \
+@@ -82350,9 +82348,9 @@ install-data-local:
+ echo ' $(INSTALL_DATA) '$$i ; \
+ $(INSTALL_DATA) $$i $${installdir}; \
+ done; \
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ if test -n "$${DOC_MODULE_VERSION}"; then \
+ mv -f $${installdir}/webkitdomgtk.devhelp2 \
+- $${installdir}/webkitdomgtk-$(DOC_MODULE_VERSION).devhelp2; \
++ $${installdir}/webkitdomgtk-$${DOC_MODULE_VERSION}.devhelp2; \
+ fi; \
+ fi
+ @ENABLE_GTK_DOC_TRUE@ @$(AM_V_GEN) PKG_CONFIG=$(PKG_CONFIG) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
diff --git a/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h b/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h
deleted file mode 100644
index a64dc29..0000000
--- a/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h,v 1.2 2013/10/06 14:03:42 landry Exp $
-./Source/JavaScriptCore/assembler/MacroAssembler.h:909: error: call of overloaded 'shouldBlindForSpecificArch(uintptr_t&)' is ambiguous
-./Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h:98: note: candidates are:
- static bool JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch(uint32_t)
-./Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h:100: note:
- static bool JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch(uint64_t)
-
---- Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h.orig Fri Aug 23 08:26:41 2013
-+++ Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h Wed Aug 28 21:16:22 2013
-@@ -102,7 +102,7 @@ class MacroAssemblerX86Common : public AbstractMacroAs
- static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
- #if CPU(X86_64)
- static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
--#if OS(DARWIN) // On 64-bit systems other than DARWIN uint64_t and uintptr_t are the same type so overload is prohibited.
-+#if OS(DARWIN) || OS(OPENBSD) // On 64-bit systems other than DARWIN uint64_t and uintptr_t are the same type so overload is prohibited.
- static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
- #endif
- #endif
diff --git a/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp b/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
index 6cc8704..f9bd129 100644
--- a/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
+++ b/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
@@ -1,7 +1,7 @@
$OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.3 2013/04/13 09:11:02 landry Exp $
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig Mon Oct 1 15:06:17 2012
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp Fri Mar 8 00:56:48 2013
-@@ -372,8 +372,10 @@ static size_t getPlatformThreadRegisters(const Platfor
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig Tue Feb 4 17:38:03 2014
++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp Fri Feb 14 20:41:39 2014
+@@ -352,8 +352,10 @@ static size_t getPlatformThreadRegisters(const Platfor
#elif USE(PTHREADS)
pthread_attr_init(&regs);
#if HAVE(PTHREAD_NP_H) || OS(NETBSD)
@@ -12,7 +12,7 @@ $OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.3 2013/04/
#else
// FIXME: this function is non-portable; other POSIX systems may have different np alternatives
pthread_getattr_np(platformThread, &regs);
-@@ -437,7 +439,14 @@ static inline void* otherThreadStackPointer(const Plat
+@@ -416,7 +418,14 @@ static inline void* otherThreadStackPointer(const Plat
#elif USE(PTHREADS)
void* stackBase = 0;
size_t stackSize = 0;
diff --git a/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h b/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h
index 765bac7..968cc3c 100644
--- a/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h
+++ b/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h
@@ -2,11 +2,11 @@ $OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.2 2013/10/06
https://bugs.webkit.org/show_bug.cgi?id=61137
---- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig Wed Jun 26 10:42:11 2013
-+++ Source/JavaScriptCore/jit/ExecutableAllocator.h Mon Jul 15 23:03:44 2013
+--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig Tue Feb 4 17:38:03 2014
++++ Source/JavaScriptCore/jit/ExecutableAllocator.h Fri Feb 14 20:41:39 2014
@@ -104,7 +104,8 @@ class DemandExecutableAllocator;
#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
- #if CPU(ARM)
+ #if CPU(ARM) || CPU(ARM64)
static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
-#elif CPU(X86_64)
+// We don't want an initial allocation of 1GB, it's above the default ulimit
diff --git a/patches/patch-Source_JavaScriptCore_llint_LLIntOfflineAsmConfig_h b/patches/patch-Source_JavaScriptCore_llint_LLIntOfflineAsmConfig_h
index c9f6298..f57e42a 100644
--- a/patches/patch-Source_JavaScriptCore_llint_LLIntOfflineAsmConfig_h
+++ b/patches/patch-Source_JavaScriptCore_llint_LLIntOfflineAsmConfig_h
@@ -1,9 +1,9 @@
$OpenBSD: patch-Source_JavaScriptCore_llint_LLIntOfflineAsmConfig_h,v 1.1 2013/10/06 14:23:04 landry Exp $
https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
---- Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h.orig Sun Oct 6 14:46:31 2013
-+++ Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h Sun Oct 6 14:47:41 2013
-@@ -153,4 +153,10 @@
- #endif
+--- Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h.orig Tue Jan 21 15:06:51 2014
++++ Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h Fri Feb 14 20:41:39 2014
+@@ -154,4 +154,10 @@
+ #define OFFLINE_ASM_GGC 0
#endif
+#if CPU(PPC)
diff --git a/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm b/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
index f8a4636..59fef7c 100644
--- a/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
+++ b/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
@@ -2,9 +2,9 @@ $OpenBSD: patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.2 2
https://bugs.webkit.org/show_bug.cgi?id=103128
https://bug-103128-attachments.webkit.org/attachment.cgi?id=202076
last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig Fri Sep 27 10:49:22 2013
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm Sun Oct 6 14:49:14 2013
-@@ -1259,7 +1259,7 @@ _llint_op_get_by_pname:
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig Tue Feb 4 17:38:03 2014
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm Fri Feb 14 20:41:39 2014
+@@ -1574,7 +1574,7 @@ _llint_op_get_by_pname:
loadp JSCell::m_structure[t2], t0
bpneq t0, JSPropertyNameIterator::m_cachedStructure[t3], .opGetByPnameSlow
loadi 24[PC], t0
@@ -13,7 +13,7 @@ last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
subi 1, t0
biaeq t0, JSPropertyNameIterator::m_numCacheableSlots[t3], .opGetByPnameSlow
bilt t0, JSPropertyNameIterator::m_cachedStructureInlineCapacity[t3], .opGetByPnameInlineProperty
-@@ -1679,7 +1679,7 @@ _llint_op_next_pname:
+@@ -2002,7 +2002,7 @@ _llint_op_next_pname:
loadi 20[PC], t2
loadi PayloadOffset[cfr, t2, 8], t2
loadp JSPropertyNameIterator::m_jsStrings[t2], t3
@@ -22,7 +22,7 @@ last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
addi 1, t0
storei t0, PayloadOffset[cfr, t1, 8]
loadi 4[PC], t1
-@@ -1743,7 +1743,11 @@ macro getDeBruijnScope(deBruijinIndexOperand, scopeChe
+@@ -2067,7 +2067,11 @@ macro getDeBruijnScope(deBruijinIndexOperand, scopeChe
loadp CodeBlock[cfr], t1
bineq CodeBlock::m_codeType[t1], FunctionCode, .loop
diff --git a/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm b/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm
index e5188b0..209a0e5 100644
--- a/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm
+++ b/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm
@@ -2,9 +2,9 @@ $OpenBSD: patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm,v 1.2 2013/1
https://bugs.webkit.org/show_bug.cgi?id=103128
https://bug-103128-attachments.webkit.org/attachment.cgi?id=202076
Last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
---- Source/JavaScriptCore/llint/LowLevelInterpreter.asm.orig Fri Sep 20 09:24:34 2013
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm Sun Oct 6 14:48:27 2013
-@@ -109,6 +109,12 @@ else
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.asm.orig Tue Feb 4 17:38:03 2014
++++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm Fri Feb 14 22:47:15 2014
+@@ -122,6 +122,12 @@ else
const PayloadOffset = 0
end
@@ -17,7 +17,7 @@ Last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
# Constant for reasoning about butterflies.
const IsArray = 1
const IndexingShapeMask = 30
-@@ -276,13 +282,13 @@ macro assertNotConstant(index)
+@@ -299,13 +305,13 @@ macro assertNotConstant(index)
end
macro functionForCallCodeBlockGetter(targetRegister)
@@ -33,11 +33,10 @@ Last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
loadp JSFunction::m_executable[targetRegister], targetRegister
loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
end
-@@ -657,7 +663,11 @@ _llint_op_jngreatereq:
- _llint_op_loop_hint:
- traceExecution()
- loadp JITStackFrame::vm[sp], t1
-- loadb VM::watchdog+Watchdog::m_timerDidFire[t1], t0
+@@ -696,6 +702,11 @@ _llint_op_loop_hint:
+ loadp CodeBlock[cfr], t1
+ loadp CodeBlock::m_vm[t1], t1
+ loadb VM::watchdog+Watchdog::m_timerDidFire[t1], t0
+ if FOUR_BYTE_BOOL
+ loadi VM::watchdog+Watchdog::m_timerDidFire[t1], t0
+ else
diff --git a/patches/patch-Source_WTF_wtf_Atomics_h b/patches/patch-Source_WTF_wtf_Atomics_h
deleted file mode 100644
index 691b528..0000000
--- a/patches/patch-Source_WTF_wtf_Atomics_h
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.3 2013/10/20 09:07:57 landry Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=86835
-Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
-
---- Source/WTF/wtf/Atomics.h.orig Sat Aug 3 18:10:38 2013
-+++ Source/WTF/wtf/Atomics.h Sun Oct 20 11:06:14 2013
-@@ -112,6 +112,15 @@ inline int atomicDecrement(int volatile* addend) { ret
- inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
- inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-
-+#elif COMPILER(GCC) && CPU(SPARC64)
-+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-+
-+inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
-+inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
- #endif
-
- #if OS(WINDOWS)
diff --git a/patches/patch-Source_WTF_wtf_DisallowCType_h b/patches/patch-Source_WTF_wtf_DisallowCType_h
index 124e236..76a6d61 100644
--- a/patches/patch-Source_WTF_wtf_DisallowCType_h
+++ b/patches/patch-Source_WTF_wtf_DisallowCType_h
@@ -3,14 +3,14 @@ just, wtf.
error:
'isspace_WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h'
was not declared in this scope
---- Source/WTF/wtf/DisallowCType.h.orig Wed Jul 17 22:49:42 2013
-+++ Source/WTF/wtf/DisallowCType.h Wed Jul 17 22:50:11 2013
+--- Source/WTF/wtf/DisallowCType.h.orig Thu Jan 23 17:49:58 2014
++++ Source/WTF/wtf/DisallowCType.h Fri Feb 14 22:53:44 2014
@@ -41,7 +41,7 @@
// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
// isacii().
#include <wtf/Platform.h>
--#if !PLATFORM(QT) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
-+#if !PLATFORM(QT) && !((OS(OPENBSD) || OS(DARWIN)) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
+-#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
++#if !((OS(OPENBSD) || OS(DARWIN)) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
#include <ctype.h>
diff --git a/patches/patch-Source_WTF_wtf_MathExtras_h b/patches/patch-Source_WTF_wtf_MathExtras_h
index 077e743..7982c8e 100644
--- a/patches/patch-Source_WTF_wtf_MathExtras_h
+++ b/patches/patch-Source_WTF_wtf_MathExtras_h
@@ -1,9 +1,9 @@
$OpenBSD: patch-Source_WTF_wtf_MathExtras_h,v 1.1 2013/10/06 14:03:43 landry Exp $
signbit & isfinite are defined in gcc's cmath for 4.6 & 4.8..
so partly revert https://bugs.webkit.org/show_bug.cgi?id=19975, make it conditional to older gcc
---- Source/WTF/wtf/MathExtras.h.orig Wed Jun 26 10:42:13 2013
-+++ Source/WTF/wtf/MathExtras.h Thu Jul 18 09:30:59 2013
-@@ -106,7 +106,8 @@ inline bool isinf(double x) { return !finite(x) && !is
+--- Source/WTF/wtf/MathExtras.h.orig Tue Jan 21 15:06:51 2014
++++ Source/WTF/wtf/MathExtras.h Fri Feb 14 20:41:39 2014
+@@ -94,7 +94,8 @@ inline bool isinf(double x) { return !finite(x) && !is
#endif
diff --git a/patches/patch-Source_WTF_wtf_Platform_h b/patches/patch-Source_WTF_wtf_Platform_h
index 870a30f..e53c4ef 100644
--- a/patches/patch-Source_WTF_wtf_Platform_h
+++ b/patches/patch-Source_WTF_wtf_Platform_h
@@ -1,12 +1,20 @@
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.3 2013/11/14 16:47:00 ajacoutot Exp $
-Add defines for mips64*/hppa.
+Add defines for sparc64*/hppa.
Disable yarr jit on anything not having a jit
https://bugs.webkit.org/show_bug.cgi?id=113638
---- Source/WTF/wtf/Platform.h.orig Mon Nov 11 10:21:52 2013
-+++ Source/WTF/wtf/Platform.h Thu Nov 14 09:38:50 2013
-@@ -83,9 +83,14 @@
+chunk 4
+https://bugs.webkit.org/show_bug.cgi?id=126502
+
+chunk 5
+http://trac.webkit.org/changeset/164220
+https://bugs.webkit.org/show_bug.cgi?id=128898
+(also check https://bugs.webkit.org/show_bug.cgi?id=128549)
+
+--- Source/WTF/wtf/Platform.h.orig Tue Feb 4 17:38:03 2014
++++ Source/WTF/wtf/Platform.h Sat Feb 15 11:00:22 2014
+@@ -82,9 +82,14 @@
/* CPU(MIPS) - MIPS 32-bit */
/* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
@@ -23,30 +31,18 @@ https://bugs.webkit.org/show_bug.cgi?id=113638
#if defined(__MIPSEB__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
-@@ -125,6 +130,11 @@
- #define WTF_CPU_SH4 1
- #endif
-
-+/* CPU(HPPA) - HP-PA */
-+#if defined(__hppa__)
-+#define WTF_CPU_HPPA 1
-+#endif
-+
- /* CPU(SPARC32) - SPARC 32-bit */
- #if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
- #define WTF_CPU_SPARC32 1
-@@ -323,7 +333,7 @@
+@@ -313,7 +318,7 @@
#endif /* ARM */
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(SPARC64)
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(MIPS64) || CPU(SPARC64)
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
-@@ -689,7 +699,8 @@
+@@ -641,7 +646,8 @@
|| CPU(ALPHA) \
- || CPU(SPARC64) \
+ || CPU(ARM64) \
|| CPU(S390X) \
- || CPU(PPC64)
+ || CPU(PPC64) \
@@ -54,16 +50,25 @@ https://bugs.webkit.org/show_bug.cgi?id=113638
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
-@@ -855,7 +866,7 @@
- #define ENABLE_REGEXP_TRACING 0
-
- /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
--#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
-+#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT)) && !(OS(QNX) && PLATFORM(QT))
- #define ENABLE_YARR_JIT 1
+@@ -708,7 +714,7 @@
+ low-level interpreter. */
+ #if !defined(ENABLE_LLINT) \
+ && ENABLE(JIT) \
+- && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
++ && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)) \
+ && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
+ && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
+ #define ENABLE_LLINT 1
+@@ -716,7 +722,7 @@
- /* Setting this flag compares JIT results with interpreter results. */
-@@ -864,7 +875,7 @@
+ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
+ /* Enable the DFG JIT on X86 and X86_64. Only tested on Mac and GNU/Linux. */
+-#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX))
++#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(OPENBSD))
+ #define ENABLE_DFG_JIT 1
+ #endif
+ /* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt/GTK+ Linux. */
+@@ -816,7 +822,7 @@
/* If either the JIT or the RegExp JIT is enabled, then the Assembler must be
enabled as well: */
diff --git a/patches/patch-Source_WTF_wtf_RAMSize_cpp b/patches/patch-Source_WTF_wtf_RAMSize_cpp
index 2d6bf11..0924991 100644
--- a/patches/patch-Source_WTF_wtf_RAMSize_cpp
+++ b/patches/patch-Source_WTF_wtf_RAMSize_cpp
@@ -1,6 +1,6 @@
$OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.1 2013/04/13 09:11:02 landry Exp $
---- Source/WTF/wtf/RAMSize.cpp.orig Thu Jul 19 12:02:14 2012
-+++ Source/WTF/wtf/RAMSize.cpp Sat Mar 9 21:26:30 2013
+--- Source/WTF/wtf/RAMSize.cpp.orig Tue Jan 21 15:06:51 2014
++++ Source/WTF/wtf/RAMSize.cpp Fri Feb 14 20:41:39 2014
@@ -27,7 +27,7 @@
#include "RAMSize.h"
@@ -10,7 +10,7 @@ $OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.1 2013/04/13 09:11:02 landry Exp
#include <sys/param.h>
#include <sys/types.h>
#include <sys/sysctl.h>
-@@ -45,13 +45,17 @@ static const size_t ramSizeGuess = 128 * MB;
+@@ -43,13 +43,17 @@ static const size_t ramSizeGuess = 128 * MB;
static size_t computeRAMSize()
{
diff --git a/patches/patch-Source_WTF_wtf_dtoa_utils_h b/patches/patch-Source_WTF_wtf_dtoa_utils_h
index b066f4d..3aa1fd2 100644
--- a/patches/patch-Source_WTF_wtf_dtoa_utils_h
+++ b/patches/patch-Source_WTF_wtf_dtoa_utils_h
@@ -1,12 +1,12 @@
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.2 2013/11/14 16:47:00 ajacoutot Exp $
---- Source/WTF/wtf/dtoa/utils.h.orig Mon Nov 11 10:23:36 2013
-+++ Source/WTF/wtf/dtoa/utils.h Thu Nov 14 09:40:22 2013
+--- Source/WTF/wtf/dtoa/utils.h.orig Tue Jan 21 15:06:51 2014
++++ Source/WTF/wtf/dtoa/utils.h Fri Feb 14 22:54:18 2014
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(HPPA)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(HPPA) || CPU(MIPS64) || CPU(SPARC64)
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(MIPS64) || CPU(SPARC64)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)
diff --git a/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp b/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp
index f03ce4b..dcdd2c8 100644
--- a/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp
+++ b/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp
@@ -1,7 +1,7 @@
$OpenBSD: patch-Source_WebCore_plugins_PluginDatabase_cpp,v 1.2 2013/04/13 09:11:02 landry Exp $
---- Source/WebCore/plugins/PluginDatabase.cpp.orig Sun Dec 16 11:24:45 2012
-+++ Source/WebCore/plugins/PluginDatabase.cpp Fri Mar 8 00:57:25 2013
-@@ -403,7 +403,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie
+--- Source/WebCore/plugins/PluginDatabase.cpp.orig Tue Jan 21 15:06:51 2014
++++ Source/WebCore/plugins/PluginDatabase.cpp Fri Feb 14 20:41:39 2014
+@@ -395,7 +395,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie
paths.append(userPluginPath);
paths.append("/usr/lib/browser/plugins");
diff --git a/patches/patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp b/patches/patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp
deleted file mode 100644
index 9762f8c..0000000
--- a/patches/patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp,v 1.1 2013/04/13 09:11:02 landry Exp $
-Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:317: error: elements of array 'iovec iov [1]' have incomplete type
-Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:317: error: storage size of 'iov' isn't known
-Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:481: error: elements of array 'iovec iov [3]' have incomplete type
-Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:481: error: storage size of 'iov' isn't known
---- Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp.orig Fri Feb 1 11:46:15 2013
-+++ Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp Fri Mar 8 00:57:25 2013
-@@ -31,6 +31,7 @@
- #include "DataReference.h"
- #include "SharedMemory.h"
- #include <sys/socket.h>
-+#include <sys/uio.h>
- #include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp b/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
index b1ce3fd..758b287 100644
--- a/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
+++ b/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
@@ -1,4 +1,7 @@
$OpenBSD: patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp,v 1.1 2013/10/06 14:03:44 landry Exp $
+
+https://bugs.webkit.org/show_bug.cgi?id=128597
+
--- Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp.orig Mon Sep 9 10:29:14 2013
+++ Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp Mon Sep 23 22:42:22 2013
@@ -43,7 +43,10 @@
diff --git a/patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp b/patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
index c3c11c3..cf724aa 100644
--- a/patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
+++ b/patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
@@ -1,6 +1,6 @@
$OpenBSD: patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp,v 1.2 2013/11/14 16:47:00 ajacoutot Exp $
---- Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp.orig Mon Nov 11 09:34:23 2013
-+++ Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp Thu Nov 14 09:38:50 2013
+--- Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp.orig Mon Feb 10 19:50:45 2014
++++ Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp Wed Feb 19 22:12:36 2014
@@ -45,7 +45,11 @@
#if OS(UNIX)
#include <sys/socket.h>
diff --git a/patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp b/patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
deleted file mode 100644
index 66c78cf..0000000
--- a/patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-$OpenBSD: patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp,v 1.4 2014/01/29 17:28:05 ajacoutot Exp $
-
-To remove in 2.4.x ?
-https://bugs.webkit.org/show_bug.cgi?id=126779
-https://trac.webkit.org/changeset/162513/trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
-
---- Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp.orig Mon Sep 9 10:29:14 2013
-+++ Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp Mon Sep 23 22:42:22 2013
-@@ -39,6 +39,9 @@
- #include <glib.h>
- #include <wtf/gobject/GOwnPtr.h>
- #endif
-+#if OS(OPENBSD)
-+#include <sys/wait.h>
-+#endif
-
- using namespace WebCore;
-
-@@ -74,16 +77,16 @@ bool PluginProcessProxy::scanPlugin(const String& plug
- int status;
- GOwnPtr<char> stdOut;
-
-- // If the disposition of SIGCLD signal is set to SIG_IGN (default)
-+ // If the disposition of SIGCHLD signal is set to SIG_IGN (default)
- // then the signal will be ignored and g_spawn_sync() will not be
- // able to return the status.
- // As a consequence, we make sure that the disposition is set to
- // SIG_DFL before calling g_spawn_sync().
- struct sigaction action;
-- sigaction(SIGCLD, 0, &action);
-+ sigaction(SIGCHLD, 0, &action);
- if (action.sa_handler == SIG_IGN) {
- action.sa_handler = SIG_DFL;
-- sigaction(SIGCLD, &action, 0);
-+ sigaction(SIGCHLD, &action, 0);
- }
-
- if (!g_spawn_sync(0, argv, 0, G_SPAWN_STDERR_TO_DEV_NULL, 0, 0, &stdOut.outPtr(), 0, &status, 0))
diff --git a/patches/patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp b/patches/patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp
deleted file mode 100644
index 1d41120..0000000
--- a/patches/patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.1 2013/10/06 14:42:39 landry Exp $
-Taken from Source/WebKit2/Platform/CoreIPC/Connection.cpp
-Needed on sparc64
---- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Oct 3 21:41:28 2013
-+++ Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Oct 3 21:43:20 2013
-@@ -47,7 +47,7 @@ uint64_t StatisticsRequest::addOutstandingRequest()
- {
- static int64_t uniqueRequestID;
-
-- uint64_t requestID = atomicIncrement(&uniqueRequestID);
-+ uint64_t requestID = atomicIncrement(reinterpret_cast<int64_t volatile*>(&uniqueRequestID));
- m_outstandingRequests.add(requestID);
- return requestID;
- }
diff --git a/patches/patch-Tools_MiniBrowser_gtk_main_c b/patches/patch-Tools_MiniBrowser_gtk_main_c
index 71dbaf2..d030b82 100644
--- a/patches/patch-Tools_MiniBrowser_gtk_main_c
+++ b/patches/patch-Tools_MiniBrowser_gtk_main_c
@@ -1,8 +1,8 @@
$OpenBSD: patch-Tools_MiniBrowser_gtk_main_c,v 1.1 2013/10/06 14:03:44 landry Exp $
Dont assume we're running from the src/objdir
---- Tools/MiniBrowser/gtk/main.c.orig Wed Sep 18 09:07:57 2013
-+++ Tools/MiniBrowser/gtk/main.c Mon Sep 23 22:44:52 2013
-@@ -263,8 +263,6 @@ int main(int argc, char *argv[])
+--- Tools/MiniBrowser/gtk/main.c.orig Wed Jan 29 17:33:49 2014
++++ Tools/MiniBrowser/gtk/main.c Fri Feb 14 22:45:07 2014
+@@ -269,8 +269,6 @@ int main(int argc, char *argv[])
}
g_option_context_free (context);
diff --git a/patches/patch-configure b/patches/patch-configure
index e83fde6..84bed0c 100644
--- a/patches/patch-configure
+++ b/patches/patch-configure
@@ -1,39 +1,16 @@
$OpenBSD: patch-configure,v 1.21 2014/01/29 17:28:05 ajacoutot Exp $
-https://bugs.webkit.org/show_bug.cgi?id=117796
-
-- Chunk 1, 2 & 4 : https://bugs.webkit.org/show_bug.cgi?id=109932
-Only webkit2 requires c++11 features atm, so let's relax the check until we have webkit2
-
-- Chunk 5 : no librt on OpenBSD
-
-- Chunk 3 : GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD
+- Chunk 1: GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
-- Chunk 6 : Don't force the use of -O2, the ports infrastructure
+- Chunk 2 : no librt on OpenBSD
+
+- Chunk 3 : Don't force the use of -O2, the ports infrastructure
takes care of that
---- configure.orig Tue Jan 21 12:09:55 2014
-+++ configure Mon Jan 27 10:18:44 2014
-@@ -4790,7 +4790,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
- #error Not a supported GCC compiler
- #endif
-
-@@ -4848,7 +4848,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
- #error Not a supported G++ compiler
- #endif
-
-@@ -17606,26 +17606,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
+--- configure.orig Mon Feb 17 09:32:57 2014
++++ configure Wed Feb 19 22:12:36 2014
+@@ -17644,26 +17644,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
all-am: $(gsettings_SCHEMAS:.xml=.valid)
uninstall-am: uninstall-gsettings-schemas
@@ -63,7 +40,7 @@ takes care of that
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:
-@@ -20951,7 +20939,7 @@ $as_echo "$ac_cv_search_shm_open" >&6; }
+@@ -20992,7 +20980,7 @@ $as_echo "$ac_cv_search_shm_open" >&6; }
ac_res=$ac_cv_search_shm_open
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -72,16 +49,7 @@ takes care of that
fi
-@@ -21383,7 +21371,7 @@ fi
- # Use C99 as the language standard for C code.
- CFLAGS="$CFLAGS -pthread -std=c99"
- # Use the C++11 standard. Do not warn about C++11 incompatibilities.
--CXXFLAGS="$CXXFLAGS -pthread -std=c++11 -Wno-c++11-compat"
-+#CXXFLAGS="$CXXFLAGS -pthread -std=c++11 -Wno-c++11-compat"
-
- # Clang requires suppression of unused arguments warnings.
- if test "$c_compiler" = "clang"; then
-@@ -21420,8 +21408,8 @@ fi
+@@ -21688,8 +21676,8 @@ fi
# Add the appropriate 'O' level for optimized builds.
if test "$enable_optimizations" = "yes"; then
@@ -89,6 +57,6 @@ takes care of that
- CFLAGS="$CFLAGS -O2"
+ CXXFLAGS="$CXXFLAGS"
+ CFLAGS="$CFLAGS"
- else
- CXXFLAGS="$CXXFLAGS -O0"
- CFLAGS="$CFLAGS -O0"
+
+ if test "$c_compiler" = "gcc"; then
+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"