Date: Friday, January 16, 2015 @ 16:51:06 Author: heftig Revision: 229449
2.4.8 Added: webkitgtk/trunk/bug140241.patch Modified: webkitgtk/trunk/PKGBUILD -----------------+ PKGBUILD | 12 +++++++--- bug140241.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-16 15:27:13 UTC (rev 229448) +++ PKGBUILD 2015-01-16 15:51:06 UTC (rev 229449) @@ -3,7 +3,7 @@ pkgbase=webkitgtk pkgname=(webkitgtk webkitgtk2) -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=1 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64) @@ -17,9 +17,10 @@ 'gst-libav: nonfree media decoding') options=(!emptydirs) source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz - fix-pretty-quotes.patch) -sha256sums=('f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + fix-pretty-quotes.patch bug140241.patch) +sha256sums=('68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23' + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6' + 'a08d43d45e9c226197d4bc4257a416bcb3507bebd2d9c9e8554d1002ddbbe537') prepare() { mkdir build-gtk{,2} path @@ -28,6 +29,9 @@ cd $pkgbase-$pkgver patch -Np0 -i ../fix-pretty-quotes.patch + + # Fix build bug; https://bugs.webkit.org/show_bug.cgi?id=140241 patch v3 + patch -Np1 -i ../bug140241.patch } _build() ( Added: bug140241.patch =================================================================== --- bug140241.patch (rev 0) +++ bug140241.patch 2015-01-16 15:51:06 UTC (rev 229449) @@ -0,0 +1,59 @@ +@@ -, +, @@ + REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled + https://bugs.webkit.org/show_bug.cgi?id=140241 + Reviewed by NOBODY (OOPS!). + We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp + just when WebKit2 is enabled and we are not building for X11. + * GNUmakefile.list.am: +--- + Source/WebCore/ChangeLog | 12 ++++++++++++ + Source/WebCore/GNUmakefile.list.am | 8 ++++++++ + 2 files changed, 20 insertions(+) +--- a/Source/WebCore/ChangeLog ++++ a/Source/WebCore/ChangeLog +@@ -1,3 +1,15 @@ ++2015-01-16 Tomas Popela <tpop...@redhat.com> ++ ++ REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled ++ https://bugs.webkit.org/show_bug.cgi?id=140241 ++ ++ Reviewed by NOBODY (OOPS!). ++ ++ We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp ++ just when WebKit2 is enabled and we are not building for X11. ++ ++ * GNUmakefile.list.am: ++ + 2014-11-10 Csaba Osztrogonác <o...@webkit.org> + + Crash in WebCore::Node::getFlag +--- a/Source/WebCore/GNUmakefile.list.am ++++ a/Source/WebCore/GNUmakefile.list.am +@@ -6254,9 +6254,13 @@ endif # END USE_GLX + endif # END TARGET_X11 + + if TARGET_WAYLAND ++if !TARGET_X11 ++if ENABLE_WEBKIT2 + webcore_sources += \ + Source/WebCore/plugins/PluginPackageNone.cpp \ + Source/WebCore/plugins/PluginViewNone.cpp ++endif # END ENABLE_WEBKIT2 ++endif # END !TARGET_X11 + endif # END TARGET_WAYLAND + + if TARGET_X11_OR_WAYLAND +@@ -6305,9 +6309,13 @@ webcoregtk_sources += \ + endif # END TARGET_WIN32 + + if TARGET_QUARTZ ++if !TARGET_X11 ++if ENABLE_WEBKIT2 + webcore_sources += \ + Source/WebCore/plugins/PluginPackageNone.cpp \ + Source/WebCore/plugins/PluginViewNone.cpp ++endif # END ENABLE_WEBKIT2 ++endif # END !TARGET_X11 + platformgtk_sources += \ + Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \ + Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp