Date: Wednesday, September 24, 2014 @ 23:36:33 Author: heftig Revision: 222958
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: webkit2gtk/repos/gnome-unstable-i686/PKGBUILD (from rev 222957, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/gnome-unstable-i686/fix-pretty-quotes.patch (from rev 222957, webkit2gtk/trunk/fix-pretty-quotes.patch) webkit2gtk/repos/gnome-unstable-x86_64/PKGBUILD (from rev 222957, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/gnome-unstable-x86_64/fix-pretty-quotes.patch (from rev 222957, webkit2gtk/trunk/fix-pretty-quotes.patch) Deleted: webkit2gtk/repos/gnome-unstable-i686/PKGBUILD webkit2gtk/repos/gnome-unstable-i686/fix-pretty-quotes.patch webkit2gtk/repos/gnome-unstable-i686/webkitgtk-2.5.3-toggle-buttons.patch webkit2gtk/repos/gnome-unstable-x86_64/PKGBUILD webkit2gtk/repos/gnome-unstable-x86_64/fix-pretty-quotes.patch webkit2gtk/repos/gnome-unstable-x86_64/webkitgtk-2.5.3-toggle-buttons.patch ------------------------------------------------------------+ /PKGBUILD | 106 +++++++++++ /fix-pretty-quotes.patch | 52 +++++ gnome-unstable-i686/PKGBUILD | 57 ----- gnome-unstable-i686/fix-pretty-quotes.patch | 26 -- gnome-unstable-i686/webkitgtk-2.5.3-toggle-buttons.patch | 30 --- gnome-unstable-x86_64/PKGBUILD | 57 ----- gnome-unstable-x86_64/fix-pretty-quotes.patch | 26 -- gnome-unstable-x86_64/webkitgtk-2.5.3-toggle-buttons.patch | 30 --- 8 files changed, 158 insertions(+), 226 deletions(-) Deleted: gnome-unstable-i686/PKGBUILD =================================================================== --- gnome-unstable-i686/PKGBUILD 2014-09-24 21:36:10 UTC (rev 222957) +++ gnome-unstable-i686/PKGBUILD 2014-09-24 21:36:33 UTC (rev 222958) @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 220846 2014-08-31 19:25:05Z heftig $ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.5.3 -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 gtk3) -makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby gtk-doc cmake python) -optdepends=('gtk2: Netscape plugin support' - 'gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=(!emptydirs) -source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz - webkitgtk-2.5.3-toggle-buttons.patch - fix-pretty-quotes.patch) -sha256sums=('010803e371ac92a3e0e297e929978f83a9a3c597e4a10d50363fb1aaa6ea18d6' - 'f034e1fc5e08da029e5a0542e614176619881bfaa5532f3117d2bd31682c2c23' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') - -prepare() { - mkdir build - - cd webkitgtk-$pkgver - patch -Np1 -i ../webkitgtk-2.5.3-toggle-buttons.patch - patch -Np0 -i ../fix-pretty-quotes.patch - rm -rf Source/ThirdParty/leveldb/ - rm -rf Source/ThirdParty/gtest/ - rm -rf Source/ThirdParty/qunit/ -} - -build() ( - cd build - cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ - ../webkitgtk-$pkgver - make -) - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" - cd "$srcdir/webkitgtk-$pkgver/Source" - for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do - echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - done -} Copied: webkit2gtk/repos/gnome-unstable-i686/PKGBUILD (from rev 222957, webkit2gtk/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2014-09-24 21:36:33 UTC (rev 222958) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.6.0 +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 gtk3) +makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby gtk-doc cmake python) +optdepends=('gtk2: Netscape plugin support' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=(!emptydirs) +source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz + fix-pretty-quotes.patch) +sha256sums=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3' + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + +prepare() { + mkdir build + + cd webkitgtk-$pkgver + patch -Np0 -i ../fix-pretty-quotes.patch + rm -r Source/ThirdParty/gtest/ + rm -r Source/ThirdParty/qunit/ +} + +build() { + cd build + cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ + ../webkitgtk-$pkgver + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" + cd "$srcdir/webkitgtk-$pkgver/Source" + for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do + echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + done +} Deleted: gnome-unstable-i686/fix-pretty-quotes.patch =================================================================== --- gnome-unstable-i686/fix-pretty-quotes.patch 2014-09-24 21:36:10 UTC (rev 222957) +++ gnome-unstable-i686/fix-pretty-quotes.patch 2014-09-24 21:36:33 UTC (rev 222958) @@ -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: webkit2gtk/repos/gnome-unstable-i686/fix-pretty-quotes.patch (from rev 222957, webkit2gtk/trunk/fix-pretty-quotes.patch) =================================================================== --- gnome-unstable-i686/fix-pretty-quotes.patch (rev 0) +++ gnome-unstable-i686/fix-pretty-quotes.patch 2014-09-24 21:36:33 UTC (rev 222958) @@ -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: gnome-unstable-i686/webkitgtk-2.5.3-toggle-buttons.patch =================================================================== --- gnome-unstable-i686/webkitgtk-2.5.3-toggle-buttons.patch 2014-09-24 21:36:10 UTC (rev 222957) +++ gnome-unstable-i686/webkitgtk-2.5.3-toggle-buttons.patch 2014-09-24 21:36:33 UTC (rev 222958) @@ -1,30 +0,0 @@ -2014-08-21 Michael Catanzaro <mcatanz...@igalia.com> - - [GTK] Toggle buttons visually broken with GTK+ 3.13.7 - https://bugs.webkit.org/show_bug.cgi?id=136130 - - Reviewed by NOBODY (OOPS!). - - No new tests. Hopefully covered by existing tests, and our tests only - run with GTK+ 3.6 anyway. - - * platform/gtk/RenderThemeGtk3.cpp: - (WebCore::paintToggle): use GTK_STATE_FLAG_CHECKED when compiling for - GTK+ 3.13.7 and above to ensure toggle buttons display as toggled. - -diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp -index 3630c43dffde59c6ea843c35a37e8e94611e4ae5..6d811a1747ac3ca7ff376bb6a0fcb02273c335d3 100644 ---- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp -+++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp -@@ -253,7 +253,11 @@ static void paintToggle(const RenderThemeGtk* theme, GType widgetType, const Ren - if (theme->isIndeterminate(renderObject)) - flags |= GTK_STATE_FLAG_INCONSISTENT; - else if (theme->isChecked(renderObject)) -+#if GTK_CHECK_VERSION(3, 13, 7) -+ flags |= GTK_STATE_FLAG_CHECKED; -+#else - flags |= GTK_STATE_FLAG_ACTIVE; -+#endif - if (theme->isPressed(renderObject)) - flags |= GTK_STATE_FLAG_SELECTED; - gtk_style_context_set_state(context, static_cast<GtkStateFlags>(flags)); Deleted: gnome-unstable-x86_64/PKGBUILD =================================================================== --- gnome-unstable-x86_64/PKGBUILD 2014-09-24 21:36:10 UTC (rev 222957) +++ gnome-unstable-x86_64/PKGBUILD 2014-09-24 21:36:33 UTC (rev 222958) @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 220846 2014-08-31 19:25:05Z heftig $ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.5.3 -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 gtk3) -makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby gtk-doc cmake python) -optdepends=('gtk2: Netscape plugin support' - 'gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=(!emptydirs) -source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz - webkitgtk-2.5.3-toggle-buttons.patch - fix-pretty-quotes.patch) -sha256sums=('010803e371ac92a3e0e297e929978f83a9a3c597e4a10d50363fb1aaa6ea18d6' - 'f034e1fc5e08da029e5a0542e614176619881bfaa5532f3117d2bd31682c2c23' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') - -prepare() { - mkdir build - - cd webkitgtk-$pkgver - patch -Np1 -i ../webkitgtk-2.5.3-toggle-buttons.patch - patch -Np0 -i ../fix-pretty-quotes.patch - rm -rf Source/ThirdParty/leveldb/ - rm -rf Source/ThirdParty/gtest/ - rm -rf Source/ThirdParty/qunit/ -} - -build() ( - cd build - cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ - ../webkitgtk-$pkgver - make -) - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" - cd "$srcdir/webkitgtk-$pkgver/Source" - for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do - echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - done -} Copied: webkit2gtk/repos/gnome-unstable-x86_64/PKGBUILD (from rev 222957, webkit2gtk/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2014-09-24 21:36:33 UTC (rev 222958) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.6.0 +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 gtk3) +makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby gtk-doc cmake python) +optdepends=('gtk2: Netscape plugin support' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=(!emptydirs) +source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz + fix-pretty-quotes.patch) +sha256sums=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3' + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + +prepare() { + mkdir build + + cd webkitgtk-$pkgver + patch -Np0 -i ../fix-pretty-quotes.patch + rm -r Source/ThirdParty/gtest/ + rm -r Source/ThirdParty/qunit/ +} + +build() { + cd build + cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ + ../webkitgtk-$pkgver + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" + cd "$srcdir/webkitgtk-$pkgver/Source" + for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do + echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + done +} Deleted: gnome-unstable-x86_64/fix-pretty-quotes.patch =================================================================== --- gnome-unstable-x86_64/fix-pretty-quotes.patch 2014-09-24 21:36:10 UTC (rev 222957) +++ gnome-unstable-x86_64/fix-pretty-quotes.patch 2014-09-24 21:36:33 UTC (rev 222958) @@ -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: webkit2gtk/repos/gnome-unstable-x86_64/fix-pretty-quotes.patch (from rev 222957, webkit2gtk/trunk/fix-pretty-quotes.patch) =================================================================== --- gnome-unstable-x86_64/fix-pretty-quotes.patch (rev 0) +++ gnome-unstable-x86_64/fix-pretty-quotes.patch 2014-09-24 21:36:33 UTC (rev 222958) @@ -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: gnome-unstable-x86_64/webkitgtk-2.5.3-toggle-buttons.patch =================================================================== --- gnome-unstable-x86_64/webkitgtk-2.5.3-toggle-buttons.patch 2014-09-24 21:36:10 UTC (rev 222957) +++ gnome-unstable-x86_64/webkitgtk-2.5.3-toggle-buttons.patch 2014-09-24 21:36:33 UTC (rev 222958) @@ -1,30 +0,0 @@ -2014-08-21 Michael Catanzaro <mcatanz...@igalia.com> - - [GTK] Toggle buttons visually broken with GTK+ 3.13.7 - https://bugs.webkit.org/show_bug.cgi?id=136130 - - Reviewed by NOBODY (OOPS!). - - No new tests. Hopefully covered by existing tests, and our tests only - run with GTK+ 3.6 anyway. - - * platform/gtk/RenderThemeGtk3.cpp: - (WebCore::paintToggle): use GTK_STATE_FLAG_CHECKED when compiling for - GTK+ 3.13.7 and above to ensure toggle buttons display as toggled. - -diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp -index 3630c43dffde59c6ea843c35a37e8e94611e4ae5..6d811a1747ac3ca7ff376bb6a0fcb02273c335d3 100644 ---- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp -+++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp -@@ -253,7 +253,11 @@ static void paintToggle(const RenderThemeGtk* theme, GType widgetType, const Ren - if (theme->isIndeterminate(renderObject)) - flags |= GTK_STATE_FLAG_INCONSISTENT; - else if (theme->isChecked(renderObject)) -+#if GTK_CHECK_VERSION(3, 13, 7) -+ flags |= GTK_STATE_FLAG_CHECKED; -+#else - flags |= GTK_STATE_FLAG_ACTIVE; -+#endif - if (theme->isPressed(renderObject)) - flags |= GTK_STATE_FLAG_SELECTED; - gtk_style_context_set_state(context, static_cast<GtkStateFlags>(flags));