[91895] trunk/dports/www/webkit-gtk

[jeremyhu at macports.org]

Revision: 91895
          https://trac.macports.org/changeset/91895
Author:   jeremyhu at macports.org
Date:     2012-04-12 15:33:42 -0700 (Thu, 12 Apr 2012)
Log Message:
-----------
webkit-gtk: Address build failure with recent glib changes.  Dev timeout, #33957.  Also re-fix #22864 while here...

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2012-04-12 21:13:07 UTC (rev 91894)
+++ trunk/dports/www/webkit-gtk/Portfile	2012-04-12 22:33:42 UTC (rev 91895)
@@ -25,6 +25,7 @@
 patchfiles      patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff \
                 patch-TextBreakIterator.diff\
                 patch-WebCore-config-h.diff \
+                patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff \
                 patch-GNUmakefile.in.diff
 
 depends_lib	\

Added: trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff	2012-04-12 22:33:42 UTC (rev 91895)
@@ -0,0 +1,31 @@
+--- JavaScriptCore/wtf/gobject/GOwnPtr.h.old	2012-04-10 20:29:14.000000000 +0200
++++ JavaScriptCore/wtf/gobject/GOwnPtr.h	2012-04-10 20:26:46.000000000 +0200
+@@ -26,17 +26,19 @@
+ #include <wtf/Assertions.h>
+ #include <wtf/Noncopyable.h>
+ 
++#include <glib.h>
++#include <gio/gio.h>
+ // Forward delcarations at this point avoid the need to include GLib includes
+ // in WTF headers.
+-typedef struct _GError GError;
+-typedef struct _GList GList;
+-typedef struct _GCond GCond;
+-typedef struct _GMutex GMutex;
+-typedef struct _GPatternSpec GPatternSpec;
+-typedef struct _GDir GDir;
+-typedef struct _GHashTable GHashTable;
+-typedef struct _GFile GFile;
+-extern "C" void g_free(void*);
++// typedef struct _GError GError;
++// typedef struct _GList GList;
++// typedef struct _GCond GCond;
++// typedef struct _GMutex GMutex;
++// typedef struct _GPatternSpec GPatternSpec;
++// typedef struct _GDir GDir;
++// typedef struct _GHashTable GHashTable;
++// typedef struct _GFile GFile;
++// extern "C" void g_free(void*);
+ 
+ namespace WTF {
+ 

Modified: trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff	2012-04-12 21:13:07 UTC (rev 91894)
+++ trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff	2012-04-12 22:33:42 UTC (rev 91895)
@@ -5,7 +5,7 @@
  namespace WebCore {
  
 -    class TextBreakIterator;
-+    typedef struct UBreakIterator TextBreakIterator;
++    typedef UBreakIterator TextBreakIterator;
  
      // Note: The returned iterator is good only until you get another iterator.
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120412/2e785765/attachment-0001.html>