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

[gui_dos at macports.org]

Revision: 34673
          http://trac.macosforge.org/projects/macports/changeset/34673
Author:   gui_dos at macports.org
Date:     2008-03-01 23:48:44 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
webkit-gtk: apply patches proposed in http://bugs.webkit.org/show_bug.cgi?id=17415
* Add system include to head of global_cppfalgs to encourage
compile to find $(prefix)/include/unicode/utf8.h, rather than
the wtf/unicode/UTF8.h on case-insensitive file systems. 
* Add -lstdc++ to link flags for minidom program.

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

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/
    trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.am.diff
    trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-GNUmakefile.am.diff

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2008-03-02 01:53:31 UTC (rev 34672)
+++ trunk/dports/www/webkit-gtk/Portfile	2008-03-02 07:48:44 UTC (rev 34673)
@@ -4,13 +4,9 @@
 PortSystem	1.0
 
 name		webkit-gtk
-version		r29807
-description	Apple's WebKit HTML Rendering library for GTK+
-long_description	\
-	The opensource HTML Rendering library from Apple for GTK+ \
-	\n\n \
-	This port is currently broken but has been included in the tree \
-	for debugging and development purposes. \
+version		r30667
+description	Apple's WebKit HTML rendering library for GTK+
+long_description ${description}
 maintainers	nomaintainer
 categories	www gnome
 platforms	darwin freebsd
@@ -19,9 +15,9 @@
 distname	WebKit-${version}
 use_bzip2	yes
 checksums	\
-	md5 85981d60ea1568b7635ee7b02a1879e6 \
-	sha1 eb4ce7dccd96e20fd3a8beba8aa9041533bc5903 \
-	rmd160 bd70ff2802d0628acc07cbe59fcd8005e9e0143e
+	md5     d5047727add37bdbba6a4642b0a9c0f4 \
+	sha1    262d56d842fb4a574b585b4cd6014c17bae5b491 \
+	rmd160  cffbb868e2fe4c53bdf60ef695fde284b940ec4e
 
 depends_lib	\
 	port:curl \
@@ -35,6 +31,11 @@
 	port:libtool \
 	port:pkgconfig
 
+# Patches proposed in http://bugs.webkit.org/show_bug.cgi?id=17415
+patchfiles	\
+	patch-GNUmakefile.am.diff \
+	patch-JavaScriptCore-GNUmakefile.am.diff
+
 post-patch	{
 	reinplace "s|aclocal |aclocal -I ${prefix}/share/aclocal |" ${worksrcpath}/autogen.sh
 }

Added: trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.am.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.am.diff	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-GNUmakefile.am.diff	2008-03-02 07:48:44 UTC (rev 34673)
@@ -0,0 +1,10 @@
+--- GNUmakefile.am.orig	2008-03-02 08:22:15.000000000 +0100
++++ GNUmakefile.am	2008-03-02 08:21:35.000000000 +0100
+@@ -52,6 +52,7 @@
+ global_cppflags :=
+ 
+ global_cppflags += \
++	-I$(prefix)/include \
+ 	-I$(srcdir)/JavaScriptCore \
+ 	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+ 	-I$(srcdir)/JavaScriptCore/wtf \

Added: trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-GNUmakefile.am.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-GNUmakefile.am.diff	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-JavaScriptCore-GNUmakefile.am.diff	2008-03-02 07:48:44 UTC (rev 34673)
@@ -0,0 +1,12 @@
+--- JavaScriptCore/GNUmakefile.am.orig	2008-02-29 12:36:16.000000000 +0100
++++ JavaScriptCore/GNUmakefile.am	2008-03-02 08:24:09.000000000 +0100
+@@ -160,7 +160,8 @@
+ Programs_minidom_LDADD = \
+ 	 libJavaScriptCore.la \
+ 	$(GLOBALDEPS_LIBS) \
+-	$(ICU_LIBS)
++	$(ICU_LIBS) \
++	-lstdc++
+ Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
+ 
+ # testkjs

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080301/9e37a2ac/attachment.html