[115803] trunk/dports/www

jeremyhu at macports.org jeremyhu at macports.org
Sat Jan 11 12:21:09 PST 2014 

Revision: 115803
          https://trac.macports.org/changeset/115803
Author:   jeremyhu at macports.org
Date:     2014-01-11 12:21:09 -0800 (Sat, 11 Jan 2014)
Log Message:
-----------
webkit-gtk{,-devel}: Possible fix for +quartz build failure (#42010)

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch
    trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch
    trunk/dports/www/webkit-gtk-devel/Portfile
    trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch
    trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk/Portfile	2014-01-11 20:21:09 UTC (rev 115803)
@@ -50,12 +50,14 @@
 # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
 # our-icu.patch: No upstream bug report, probably not wanted
 # 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
 
 patchfiles \
         clang-assertions.patch \
         case-insensitive.patch \
         our-icu.patch \
+        quartz-duplicate-symbols.patch \
         quartz-webcore.patch \
         clang-check.patch \
         no-WebCoreLayer.a.patch
@@ -231,8 +233,7 @@
     # quartz-include-widgetbackingstorecairo.patch
     # https://trac.macports.org/ticket/38203
     # https://bugs.webkit.org/show_bug.cgi?id=111598
-    patchfiles-append quartz-duplicate-symbols.patch \
-                      quartz-include-widgetbackingstorecairo.patch
+    patchfiles-append quartz-include-widgetbackingstorecairo.patch
 }
 
 variant video description {Enable HTML5 video support using gstreamer} {

Modified: trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch	2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch	2014-01-11 20:21:09 UTC (rev 115803)
@@ -1,13 +1,13 @@
---- Source/WebCore/plugins/PluginPackageNone.cpp.orig	2012-10-29 20:40:46.000000000 -0400
-+++ Source/WebCore/plugins/PluginPackageNone.cpp	2012-10-29 20:40:46.000000000 -0400
-@@ -28,10 +28,6 @@
+--- Source/WebCore/GNUmakefile.list.am.orig	2013-12-18 03:03:41.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am	2014-01-11 12:15:07.000000000 -0800
+@@ -6283,10 +6283,6 @@ webcoregtk_sources += \
+ 	Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
+ 	Source/WebCore/platform/graphics/glx/GLContextGLX.h
+ endif # END USE_GLX
+-else
+-webcore_sources += \
+-	Source/WebCore/plugins/PluginPackageNone.cpp \
+-	Source/WebCore/plugins/PluginViewNone.cpp
+ endif # END TARGET_X11
  
- namespace WebCore {
- 
--void PluginPackage::determineQuirks(const String&)
--{
--}
--
- bool PluginPackage::fetchInfo()
- {
-     return false;
+ if TARGET_X11_OR_WAYLAND

Modified: trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch	2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch	2014-01-11 20:21:09 UTC (rev 115803)
@@ -1,6 +1,6 @@
---- Source/WebCore/GNUmakefile.list.am.old	2013-02-24 19:01:51.000000000 +0100
-+++ Source/WebCore/GNUmakefile.list.am	2013-02-24 19:03:41.000000000 +0100
-@@ -5949,6 +5949,9 @@
+--- Source/WebCore/GNUmakefile.list.am.orig	2014-01-11 12:15:07.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am	2014-01-11 12:16:03.000000000 -0800
+@@ -6328,6 +6328,9 @@ else
  webcore_sources += \
  	Source/WebCore/plugins/PluginPackageNone.cpp \
  	Source/WebCore/plugins/PluginViewNone.cpp
@@ -8,5 +8,5 @@
 +webcoregtk_sources += \
 +	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
  endif # END TARGET_WIN32
- endif # END TARGET_X11
+ endif # END TARGET_X11_OR_WAYLAND
  

Modified: trunk/dports/www/webkit-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-devel/Portfile	2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk-devel/Portfile	2014-01-11 20:21:09 UTC (rev 115803)
@@ -55,6 +55,7 @@
 # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
 # our-icu.patch: No upstream bug report, probably not wanted
 # 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
 # libc++.patch: https://bugs.webkit.org/show_bug.cgi?id=126431
 # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
@@ -63,6 +64,7 @@
         clang-assertions.patch \
         case-insensitive.patch \
         our-icu.patch \
+        quartz-duplicate-symbols.patch \
         quartz-webcore.patch \
         clang-check.patch \
         libc++.patch \
@@ -239,8 +241,7 @@
     # quartz-include-widgetbackingstorecairo.patch
     # https://trac.macports.org/ticket/38203
     # https://bugs.webkit.org/show_bug.cgi?id=111598
-    patchfiles-append quartz-duplicate-symbols.patch \
-                      quartz-include-widgetbackingstorecairo.patch
+    patchfiles-append quartz-include-widgetbackingstorecairo.patch
 }
 
 variant video description {Enable HTML5 video support using gstreamer} {

Modified: trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch	2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch	2014-01-11 20:21:09 UTC (rev 115803)
@@ -1,13 +1,13 @@
---- Source/WebCore/plugins/PluginPackageNone.cpp.orig	2012-10-29 20:40:46.000000000 -0400
-+++ Source/WebCore/plugins/PluginPackageNone.cpp	2012-10-29 20:40:46.000000000 -0400
-@@ -28,10 +28,6 @@
+--- Source/WebCore/GNUmakefile.list.am.orig	2013-12-18 03:03:41.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am	2014-01-11 12:15:07.000000000 -0800
+@@ -6283,10 +6283,6 @@ webcoregtk_sources += \
+ 	Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
+ 	Source/WebCore/platform/graphics/glx/GLContextGLX.h
+ endif # END USE_GLX
+-else
+-webcore_sources += \
+-	Source/WebCore/plugins/PluginPackageNone.cpp \
+-	Source/WebCore/plugins/PluginViewNone.cpp
+ endif # END TARGET_X11
  
- namespace WebCore {
- 
--void PluginPackage::determineQuirks(const String&)
--{
--}
--
- bool PluginPackage::fetchInfo()
- {
-     return false;
+ if TARGET_X11_OR_WAYLAND

Modified: trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch	2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch	2014-01-11 20:21:09 UTC (rev 115803)
@@ -1,6 +1,6 @@
---- Source/WebCore/GNUmakefile.list.am.old	2013-02-24 19:01:51.000000000 +0100
-+++ Source/WebCore/GNUmakefile.list.am	2013-02-24 19:03:41.000000000 +0100
-@@ -5949,6 +5949,9 @@
+--- Source/WebCore/GNUmakefile.list.am.orig	2014-01-11 12:15:07.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am	2014-01-11 12:16:03.000000000 -0800
+@@ -6328,6 +6328,9 @@ else
  webcore_sources += \
  	Source/WebCore/plugins/PluginPackageNone.cpp \
  	Source/WebCore/plugins/PluginViewNone.cpp
@@ -8,5 +8,5 @@
 +webcoregtk_sources += \
 +	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
  endif # END TARGET_WIN32
- endif # END TARGET_X11
+ endif # END TARGET_X11_OR_WAYLAND
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140111/ce36e4e8/attachment.html>

More information about the macports-changes mailing list