[102295] trunk/dports/www/webkit-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 30 00:08:42 PST 2013
Revision: 102295
https://trac.macports.org/changeset/102295
Author: jeremyhu at macports.org
Date: 2013-01-30 00:08:42 -0800 (Wed, 30 Jan 2013)
Log Message:
-----------
webkit-gtk: Remove an invalid assert for ppc (#35989)
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
Added Paths:
-----------
trunk/dports/www/webkit-gtk/files/ppc.patch
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2013-01-30 07:27:45 UTC (rev 102294)
+++ trunk/dports/www/webkit-gtk/Portfile 2013-01-30 08:08:42 UTC (rev 102295)
@@ -44,6 +44,7 @@
# our-icu.patch: No upstream bug report, probably not wanted
# xrender-check.patch: https://bugs.webkit.org/show_bug.cgi?id=84095
# bison-2.6.patch: No upstream bug (?)
+# ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
# tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
# bison-2.6.patch \
@@ -53,6 +54,7 @@
our-icu.patch \
xrender-check.patch \
ruby-1.8.patch \
+ ppc.patch \
tiger.patch
conflicts_build google-test
Added: trunk/dports/www/webkit-gtk/files/ppc.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/ppc.patch (rev 0)
+++ trunk/dports/www/webkit-gtk/files/ppc.patch 2013-01-30 08:08:42 UTC (rev 102295)
@@ -0,0 +1,15 @@
+--- Source/WebCore/platform/Length.cpp.orig 2012-11-23 14:12:17.000000000 -0600
++++ Source/WebCore/platform/Length.cpp 2013-01-28 15:38:17.000000000 -0600
+@@ -249,10 +249,12 @@
+ return isCalculated() && (calculationValue() == o.calculationValue() || *calculationValue() == *o.calculationValue());
+ }
+
++#ifndef __ppc__
+ struct SameSizeAsLength {
+ int32_t value;
+ int32_t metaData;
+ };
+ COMPILE_ASSERT(sizeof(Length) == sizeof(SameSizeAsLength), length_should_stay_small);
++#endif
+
+ } // namespace WebCore
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130130/98b12d30/attachment.html>
More information about the macports-changes
mailing list