GNOME.org
 

[gtk-osx] Webkit fixups for clang, newer autoconf, and out-of-source builds.

commit 4654ca3e26e8bbc2fca3d73048c9c960d7f2d9eb
Author: John Ralls <jralls ceridwen us>
Date:   Mon Feb 24 12:52:56 2014 -0800

    Webkit fixups for clang, newer autoconf, and out-of-source builds.

 modulesets-stable/gtk-osx-unsupported.modules |    4 +-
 patches/webkit-1.6-clang-fixup.patch          |   35 +++++
 patches/webkit-1.6-gnome-3.6-fixup.patch      |  169 +++++++++++++------------
 patches/webkit-1.6-out-of-source-fixup.patch  |   18 +++
 4 files changed, 146 insertions(+), 80 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 44c6d76..5660648 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -164,7 +164,9 @@
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-icu-files.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch"; 
strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch"; 
strip="0"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch"; 
strip="1"/>
     </branch>
     <dependencies>
       <dep package="enchant"/>
diff --git a/patches/webkit-1.6-clang-fixup.patch b/patches/webkit-1.6-clang-fixup.patch
new file mode 100644
index 0000000..a27147e
--- /dev/null
+++ b/patches/webkit-1.6-clang-fixup.patch
@@ -0,0 +1,35 @@
+--- a/Source/JavaScriptCore/heap/Handle.h      2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/heap/Handle.h      2013-11-23 13:53:03.000000000 -0800
+@@ -113,7 +113,7 @@
+
+ template <typename T> class Handle : public HandleBase, public HandleConverter<Handle<T>, T> {
+ public:
+-    template <typename A, typename B> friend class HandleConverter;
++    template <typename A, typename B> friend struct HandleConverter;
+     typedef typename HandleTypes<T>::ExternalType ExternalType;
+     template <typename U> Handle(Handle<U> o)
+     {
+--- a/Source/JavaScriptCore/wtf/NullPtr.h      2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/wtf/NullPtr.h      2013-11-23 12:59:36.000000000 -0800
+@@ -46,7 +46,9 @@
+ namespace std {
+     class nullptr_t { };
+ }
+-
++#if defined nullptr
++#undef nullptr
++#endif
+ extern std::nullptr_t nullptr;
+
+ #endif
+--- a/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h    2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h    2014-01-05 16:59:44.000000000 -0800
+@@ -32,7 +32,7 @@
+
+ namespace WebCore {
+
+-class GraphicsContextState;
++struct GraphicsContextState;
+
+ // Much like PlatformContextSkia in the Skia port, this class holds information that
+ // would normally be private to GraphicsContext, except that we want to allow access
diff --git a/patches/webkit-1.6-gnome-3.6-fixup.patch b/patches/webkit-1.6-gnome-3.6-fixup.patch
index 15dddf9..20e3bff 100644
--- a/patches/webkit-1.6-gnome-3.6-fixup.patch
+++ b/patches/webkit-1.6-gnome-3.6-fixup.patch
@@ -1,5 +1,5 @@
---- ./configure.ac~    2012-11-01 13:21:40.000000000 -0700
-+++ ./configure.ac     2012-11-01 15:10:37.000000000 -0700
+--- a/configure.ac     2012-11-01 13:21:40.000000000 -0700
++++ b/configure.ac     2012-11-01 15:10:37.000000000 -0700
 @@ -321,7 +321,7 @@
     AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])
  else
@@ -9,8 +9,19 @@
  
     if test "$with_target" = "x11" && test "$os_win32" = "no"; then
        # check for XT
---- ./Source/JavaScriptCore/GNUmakefile.am~    2011-09-26 13:54:57.000000000 -0700
-+++ ./Source/JavaScriptCore/GNUmakefile.am     2012-11-02 13:23:15.000000000 -0700
+--- a/Source/autotools/webkit.m4       2011-09-26 13:55:03.000000000 -0700
++++ b/Source/autotools/webkit.m4       2014-02-15 16:49:07.000000000 -0800
+@@ -67,7 +67,7 @@
+
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_PROG_CXX])
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+--- a/Source/JavaScriptCore/GNUmakefile.am     2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/GNUmakefile.am     2012-11-02 13:23:15.000000000 -0700
 @@ -72,6 +72,7 @@
  javascriptcore_cflags += \
        $(global_cflags) \
@@ -35,8 +46,8 @@
        $(GLOBALDEPS_CFLAGS) \
        $(UNICODE_CFLAGS)
  
---- ./Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp~  2011-09-26 13:54:57.000000000 -0700
-+++ ./Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp   2012-11-02 13:50:33.000000000 -0700
+--- a/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp   2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp   2012-11-02 13:50:33.000000000 -0700
 @@ -58,8 +58,8 @@
  
  void initializeThreading()
@@ -48,8 +59,8 @@
      ASSERT(g_thread_supported());
  
      if (!atomicallyInitializedStaticMutex) {
---- ./Source/JavaScriptCore/wtf/Platform.h~    2011-09-26 13:54:57.000000000 -0700
-+++ ./Source/JavaScriptCore/wtf/Platform.h     2012-11-01 14:17:38.000000000 -0700
+--- a/Source/JavaScriptCore/wtf/Platform.h     2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/wtf/Platform.h     2012-11-01 14:17:38.000000000 -0700
 @@ -1120,7 +1120,10 @@
  #endif
  
@@ -62,8 +73,8 @@
  #endif
  
  /* FIXME: This define won't be needed once #27551 is fully landed. However, 
---- ./Source/WebCore/bridge/npruntime_internal.h~      2011-09-26 13:54:59.000000000 -0700
-+++ ./Source/WebCore/bridge/npruntime_internal.h       2012-11-01 14:58:09.000000000 -0700
+--- a/Source/WebCore/bridge/npruntime_internal.h       2011-09-26 13:54:59.000000000 -0700
++++ b/Source/WebCore/bridge/npruntime_internal.h       2012-11-01 14:58:09.000000000 -0700
 @@ -29,7 +29,7 @@
  #include "npfunctions.h"
  #include "npruntime.h"
@@ -73,8 +84,8 @@
      #include <X11/Xresource.h>
  
      #undef None
---- ./Source/WebCore/GNUmakefile.am~   2012-11-01 13:21:40.000000000 -0700
-+++ ./Source/WebCore/GNUmakefile.am    2012-11-01 16:25:42.000000000 -0700
+--- a/Source/WebCore/GNUmakefile.am    2012-11-01 13:21:40.000000000 -0700
++++ b/Source/WebCore/GNUmakefile.am    2012-11-01 16:25:42.000000000 -0700
 @@ -771,6 +771,7 @@
        $(ENCHANT_CFLAGS) \
        $(GEOCLUE_CFLAGS) \
@@ -83,8 +94,8 @@
        $(GSTREAMER_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
        $(LIBXML_CFLAGS) \
---- ./Source/WebCore/plugins/gtk/PluginPackageGtk.cpp~ 2011-09-26 13:55:00.000000000 -0700
-+++ ./Source/WebCore/plugins/gtk/PluginPackageGtk.cpp  2012-11-02 12:42:03.000000000 -0700
+--- a/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp  2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp  2012-11-02 12:42:03.000000000 -0700
 @@ -103,7 +103,7 @@
  #endif
  }
@@ -103,8 +114,8 @@
      if (!g_strcmp0(baseName.get(), "libflashplayer.so")) {
          // Flash plugin can produce X errors that are handled by the GDK X error handler, which
          // exits the process. Since we don't want to crash due to flash bugs, we install a
---- ./Source/WebCore/plugins/gtk/PluginViewGtk.cpp~    2012-11-01 13:21:40.000000000 -0700
-+++ ./Source/WebCore/plugins/gtk/PluginViewGtk.cpp     2012-11-02 12:45:36.000000000 -0700
+--- a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp     2012-11-01 13:21:40.000000000 -0700
++++ b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp     2012-11-02 12:45:36.000000000 -0700
 @@ -691,7 +691,7 @@
  #endif
  
@@ -123,8 +134,8 @@
  static Display* getPluginDisplay()
  {
      // The plugin toolkit might have a different X connection open.  Since we're
---- ./Source/WebCore/plugins/npapi.h~  2011-09-26 13:55:00.000000000 -0700
-+++ ./Source/WebCore/plugins/npapi.h   2012-11-01 15:00:25.000000000 -0700
+--- a/Source/WebCore/plugins/npapi.h   2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/npapi.h   2012-11-01 15:00:25.000000000 -0700
 @@ -89,7 +89,7 @@
  #endif
  #endif
@@ -161,8 +172,8 @@
  typedef Region NPRegion;
  #elif defined(XP_SYMBIAN)
  typedef QRegion* NPRegion;
---- ./Source/WebCore/plugins/PluginView.cpp~   2011-09-26 13:55:00.000000000 -0700
-+++ ./Source/WebCore/plugins/PluginView.cpp    2012-11-02 11:35:33.000000000 -0700
+--- a/Source/WebCore/plugins/PluginView.cpp    2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/PluginView.cpp    2012-11-02 11:35:33.000000000 -0700
 @@ -363,7 +363,7 @@
          PluginView::setCurrentPluginView(0);
      }
@@ -181,8 +192,8 @@
      , m_hasPendingGeometryChange(true)
      , m_drawable(0)
      , m_visual(0)
---- ./Source/WebCore/plugins/PluginView.h~     2011-09-26 13:55:00.000000000 -0700
-+++ ./Source/WebCore/plugins/PluginView.h      2012-11-01 15:15:34.000000000 -0700
+--- a/Source/WebCore/plugins/PluginView.h      2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/PluginView.h      2012-11-01 15:15:34.000000000 -0700
 @@ -408,7 +408,7 @@
          Point mousePosForPlugin(MouseEvent* event = 0) const;
  #endif
@@ -192,8 +203,8 @@
          bool m_hasPendingGeometryChange;
          Pixmap m_drawable;
          Visual* m_visual;
---- ./Source/WebKit/gtk/tests/testapplicationcache.c~  2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testapplicationcache.c   2012-11-02 13:31:27.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testapplicationcache.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testapplicationcache.c   2012-11-02 13:31:27.000000000 -0700
 @@ -39,7 +39,7 @@
  
  int main(int argc, char** argv)
@@ -203,8 +214,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testatk.c~       2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testatk.c        2012-11-02 13:40:25.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testatk.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testatk.c        2012-11-02 13:40:25.000000000 -0700
 @@ -1660,7 +1660,7 @@
  
  int main(int argc, char** argv)
@@ -214,8 +225,8 @@
      gtk_test_init(&argc, &argv, 0);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testatkroles.c~  2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testatkroles.c   2012-11-02 13:40:40.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testatkroles.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testatkroles.c   2012-11-02 13:40:40.000000000 -0700
 @@ -302,7 +302,7 @@
  
  int main(int argc, char** argv)
@@ -225,8 +236,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testcopyandpaste.c~      2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testcopyandpaste.c       2012-11-02 13:41:07.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testcopyandpaste.c       2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testcopyandpaste.c       2012-11-02 13:41:07.000000000 -0700
 @@ -228,7 +228,7 @@
  
  int main(int argc, char** argv)
@@ -236,8 +247,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testdomdocument.c~       2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testdomdocument.c        2012-11-02 13:41:37.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testdomdocument.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdomdocument.c        2012-11-02 13:41:37.000000000 -0700
 @@ -319,8 +319,8 @@
  
  int main(int argc, char** argv)
@@ -249,8 +260,8 @@
  
      gtk_test_init(&argc, &argv, NULL);
  
---- ./Source/WebKit/gtk/tests/testdomdomwindow.c~      2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testdomdomwindow.c       2012-11-02 13:42:00.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testdomdomwindow.c       2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdomdomwindow.c       2012-11-02 13:42:00.000000000 -0700
 @@ -197,8 +197,8 @@
  
  int main(int argc, char** argv)
@@ -262,8 +273,8 @@
  
      gtk_test_init(&argc, &argv, NULL);
  
---- ./Source/WebKit/gtk/tests/testdomnode.c~   2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testdomnode.c    2012-11-02 13:42:23.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testdomnode.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdomnode.c    2012-11-02 13:42:23.000000000 -0700
 @@ -174,8 +174,8 @@
  
  int main(int argc, char** argv)
@@ -275,8 +286,8 @@
  
      gtk_test_init(&argc, &argv, NULL);
  
---- ./Source/WebKit/gtk/tests/testdownload.c~  2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testdownload.c   2012-11-02 13:42:42.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testdownload.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdownload.c   2012-11-02 13:42:42.000000000 -0700
 @@ -250,7 +250,7 @@
  
  int main(int argc, char** argv)
@@ -286,8 +297,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testglobals.c~   2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testglobals.c    2012-11-02 13:43:01.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testglobals.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testglobals.c    2012-11-02 13:43:01.000000000 -0700
 @@ -47,7 +47,7 @@
  
  int main(int argc, char** argv)
@@ -297,8 +308,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testhittestresult.c~     2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testhittestresult.c      2012-11-02 13:43:20.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testhittestresult.c      2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testhittestresult.c      2012-11-02 13:43:20.000000000 -0700
 @@ -136,7 +136,7 @@
  
  int main(int argc, char** argv)
@@ -308,8 +319,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testhttpbackend.c~       2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testhttpbackend.c        2012-11-02 13:43:47.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testhttpbackend.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testhttpbackend.c        2012-11-02 13:43:47.000000000 -0700
 @@ -68,7 +68,7 @@
  
  int main(int argc, char** argv)
@@ -319,8 +330,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testkeyevents.c~ 2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testkeyevents.c  2012-11-02 13:44:45.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testkeyevents.c  2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testkeyevents.c  2012-11-02 13:44:45.000000000 -0700
 @@ -303,7 +303,7 @@
  
  int main(int argc, char** argv)
@@ -330,8 +341,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testloading.c~   2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testloading.c    2012-11-02 13:45:04.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testloading.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testloading.c    2012-11-02 13:45:04.000000000 -0700
 @@ -400,7 +400,7 @@
  {
      SoupServer* server;
@@ -341,8 +352,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
---- ./Source/WebKit/gtk/tests/testmimehandling.c~      2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testmimehandling.c       2012-11-02 13:45:22.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testmimehandling.c       2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testmimehandling.c       2012-11-02 13:45:22.000000000 -0700
 @@ -176,7 +176,7 @@
      SoupServer* server;
      SoupURI* soup_uri;
@@ -352,8 +363,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      /* Hopefully make test independent of the path it's called from. */
---- ./Source/WebKit/gtk/tests/testnetworkrequest.c~    2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testnetworkrequest.c     2012-11-02 13:45:41.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testnetworkrequest.c     2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testnetworkrequest.c     2012-11-02 13:45:41.000000000 -0700
 @@ -88,7 +88,7 @@
  
  int main(int argc, char** argv)
@@ -363,8 +374,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testnetworkresponse.c~   2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testnetworkresponse.c    2012-11-02 13:45:53.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testnetworkresponse.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testnetworkresponse.c    2012-11-02 13:45:53.000000000 -0700
 @@ -89,7 +89,7 @@
  
  int main(int argc, char** argv)
@@ -374,8 +385,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebbackforwardlist.c~        2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebbackforwardlist.c 2012-11-02 13:47:05.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2012-11-02 13:47:05.000000000 -0700
 @@ -316,7 +316,7 @@
  
  int main(int argc, char** argv)
@@ -385,8 +396,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebdatasource.c~     2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebdatasource.c      2012-11-02 13:47:21.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebdatasource.c      2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebdatasource.c      2012-11-02 13:47:21.000000000 -0700
 @@ -226,7 +226,7 @@
  
  int main(int argc, char** argv)
@@ -396,8 +407,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebframe.c~  2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebframe.c   2012-11-02 13:47:37.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebframe.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebframe.c   2012-11-02 13:47:37.000000000 -0700
 @@ -209,7 +209,7 @@
  
  int main(int argc, char** argv)
@@ -407,8 +418,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebhistoryitem.c~    2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebhistoryitem.c     2012-11-02 13:47:55.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebhistoryitem.c     2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebhistoryitem.c     2012-11-02 13:47:55.000000000 -0700
 @@ -58,7 +58,7 @@
  
  int main(int argc, char** argv)
@@ -418,8 +429,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebplugindatabase.c~ 2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebplugindatabase.c  2012-11-02 13:48:20.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebplugindatabase.c  2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebplugindatabase.c  2012-11-02 13:48:20.000000000 -0700
 @@ -71,7 +71,7 @@
  
  int main(int argc, char** argv)
@@ -429,8 +440,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebresource.c~       2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebresource.c        2012-11-02 13:48:37.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebresource.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebresource.c        2012-11-02 13:48:37.000000000 -0700
 @@ -295,7 +295,7 @@
      SoupServer* server;
      SoupURI* soup_uri;
@@ -440,8 +451,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
---- ./Source/WebKit/gtk/tests/testwebsettings.c~       2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebsettings.c        2012-11-02 13:48:52.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebsettings.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebsettings.c        2012-11-02 13:48:52.000000000 -0700
 @@ -149,7 +149,7 @@
  
  int main(int argc, char **argv)
@@ -451,8 +462,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Source/WebKit/gtk/tests/testwebview.c~   2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwebview.c    2012-11-02 13:49:09.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwebview.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebview.c    2012-11-02 13:49:09.000000000 -0700
 @@ -368,7 +368,7 @@
      SoupServer* server;
      SoupURI* soup_uri;
@@ -462,8 +473,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      /* Hopefully make test independent of the path it's called from. */
---- ./Source/WebKit/gtk/tests/testwindow.c~    2011-09-26 13:55:01.000000000 -0700
-+++ ./Source/WebKit/gtk/tests/testwindow.c     2012-11-02 13:49:24.000000000 -0700
+--- a/Source/WebKit/gtk/tests/testwindow.c     2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwindow.c     2012-11-02 13:49:24.000000000 -0700
 @@ -112,7 +112,7 @@
  
  int main(int argc, char** argv)
@@ -473,8 +484,8 @@
      gtk_test_init(&argc, &argv, NULL);
  
      g_test_bug_base("https://bugs.webkit.org/";);
---- ./Tools/DumpRenderTree/gtk/DumpRenderTree.cpp~     2011-09-26 13:55:03.000000000 -0700
-+++ ./Tools/DumpRenderTree/gtk/DumpRenderTree.cpp      2012-11-02 14:00:53.000000000 -0700
+--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp      2011-09-26 13:55:03.000000000 -0700
++++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp      2012-11-02 14:00:53.000000000 -0700
 @@ -1168,7 +1168,7 @@
  
  int main(int argc, char* argv[])
@@ -484,9 +495,9 @@
      gtk_init(&argc, &argv);
  
      // Some plugins might try to use the GLib logger for printing debug
---- ./Tools/GtkLauncher/main.c~        2011-09-26 13:55:03.000000000 -0700
-+++ ./Tools/GtkLauncher/main.c 2012-11-02 14:01:23.000000000 -0700
-@@ -388,8 +388,8 @@
+--- a/Tools/GtkLauncher/main.c 2011-09-26 13:55:03.000000000 -0700
++++ b/Tools/GtkLauncher/main.c 2012-11-02 14:01:23.000000000 -0700
+@@ -88,8 +388,8 @@
      };
  
      gtk_init(&argc, &argv);
@@ -497,8 +508,8 @@
  
      GOptionContext *context = g_option_context_new(0);
      g_option_context_add_main_entries(context, commandLineOptions, 0);
---- ./Tools/MiniBrowser/gtk/main.c~    2011-09-26 13:55:03.000000000 -0700
-+++ ./Tools/MiniBrowser/gtk/main.c     2012-11-02 14:01:52.000000000 -0700
+--- a/Tools/MiniBrowser/gtk/main.c     2011-09-26 13:55:03.000000000 -0700
++++ b/Tools/MiniBrowser/gtk/main.c     2012-11-02 14:01:52.000000000 -0700
 @@ -76,8 +76,8 @@
  
  int main(int argc, char *argv[])
diff --git a/patches/webkit-1.6-out-of-source-fixup.patch b/patches/webkit-1.6-out-of-source-fixup.patch
new file mode 100644
index 0000000..59cf949
--- /dev/null
+++ b/patches/webkit-1.6-out-of-source-fixup.patch
@@ -0,0 +1,18 @@
+--- a/Source/WebKit/gtk/po/GNUmakefile.am      2014-02-15 16:45:30.000000000 -0800
++++ b/Source/WebKit/gtk/po/GNUmakefile.am      2014-02-24 12:21:01.000000000 -0800
+@@ -30,7 +30,6 @@
+ MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
+
+ .po.mo:
+-      test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o $@ $<
+
+@@ -60,6 +59,7 @@
+ # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+ # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/Source/WebKit/gtk/po/POTFILES
++      test -d $(top_builddir)/Source/WebKit/gtk/po/ || mkdir -p $(top_builddir)/Source/WebKit/gtk/po/
+       package_gnu=''; \
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]