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

[jeremyhu at macports.org]

Revision: 92147
          https://trac.macports.org/changeset/92147
Author:   jeremyhu at macports.org
Date:     2012-04-20 00:07:58 -0700 (Fri, 20 Apr 2012)
Log Message:
-----------
webkit-gtk: Fix the +pango variant and address another +quartz build failure (#34134)

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/xrender-check.patch

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/pango.patch
    trunk/dports/www/webkit-gtk/files/quartz.patch

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2012-04-20 05:55:48 UTC (rev 92146)
+++ trunk/dports/www/webkit-gtk/Portfile	2012-04-20 07:07:58 UTC (rev 92147)
@@ -41,6 +41,8 @@
         case-insensitive.patch \
         our-icu.patch \
         xrender-check.patch \
+        pango.patch \
+        quartz.patch \
         glib-2.32.patch
 
 configure.args	\
@@ -49,6 +51,10 @@
         --disable-svg \
         --disable-video
 
+autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
+use_autoreconf  yes
+autoreconf.args -fvi
+
 # BUILD FIX TODO: clang C++
 # clang has trouble with webkit-1.6.3's C++ as of 2012.04.19
 if {${configure.compiler} == "clang"} {
@@ -77,10 +83,9 @@
     depends_lib-delete port:xorg-libXt
 }
 
-# Doesn't work in 1.6.3, but it should in 1.8.0
-#variant pango description {Use the pango font backend instead of freetype} {
-#    configure.args-append --with-font-backend=pango
-#}
+variant pango description {Use the pango font backend instead of freetype} {
+    configure.args-append --with-font-backend=pango
+}
 
 #
 # video is now enabled by default so make the variant no_video

Added: trunk/dports/www/webkit-gtk/files/pango.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/pango.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/pango.patch	2012-04-20 07:07:58 UTC (rev 92147)
@@ -0,0 +1,26 @@
+--- Source/WebCore/GNUmakefile.am	(revision 106782)
++++ Source/WebCore/GNUmakefile.am	(revision 106847)
+@@ -836,4 +836,5 @@
+ 	$(LIBXML_CFLAGS) \
+ 	$(LIBXSLT_CFLAGS) \
++	$(PANGO_CFLAGS) \
+ 	$(SQLITE3_CFLAGS) \
+ 	$(UNICODE_CFLAGS) \
+--- Tools/GNUmakefile.am	(revision 106786)
++++ Tools/GNUmakefile.am	(revision 106847)
+@@ -66,4 +66,5 @@
+ 	$(CAIRO_CFLAGS) \
+ 	$(LIBSOUP_CFLAGS) \
++	$(PANGO_CFLAGS) \
+ 	-I$(top_builddir)/DerivedSources \
+ 	-I$(top_builddir)/DerivedSources/WebCore
+--- Source/WebCore/GNUmakefile.am.orig	2012-04-19 22:57:39.000000000 -0700
++++ Source/WebCore/GNUmakefile.am	2012-04-19 22:58:17.000000000 -0700
+@@ -134,6 +134,7 @@ endif # END USE_FREETYPE
+ # ---
+ if USE_PANGO
+ webcoregtk_cppflags += \
++	$(PANGO_CFLAGS) \
+ 	-DWTF_USE_PANGO=1 \
+ 	-I$(srcdir)/Source/WebCore/platform/graphics/pango
+ endif # END USE_PANGO

Added: trunk/dports/www/webkit-gtk/files/quartz.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/quartz.patch	2012-04-20 07:07:58 UTC (rev 92147)
@@ -0,0 +1,18 @@
+--- Source/WebCore/GNUmakefile.list.am.orig	2012-04-19 22:17:20.000000000 -0700
++++ Source/WebCore/GNUmakefile.list.am	2011-10-14 22:27:23.000000000 -0700
+@@ -3986,7 +3986,6 @@ webcoregtk_sources += \
+ 	Source/WebCore/platform/gtk/GtkUtilities.cpp \
+ 	Source/WebCore/platform/gtk/GtkUtilities.h \
+ 	Source/WebCore/platform/gtk/GtkWidgetBackingStoreCairo.cpp \
+-	Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
+ 	Source/WebCore/platform/gtk/GeolocationServiceGtk.cpp \
+ 	Source/WebCore/platform/gtk/GeolocationServiceGtk.h \
+ 	Source/WebCore/platform/gtk/GOwnPtrGtk.cpp \
+@@ -4035,6 +4036,7 @@ webcoregtk_sources += \
+ 
+ if TARGET_X11
+ webcoregtk_sources += \
++	Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
+ 	Source/WebCore/plugins/gtk/gtk2xtbin.c \
+ 	Source/WebCore/plugins/gtk/gtk2xtbin.h \
+ 	Source/WebCore/plugins/gtk/xembed.h

Modified: trunk/dports/www/webkit-gtk/files/xrender-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/xrender-check.patch	2012-04-20 05:55:48 UTC (rev 92146)
+++ trunk/dports/www/webkit-gtk/files/xrender-check.patch	2012-04-20 07:07:58 UTC (rev 92147)
@@ -1,11 +1,11 @@
---- configure.orig	2012-04-18 17:55:13.000000000 -0500
-+++ configure	2012-04-18 17:56:11.000000000 -0500
-@@ -22086,7 +22086,7 @@
+--- configure.ac.orig	2012-04-19 23:01:55.000000000 -0700
++++ configure.ac	2012-04-19 23:02:18.000000000 -0700
+@@ -1020,7 +1020,7 @@ fi
  
  # check for XRender under Linux/Unix. Some linkers require explicit
  # linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
 -if test "$os_win32" = "no"; then
 +if test "$with_target" = "x11"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5
+    PKG_CHECK_MODULES([XRENDER], [xrender])
+    AC_SUBST([XRENDER_CFLAGS])
+    AC_SUBST([XRENDER_LIBS])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120420/56b1696d/attachment-0001.html>