webkitgtk-redefined.patch

   1 @@ -, +, @@
   2         REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
   3         https://bugs.webkit.org/show_bug.cgi?id=140241
   4         Reviewed by NOBODY (OOPS!).
   5         We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
   6         just when WebKit2 is enabled and we are not building for X11.
   7         * GNUmakefile.list.am:
   8 ---
   9  Source/WebCore/ChangeLog           | 12 ++++++++++++
  10  Source/WebCore/GNUmakefile.list.am |  8 ++++++++
  11  2 files changed, 20 insertions(+)
  12 --- a/Source/WebCore/ChangeLog
  13 +++ a/Source/WebCore/ChangeLog
  14 @@ -1,3 +1,15 @@
  15 +2015-01-16  Tomas Popela  <tpopela@redhat.com>
  16 +
  17 +        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
  18 +        https://bugs.webkit.org/show_bug.cgi?id=140241
  19 +
  20 +        Reviewed by NOBODY (OOPS!).
  21 +
  22 +        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
  23 +        just when WebKit2 is enabled and we are not building for X11.
  24 +
  25 +        * GNUmakefile.list.am:
  26 +
  27  2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
  28
  29          Crash in WebCore::Node::getFlag
  30 --- a/Source/WebCore/GNUmakefile.list.am
  31 +++ a/Source/WebCore/GNUmakefile.list.am
  32 @@ -6254,9 +6254,13 @@ endif # END USE_GLX
  33  endif # END TARGET_X11
  34
  35  if TARGET_WAYLAND
  36 +if !TARGET_X11
  37 +if ENABLE_WEBKIT2
  38  webcore_sources += \
  39         Source/WebCore/plugins/PluginPackageNone.cpp \
  40         Source/WebCore/plugins/PluginViewNone.cpp
  41 +endif # END ENABLE_WEBKIT2
  42 +endif # END !TARGET_X11
  43  endif # END TARGET_WAYLAND
  44
  45  if TARGET_X11_OR_WAYLAND
  46 @@ -6305,9 +6309,13 @@ webcoregtk_sources += \
  47  endif # END TARGET_WIN32
  48
  49  if TARGET_QUARTZ
  50 +if !TARGET_X11
  51 +if ENABLE_WEBKIT2
  52  webcore_sources += \
  53         Source/WebCore/plugins/PluginPackageNone.cpp \
  54         Source/WebCore/plugins/PluginViewNone.cpp
  55 +endif # END ENABLE_WEBKIT2
  56 +endif # END !TARGET_X11
  57  platformgtk_sources += \
  58         Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
  59         Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp