Changeset 99154

Timestamp:

Oct 28, 2012, 8:24:28 PM (12 years ago)

Author:

jeremyhu@…

Message:

webkit-gtk: Bump to 1.10.1

Location:

trunk/dports/www/webkit-gtk

Files:

• Portfile (modified) (8 diffs)
• files/quartz.patch (deleted)
• files/tiger.patch (modified) (2 diffs)

trunk/dports/www/webkit-gtk/Portfile

@@ -7 +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}
@@ -19 +18 @@
 
 use_xz          yes
-distname        webkit-${version}
-
-checksums       sha1    ccf567fdfd7fbc63a3340777278e41b17522b80d \
-                rmd160  a25fe7966630d2a0e0926f565e28a9054d446c14 \
-                sha256  ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7
+distname        webkitgtk-${version}
+
+checksums       sha1    3a2df2eb42ffdd7f3b39873d5461c347a6330493 \
+                rmd160  ea246d29a1def4993d592d8464b527b2c9ed1bdc \
+                sha256  8a2c59c7fdd2c011bdb6ca479aebdf892220d6caf484ddb17ed97fd2575fc7f4
 
 depends_lib     \
@@ -44 +43 @@
 # 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 \
@@ -52 +52 @@
         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 \
@@ -83 +82 @@
 #        --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
@@ -134 +137 @@
 # 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"
@@ -155 +160 @@
     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
 }
 
@@ -162 +175 @@
 #    file copy ${worksrcpath}/Programs/.libs/GtkLauncher ${destroot}${prefix}/bin
 #}
+
+build.args-append V=1
 
 # see bug #24622

trunk/dports/www/webkit-gtk/files/tiger.patch

@@ -1 @@
---- 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
@@ -7 +7 @@
 -#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
+