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

[jeremyhu at macports.org]

Revision: 97311
          https://trac.macports.org/changeset/97311
Author:   jeremyhu at macports.org
Date:     2012-09-03 02:14:57 -0700 (Mon, 03 Sep 2012)
Log Message:
-----------
webkit-gtk: Update to version 1.8.3, #35941

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

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2012-09-03 09:14:50 UTC (rev 97310)
+++ trunk/dports/www/webkit-gtk/Portfile	2012-09-03 09:14:57 UTC (rev 97311)
@@ -6,8 +6,7 @@
 
 name		webkit-gtk
 epoch           1
-version		1.8.2
-revision	2
+version		1.8.3
 description	Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers	jeremyhu devans
@@ -20,9 +19,9 @@
 use_xz          yes
 distname        webkit-${version}
 
-checksums       sha1    138f86894e0a7ed0a41c18c4ac30fcaf961d8d79 \
-                rmd160  e8b3b77143ba8a0711b9ff68872223b7a39af6ce \
-                sha256  0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6
+checksums       sha1    ccf567fdfd7fbc63a3340777278e41b17522b80d \
+                rmd160  a25fe7966630d2a0e0926f565e28a9054d446c14 \
+                sha256  ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7
 
 depends_lib	\
         port:gtk2 \
@@ -52,6 +51,10 @@
         quartz.patch \
         bison-2.6.patch
 
+# https://trac.macports.org/ticket/35793
+configure.env-append \
+        PYTHON=/usr/bin/python
+
 configure.args	\
         --with-gtk=2.0 \
         --disable-introspection \

Modified: trunk/dports/www/webkit-gtk/files/quartz.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz.patch	2012-09-03 09:14:50 UTC (rev 97310)
+++ trunk/dports/www/webkit-gtk/files/quartz.patch	2012-09-03 09:14:57 UTC (rev 97311)
@@ -1,16 +1,24 @@
---- Source/WebCore/GNUmakefile.list.am.orig	2012-08-20 10:11:33.000000000 +0300
-+++ Source/WebCore/GNUmakefile.list.am	2012-08-20 10:13:58.000000000 +0300
-@@ -4582,11 +4582,11 @@
- 	Source/WebCore/platform/gtk/WidgetGtk.cpp \
- 	Source/WebCore/platform/gtk/WidgetRenderingContext.cpp \
- 	Source/WebCore/platform/gtk/WidgetRenderingContext.h \
+--- Source/WebCore/GNUmakefile.list.am.orig	2012-08-20 13:36:43.000000000 -0700
++++ Source/WebCore/GNUmakefile.list.am	2012-09-03 01:50:55.000000000 -0700
+@@ -4588,7 +4588,9 @@ 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
++	Source/WebCore/plugins/gtk/xembed.h \
++	Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
++	Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+ endif
+ 
+ if TARGET_WIN32
+@@ -4612,10 +4614,6 @@ webcore_sources += \
+ webcoregtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
+ 	Source/WebCore/plugins/win/PluginViewWin.cpp
+-else
+-webcoregtk_sources += \
 -	Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
 -	Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+	Source/WebCore/plugins/gtk/PluginPackageGtk.cpp 
+ endif
  
- if TARGET_X11
- webcoregtk_sources += \
-+	Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
- 	Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
- 	Source/WebCore/plugins/gtk/gtk2xtbin.c \
- 	Source/WebCore/plugins/gtk/gtk2xtbin.h \
+ # ----
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120903/9285e0c8/attachment-0001.html>