[131267] trunk/dports/www/webkit-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 7 19:53:04 PST 2015
Revision: 131267
https://trac.macports.org/changeset/131267
Author: jeremyhu at macports.org
Date: 2015-01-07 19:53:03 -0800 (Wed, 07 Jan 2015)
Log Message:
-----------
webkit-gtk: Bump to 2.4.8 and fix Leopard build issues
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
Added Paths:
-----------
trunk/dports/www/webkit-gtk/files/leopard-malloc.patch
trunk/dports/www/webkit-gtk/files/leopard-platform.patch
trunk/dports/www/webkit-gtk/files/ruby-1.8.patch
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2015-01-08 03:03:29 UTC (rev 131266)
+++ trunk/dports/www/webkit-gtk/Portfile 2015-01-08 03:53:03 UTC (rev 131267)
@@ -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,12 +50,16 @@
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
@@ -65,17 +68,16 @@
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
Added: trunk/dports/www/webkit-gtk/files/leopard-malloc.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/leopard-malloc.patch (rev 0)
+++ trunk/dports/www/webkit-gtk/files/leopard-malloc.patch 2015-01-08 03:53:03 UTC (rev 131267)
@@ -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
+
+ };
+ }
Added: trunk/dports/www/webkit-gtk/files/leopard-platform.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/leopard-platform.patch (rev 0)
+++ trunk/dports/www/webkit-gtk/files/leopard-platform.patch 2015-01-08 03:53:03 UTC (rev 131267)
@@ -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
Added: trunk/dports/www/webkit-gtk/files/ruby-1.8.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/ruby-1.8.patch (rev 0)
+++ trunk/dports/www/webkit-gtk/files/ruby-1.8.patch 2015-01-08 03:53:03 UTC (rev 131267)
@@ -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/20150107/9d4e3766/attachment-0001.html>
More information about the macports-changes
mailing list