[arch-commits] Commit in (5 files)

[Jan de Groot]

    Date: Wednesday, September 10, 2014 @ 11:11:48
  Author: jgc
Revision: 221367

Add new webkit2gtk package. New incompatible version, parallel installable with 2.4

Added:
  webkit2gtk/
  webkit2gtk/repos/
  webkit2gtk/trunk/
  webkit2gtk/trunk/PKGBUILD
  webkit2gtk/trunk/webkitgtk-2.5.3-toggle-buttons.patch

--------------------------------------+
 PKGBUILD                             |   57 +++++++++++++++++++++++++++++++++
 webkitgtk-2.5.3-toggle-buttons.patch |   30 +++++++++++++++++
 2 files changed, 87 insertions(+)

Added: webkit2gtk/trunk/PKGBUILD
===================================================================
--- webkit2gtk/trunk/PKGBUILD	                        (rev 0)
+++ webkit2gtk/trunk/PKGBUILD	2014-09-10 09:11:48 UTC (rev 221367)
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 220846 2014-08-31 19:25:05Z heftig $
+# Maintainer: Andreas Radke <andyrtr at 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
+}

Added: webkit2gtk/trunk/webkitgtk-2.5.3-toggle-buttons.patch
===================================================================
--- webkit2gtk/trunk/webkitgtk-2.5.3-toggle-buttons.patch	                        (rev 0)
+++ webkit2gtk/trunk/webkitgtk-2.5.3-toggle-buttons.patch	2014-09-10 09:11:48 UTC (rev 221367)
@@ -0,0 +1,30 @@
+2014-08-21  Michael Catanzaro  <mcatanzaro at 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));