Date: Wednesday, October 8, 2014 @ 20:16:28 Author: heftig Revision: 224110
Use webkit2gtk Added: gthumb/trunk/webkit2gtk-4.0.patch Modified: gthumb/trunk/PKGBUILD ----------------------+ PKGBUILD | 15 ++++++++++----- webkit2gtk-4.0.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-08 18:13:12 UTC (rev 224109) +++ PKGBUILD 2014-10-08 18:16:28 UTC (rev 224110) @@ -5,7 +5,7 @@ pkgname=gthumb pkgver=3.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=(GPL) @@ -12,8 +12,9 @@ url="http://live.gnome.org/gthumb"; 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' @@ -21,11 +22,15 @@ 'liboauth: web albums') options=('!emptydirs') install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + webkit2gtk-4.0.patch) +sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8' + '0174bdff5d193962d52cb018f233570b8f18a740281f51b79bc52f18c4e9a929') prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../webkit2gtk-4.0.patch + AUTOPOINT='intltoolize --automake --copy' autoreconf -fi } build() { Added: webkit2gtk-4.0.patch =================================================================== --- webkit2gtk-4.0.patch (rev 0) +++ webkit2gtk-4.0.patch 2014-10-08 18:16:28 UTC (rev 224110) @@ -0,0 +1,31 @@ +From 4c64cb990fc1e32e269571b34065d7aa8d92c79e Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <[email protected]> +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 +
