[arch-commits] Commit in webkitgtk/repos (10 files)
Jan Steffens
heftig at archlinux.org
Fri Jan 16 16:05:57 UTC 2015
Date: Friday, January 16, 2015 @ 17:05:56
Author: heftig
Revision: 229451
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
webkitgtk/repos/extra-i686/PKGBUILD
(from rev 229450, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/extra-i686/bug140241.patch
(from rev 229450, webkitgtk/trunk/bug140241.patch)
webkitgtk/repos/extra-i686/fix-pretty-quotes.patch
(from rev 229450, webkitgtk/trunk/fix-pretty-quotes.patch)
webkitgtk/repos/extra-x86_64/PKGBUILD
(from rev 229450, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/extra-x86_64/bug140241.patch
(from rev 229450, webkitgtk/trunk/bug140241.patch)
webkitgtk/repos/extra-x86_64/fix-pretty-quotes.patch
(from rev 229450, webkitgtk/trunk/fix-pretty-quotes.patch)
Deleted:
webkitgtk/repos/extra-i686/PKGBUILD
webkitgtk/repos/extra-i686/fix-pretty-quotes.patch
webkitgtk/repos/extra-x86_64/PKGBUILD
webkitgtk/repos/extra-x86_64/fix-pretty-quotes.patch
--------------------------------------+
/PKGBUILD | 166 +++++++++++++++++++++++++++++++++
/fix-pretty-quotes.patch | 52 ++++++++++
extra-i686/PKGBUILD | 79 ---------------
extra-i686/bug140241.patch | 59 +++++++++++
extra-i686/fix-pretty-quotes.patch | 26 -----
extra-x86_64/PKGBUILD | 79 ---------------
extra-x86_64/bug140241.patch | 59 +++++++++++
extra-x86_64/fix-pretty-quotes.patch | 26 -----
8 files changed, 336 insertions(+), 210 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-01-16 15:51:28 UTC (rev 229450)
+++ extra-i686/PKGBUILD 2015-01-16 16:05:56 UTC (rev 229451)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.7
-pkgrel=1
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="http://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
- libsecret libwebp harfbuzz-icu)
-makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
-optdepends=('gst-plugins-base: free media decoding'
- 'gst-plugins-good: media decoding'
- 'gst-libav: nonfree media decoding')
-options=(!emptydirs)
-source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
- fix-pretty-quotes.patch)
-sha256sums=('f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38'
- '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
-
-prepare() {
- mkdir build-gtk{,2} path
-
- ln -s /usr/bin/python2 path/python
-
- cd $pkgbase-$pkgver
- patch -Np0 -i ../fix-pretty-quotes.patch
-}
-
-_build() (
- _ver="$1"; shift
- cd build-${_ver}
-
- ../$pkgbase-$pkgver/configure --prefix=/usr \
- --libexecdir=/usr/lib/webkit${_ver} \
- --enable-introspection \
- --disable-webkit2 \
- --disable-gtk-doc \
- "$@"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make all stamp-po
-)
-
-build() {
- PATH="$srcdir/path:$PATH"
-
- _build gtk
- _build gtk2 --with-gtk=2.0
-}
-
-package_webkitgtk() {
- depends+=(gtk3)
- optdepends+=('gtk2: Netscape plugin support')
- provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
- conflicts=(webkitgtk3 libwebkit3)
- replaces=(webkitgtk3 libwebkit3)
-
- make -C build-gtk -j1 DESTDIR="$pkgdir" install
- install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
- "$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
-}
-
-package_webkitgtk2() {
- pkgdesc+=" for GTK2"
- depends+=(gtk2)
- provides=("libwebkit=${pkgver}")
- conflicts=(libwebkit)
- replaces=(libwebkit)
-
- make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
- install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
- "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
-}
Copied: webkitgtk/repos/extra-i686/PKGBUILD (from rev 229450, webkitgtk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-01-16 16:05:56 UTC (rev 229451)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.8
+pkgrel=1
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="http://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+ libsecret libwebp harfbuzz-icu)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
+optdepends=('gst-plugins-base: free media decoding'
+ 'gst-plugins-good: media decoding'
+ 'gst-libav: nonfree media decoding')
+options=(!emptydirs)
+source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+ fix-pretty-quotes.patch bug140241.patch)
+sha256sums=('68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23'
+ '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6'
+ 'a08d43d45e9c226197d4bc4257a416bcb3507bebd2d9c9e8554d1002ddbbe537')
+
+prepare() {
+ mkdir build-gtk{,2} path
+
+ ln -s /usr/bin/python2 path/python
+
+ 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() (
+ _ver="$1"; shift
+ cd build-${_ver}
+
+ ../$pkgbase-$pkgver/configure --prefix=/usr \
+ --libexecdir=/usr/lib/webkit${_ver} \
+ --enable-introspection \
+ --disable-webkit2 \
+ --disable-gtk-doc \
+ "$@"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make all stamp-po
+)
+
+build() {
+ PATH="$srcdir/path:$PATH"
+
+ _build gtk
+ _build gtk2 --with-gtk=2.0
+}
+
+package_webkitgtk() {
+ depends+=(gtk3)
+ optdepends+=('gtk2: Netscape plugin support')
+ provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+ conflicts=(webkitgtk3 libwebkit3)
+ replaces=(webkitgtk3 libwebkit3)
+
+ make -C build-gtk -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
+}
+
+package_webkitgtk2() {
+ pkgdesc+=" for GTK2"
+ depends+=(gtk2)
+ provides=("libwebkit=${pkgver}")
+ conflicts=(libwebkit)
+ replaces=(libwebkit)
+
+ make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
+}
Copied: webkitgtk/repos/extra-i686/bug140241.patch (from rev 229450, webkitgtk/trunk/bug140241.patch)
===================================================================
--- extra-i686/bug140241.patch (rev 0)
+++ extra-i686/bug140241.patch 2015-01-16 16:05:56 UTC (rev 229451)
@@ -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 <tpopela at 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 <ossy at 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
Deleted: extra-i686/fix-pretty-quotes.patch
===================================================================
--- extra-i686/fix-pretty-quotes.patch 2015-01-16 15:51:28 UTC (rev 229450)
+++ extra-i686/fix-pretty-quotes.patch 2015-01-16 16:05:56 UTC (rev 229451)
@@ -1,26 +0,0 @@
-Pretty quotes in licence break Python stdin.
-
-https://bugs.webkit.org/show_bug.cgi?id=128971
-
---- Source/WebCore/xml/XMLViewer.css.orig 2014-01-23 16:49:58.000000000 +0000
-+++ Source/WebCore/xml/XMLViewer.css
-@@ -14,7 +14,7 @@
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
-- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
---- Source/WebCore/xml/XMLViewer.js.orig 2014-01-23 16:49:58.000000000 +0000
-+++ Source/WebCore/xml/XMLViewer.js
-@@ -15,7 +15,7 @@
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
-- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
Copied: webkitgtk/repos/extra-i686/fix-pretty-quotes.patch (from rev 229450, webkitgtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- extra-i686/fix-pretty-quotes.patch (rev 0)
+++ extra-i686/fix-pretty-quotes.patch 2015-01-16 16:05:56 UTC (rev 229451)
@@ -0,0 +1,26 @@
+Pretty quotes in licence break Python stdin.
+
+https://bugs.webkit.org/show_bug.cgi?id=128971
+
+--- Source/WebCore/xml/XMLViewer.css.orig 2014-01-23 16:49:58.000000000 +0000
++++ Source/WebCore/xml/XMLViewer.css
+@@ -14,7 +14,7 @@
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
+- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
+ * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+--- Source/WebCore/xml/XMLViewer.js.orig 2014-01-23 16:49:58.000000000 +0000
++++ Source/WebCore/xml/XMLViewer.js
+@@ -15,7 +15,7 @@
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
+- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
+ * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-01-16 15:51:28 UTC (rev 229450)
+++ extra-x86_64/PKGBUILD 2015-01-16 16:05:56 UTC (rev 229451)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.7
-pkgrel=1
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="http://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
- libsecret libwebp harfbuzz-icu)
-makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
-optdepends=('gst-plugins-base: free media decoding'
- 'gst-plugins-good: media decoding'
- 'gst-libav: nonfree media decoding')
-options=(!emptydirs)
-source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
- fix-pretty-quotes.patch)
-sha256sums=('f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38'
- '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
-
-prepare() {
- mkdir build-gtk{,2} path
-
- ln -s /usr/bin/python2 path/python
-
- cd $pkgbase-$pkgver
- patch -Np0 -i ../fix-pretty-quotes.patch
-}
-
-_build() (
- _ver="$1"; shift
- cd build-${_ver}
-
- ../$pkgbase-$pkgver/configure --prefix=/usr \
- --libexecdir=/usr/lib/webkit${_ver} \
- --enable-introspection \
- --disable-webkit2 \
- --disable-gtk-doc \
- "$@"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make all stamp-po
-)
-
-build() {
- PATH="$srcdir/path:$PATH"
-
- _build gtk
- _build gtk2 --with-gtk=2.0
-}
-
-package_webkitgtk() {
- depends+=(gtk3)
- optdepends+=('gtk2: Netscape plugin support')
- provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
- conflicts=(webkitgtk3 libwebkit3)
- replaces=(webkitgtk3 libwebkit3)
-
- make -C build-gtk -j1 DESTDIR="$pkgdir" install
- install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
- "$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
-}
-
-package_webkitgtk2() {
- pkgdesc+=" for GTK2"
- depends+=(gtk2)
- provides=("libwebkit=${pkgver}")
- conflicts=(libwebkit)
- replaces=(libwebkit)
-
- make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
- install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
- "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
-}
Copied: webkitgtk/repos/extra-x86_64/PKGBUILD (from rev 229450, webkitgtk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-01-16 16:05:56 UTC (rev 229451)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.8
+pkgrel=1
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="http://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+ libsecret libwebp harfbuzz-icu)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
+optdepends=('gst-plugins-base: free media decoding'
+ 'gst-plugins-good: media decoding'
+ 'gst-libav: nonfree media decoding')
+options=(!emptydirs)
+source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+ fix-pretty-quotes.patch bug140241.patch)
+sha256sums=('68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23'
+ '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6'
+ 'a08d43d45e9c226197d4bc4257a416bcb3507bebd2d9c9e8554d1002ddbbe537')
+
+prepare() {
+ mkdir build-gtk{,2} path
+
+ ln -s /usr/bin/python2 path/python
+
+ 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() (
+ _ver="$1"; shift
+ cd build-${_ver}
+
+ ../$pkgbase-$pkgver/configure --prefix=/usr \
+ --libexecdir=/usr/lib/webkit${_ver} \
+ --enable-introspection \
+ --disable-webkit2 \
+ --disable-gtk-doc \
+ "$@"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make all stamp-po
+)
+
+build() {
+ PATH="$srcdir/path:$PATH"
+
+ _build gtk
+ _build gtk2 --with-gtk=2.0
+}
+
+package_webkitgtk() {
+ depends+=(gtk3)
+ optdepends+=('gtk2: Netscape plugin support')
+ provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+ conflicts=(webkitgtk3 libwebkit3)
+ replaces=(webkitgtk3 libwebkit3)
+
+ make -C build-gtk -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
+}
+
+package_webkitgtk2() {
+ pkgdesc+=" for GTK2"
+ depends+=(gtk2)
+ provides=("libwebkit=${pkgver}")
+ conflicts=(libwebkit)
+ replaces=(libwebkit)
+
+ make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
+}
Copied: webkitgtk/repos/extra-x86_64/bug140241.patch (from rev 229450, webkitgtk/trunk/bug140241.patch)
===================================================================
--- extra-x86_64/bug140241.patch (rev 0)
+++ extra-x86_64/bug140241.patch 2015-01-16 16:05:56 UTC (rev 229451)
@@ -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 <tpopela at 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 <ossy at 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
Deleted: extra-x86_64/fix-pretty-quotes.patch
===================================================================
--- extra-x86_64/fix-pretty-quotes.patch 2015-01-16 15:51:28 UTC (rev 229450)
+++ extra-x86_64/fix-pretty-quotes.patch 2015-01-16 16:05:56 UTC (rev 229451)
@@ -1,26 +0,0 @@
-Pretty quotes in licence break Python stdin.
-
-https://bugs.webkit.org/show_bug.cgi?id=128971
-
---- Source/WebCore/xml/XMLViewer.css.orig 2014-01-23 16:49:58.000000000 +0000
-+++ Source/WebCore/xml/XMLViewer.css
-@@ -14,7 +14,7 @@
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
-- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
---- Source/WebCore/xml/XMLViewer.js.orig 2014-01-23 16:49:58.000000000 +0000
-+++ Source/WebCore/xml/XMLViewer.js
-@@ -15,7 +15,7 @@
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
-- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
Copied: webkitgtk/repos/extra-x86_64/fix-pretty-quotes.patch (from rev 229450, webkitgtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- extra-x86_64/fix-pretty-quotes.patch (rev 0)
+++ extra-x86_64/fix-pretty-quotes.patch 2015-01-16 16:05:56 UTC (rev 229451)
@@ -0,0 +1,26 @@
+Pretty quotes in licence break Python stdin.
+
+https://bugs.webkit.org/show_bug.cgi?id=128971
+
+--- Source/WebCore/xml/XMLViewer.css.orig 2014-01-23 16:49:58.000000000 +0000
++++ Source/WebCore/xml/XMLViewer.css
+@@ -14,7 +14,7 @@
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
+- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
+ * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+--- Source/WebCore/xml/XMLViewer.js.orig 2014-01-23 16:49:58.000000000 +0000
++++ Source/WebCore/xml/XMLViewer.js
+@@ -15,7 +15,7 @@
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
+- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
+ * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
More information about the arch-commits
mailing list