[131881] users/devans/GNOME-3/stable/dports/www

Tue Jan 20 00:59:12 PST 2015

Revision: 131881
          https://trac.macports.org/changeset/131881
Author:   devans at macports.org
Date:     2015-01-20 00:59:12 -0800 (Tue, 20 Jan 2015)
Log Message:
-----------
GNOME-3/stable: webkit-gtk, webkit-gtkdevel, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/
    users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit-gtk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk:127269-127943
   + /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk:127269-131880

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile
===================================================================

--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile	2015-01-20 08:53:40 UTC (rev 131880)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile	2015-01-20 08:59:12 UTC (rev 131881)
@@ -12,8 +12,7 @@
 
 name        webkit-gtk
 epoch       2
-version     2.4.7
-revision    1
+version     2.4.8
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -28,9 +27,9 @@
 
 dist_subdir webkit-gtk
 
-checksums           sha1    10d4cd1c1f7454adc576c6b97fa3d262b6665764 \
-                    rmd160  25e1732f7e04ee0e15d7292aa5ef693d5c25679d \
-                    sha256  f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38
+checksums           sha1    44c6bbe52108297126830525619c1df047886a6f \
+                    rmd160  24f812f3989baa67e165c1076923020c37df9501 \
+                    sha256  68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -51,31 +50,36 @@
 
 depends_build   \
         port:gtk-doc \
-        port:pkgconfig
+        port:pkgconfig \
+        port:python27 \
+        port:py27-simplejson
 
+configure.python    ${prefix}/bin/python2.7
+
 # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
 # our-icu.patch: No upstream bug report, probably not wanted
+# ruby-1.8.patch: https://bugs.webkit.org/show_bug.cgi?id=126327
 # 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
 # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
 # libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
+# leopard-malloc.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
+# leopard-platform.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
 
 patchfiles \
         clang-assertions.patch \
         case-insensitive.patch \
         our-icu.patch \
-        quartz-duplicate-symbols.patch \
+        ruby-1.8.patch \
         quartz-webcore.patch \
         clang-check.patch \
         gstreamer.patch \
+        leopard-platform.patch \
+        leopard-malloc.patch \
         libedit.patch
 
 conflicts_build     google-test
 
-# https://trac.macports.org/ticket/36329
-configure.python    /usr/bin/python
-
 # --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
 # --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
 # --disable-jit: https://bugs.webkit.org/show_bug.cgi?id=133293
@@ -226,12 +230,6 @@
     depends_lib-delete \
         port:mesa \
         port:xorg-libXt
-
-    # 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 \
-                      quartz-duplicate-symbols2.patch
 }
 
 variant video description {Enable HTML5 video support using gstreamer} {

Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch (from rev 131290, trunk/dports/www/webkit-gtk/files/leopard-malloc.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch	2015-01-20 08:59:12 UTC (rev 131881)
@@ -0,0 +1,16 @@
+--- Source/WTF/wtf/FastMalloc.cpp.orig	2015-01-07 16:04:31.000000000 -0800
++++ Source/WTF/wtf/FastMalloc.cpp	2015-01-07 16:06:05.000000000 -0800
+@@ -5095,8 +5095,13 @@ void* FastMallocZone::zoneRealloc(malloc
+ extern "C" {
+ malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
+     &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
++
++#if OS(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+     , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
++#endif
++#if OS(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+     , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
++#endif
+ 
+     };
+ }

Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch (from rev 131290, trunk/dports/www/webkit-gtk/files/leopard-platform.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch	2015-01-20 08:59:12 UTC (rev 131881)
@@ -0,0 +1,19 @@
+--- Source/WTF/wtf/Platform.h.orig	2015-01-06 13:30:52.000000000 -0800
++++ Source/WTF/wtf/Platform.h	2015-01-06 13:42:15.000000000 -0800
+@@ -587,11 +587,14 @@
+ 
+ #if OS(DARWIN)
+ 
++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 || PLATFORM(IOS)
+ #define HAVE_DISPATCH_H 1
+-#define HAVE_MADV_FREE 1
+ #define HAVE_MADV_FREE_REUSE 1
+-#define HAVE_MERGESORT 1
+ #define HAVE_PTHREAD_SETNAME_NP 1
++#endif
++
++#define HAVE_MADV_FREE 1
++#define HAVE_MERGESORT 1
+ #define HAVE_READLINE 1
+ #define HAVE_SYS_TIMEB_H 1
+ #define WTF_USE_ACCELERATE 1

Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch	2015-01-20 08:53:40 UTC (rev 131880)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch	2015-01-20 08:59:12 UTC (rev 131881)
@@ -1,13 +0,0 @@
---- 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;

Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch	2015-01-20 08:53:40 UTC (rev 131880)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch	2015-01-20 08:59:12 UTC (rev 131881)
@@ -1,12 +0,0 @@
---- Source/WebCore/GNUmakefile.list.am.orig	2014-01-11 12:15:07.000000000 -0800
-+++ Source/WebCore/GNUmakefile.list.am	2014-01-11 12:16:03.000000000 -0800
-@@ -6328,6 +6328,9 @@ else
- webcore_sources += \
- 	Source/WebCore/plugins/PluginPackageNone.cpp \
- 	Source/WebCore/plugins/PluginViewNone.cpp
-+# in quartz mode include cairo widgetbackingstore implementation also
-+webcoregtk_sources += \
-+	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
- endif # END TARGET_WIN32
- endif # END TARGET_X11_OR_WAYLAND
- 

Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch (from rev 131290, trunk/dports/www/webkit-gtk/files/ruby-1.8.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch	2015-01-20 08:59:12 UTC (rev 131881)
@@ -0,0 +1,15 @@
+--- Source/JavaScriptCore/offlineasm/offsets.rb.orig	2012-11-23 14:12:16.000000000 -0600
++++ Source/JavaScriptCore/offlineasm/offsets.rb	2013-01-22 19:35:47.000000000 -0600
+@@ -109,7 +109,11 @@
+     File.open(file, "r") {
+         | inp |
+         loop {
+-            byte = inp.getbyte
++            if RUBY_VERSION >= '1.8.7'
++              byte = inp.getbyte
++            else
++              byte = inp.getc
++            end
+             break unless byte
+             fileBytes << byte
+         }


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk-devel:127269-127943
   + /branches/mld-qt-481/dports/www/webkit-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk-devel:127269-131880
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150120/01d972db/attachment.html>
