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

[devans at macports.org]

Revision: 52407
          http://trac.macports.org/changeset/52407
Author:   devans at macports.org
Date:     2009-06-15 20:13:11 -0700 (Mon, 15 Jun 2009)
Log Message:
-----------
webkit-gtk:

  * update to version 1.10
  * update dependencies
  * fix Quickdraw/X11 namespace conflict in TestNetscapePlugin.cpp using method suggested by jeremyhu in #19346
  * rename variant svg_filters to filters to conform with current configure arg usage
  * retain svg_filters as stub to ease transition to filters when upgrading

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

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/
    trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2009-06-16 02:54:41 UTC (rev 52406)
+++ trunk/dports/www/webkit-gtk/Portfile	2009-06-16 03:13:11 UTC (rev 52407)
@@ -4,7 +4,7 @@
 PortSystem	1.0
 
 name		webkit-gtk
-version		1.1.7
+version		1.1.10
 epoch           1
 description	Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
@@ -16,10 +16,12 @@
 
 distname        webkit-${version}
 
-checksums       md5     f681773e29898509741cd3bc293816f4 \
-                sha1    77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 \
-                rmd160  63dea479e23b62ae6d0abb0e5559c35eed34466d
+checksums       md5     b852753b3e21f010f565312132f88311 \
+                sha1    8f0637c936b4f62fb21c8d0c35298e5c0317fd0a \
+                rmd160  c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735
 
+patchfiles      patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
+
 depends_lib	\
 	port:gtk2 \
 	port:libsoup \
@@ -31,7 +33,8 @@
         
 
 depends_build	\
-	port:pkgconfig
+	port:pkgconfig \
+        port:gtk-doc
 
 post-patch {
     reinplace "s|-licucore|-licui18n -licuuc|" ${worksrcpath}/configure
@@ -56,15 +59,22 @@
 }
 
 #
-# add new variant to enable svg filter support which is disabled by default
-# old --enable-experimental configure arg is no longer available
+# variant to enable filter support which is disabled by default
+# was svg_filters previously but renamed to follow configure arg usage
 #
 
-variant svg_filters description {Enable support for SVG filters (experimental)} {
-	configure.args-append	--enable-svg-filters
+variant filters description {Enable support for SVG filters (experimental)} {
+	configure.args-append	--enable-filters
 }
 
 #
+# include dummy variant to ease transition from svg_filters to filters
+#
+
+variant svg_filters requires filters description {Build with +filters if +svg_filters was previously installed} {
+}
+
+#
 # all svg support (except filters) is enabled by default
 #
 

Added: 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	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2009-06-16 03:13:11 UTC (rev 52407)
@@ -0,0 +1,30 @@
+--- WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp.orig	2009-06-11 17:05:32.000000000 -0700
++++ WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp	2009-06-15 13:59:40.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>
+ 
+ static void log(NPP instance, const char* format, ...)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090615/62d2b0cd/attachment.html>