Ignore:
Timestamp:
Jan 11, 2014, 8:21:09 PM (5 years ago)
Author:
jeremyhu@…
Message:

webkit-gtk{,-devel}: Possible fix for +quartz build failure (#42010)

Location:
trunk/dports/www/webkit-gtk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/webkit-gtk/Portfile

    r115644 r115803  
    5151# our-icu.patch: No upstream bug report, probably not wanted
    5252# quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
     53# quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
    5354# clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
    5455
     
    5758        case-insensitive.patch \
    5859        our-icu.patch \
     60        quartz-duplicate-symbols.patch \
    5961        quartz-webcore.patch \
    6062        clang-check.patch \
     
    232234    # https://trac.macports.org/ticket/38203
    233235    # https://bugs.webkit.org/show_bug.cgi?id=111598
    234     patchfiles-append quartz-duplicate-symbols.patch \
    235                       quartz-include-widgetbackingstorecairo.patch
     236    patchfiles-append quartz-include-widgetbackingstorecairo.patch
    236237}
    237238
  • trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch

    r99238 r115803  
    1 --- Source/WebCore/plugins/PluginPackageNone.cpp.orig   2012-10-29 20:40:46.000000000 -0400
    2 +++ Source/WebCore/plugins/PluginPackageNone.cpp        2012-10-29 20:40:46.000000000 -0400
    3 @@ -28,10 +28,6 @@
     1--- Source/WebCore/GNUmakefile.list.am.orig     2013-12-18 03:03:41.000000000 -0800
     2+++ Source/WebCore/GNUmakefile.list.am  2014-01-11 12:15:07.000000000 -0800
     3@@ -6283,10 +6283,6 @@ webcoregtk_sources += \
     4        Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
     5        Source/WebCore/platform/graphics/glx/GLContextGLX.h
     6 endif # END USE_GLX
     7-else
     8-webcore_sources += \
     9-       Source/WebCore/plugins/PluginPackageNone.cpp \
     10-       Source/WebCore/plugins/PluginViewNone.cpp
     11 endif # END TARGET_X11
    412 
    5  namespace WebCore {
    6  
    7 -void PluginPackage::determineQuirks(const String&)
    8 -{
    9 -}
    10 -
    11  bool PluginPackage::fetchInfo()
    12  {
    13      return false;
     13 if TARGET_X11_OR_WAYLAND
  • trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch

    r103757 r115803  
    1 --- Source/WebCore/GNUmakefile.list.am.old      2013-02-24 19:01:51.000000000 +0100
    2 +++ Source/WebCore/GNUmakefile.list.am  2013-02-24 19:03:41.000000000 +0100
    3 @@ -5949,6 +5949,9 @@
     1--- Source/WebCore/GNUmakefile.list.am.orig     2014-01-11 12:15:07.000000000 -0800
     2+++ Source/WebCore/GNUmakefile.list.am  2014-01-11 12:16:03.000000000 -0800
     3@@ -6328,6 +6328,9 @@ else
    44 webcore_sources += \
    55        Source/WebCore/plugins/PluginPackageNone.cpp \
     
    99+       Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
    1010 endif # END TARGET_WIN32
    11  endif # END TARGET_X11
     11 endif # END TARGET_X11_OR_WAYLAND
    1212 
Note: See TracChangeset for help on using the changeset viewer.