2.3.91, packaging on amd64

5 files changed, 33 insertions, 57 deletions

diff --git a/patches/patch-GNUmakefile_in b/patches/patch-GNUmakefile_in
index 9e35808..f7506e4 100644
--- a/patches/patch-GNUmakefile_in
+++ b/patches/patch-GNUmakefile_in
@@ -8,9 +8,9 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
 (on Source/JavaScriptCore/runtime/NumberPrototype.cpp)
 - 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
+--- GNUmakefile.in.orig	Mon Mar  3 12:32:20 2014
++++ GNUmakefile.in	Thu Mar  6 20:36:48 2014
+@@ -12417,11 +12417,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
-@@ -12423,7 +12423,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -12431,7 +12431,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) \
-@@ -12431,13 +12431,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
+@@ -12439,13 +12439,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) \
-@@ -12445,7 +12445,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
+@@ -12453,7 +12453,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,7 +58,7 @@ $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) \
-@@ -12979,7 +12979,7 @@ libwebkitgtkincludedir := $(prefix)/include/webkitgtk-
+@@ -12987,7 +12987,7 @@ libwebkitgtkincludedir := $(prefix)/include/webkitgtk-
  INSPECTOR_SCRIPTS_DIR := $(JavaScriptCore)/inspector/scripts
  
  # Libraries and support components
@@ -67,7 +67,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
  noinst_DATA := DerivedSources/webkitdom/webkitdom.symbols \
  	$(am__append_31) $(am__append_92)
  noinst_HEADERS := 
-@@ -72723,7 +72723,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
+@@ -72748,7 +72748,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,7 +76,7 @@ $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@
-@@ -80991,14 +80991,12 @@ installdirs:
+@@ -81024,14 +81024,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
@@ -93,7 +93,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
  
  installcheck: installcheck-am
  install-strip:
-@@ -82300,8 +82298,8 @@ install-data-local:
+@@ -82335,8 +82333,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`; \
@@ -104,7 +104,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
  @ENABLE_WEBKIT1_TRUE@	  else \
  @ENABLE_WEBKIT1_TRUE@	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
  @ENABLE_WEBKIT1_TRUE@	  fi; \
-@@ -82310,9 +82308,9 @@ install-data-local:
+@@ -82345,9 +82343,9 @@ install-data-local:
  @ENABLE_WEBKIT1_TRUE@	    echo ' $(INSTALL_DATA) '$$i ; \
  @ENABLE_WEBKIT1_TRUE@	    $(INSTALL_DATA) $$i $${installdir}; \
  @ENABLE_WEBKIT1_TRUE@	  done; \
@@ -116,7 +116,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
  @ENABLE_WEBKIT1_TRUE@	  fi; \
  @ENABLE_WEBKIT1_TRUE@	fi
  @ENABLE_WEBKIT2_TRUE@	@installfiles=`echo ./Documentation/webkit2gtk/html/*`; \
-@@ -82340,8 +82338,8 @@ install-data-local:
+@@ -82375,8 +82373,8 @@ install-data-local:
  	then echo 1>&2 'No documentation to install' ; \
  	else \
  	  DOC_MODULE_VERSION=`cat ./Documentation/webkitdomgtk/version.xml`; \
@@ -127,7 +127,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $
  	  else \
  	    installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk"; \
  	  fi; \
-@@ -82350,9 +82348,9 @@ install-data-local:
+@@ -82385,9 +82383,9 @@ install-data-local:
  	    echo ' $(INSTALL_DATA) '$$i ; \
  	    $(INSTALL_DATA) $$i $${installdir}; \
  	  done; \
diff --git a/patches/patch-Source_WTF_wtf_Platform_h b/patches/patch-Source_WTF_wtf_Platform_h
index e53c4ef..e364e8b 100644
--- a/patches/patch-Source_WTF_wtf_Platform_h
+++ b/patches/patch-Source_WTF_wtf_Platform_h
@@ -12,8 +12,10 @@ 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
+chunk 6/7 needed to build on ppc, otherwise assembler is
+enabled (because of llint cloop) but there's no asm for ppc
+--- Source/WTF/wtf/Platform.h.orig	Mon Mar  3 09:11:49 2014
++++ Source/WTF/wtf/Platform.h	Thu Mar  6 20:42:02 2014
 @@ -82,9 +82,14 @@
  
  /* CPU(MIPS) - MIPS 32-bit */
@@ -62,12 +64,21 @@ https://bugs.webkit.org/show_bug.cgi?id=128898
 @@ -716,7 +722,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))
+ /* Enable the DFG JIT on X86 and X86_64.  Only tested on Mac, GNU/Linux and FreeBSD. */
+-#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD))
++#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD))
  #define ENABLE_DFG_JIT 1
  #endif
  /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt/GTK+ Linux. */
+@@ -807,7 +813,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))
++#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT))
+ #define ENABLE_YARR_JIT 1
+ 
+ /* Setting this flag compares JIT results with interpreter results. */
 @@ -816,7 +822,7 @@
  
  /* If either the JIT or the RegExp JIT is enabled, then the Assembler must be
diff --git a/patches/patch-Source_WebKit2_NetworkProcess_unix_NetworkProcessMainUnix_cpp b/patches/patch-Source_WebKit2_NetworkProcess_unix_NetworkProcessMainUnix_cpp
deleted file mode 100644
index 5944363..0000000
--- a/patches/patch-Source_WebKit2_NetworkProcess_unix_NetworkProcessMainUnix_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD$
-
-Shoplifted from FreeBSD's
-https://wiki.gnome.org/Projects/Jhbuild/FreeBSD?action=AttachFile&do=view&target=webkit-patch.patch.txt
-
-https://bugs.webkit.org/show_bug.cgi?id=126774
-
---- Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp.orig	Mon Feb 17 19:18:14 2014
-+++ Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp	Mon Feb 17 19:18:31 2014
-@@ -33,7 +33,6 @@
- #include "WebKit2Initialize.h"
- #include <WebCore/SoupNetworkSession.h>
- #include <WebKit2/NetworkProcess.h>
--#include <error.h>
- #include <runtime/InitializeThreading.h>
- #include <stdlib.h>
- #include <wtf/MainThread.h>
diff --git a/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp b/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
deleted file mode 100644
index 758b287..0000000
--- a/patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$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 @@
- #elif PLATFORM(EFL) && HAVE_ECORE_X
- #include <Ecore_X.h>
- #endif
--
-+/* for basename() */
-+#if OS(OPENBSD)
-+#include <libgen.h>
-+#endif
- using namespace WebCore;
- 
- namespace WebKit {
diff --git a/patches/patch-configure b/patches/patch-configure
index 84bed0c..2d2b5b0 100644
--- a/patches/patch-configure
+++ b/patches/patch-configure
@@ -8,8 +8,8 @@ glib commit 136e705e8383ff8848e425ac01278102d7badc52
 - Chunk 3 : Don't force the use of -O2, the ports infrastructure
 takes care of that
 
---- configure.orig	Mon Feb 17 09:32:57 2014
-+++ configure	Wed Feb 19 22:12:36 2014
+--- configure.orig	Mon Mar  3 12:31:57 2014
++++ configure	Thu Mar  6 20:40:08 2014
 @@ -17644,26 +17644,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
  
  all-am: $(gsettings_SCHEMAS:.xml=.valid)
@@ -40,7 +40,7 @@ takes care of that
  	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
  
  uninstall-gsettings-schemas:
-@@ -20992,7 +20980,7 @@ $as_echo "$ac_cv_search_shm_open" >&6; }
+@@ -21068,7 +21056,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"
@@ -49,7 +49,7 @@ takes care of that
  fi
  
  
-@@ -21688,8 +21676,8 @@ fi
+@@ -21764,8 +21752,8 @@ fi
  
  # Add the appropriate 'O' level for optimized builds.
  if test "$enable_optimizations" = "yes"; then