gthumb-3.4.0-1.nonprism1: updating version

3 files changed, 54 insertions, 90 deletions

diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD
index 8ff63015d..152be0486 100644
--- a/nonprism/gthumb/PKGBUILD
+++ b/nonprism/gthumb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 224110 2014-10-08 18:16:28Z heftig $
+# $Id: PKGBUILD 236546 2015-04-14 17:41:47Z 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>
@@ -6,8 +6,8 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=gthumb
-pkgver=3.2.8
-pkgrel=2.nonprism1
+pkgver=3.4.0
+pkgrel=1.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)
@@ -17,9 +17,9 @@ conflicts=(${pkgname}-nonprism)
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
          gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
          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'
+makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth
+             docbook-xsl yelp-tools gnome-common flex)
+optdepends=('libraw: read RAW files'
             'exiv2: metadata support'
             'libchamplain: map viewer'
             'brasero: burn discs'
@@ -27,17 +27,13 @@ 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')
+sha256sums=('abd1afe457c65289af31c6db7037452faa3838356480857d8cdc19f0ecde4933'
+            'b1cd2463ab6475ce91a2b2e83dfcb1835ffaa9640c59d7bcfbe611163327fa45')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../webkit2gtk-4.0.patch
   patch -Np1 -i ../nonprism.patch
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
 }
 
 build() {
@@ -45,7 +41,7 @@ build() {
   
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
-      --enable-libchamplain --enable-libopenraw
+      --enable-libchamplain
   
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
diff --git a/nonprism/gthumb/nonprism.patch b/nonprism/gthumb/nonprism.patch
index 0bdde908f..5c8374b51 100644
--- a/nonprism/gthumb/nonprism.patch
+++ b/nonprism/gthumb/nonprism.patch
@@ -17,10 +17,10 @@ diff -Nur gthumb-3.2.7.orig/data/Makefile.am gthumb-3.2.7/data/Makefile.am
  	org.gnome.gthumb.pixbuf-savers.gschema.xml.in		\
  	org.gnome.gthumb.rename-series.gschema.xml.in		\
  	org.gnome.gthumb.resize.gschema.xml.in			\
-diff -Nur gthumb-3.2.7.orig/data/Makefile.in gthumb-3.2.7/data/Makefile.in
---- gthumb-3.2.7.orig/data/Makefile.in	2014-03-25 17:22:56.000000000 -0300
-+++ gthumb-3.2.7/data/Makefile.in	2014-04-19 12:30:16.910790641 -0300
-@@ -433,15 +433,12 @@
+diff -Nur gthumb-3.4.0.orig/data/Makefile.in gthumb-3.4.0/data/Makefile.in
+--- gthumb-3.4.0.orig/data/Makefile.in	2015-04-14 12:12:24.000000000 -0300
++++ gthumb-3.4.0/data/Makefile.in	2015-04-15 03:26:24.760821523 -0300
+@@ -445,15 +445,12 @@
  	org.gnome.gthumb.contact-sheet.gschema.xml.in		\
  	org.gnome.gthumb.convert-format.gschema.xml.in		\
  	org.gnome.gthumb.crop.gschema.xml.in			\
@@ -59,34 +59,34 @@ diff -Nur gthumb-3.2.7.orig/data/gthumb.convert gthumb-3.2.7/data/gthumb.convert
  [org.gnome.gthumb.pixbuf-savers.jpeg]
  default-ext = /apps/gthumb/save_options/jpeg/default_ext
  quality = /apps/gthumb/save_options/jpeg/quality
-diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am
---- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am	2013-10-11 16:11:08.000000000 -0200
-+++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am	2014-04-19 12:56:04.599700437 -0300
-@@ -19,10 +19,6 @@
- 	selection1.png			\
- 	selection2.png			\
- 	selection3.png			\
--	site-facebook.png		\
--	site-flickr.png			\
--	site-photobucket.png		\
--	site-picasaweb.png		\
- 	site-twentythree.png		\
- 	tag.png				\
- 	tool-adjust-colors.png		\
-diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in
---- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in	2014-03-25 17:22:56.000000000 -0300
-+++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in	2014-04-19 12:56:16.376495364 -0300
-@@ -371,10 +371,6 @@
- 	selection1.png			\
- 	selection2.png			\
- 	selection3.png			\
--	site-facebook.png		\
--	site-flickr.png			\
--	site-photobucket.png		\
--	site-picasaweb.png		\
- 	site-twentythree.png		\
- 	tag.png				\
- 	tool-adjust-colors.png		\
+diff -Nur gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.am
+--- gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.am	2015-03-30 17:08:32.000000000 -0300
++++ gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.am	2015-04-15 03:27:36.753875539 -0300
+@@ -42,10 +42,6 @@
+ 	map-symbolic.svg			\
+ 	palette-symbolic.svg			\
+ 	presets-symbolic.svg			\
+-	site-facebook.png			\
+-	site-flickr.png				\
+-	site-photobucket.png			\
+-	site-picasaweb.png			\
+ 	site-twentythree.png			\
+ 	special-effects-symbolic.svg		\
+ 	swap-values-symbolic.svg		\
+diff -Nur gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.in
+--- gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.in	2015-04-14 12:12:24.000000000 -0300
++++ gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.in	2015-04-15 03:28:08.005640761 -0300
+@@ -406,10 +406,6 @@
+ 	map-symbolic.svg			\
+ 	palette-symbolic.svg			\
+ 	presets-symbolic.svg			\
+-	site-facebook.png			\
+-	site-flickr.png				\
+-	site-photobucket.png			\
+-	site-picasaweb.png			\
+ 	site-twentythree.png			\
+ 	special-effects-symbolic.svg		\
+ 	swap-values-symbolic.svg		\
 diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makefile.am
 --- gthumb-3.2.7.orig/extensions/Makefile.am	2013-04-30 13:56:12.000000000 -0300
 +++ gthumb-3.2.7/extensions/Makefile.am	2014-04-19 13:12:36.788627648 -0300
@@ -109,10 +109,10 @@ diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makef
  	webalbums		\
  	$(NULL)
  	
-diff -Nur gthumb-3.2.7.orig/extensions/Makefile.in gthumb-3.2.7/extensions/Makefile.in
---- gthumb-3.2.7.orig/extensions/Makefile.in	2014-03-25 17:22:57.000000000 -0300
-+++ gthumb-3.2.7/extensions/Makefile.in	2014-04-19 13:12:49.175395986 -0300
-@@ -388,18 +388,14 @@
+diff -Nur gthumb-3.4.0.orig/extensions/Makefile.in gthumb-3.4.0/extensions/Makefile.in
+--- gthumb-3.4.0.orig/extensions/Makefile.in	2015-04-14 12:12:24.000000000 -0300
++++ gthumb-3.4.0/extensions/Makefile.in	2015-04-15 03:26:24.760821523 -0300
+@@ -400,18 +400,14 @@
  
  FLICKR_EXPORTERS = \
  	23hq			\
@@ -131,22 +131,21 @@ diff -Nur gthumb-3.2.7.orig/extensions/Makefile.in gthumb-3.2.7/extensions/Makef
  	webalbums		\
  	$(NULL)
  
-diff -Nur gthumb-3.2.7.orig/gthumb/gth-main.c gthumb-3.2.7/gthumb/gth-main.c
---- gthumb-3.2.7.orig/gthumb/gth-main.c	2013-09-27 12:38:40.000000000 -0300
-+++ gthumb-3.2.7/gthumb/gth-main.c	2014-04-19 12:54:27.448720074 -0300
-@@ -1185,11 +1185,9 @@
+diff -Nur gthumb-3.4.0.orig/gthumb/gth-main.c gthumb-3.4.0/gthumb/gth-main.c
+--- gthumb-3.4.0.orig/gthumb/gth-main.c	2015-04-04 16:27:06.000000000 -0300
++++ gthumb-3.4.0/gthumb/gth-main.c	2015-04-15 03:29:03.749510547 -0300
+@@ -1221,10 +1221,8 @@
  						"desktop_background",
  						"edit_metadata",
  						"exiv2_tools",
 -						"facebook",
  						"file_manager",
- 						"file_tools",
  						"find_duplicates",
 -						"flicker",
  						"gstreamer_tools",
  						"gstreamer_utils",
  						"image_print",
-@@ -1200,8 +1198,6 @@
+@@ -1234,8 +1232,6 @@
  						"list_tools",
  						"oauth",
  						"photo_importer",
@@ -166,10 +165,10 @@ diff -Nur gthumb-3.2.7.orig/help/Makefile.am gthumb-3.2.7/help/Makefile.am
  	wallpaper.page \
  	bookmarks.page \
  	import.page \
-diff -Nur gthumb-3.2.7.orig/help/Makefile.in gthumb-3.2.7/help/Makefile.in
---- gthumb-3.2.7.orig/help/Makefile.in	2014-03-25 17:23:08.000000000 -0300
-+++ gthumb-3.2.7/help/Makefile.in	2014-04-19 13:18:50.698270179 -0300
-@@ -351,7 +351,6 @@
+diff -Nur gthumb-3.4.0.orig/help/Makefile.in gthumb-3.4.0/help/Makefile.in
+--- gthumb-3.4.0.orig/help/Makefile.in	2015-04-14 12:12:28.000000000 -0300
++++ gthumb-3.4.0/help/Makefile.in	2015-04-15 03:26:24.760821523 -0300
+@@ -363,7 +363,6 @@
  	printing.page \
  	shortcuts.page \
  	sharing-disc.page \
diff --git a/nonprism/gthumb/webkit2gtk-4.0.patch b/nonprism/gthumb/webkit2gtk-4.0.patch
deleted file mode 100644
index 8fb23585c..000000000
--- a/nonprism/gthumb/webkit2gtk-4.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-