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

jeremyhu at macports.org jeremyhu at macports.org
Thu Apr 12 18:29:45 PDT 2012


Revision: 91898
          https://trac.macports.org/changeset/91898
Author:   jeremyhu at macports.org
Date:     2012-04-12 18:29:45 -0700 (Thu, 12 Apr 2012)
Log Message:
-----------
webkit-gtk: Give this port a much needed bump to 1.6.3 (#32194)

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/case-insensitive.patch
    trunk/dports/www/webkit-gtk/files/glib-2.32.patch

Removed Paths:
-------------
    trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.in.diff
    trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff
    trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff
    trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff
    trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff
    trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
    trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff
    trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/Portfile	2012-04-13 01:29:45 UTC (rev 91898)
@@ -5,8 +5,7 @@
 
 name		webkit-gtk
 epoch           1
-version		1.2.7
-revision        1
+version		1.6.3
 description	Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers	gmail.com:myschizobuddy devans
@@ -14,20 +13,15 @@
 platforms	darwin freebsd
 license     LGPL-2+ BSD
 homepage	http://webkitgtk.org/
-master_sites    ${homepage}
+master_sites    http://webkitgtk.org/releases/
 
+use_xz          yes
 distname        webkit-${version}
 
-checksums       md5     25c7e548b65aeb6d83c0182c32ef0927 \
-                sha1    e9afc573d2459794c3749ba404f2187f9dcc9ed3 \
-                rmd160  f36b3ae05693e0eeb4d1936ceee52b6fe1517e57
+checksums       md5     c476d9335419df061510d31e21175df1 \
+                sha1    7df69608ef2ce9dd7328353b4ee34f69271cd43b \
+                rmd160  cc319ffe4c2810663ae05b90e69d9495f5c3f0aa
 
-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	\
 	port:gtk2 \
 	port:libsoup \
@@ -42,8 +36,13 @@
 	port:pkgconfig \
         port:gtk-doc
 
-# TODO: Use muniversal, so this is detected per arch
+patchfiles \
+        case-insensitive.patch \
+        glib-2.32.patch
+
+# TODO: Use muniversal, so jit is detected per arch
 configure.args	\
+        --with-gtk=2.0 \
         --enable-jit=no \
         --enable-introspection=no
 
@@ -54,9 +53,6 @@
 }
 
 post-patch {
-    reinplace "s|-licucore|-licui18n -licuuc|" ${worksrcpath}/configure
-    reinplace "s|@@CPP@@|${configure.cpp}|" ${worksrcpath}/GNUmakefile.in
-
     # For some reason, this isn't getting created for some people... ? /shrug
     file mkdir ${worksrcpath}/DerivedSources
 }
@@ -70,8 +66,6 @@
 variant quartz {
     configure.args-append    --with-font-backend=pango --with-target=quartz
     depends_lib-delete port:xorg-libXt
-    patchfiles-append  patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff \
-                       patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff
 }
 
 #
@@ -108,12 +102,6 @@
 	configure.args-append	--disable-svg
 }
 
-# compile bug when building 1.2.1 on Tiger,
-# see https://bugs.webkit.org/show_bug.cgi?id=39847
-platform darwin 8 {
-	patchfiles-append patch-JavascriptCore-wtf-FastMalloc.cpp.diff
-}
-
 livecheck.type  regex
 livecheck.url   http://webkitgtk.org/?page=download
 livecheck.regex webkit-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)

Added: trunk/dports/www/webkit-gtk/files/case-insensitive.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/case-insensitive.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/case-insensitive.patch	2012-04-13 01:29:45 UTC (rev 91898)
@@ -0,0 +1,13 @@
+--- Source/WebCore/platform/text/TextCodecUTF8.h.orig	2012-04-12 17:24:24.000000000 -0700
++++ Source/WebCore/platform/text/TextCodecUTF8.h	2012-04-12 17:46:05.000000000 -0700
+@@ -28,6 +28,9 @@
+ 
+ #include "TextCodec.h"
+ 
++/* https://bugs.webkit.org/show_bug.cgi?id=65811 */
++#include "../../../JavaScriptCore/icu/unicode/utf8.h"
++
+ namespace WebCore {
+ 
+ class TextCodecUTF8 : public TextCodec {
+

Copied: trunk/dports/www/webkit-gtk/files/glib-2.32.patch (from rev 91897, trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff)
===================================================================
--- trunk/dports/www/webkit-gtk/files/glib-2.32.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/glib-2.32.patch	2012-04-13 01:29:45 UTC (rev 91898)
@@ -0,0 +1,12 @@
+--- Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.orig	2012-04-12 18:11:26.000000000 -0700
++++ Source/JavaScriptCore/wtf/gobject/GOwnPtr.h	2012-04-12 18:11:49.000000000 -0700
+@@ -28,6 +28,9 @@
+ #include <wtf/Assertions.h>
+ #include <wtf/Noncopyable.h>
+ 
++#include <glib.h>
++#include <gio/gio.h>
++
+ extern "C" void g_free(void*);
+ 
+ namespace WTF {

Deleted: trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.in.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.in.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.in.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,11 +0,0 @@
---- GNUmakefile.in.orig	2010-12-25 19:38:17.000000000 -0500
-+++ GNUmakefile.in	2010-12-25 19:39:20.000000000 -0500
-@@ -32168,7 +32168,7 @@
- 	$(PERL) $^ -i > $@
- 
- JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables
--	$(PERL) $^ $@
-+	$(PERL) $^ --preprocessor="@@CPP@@" $@
- # XPath grammar
- 
- @ENABLE_XPATH_TRUE@$(GENSOURCES)/XPathGrammar.h: $(GENSOURCES)/XPathGrammar.cpp;

Deleted: 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	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-wtf-gobject-GOwnPtr.h.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,31 +0,0 @@
---- 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 {
- 

Deleted: trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,17 +0,0 @@
---- JavaScriptCore/wtf/FastMalloc.cpp.orig	2010-05-27 19:00:10.000000000 +0200
-+++ JavaScriptCore/wtf/FastMalloc.cpp	2010-05-27 19:00:40.000000000 +0200
-@@ -1381,14 +1381,12 @@
-   // Bytes allocated from system
-   uint64_t system_bytes_;
- 
--#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
-   // Number of pages kept in free lists that are still committed.
-   Length free_committed_pages_;
- 
-   // Minimum number of free committed pages since last scavenge. (Can be 0 if
-   // we've committed new pages since the last scavenge.)
-   Length min_free_committed_pages_since_last_scavenge_;
--#endif
- 
-   bool GrowHeap(Length n);
- 

Deleted: trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,11 +0,0 @@
---- WebCore/platform/text/TextBreakIterator.h	2009-12-21 01:32:31.000000000 -0500
-+++ WebCore/platform/text/TextBreakIterator.new.h	2009-12-21 01:32:22.000000000 -0500
-@@ -26,7 +26,7 @@
- 
- namespace WebCore {
- 
--    class TextBreakIterator;
-+    typedef UBreakIterator TextBreakIterator;
- 
-     // Note: The returned iterator is good only until you get another iterator.
- 

Deleted: trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,11 +0,0 @@
---- WebCore/config.h.orig	2010-09-10 06:20:33.000000000 -0700
-+++ WebCore/config.h	2010-10-05 11:28:51.000000000 -0700
-@@ -126,7 +126,7 @@
- // Also generates errors on wx on Windows, presumably because these functions
- // are used from wx headers.
- #if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
--#include <wtf/DisallowCType.h>
-+//#include <wtf/DisallowCType.h>
- #endif
- 
- #if COMPILER(MSVC)

Deleted: trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,30 +0,0 @@
---- WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp.orig	2010-09-10 06:20:34.000000000 -0700
-+++ WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp	2010-10-05 11:28:51.000000000 -0700
-@@ -26,6 +26,13 @@
-  */
- 
- #include "config.h"
-+
-+#define Cursor       QD_Cursor
-+#define WindowPtr    QD_WindowPtr
-+#define Picture      QD_Picture
-+#define BOOL         OSX_BOOL
-+#define EventType    HIT_EventType
-+
- #include "PluginObject.h"
- 
- #include "npapi.h"
-@@ -36,6 +43,13 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+
-+#undef Cursor
-+#undef WindowPtr
-+#undef Picture
-+#undef BOOL
-+#undef EventType
-+
- #include <X11/Xlib.h>
- 
- extern "C" {

Deleted: trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,60 +0,0 @@
---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2010-09-10 06:20:33.000000000 -0700
-+++ WebCore/plugins/gtk/PluginViewGtk.cpp	2010-10-06 09:45:37.000000000 -0700
-@@ -60,10 +60,13 @@
- #include "runtime_root.h"
- #include <runtime/JSLock.h>
- #include <runtime/JSValue.h>
-+#include "NotImplemented.h"
- 
- #include <gdkconfig.h>
- #include <gtk/gtk.h>
- 
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "gtk2xtbin.h"
- #define Bool int // this got undefined somewhere
-@@ -441,9 +444,9 @@
-         event->setDefaultHandled();
- }
- 
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
-     XEvent npEvent;
-     initXEvent(&npEvent);
- 
-@@ -453,10 +456,12 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
-+#endif
- }
- 
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
-     XEvent npEvent;
-     initXEvent(&npEvent);
- 
-@@ -466,8 +471,8 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
--}
- #endif
-+}
- 
- void PluginView::setParent(ScrollView* parent)
- {
-@@ -797,8 +802,8 @@
-     }
- 
-     if (m_isWindowed) {
--#if defined(XP_UNIX)
-         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
-+#if defined(XP_UNIX)
- 
-         if (m_needsXEmbed) {
-             // If our parent is not anchored the startup process will

Deleted: trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff	2012-04-12 23:28:42 UTC (rev 91897)
+++ trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff	2012-04-13 01:29:45 UTC (rev 91898)
@@ -1,16 +0,0 @@
---- WebCore/plugins/gtk/gtk2xtbin.c.orig	2010-09-10 06:20:33.000000000 -0700
-+++ WebCore/plugins/gtk/gtk2xtbin.c	2010-10-06 09:45:37.000000000 -0700
-@@ -41,7 +41,7 @@
-  * The GtkXtBin widget allows for Xt toolkit code to be used
-  * inside a GTK application.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -951,3 +951,4 @@
- 
-   return;
- }
-+#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120412/f99352a7/attachment-0001.html>


More information about the macports-changes mailing list