From 77e0d1bf5439f0ccb2f7df486c4beb18bb9c381192de799671d6c0022a54135d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Aug 2019 09:49:59 +0000 Subject: [PATCH] Accepting request 720282 from home:z1trus:branches:GNOME:Apps Update version to 1.5 Remove patch (fixed in upstream) OBS-URL: https://build.opensuse.org/request/show/720282 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=25 --- exiv-2.0.27-buildfix.patch | 96 -------------------------------------- geeqie-1.3.tar.xz | 3 -- geeqie-1.3.tar.xz.asc | 15 ------ geeqie-1.5.tar.xz | 3 ++ geeqie-1.5.tar.xz.asc | 15 ++++++ geeqie.changes | 7 +++ geeqie.spec | 9 ++-- 7 files changed, 28 insertions(+), 120 deletions(-) delete mode 100644 exiv-2.0.27-buildfix.patch delete mode 100644 geeqie-1.3.tar.xz delete mode 100644 geeqie-1.3.tar.xz.asc create mode 100644 geeqie-1.5.tar.xz create mode 100644 geeqie-1.5.tar.xz.asc diff --git a/exiv-2.0.27-buildfix.patch b/exiv-2.0.27-buildfix.patch deleted file mode 100644 index b5ca058..0000000 --- a/exiv-2.0.27-buildfix.patch +++ /dev/null @@ -1,96 +0,0 @@ -commit f9213c8ad796cf4571b2606435c32753040ec645 -Author: Rasmus Thomsen -Date: Sun Jan 6 17:40:31 2019 +0000 - - Fix #654, 655: fix build against exiv2-0.27.x - - https://github.com/BestImageViewer/geeqie/pull/655 - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index 1dbe118..5dc31ac 100644 ---- a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -22,16 +22,24 @@ - - #ifdef HAVE_EXIV2 - --#include --#include -+// Don't include the file directly -+// Early Exiv2 versions didn't have version.hpp and the macros. -+#include - #include - - // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. -+#ifdef EXIV2_VERSION - #ifndef EXIV2_TEST_VERSION --# define EXIV2_TEST_VERSION(major,minor,patch) \ -+#define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) - #endif -+#else -+#define EXIV2_TEST_VERSION(major,minor,patch) (false) -+#endif - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define HAVE_EXIV2_ERROR_CODE -+#endif - - #include - #include -@@ -39,27 +47,8 @@ - #include - #include - --#if !EXIV2_TEST_VERSION(0,17,90) --#include --#include --#include --#include --#include --#include --#if EXIV2_TEST_VERSION(0,16,0) --#include --#endif --#if EXIV2_TEST_VERSION(0,13,0) --#include --#endif --#include --#else --#include --#endif -- --#if EXIV2_TEST_VERSION(0,17,0) --#include --#include -+#if EXIV2_TEST_VERSION(0,27,0) -+#define EXV_PACKAGE "exiv2" - #endif - - extern "C" { -@@ -357,8 +346,11 @@ public: - copyXmpToExif(xmpData_, exifData_); - #endif - Exiv2::Image *image = imageData_->image(); -- -+#ifdef HAVE_EXIV2_ERROR_CODE -+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); -+#else - if (!image) Exiv2::Error(21); -+#endif - image->setExifData(exifData_); - image->setIptcData(iptcData_); - #if EXIV2_TEST_VERSION(0,16,0) -@@ -377,8 +369,12 @@ public: - - sidecar->setXmpData(xmpData_); - sidecar->writeMetadata(); -+#else -+#ifdef HAVE_EXIV2_ERROR_CODE -+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); - #else - throw Exiv2::Error(3, "xmp"); -+#endif - #endif - } - } diff --git a/geeqie-1.3.tar.xz b/geeqie-1.3.tar.xz deleted file mode 100644 index 81d2747..0000000 --- a/geeqie-1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f -size 1141820 diff --git a/geeqie-1.3.tar.xz.asc b/geeqie-1.3.tar.xz.asc deleted file mode 100644 index 96b57ab..0000000 --- a/geeqie-1.3.tar.xz.asc +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 -Comment: Charset: ISO-8859-1 - -iQGcBAABCgAGBQJXSBaaAAoJEKZ8CrGAGfaskMAL/0jQkUJ1ZBorc5wEpg3CJ7pJ -C++qD+fCnB7DH0CjP/m/EEm5gy6FwucoKorbbjv+34RObDo8a/qJW3Eyp7GvOhXG -dy3pfLgHrVFXr+OP7zQJyRX0NG4RaK0ku2rjZ7biCcqEU2Lg6Dr+T7kh5H62Lyb8 -K3/oYLj+7hMEHhGeSkwFL9LbOmo2SUnOofDJ+/26F8isBWLM9Eveo9n7ZkbK50PT -RZoqloM9ikzFKtZr1FyfmTWm5h7x8PmMuwxm1s8JVSigHwPiSLavthwu3+kU+i6P -2ok2+tnJGacoqfshaD7wXYCJ2jobo9taRdK0K7UJaOess6foOUdb81aEHKXD6zql -qDMKjvKqHTldVlbwqTGJVVoAE6tNsLUa8ZByrhIhCUyj76GuqCgV9hAk4E4CweaO -k70XA/qogvHSv+9kihB3f+bopG4moPLf48x30KXhbEw1qySHJ1Ie9NIgugWI/CGd -AYAC4qw40DK9JSSdvW6unLDcaa6ZWMrXJpcGCCW5qw== -=wf1s ------END PGP SIGNATURE----- diff --git a/geeqie-1.5.tar.xz b/geeqie-1.5.tar.xz new file mode 100644 index 0000000..f0f636f --- /dev/null +++ b/geeqie-1.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9736c8cbf21cc39d0a9c720934cdd33fe2756dc903c2a12cfc78b8822d2d1bf5 +size 1585780 diff --git a/geeqie-1.5.tar.xz.asc b/geeqie-1.5.tar.xz.asc new file mode 100644 index 0000000..2e810d5 --- /dev/null +++ b/geeqie-1.5.tar.xz.asc @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: Charset: ISO-8859-1 + +iQGzBAABCgAdFiEEMWF28vh4/UMJJLQEpnwKsYAZ9qwFAl07RW8ACgkQpnwKsYAZ +9qydjQv/VRDzWcY/CsTsvcZdpecrb79J6GgRHb60SjvNkrBg3uk5ZyWwn53YjzCH ++Qh7K5zmmuO043GFH9oaxF/V0+56vLxv6bWd1qBVULV8wIPNbk1yWWjexSXkaFy6 +2WWSJFRFwPSygYUZasuGo9EyddNYPXtnPSKKJ0yqQjCIHPWGiQIhNDzQRWiL+jsD +fMeFJL+StTCRoJQAMyuhyYzip8L5DR4RckmyfHYaqBGTw2OyXpYkXazk17mPUPL7 +GcEbWOkzZSK6XgXnWlF52cMnz9d/ZQ+9v7brSo7KV+BXMyC9vys0THKOAQO2IkBv +OSuc3HUwBXM+/7gsWuOhSD+zIYfbSzeVtx4wIujE8amBgrMv6qEk1Xu3EkU1inaN +s7gVwtFNeY1T4WSkokbhWmOg2mFLquIa5yTWYUzDvGTuIV6/AHPFEYfxfTDL9LkF +b83vuB3PygfKa4jye1EJkKwH4ZW9W+QNNaT08KsYFgiGpurhgieJA1ubsIarwjIu +Xw5ohkyB +=ARIP +-----END PGP SIGNATURE----- diff --git a/geeqie.changes b/geeqie.changes index baf34f6..e298056 100644 --- a/geeqie.changes +++ b/geeqie.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 31 08:53:24 UTC 2019 - gutaper@gmail.com + +- Update to version 1.5 +- Drop exiv-2.0.27-buildfix.patch (fixed in upstream) +- Set CFLAGS="-Wno-deprecated-declarations" (Fix compilation fail) + ------------------------------------------------------------------- Mon Apr 8 16:16:22 UTC 2019 - Christophe Giboudeaux diff --git a/geeqie.spec b/geeqie.spec index ecc5ed8..aae719b 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -17,7 +17,7 @@ Name: geeqie -Version: 1.3 +Version: 1.5 Release: 0 Summary: Lightweight Gtk+ based image viewer License: GPL-2.0-or-later @@ -26,8 +26,6 @@ URL: http://www.geeqie.org/ Source0: http://www.geeqie.org/%{name}-%{version}.tar.xz Source1: http://www.geeqie.org/%{name}-%{version}.tar.xz.asc Source2: geeqie.keyring -# PATCH-FIX-UPSTREAM -Patch0: exiv-2.0.27-buildfix.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool @@ -59,7 +57,6 @@ Geeqie is a lightweight image viewer for Linux, BSDs and compatibles. %prep %setup -q -%patch0 -p1 %build # Needed to bootstrap @@ -70,7 +67,7 @@ autoreconf -fvi --with-readmedir=%{_defaultdocdir}/%{name} \ --enable-map \ %{nil} -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="-Wno-deprecated-declarations" %install %make_install @@ -90,7 +87,7 @@ rm %{buildroot}%{_docdir}/%{name}/COPYING %files %defattr(-,root,root) %license COPYING -%doc AUTHORS ChangeLog NEWS README TODO README.lirc +%doc AUTHORS ChangeLog ChangeLog.html NEWS TODO README.md README.lirc %{_bindir}/geeqie %{_datadir}/applications/geeqie.desktop %{_datadir}/geeqie/