[113168] trunk/dports/www/webkit-gtk

[jeremyhu at macports.org]

Revision: 113168
          https://trac.macports.org/changeset/113168
Author:   jeremyhu at macports.org
Date:     2013-11-11 01:33:52 -0800 (Mon, 11 Nov 2013)
Log Message:
-----------
webkit-gtk: Revert accidental commit

no epoch bump because the previous version wouldn't actually build anyways

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/execinfo.patch
    trunk/dports/www/webkit-gtk/files/quartz-webcore.patch

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-11-11 09:25:36 UTC (rev 113167)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-11-11 09:33:52 UTC (rev 113168)
@@ -8,7 +8,7 @@
 
 name        webkit-gtk
 epoch       2
-version     2.2.1
+version     2.0.4
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -21,9 +21,9 @@
 use_xz      yes
 distname    webkitgtk-${version}
 
-checksums           sha1    a91fe58d242b3f7c4a220990742304031aa74a07 \
-                    rmd160  d31ca3e8611401f272a1a45f34f5fe2166c03e83 \
-                    sha256  13d081df8dd0a442d4f4e91a6d5236aa91b78f62a670283da08ad5bff76e4ae8
+checksums           sha1    3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a \
+                    rmd160  19643cac3f53928757a7c3fe8ea33f144a581456 \
+                    sha256  bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -54,7 +54,6 @@
 # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
 # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
 # quartz-webcore.patch: No upstream bug, http://trac.macports.org/ticket/39898
-# clang-check.patch: No upstream bug, emailed mailing list
 
 patchfiles \
         clang-assertions.patch \
@@ -65,8 +64,7 @@
         ListableHandler.patch \
         ppc.patch \
         tiger.patch \
-        quartz-webcore.patch \
-        clang-check.patch
+        quartz-webcore.patch
 
 conflicts_build     google-test
 
@@ -159,7 +157,7 @@
 
 autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
 use_autoreconf  yes
-autoreconf.args -fvi
+autoreconf.args -fi
 
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 

Modified: trunk/dports/www/webkit-gtk/files/execinfo.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/execinfo.patch	2013-11-11 09:25:36 UTC (rev 113167)
+++ trunk/dports/www/webkit-gtk/files/execinfo.patch	2013-11-11 09:33:52 UTC (rev 113168)
@@ -28,8 +28,8 @@
  
  void WTFGetBacktrace(void** stack, int* size)
  {
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
-+#if (OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
      *size = backtrace(stack, *size);
  #elif OS(WINDOWS) && !OS(WINCE)
      // The CaptureStackBackTrace function is available in XP, but it is not defined

Modified: trunk/dports/www/webkit-gtk/files/quartz-webcore.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz-webcore.patch	2013-11-11 09:25:36 UTC (rev 113167)
+++ trunk/dports/www/webkit-gtk/files/quartz-webcore.patch	2013-11-11 09:33:52 UTC (rev 113168)
@@ -1,3 +1,14 @@
+--- Source/WebCore/bridge/npruntime_internal-orig.h	2013-07-19 00:04:01.000000000 -0700
++++ Source/WebCore/bridge/npruntime_internal.h	2013-08-12 16:04:17.000000000 -0700
+@@ -29,7 +29,7 @@
+ #include "npfunctions.h"
+ #include "npruntime.h"
+ 
+-#ifdef XP_UNIX
++#if PLATFORM(X11)
+     #include <X11/Xresource.h>
+ 
+     #undef None
 --- 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 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131111/a84dbd63/attachment.html>