[115984] trunk/dports/www/webkit-gtk-devel

jeremyhu at macports.org jeremyhu at macports.org
Wed Jan 15 16:08:24 PST 2014


Revision: 115984
          https://trac.macports.org/changeset/115984
Author:   jeremyhu at macports.org
Date:     2014-01-15 16:08:24 -0800 (Wed, 15 Jan 2014)
Log Message:
-----------
webkit-gtk-devel: Bump to 2.3.4

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

Added Paths:
-----------
    trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch
    trunk/dports/www/webkit-gtk-devel/files/libedit.patch
    trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch

Removed Paths:
-------------
    trunk/dports/www/webkit-gtk-devel/files/libc++.patch

Modified: trunk/dports/www/webkit-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-devel/Portfile	2014-01-15 23:46:47 UTC (rev 115983)
+++ trunk/dports/www/webkit-gtk-devel/Portfile	2014-01-16 00:08:24 UTC (rev 115984)
@@ -12,7 +12,7 @@
 
 name        webkit-gtk-devel
 epoch       2
-version     2.3.3
+version     2.3.4
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -27,9 +27,9 @@
 
 dist_subdir webkit-gtk
 
-checksums           sha1    30094e23a4cae478cf03f11c12cd29c0bb326cc6 \
-                    rmd160  165727f34786fcbc62a153e97ba40ec0567c93c6 \
-                    sha256  43b779d0c30a1d7af6fb62fcf4e0ed13871edd302317c6acaba7beb9c8157b1e
+checksums           sha1    ef1aacb24bb9b41e4be10fd84cf4fe571b765313 \
+                    rmd160  283dd533d07d613ad08a962eee63353bbb3c1d13 \
+                    sha256  5e7d9daf4f87a25c4fee50d11d00e9b76879021e488a97827021b3ce7342a9a7
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -57,8 +57,9 @@
 # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
 # quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
 # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
-# libc++.patch: https://bugs.webkit.org/show_bug.cgi?id=126431
 # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
+# libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
+# leopard-python.patch: https://bugs.webkit.org/show_bug.cgi?id=126323
 
 patchfiles \
         clang-assertions.patch \
@@ -67,8 +68,9 @@
         quartz-duplicate-symbols.patch \
         quartz-webcore.patch \
         clang-check.patch \
-        libc++.patch \
-        gstreamer.patch
+        gstreamer.patch \
+        libedit.patch \
+        leopard-python.patch
 
 conflicts_build     google-test
 
@@ -110,7 +112,6 @@
 }
 
 subport webkit-gtk3-devel {
-    revision    1
     conflicts   webkit-gtk3 webkit-gtk3-2.0
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
@@ -241,7 +242,8 @@
     # quartz-include-widgetbackingstorecairo.patch
     # https://trac.macports.org/ticket/38203
     # https://bugs.webkit.org/show_bug.cgi?id=111598
-    patchfiles-append quartz-include-widgetbackingstorecairo.patch
+    patchfiles-append quartz-include-widgetbackingstorecairo.patch \
+                      quartz-duplicate-symbols2.patch
 }
 
 variant video description {Enable HTML5 video support using gstreamer} {

Added: trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch	2014-01-16 00:08:24 UTC (rev 115984)
@@ -0,0 +1,11 @@
+diff --git Tools/gtk/generate-feature-defines-files Tools/gtk/generate-feature-defines-files
+index f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9..17d52e65a450e3687d8f80a72917ddec34a08caa 100755
+--- Tools/gtk/generate-feature-defines-files
++++ Tools/gtk/generate-feature-defines-files
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-
++from __future__ import with_statement
+ import os
+ import re
+ import sys

Deleted: trunk/dports/www/webkit-gtk-devel/files/libc++.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/libc++.patch	2014-01-15 23:46:47 UTC (rev 115983)
+++ trunk/dports/www/webkit-gtk-devel/files/libc++.patch	2014-01-16 00:08:24 UTC (rev 115984)
@@ -1,17 +0,0 @@
---- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2014-01-03 08:55:20.000000000 -0800
-+++ Source/autotools/CheckSystemAndBasicDependencies.m4	2014-01-03 08:57:19.000000000 -0800
-@@ -123,14 +123,6 @@ elif test "$cxx_compiler" = "clang++"; t
-     OLD_CXXFLAGS="$CXXFLAGS"
-     CXXFLAGS="-std=c++11"
-     AC_LANG_PUSH([C++])
--    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#include <type_traits>
--#if defined(__GLIBCXX__) && __GLIBCXX__ >= 20130531
--bool libstdcxxTest = std::is_trivially_destructible<bool>::value;
--#else
--#error libstdc++ >= 4.8.1 is required
--#endif
--])], [], [AC_MSG_ERROR([libstdc++ >= 4.8.1 is required as the standard library used with the Clang compiler.])])
-     AC_LANG_POP([C++])
-     CXXFLAGS="$OLD_CXXFLAGS"
- fi

Added: trunk/dports/www/webkit-gtk-devel/files/libedit.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/libedit.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/libedit.patch	2014-01-16 00:08:24 UTC (rev 115984)
@@ -0,0 +1,10 @@
+--- Source/JavaScriptCore/GNUmakefile.am.orig	2014-01-12 11:11:12.000000000 -0800
++++ Source/JavaScriptCore/GNUmakefile.am	2014-01-15 12:33:06.000000000 -0800
+@@ -26,6 +26,7 @@ libjavascriptcoregtk_ at WEBKITGTK_API_MAJO
+ 	$(javascriptcore_sources)
+ 
+ libjavascriptcoregtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
++	-ledit \
+ 	-lpthread \
+ 	libWTF.la \
+ 	$(GLIB_LIBS) \

Added: trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch	2014-01-16 00:08:24 UTC (rev 115984)
@@ -0,0 +1,13 @@
+--- Source/WebCore/plugins/PluginPackageNone.cpp.orig	2012-10-29 20:40:46.000000000 -0400
++++ Source/WebCore/plugins/PluginPackageNone.cpp	2012-10-29 20:40:46.000000000 -0400
+@@ -28,10 +28,6 @@
+ 
+ namespace WebCore {
+ 
+-void PluginPackage::determineQuirks(const String&)
+-{
+-}
+-
+ bool PluginPackage::fetchInfo()
+ {
+     return false;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140115/d657c649/attachment.html>


More information about the macports-changes mailing list