[99154] trunk/dports/www/webkit-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Sun Oct 28 13:24:29 PDT 2012
Revision: 99154
http://trac.macports.org//changeset/99154
Author: jeremyhu at macports.org
Date: 2012-10-28 13:24:28 -0700 (Sun, 28 Oct 2012)
Log Message:
-----------
webkit-gtk: Bump to 1.10.1
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
trunk/dports/www/webkit-gtk/files/tiger.patch
Removed Paths:
-------------
trunk/dports/www/webkit-gtk/files/quartz.patch
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2012-10-28 19:39:25 UTC (rev 99153)
+++ trunk/dports/www/webkit-gtk/Portfile 2012-10-28 20:24:28 UTC (rev 99154)
@@ -6,8 +6,7 @@
name webkit-gtk
epoch 1
-version 1.8.3
-revision 2
+version 1.10.1
description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers jeremyhu devans
@@ -18,11 +17,11 @@
master_sites http://webkitgtk.org/releases/
use_xz yes
-distname webkit-${version}
+distname webkitgtk-${version}
-checksums sha1 ccf567fdfd7fbc63a3340777278e41b17522b80d \
- rmd160 a25fe7966630d2a0e0926f565e28a9054d446c14 \
- sha256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7
+checksums sha1 3a2df2eb42ffdd7f3b39873d5461c347a6330493 \
+ rmd160 ea246d29a1def4993d592d8464b527b2c9ed1bdc \
+ sha256 8a2c59c7fdd2c011bdb6ca479aebdf892220d6caf484ddb17ed97fd2575fc7f4
depends_lib \
port:gtk2 \
@@ -43,20 +42,20 @@
# case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
# our-icu.patch: No upstream bug report, probably not wanted
# xrender-check.patch: https://bugs.webkit.org/show_bug.cgi?id=84095
-# quartz.patch: https://bugs.webkit.org/show_bug.cgi?id=84423
# bison-2.6.patch: No upstream bug (?)
# tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
+# bison-2.6.patch \
+
patchfiles \
case-insensitive.patch \
our-icu.patch \
xrender-check.patch \
- quartz.patch \
- bison-2.6.patch \
tiger.patch
configure.args \
--with-gtk=2.0 \
+ --disable-webkit2 \
--disable-introspection \
--enable-link-prefetch \
--enable-image-resizer \
@@ -82,6 +81,10 @@
# --enable-animation-api \
# --enable-register-protocol-handler \
+# In 1.10.1:
+# https://bugs.webkit.org/show_bug.cgi?id=99732
+configure.args-append --disable-jit
+
# In 1.8.2:
# ./Source/WebCore/workers/WorkerContext.h:225: error: 'IDBFactoryBackendInterface' was not declared in this scope
# https://bugs.webkit.org/show_bug.cgi?id=94495
@@ -133,6 +136,8 @@
# We don't want to use the headers from the installed WebKit
configure.cppflags-delete -I${prefix}/include
+configure.cflags-append -g3
+configure.cxxflags-append -g3
autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
use_autoreconf yes
@@ -154,6 +159,14 @@
# https://bugs.webkit.org/show_bug.cgi?id=88407
reinplace "s:echo -n:/bin/echo -n:g" \
${worksrcpath}/Source/WebCore/GNUmakefile.am
+
+ # https://bugs.webkit.org/show_bug.cgi?id=99679
+ # https://bugs.webkit.org/show_bug.cgi?id=99683
+ reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
+ ${worksrcpath}/Source/WTF/wtf/InlineASM.h \
+ ${worksrcpath}/Source/JavaScriptCore/heap/VTableSpectrum.cpp \
+ ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
+ ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp
}
# TODO: fix this for muniversal
@@ -162,6 +175,8 @@
# file copy ${worksrcpath}/Programs/.libs/GtkLauncher ${destroot}${prefix}/bin
#}
+build.args-append V=1
+
# see bug #24622
variant quartz {
configure.args-append --with-target=quartz
Deleted: trunk/dports/www/webkit-gtk/files/quartz.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz.patch 2012-10-28 19:39:25 UTC (rev 99153)
+++ trunk/dports/www/webkit-gtk/files/quartz.patch 2012-10-28 20:24:28 UTC (rev 99154)
@@ -1,24 +0,0 @@
---- 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
- endif
-
- # ----
Modified: trunk/dports/www/webkit-gtk/files/tiger.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/tiger.patch 2012-10-28 19:39:25 UTC (rev 99153)
+++ trunk/dports/www/webkit-gtk/files/tiger.patch 2012-10-28 20:24:28 UTC (rev 99154)
@@ -1,13 +1,14 @@
---- Source/JavaScriptCore/wtf/Platform.h.orig 2012-09-03 23:55:53.000000000 -0700
-+++ Source/JavaScriptCore/wtf/Platform.h 2012-09-03 23:59:14.000000000 -0700
-@@ -316,7 +316,9 @@
+--- Source/WTF/wtf/Platform.h.orig 2012-10-17 21:57:04.000000000 -0700
++++ Source/WTF/wtf/Platform.h 2012-10-17 21:57:40.000000000 -0700
+@@ -321,8 +321,10 @@
#ifdef __APPLE__
#define WTF_OS_DARWIN 1
-#include <Availability.h>
#include <AvailabilityMacros.h>
-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
+#include <Availability.h>
+#endif
#include <TargetConditionals.h>
#endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121028/ef10e701/attachment.html>
More information about the macports-changes
mailing list