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

[jeremyhu at macports.org]

Revision: 63157
          http://trac.macports.org/changeset/63157
Author:   jeremyhu at macports.org
Date:     2010-01-27 15:57:09 -0800 (Wed, 27 Jan 2010)
Log Message:
-----------
webkit-gtk: Bump to 1.1.15.4, fix compilation #21151 #22864, dev timeout.

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

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff

Removed Paths:
-------------
    trunk/dports/www/webkit-gtk/files/patch-purgable-buffer.diff

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2010-01-27 23:56:34 UTC (rev 63156)
+++ trunk/dports/www/webkit-gtk/Portfile	2010-01-27 23:57:09 UTC (rev 63157)
@@ -4,8 +4,8 @@
 PortSystem	1.0
 
 name		webkit-gtk
-version		1.1.10
-revision        4
+version		1.1.15.4
+revision        0
 epoch           1
 description	Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
@@ -17,12 +17,12 @@
 
 distname        webkit-${version}
 
-checksums       md5     b852753b3e21f010f565312132f88311 \
-                sha1    8f0637c936b4f62fb21c8d0c35298e5c0317fd0a \
-                rmd160  c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735
+checksums           md5     47301fb7120421ac38bf714db8f5d428 \
+                    sha1    0778b130720756d880c2bbe9eeef79f35bcf861a \
+                    rmd160  dcfae86f7a2fc63b478741b370ac620d1659513e
 
 patchfiles      patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff \
-                patch-purgable-buffer.diff
+                TextBreakIterator.diff
 
 depends_lib	\
 	port:gtk2 \
@@ -33,19 +33,18 @@
         port:enchant \
         port:gst-plugins-base
         
-
 depends_build	\
 	port:pkgconfig \
         port:gtk-doc
 
+# TODO: Use muniversal, so this is detected per arch
+configure.args	\
+        --enable-jit=no
+
 post-patch {
     reinplace "s|-licucore|-licui18n -licuuc|" ${worksrcpath}/configure
 }
 
-if {${os.major} > 9} {
-    configure.args-append --enable-jit=no
-}
-
 #
 # video is now enabled by default so make the variant no_video
 #

Added: trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff	2010-01-27 23:57:09 UTC (rev 63157)
@@ -0,0 +1,11 @@
+--- 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 struct UBreakIterator TextBreakIterator;
+ 
+     // Note: The returned iterator is good only until you get another iterator.
+ 

Deleted: trunk/dports/www/webkit-gtk/files/patch-purgable-buffer.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-purgable-buffer.diff	2010-01-27 23:56:34 UTC (rev 63156)
+++ trunk/dports/www/webkit-gtk/files/patch-purgable-buffer.diff	2010-01-27 23:57:09 UTC (rev 63157)
@@ -1,12 +0,0 @@
---- WebCore/platform/PurgeableBuffer.h.orig
-+++ WebCore/platform/PurgeableBuffer.h
-@@ -62,7 +62,7 @@ namespace WebCore {
-         mutable State m_state;
-     };
-
--#if !PLATFORM(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT)
-+#if !PLATFORM(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT) || PLATFORM(GTK)
-     inline PurgeableBuffer* PurgeableBuffer::create(const char*, size_t) { return 0; }
-     inline PurgeableBuffer::~PurgeableBuffer() { }
-     inline const char* PurgeableBuffer::data() const { return 0; }
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100127/c70194f8/attachment.html>