[139266] users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel

devans at macports.org devans at macports.org
Sun Aug 9 20:14:08 PDT 2015


Revision: 139266
          https://trac.macports.org/changeset/139266
Author:   devans at macports.org
Date:     2015-08-09 20:14:07 -0700 (Sun, 09 Aug 2015)
Log Message:
-----------
GNOME-3/stable: webkit-gtk-devel, update to version 2.4.9.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile
    users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-assertions.patch
    users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-webcore.patch

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

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

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


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-139222
   + /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-139264

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile	2015-08-10 03:12:10 UTC (rev 139265)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile	2015-08-10 03:14:07 UTC (rev 139266)
@@ -12,8 +12,7 @@
 
 name                webkit-gtk-devel
 epoch               2
-version             2.4.7
-revision            1
+version             2.4.9
 description         Apple's WebKit HTML rendering library for GTK+
 long_description    ${description}
 maintainers         jeremyhu devans
@@ -28,12 +27,13 @@
 
 dist_subdir         webkit-gtk
 
-checksums           sha1    10d4cd1c1f7454adc576c6b97fa3d262b6665764 \
-                    rmd160  25e1732f7e04ee0e15d7292aa5ef693d5c25679d \
-                    sha256  f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38
+checksums           rmd160  122468435539d69665d5206ae266fb36ff2d86c2 \
+                    sha256  afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
 
 depends_build       port:pkgconfig \
-                    port:gtk-doc
+                    port:gtk-doc \
+                    port:python27 \
+                    port:py27-simplejson
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:bison \
@@ -42,6 +42,7 @@
                     port:geoclue2 \
                     port:gobject-introspection \
                     port:harfbuzz-icu \
+                    port:icu \
                     port:libxslt \
                     port:libpng \
                     port:libsecret \
@@ -53,18 +54,21 @@
 
 # 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
@@ -222,12 +226,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} {

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-assertions.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-assertions.patch	2015-08-10 03:12:10 UTC (rev 139265)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-assertions.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -1,6 +1,6 @@
 --- Source/WTF/wtf/Assertions.h.orig	2013-01-18 15:03:57.000000000 -0800
 +++ Source/WTF/wtf/Assertions.h	2013-01-18 15:04:46.000000000 -0800
-@@ -381,7 +381,8 @@ while (0)
+@@ -371,7 +371,8 @@ while (0)
  // a function. Hence it uses macro naming convention.
  #pragma clang diagnostic push
  #pragma clang diagnostic ignored "-Wmissing-noreturn"

Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-check.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-check.patch	2015-08-10 03:12:10 UTC (rev 139265)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/clang-check.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -1,20 +0,0 @@
---- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2014-01-23 08:49:59.000000000 -0800
-+++ Source/autotools/CheckSystemAndBasicDependencies.m4	2014-02-05 17:29:39.000000000 -0800
-@@ -92,7 +92,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #endif
- ])], [c_compiler="gcc"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang compiler
- #endif
- ])], [c_compiler="clang"], [])
-@@ -111,7 +111,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #endif
- ])], [cxx_compiler="g++"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang++ compiler
- #endif
- ])], [cxx_compiler="clang++"], [])

Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/leopard-malloc.patch (from rev 139264, trunk/dports/www/webkit-gtk-devel/files/leopard-malloc.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/leopard-malloc.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/leopard-malloc.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -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-devel/files/leopard-platform.patch (from rev 139264, trunk/dports/www/webkit-gtk-devel/files/leopard-platform.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/leopard-platform.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/leopard-platform.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -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
+@@ -590,11 +590,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-devel/files/quartz-duplicate-symbols2.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch	2015-08-10 03:12:10 UTC (rev 139265)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -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-devel/files/quartz-include-widgetbackingstorecairo.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch	2015-08-10 03:12:10 UTC (rev 139265)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -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
- 

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-webcore.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-webcore.patch	2015-08-10 03:12:10 UTC (rev 139265)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/quartz-webcore.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -1,18 +1,18 @@
---- Source/WebCore/plugins/PluginView-orig.cpp	2013-07-19 00:04:11.000000000 -0700
-+++ Source/WebCore/plugins/PluginView.cpp	2013-08-12 17:48:20.000000000 -0700
-@@ -865,7 +865,7 @@
+--- Source/WebCore/plugins/PluginView.cpp.orig	2015-05-20 02:03:24.000000000 -0700
++++ Source/WebCore/plugins/PluginView.cpp	2015-08-08 15:02:30.000000000 -0700
+@@ -839,7 +839,7 @@
+ #if defined(XP_MACOSX)
      , m_contextRef(0)
-     , m_fakeWindow(0)
  #endif
 -#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
 +#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
      , m_hasPendingGeometryChange(true)
      , m_drawable(0)
      , m_visual(0)
---- Source/WebCore/plugins/PluginView-orig.h	2013-07-19 00:04:11.000000000 -0700
-+++ Source/WebCore/plugins/PluginView.h	2013-08-12 16:09:21.000000000 -0700
-@@ -427,7 +427,7 @@
-         Point mousePosForPlugin(MouseEvent* event = 0) const;
+--- Source/WebCore/plugins/PluginView.h.orig	2015-05-20 02:03:24.000000000 -0700
++++ Source/WebCore/plugins/PluginView.h	2015-08-08 15:02:30.000000000 -0700
+@@ -378,7 +378,7 @@
+         void setNPWindowIfNeeded();
  #endif
  
 -#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
@@ -20,3 +20,17 @@
          bool m_hasPendingGeometryChange;
          Pixmap m_drawable;
          Visual* m_visual;
+--- Source/WebCore/GNUmakefile.list.am.orig	2015-06-16 09:12:37.000000000 +0200
++++ Source/WebCore/GNUmakefile.list.am	2015-06-16 09:13:38.000000000 +0200
+@@ -6315,11 +6315,9 @@
+ 
+ if TARGET_QUARTZ
+ if !TARGET_X11
+-if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
+-endif # END ENABLE_WEBKIT2
+ endif # END !TARGET_X11
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \

Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/ruby-1.8.patch (from rev 139264, trunk/dports/www/webkit-gtk-devel/files/ruby-1.8.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/ruby-1.8.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/files/ruby-1.8.patch	2015-08-10 03:14:07 UTC (rev 139266)
@@ -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
+         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150809/f101e7ea/attachment-0001.html>


More information about the macports-changes mailing list