From 2786cb998cbf75e229fb0eaa4b6b13ddca114285 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 17 Oct 2014 16:00:43 -0200
Subject: gthumb-3.2.8-2.nonprism1: use webkit2gtk

---
 nonprism/gthumb/PKGBUILD             | 15 ++++++++++-----
 nonprism/gthumb/webkit2gtk-4.0.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 nonprism/gthumb/webkit2gtk-4.0.patch

(limited to 'nonprism/gthumb')

diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD
index 7e379542d..8ff63015d 100644
--- a/nonprism/gthumb/PKGBUILD
+++ b/nonprism/gthumb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213426 2014-05-23 22:54:51Z heftig $
+# $Id: PKGBUILD 224110 2014-10-08 18:16:28Z heftig $
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
 # Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>
@@ -7,7 +7,7 @@
 
 pkgname=gthumb
 pkgver=3.2.8
-pkgrel=1.nonprism1
+pkgrel=2.nonprism1
 pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64)
 license=(GPL)
@@ -16,8 +16,9 @@ replaces=(${pkgname}-nonprism)
 conflicts=(${pkgname}-nonprism)
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
          gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
-         libsoup webkitgtk json-glib)
-makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
+         libsoup webkit2gtk json-glib)
+makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg
+             libopenraw liboauth docbook-xsl yelp-tools gnome-common)
 optdepends=('libopenraw: read RAW files'
             'exiv2: metadata support'
             'libchamplain: map viewer'
@@ -26,13 +27,17 @@ optdepends=('libopenraw: read RAW files'
 options=('!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        webkit2gtk-4.0.patch
         nonprism.patch)
 sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8'
+            '0174bdff5d193962d52cb018f233570b8f18a740281f51b79bc52f18c4e9a929'
             '7706181514c9cfe0241329e9b14778dfa2797ddc1feb206b1cd9f07f9be31490')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i $srcdir/nonprism.patch
+  patch -Np1 -i ../webkit2gtk-4.0.patch
+  patch -Np1 -i ../nonprism.patch
+  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
 }
 
 build() {
diff --git a/nonprism/gthumb/webkit2gtk-4.0.patch b/nonprism/gthumb/webkit2gtk-4.0.patch
new file mode 100644
index 000000000..8fb23585c
--- /dev/null
+++ b/nonprism/gthumb/webkit2gtk-4.0.patch
@@ -0,0 +1,31 @@
+From 4c64cb990fc1e32e269571b34065d7aa8d92c79e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Fri, 15 Aug 2014 16:47:27 +0200
+Subject: Build against either webkit2gtk-3.0 or webkit2gtk-4.0
+
+The API changes were minor and none affected gthumb.
+
+diff --git a/configure.ac b/configure.ac
+index 6f9f03e..da246f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -508,10 +508,14 @@ AC_ARG_ENABLE([webkit2],
+ 
+ if test x$enable_webkit2 = xyes ; then
+ 	PKG_CHECK_MODULES(WEBKIT2,
+-			  [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
++			  [webkit2gtk-4.0 >= $WEBKIT2_REQUIRED],
+ 			  [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
+ 			   enable_webkit2=yes],
+-			  [enable_webkit2=no])
++			  [PKG_CHECK_MODULES(WEBKIT2,
++					     [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
++					     [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
++					      enable_webkit2=yes],
++					     [enable_webkit2=no])])
+ fi
+ AC_SUBST(WEBKIT2_CFLAGS)
+ AC_SUBST(WEBKIT2_LIBS)
+-- 
+cgit v0.10.1
+
-- 
cgit v1.2.3