Hello community, here is the log from the commit of package pix for openSUSE:Factory checked in at 2019-07-08 15:11:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pix (Old) and /work/SRC/openSUSE:Factory/.pix.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pix" Mon Jul 8 15:11:29 2019 rev:19 rq:713771 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pix/pix.changes 2019-06-22 11:25:04.945441580 +0200 +++ /work/SRC/openSUSE:Factory/.pix.new.4615/pix.changes 2019-07-08 15:11:30.747373149 +0200 @@ -1,0 +2,11 @@ +Mon Jul 1 04:10:55 UTC 2019 - Dead Mozay <dead_mo...@opensuse.org> + +- Update to version 2.2.0 + * Patches rebase and merged + * Add autogen file and amend Install (#64) + * Fix exiv2 issues (https://github.com/linuxmint/pix/issues/70) (#71) + * Add Ctrl+W and Ctrl+Q shortcuts + * l10n: Update translations +- drop pix-exiv2-xmp_hpp.patch, upstream fixed. + +------------------------------------------------------------------- Old: ---- pix-2.0.3.tar.gz pix-exiv2-xmp_hpp.patch New: ---- pix-2.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pix.spec ++++++ --- /var/tmp/diff_new_pack.vFxdHu/_old 2019-07-08 15:11:31.687374051 +0200 +++ /var/tmp/diff_new_pack.vFxdHu/_new 2019-07-08 15:11:31.691374055 +0200 @@ -17,17 +17,15 @@ Name: pix -Version: 2.0.3 +Version: 2.2.0 Release: 0 Summary: Image viewer and browser utility License: GPL-2.0-or-later Group: Productivity/Graphics/Viewers URL: https://github.com/linuxmint/pix Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -#PATCH-FIX-UPSTREAM marguer...@opensuse.org - <xmp.hpp> was renamed to <xmp_exiv2.hpp> -Patch: pix-exiv2-xmp_hpp.patch -#PATCH-FIX-UPSTREAM marguer...@opensuse.org - exiv2 0.27 Exiv2::Error has changed from an int to an Exiv2::ErrorCode enum -Patch1: pix-exiv2-error.patch +#PATCH-FIX-UPSTREAM dead_mo...@opensuse.org - exiv2 0.27 Exiv2::Error has changed from an int to an Exiv2::ErrorCode enum +Patch0: pix-exiv2-error.patch BuildRequires: bison BuildRequires: dcraw BuildRequires: fdupes @@ -88,12 +86,12 @@ slide shows, set your desktop background, and more. %prep -%setup -q -%patch -p1 -%patch1 -p1 +%autosetup -p1 %build NOCONFIGURE=1 gnome-autogen.sh +export SUID_CFLAGS=-fPIE +export SUID_LDFLAGS=-pie %configure\ --disable-static \ --disable-silent-rules \ @@ -108,7 +106,7 @@ %suse_update_desktop_file %{name} %suse_update_desktop_file %{name}-import %find_lang %{name} %{?no_lang_C} -%fdupes %{buildroot}%{_datadir}/%{name}/ +%fdupes %{buildroot}%{_prefix} %if 0%{?suse_version} < 1500 %post ++++++ pix-2.0.3.tar.gz -> pix-2.2.0.tar.gz ++++++ ++++ 8740 lines of diff (skipped) ++++++ pix-exiv2-error.patch ++++++ --- /var/tmp/diff_new_pack.vFxdHu/_old 2019-07-08 15:11:32.515374845 +0200 +++ /var/tmp/diff_new_pack.vFxdHu/_new 2019-07-08 15:11:32.519374849 +0200 @@ -1,26 +1,22 @@ -Index: pix-2.0.3/extensions/exiv2_tools/exiv2-utils.cpp -=================================================================== ---- pix-2.0.3.orig/extensions/exiv2_tools/exiv2-utils.cpp -+++ pix-2.0.3/extensions/exiv2_tools/exiv2-utils.cpp -@@ -41,6 +41,9 @@ +diff -rub a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp +--- a/extensions/exiv2_tools/exiv2-utils.cpp 2019-06-23 18:12:10.000000000 +0600 ++++ b/extensions/exiv2_tools/exiv2-utils.cpp 2019-07-01 12:19:45.867089197 +0600 +@@ -38,13 +38,17 @@ + #if EXIV2_TEST_VERSION(0, 27, 0) + #include <exiv2/xmp_exiv2.hpp> + #else +-#include <exiv2/xmp.hpp> ++#include <exiv2/version.hpp> + #endif + #include <pix.h> + #include "exiv2-utils.h" using namespace std; +#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27) +#define HAVE_EXIV2_ERROR_CODE +#endif ++ #define INVALID_VALUE "---" -@@ -948,7 +951,11 @@ dump_exif_data (Exiv2::ExifData &exifDat - - try { - if (exifData.empty()) { -+#ifdef HAVE_EXIV2_ERROR_CODE -+ 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) {
