[packages/gthumb] - up to 3.6.2

[baggins]

commit d27079bca63b0f621ebfa997a4b0b8d65216f23c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 13 00:07:24 2019 +0100

    - up to 3.6.2

 exiv2-0.27.patch | 25 +++++++++++++++++++++++++
 gthumb.spec      | 23 ++++++++++++-----------
 2 files changed, 37 insertions(+), 11 deletions(-)
---
diff --git a/gthumb.spec b/gthumb.spec
index 42c9a28..55ba9e1 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,13 +1,14 @@
 Summary:	An image viewer and browser for GNOME
 Summary(pl.UTF-8):	Przeglądarka obrazków dla GNOME
 Name:		gthumb
-Version:	3.4.5
-Release:	2
+Version:	3.6.2
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gthumb/3.4/%{name}-%{version}.tar.xz
-# Source0-md5:	4e61136814fab59d8b1c3ebdbede6b56
-URL:		https://wiki.gnome.org/Apps/gthumb
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gthumb/3.6/%{name}-%{version}.tar.xz
+# Source0-md5:	e7c518ebb9270b3adc5a39f19e424b20
+Patch0:		exiv2-0.27.patch
+URL:		https://wiki.gnome.org/Apps/Gthumb
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bison
@@ -96,6 +97,7 @@ rozszerzeń gThumb.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -140,8 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/extensions/*.so
 %{_libdir}/%{name}/extensions/*.extension
 %{_datadir}/%{name}
-%{_datadir}/appdata/gthumb.appdata.xml
-%{_datadir}/GConf/gsettings/gthumb.convert
+%{_datadir}/appdata/org.gnome.gThumb.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gthumb.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gthumb.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gthumb.*.gschema.xml
@@ -149,12 +150,12 @@ rm -rf $RPM_BUILD_ROOT
 # wrong dir?
 %{_iconsdir}/hicolor/16x16/apps/gthumb-symbolic.svg
 %{_iconsdir}/hicolor/scalable/apps/gthumb.svg
-%{_desktopdir}/gthumb.desktop
-%{_desktopdir}/gthumb-import.desktop
+%{_desktopdir}/org.gnome.gThumb.desktop
+%{_desktopdir}/org.gnome.gThumb.Import.desktop
 %{_mandir}/man1/gthumb.1*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/gthumb-3.4
-%{_pkgconfigdir}/gthumb-3.4.pc
+%{_includedir}/gthumb-3.6
+%{_pkgconfigdir}/gthumb-3.6.pc
 %{_aclocaldir}/gthumb.m4
diff --git a/exiv2-0.27.patch b/exiv2-0.27.patch
new file mode 100644
index 0000000..a188f51
--- /dev/null
+++ b/exiv2-0.27.patch
@@ -0,0 +1,25 @@
+diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
+--- a/extensions/exiv2_tools/exiv2-utils.cpp	2018-06-17 08:24:44.000000000 +0200
++++ b/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) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gthumb.git/commitdiff/d27079bca63b0f621ebfa997a4b0b8d65216f23c