Date: Wednesday, September 24, 2014 @ 23:31:35 Author: heftig Revision: 222955
2.6.0 Modified: webkit2gtk/trunk/PKGBUILD (contents, properties) Deleted: webkit2gtk/trunk/webkitgtk-2.5.3-toggle-buttons.patch --------------------------------------+ PKGBUILD | 18 +++++++----------- webkitgtk-2.5.3-toggle-buttons.patch | 30 ------------------------------ 2 files changed, 7 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-24 21:30:34 UTC (rev 222954) +++ PKGBUILD 2014-09-24 21:31:35 UTC (rev 222955) @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 220846 2014-08-31 19:25:05Z heftig $ +# $Id$ # Maintainer: Andreas Radke <[email protected]> pkgname=webkit2gtk -pkgver=2.5.3 +pkgver=2.6.0 pkgrel=1 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64) @@ -17,10 +17,8 @@ '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' +sha256sums=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3' '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') prepare() { @@ -27,14 +25,12 @@ 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/ + rm -r Source/ThirdParty/gtest/ + rm -r Source/ThirdParty/qunit/ } -build() ( +build() { cd build cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ @@ -41,7 +37,7 @@ -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ ../webkitgtk-$pkgver make -) +} package() { cd build Property changes on: webkit2gtk/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Deleted: webkitgtk-2.5.3-toggle-buttons.patch =================================================================== --- webkitgtk-2.5.3-toggle-buttons.patch 2014-09-24 21:30:34 UTC (rev 222954) +++ webkitgtk-2.5.3-toggle-buttons.patch 2014-09-24 21:31:35 UTC (rev 222955) @@ -1,30 +0,0 @@ -2014-08-21 Michael Catanzaro <[email protected]> - - [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));
