From 201ba0321338f72034dadec026d73741bf8380e6 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Sun, 1 Dec 2019 14:52:47 +0300
Subject: [PATCH] gthumb: update to 3.8.3.

---
 srcpkgs/gthumb/patches/exiv-0.27.patch | 25 ------------------
 srcpkgs/gthumb/template                | 35 +++++++++++---------------
 2 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/gthumb/patches/exiv-0.27.patch

diff --git a/srcpkgs/gthumb/patches/exiv-0.27.patch b/srcpkgs/gthumb/patches/exiv-0.27.patch
deleted file mode 100644
index 1531c0e0eda..00000000000
--- a/srcpkgs/gthumb/patches/exiv-0.27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
---- extensions/exiv2_tools/exiv2-utils.cpp	2018-06-17 08:24:44.000000000 +0200
-+++ extensions/exiv2_tools/exiv2-utils.cpp	2018-12-31 15:51:50.912329232 +0100
-@@ -32,7 +32,8 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
-+#include <exiv2/xmp_exiv2.hpp>
- #include <gthumb.h>
- #include "exiv2-utils.h"
- 
-@@ -1073,7 +1074,11 @@
- 
- 	try {
- 		if (exifData.empty()) {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
-+#else
- 			throw Exiv2::Error(1, " No Exif data found in the file");
-+#endif
- 		}
- 		Exiv2::ExifData::const_iterator end = exifData.end();
- 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index 7b686db044b..30684656c84 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,33 +1,28 @@
 # Template file for 'gthumb'
 pkgname=gthumb
-version=3.6.2
-revision=3
-build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-static
- $(vopt_enable tiff) $(vopt_enable clutter)
- $(vopt_enable gstreamer)  $(vopt_enable soup libsoup)
- $(vopt_enable brasero libbrasero)"
-hostmakedepends="pkg-config intltool itstool glib-devel"
-makedepends="webkit2gtk-devel json-glib-devel gnome-desktop-devel
- libsecret-devel librsvg-devel libwebp-devel exiv2-devel
- $(vopt_if tiff tiff-devel) $(vopt_if clutter clutter-gtk-devel)
- $(vopt_if gstreamer gstreamer1-devel) $(vopt_if soup libsoup-gnome-devel)
- $(vopt_if brasero brasero-devel)"
+version=3.8.3
+revision=1
+build_style=meson
+hostmakedepends="pkg-config itstool glib-devel"
+makedepends="webkit2gtk-devel json-glib-devel libsecret-devel librsvg-devel
+ libwebp-devel exiv2-devel gtk+3-devel libraw-devel libchamplain-devel
+ colord-devel gsettings-desktop-schemas-devel $(vopt_if brasero brasero-devel)
+ $(vopt_if clutter 'clutter-devel clutter-gtk-devel') $(vopt_if gstreamer gstreamer1-devel)
+ $(vopt_if soup libsoup-devel)"
 short_desc='Image viewer and browser for the GNOME Desktop'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 license="GPL-2.0-or-later"
 homepage="http://live.gnome.org/gthumb"
-distfiles=${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz
-checksum=c9bf6bb7502659f5e990069527584bb96193f7f5f9492f0bf5f65828f5024b66
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=eff9fc5ac2ee251bc780bbe327d1f06ef1f8029ba5aa7959f68a33c992d60fa8
 
-## Package build options
-build_options="brasero clutter gstreamer soup tiff"
+LDFLAGS="-fPIC"
+
+build_options="brasero clutter gstreamer soup"
 desc_option_brasero="Enable burning discs"
 desc_option_clutter="Enable clutter (for slideshows)"
 desc_option_soup="Enable webservices"
-build_options_default="clutter gstreamer soup tiff"
-
-LDFLAGS="-fPIC"
+build_options_default="clutter gstreamer soup"
 
 gthumb-devel_package() {
 	short_desc+=" - development files"