Hello community, here is the log from the commit of package pix for openSUSE:Factory checked in at 2019-02-04 14:25:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pix (Old) and /work/SRC/openSUSE:Factory/.pix.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pix" Mon Feb 4 14:25:53 2019 rev:17 rq:670930 version:2.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/pix/pix.changes 2018-06-28 15:13:14.579612244 +0200 +++ /work/SRC/openSUSE:Factory/.pix.new.28833/pix.changes 2019-02-04 14:26:00.837036646 +0100 @@ -1,0 +2,16 @@ +Mon Feb 4 02:34:54 UTC 2019 - Marguerite Su <[email protected]> + +- Update to version 2.0.3 + * Update translations. +- Changes in 2.0.2 + * image_viewer/gth-image-viewer-page.c: Use ctrl-v for Paste + Image shortcut. +- Changes in 2.0.0 + * Use icon for keyboard shortcuts help entry +- Add pix-exiv2-xmp_hpp.patch + * xmp.hpp was renamed to xmp_exiv2.hpp +- Add pix-exiv2-error.patch + * exiv2 0.27 Exiv2::Error has changed from an int to an + Exiv2::ErrorCode enum + +------------------------------------------------------------------- Old: ---- pix-1.8.2.tar.gz New: ---- pix-2.0.3.tar.gz pix-exiv2-error.patch pix-exiv2-xmp_hpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pix.spec ++++++ --- /var/tmp/diff_new_pack.9HKE2g/_old 2019-02-04 14:26:02.261035971 +0100 +++ /var/tmp/diff_new_pack.9HKE2g/_new 2019-02-04 14:26:02.293035956 +0100 @@ -1,7 +1,7 @@ # # spec file for package pix # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: pix -Version: 1.8.2 +Version: 2.0.3 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 [email protected] - <xmp.hpp> was renamed to <xmp_exiv2.hpp> +Patch: pix-exiv2-xmp_hpp.patch +#PATCH-FIX-UPSTREAM [email protected] - exiv2 0.27 Exiv2::Error has changed from an int to an Exiv2::ErrorCode enum +Patch1: pix-exiv2-error.patch BuildRequires: bison BuildRequires: dcraw BuildRequires: fdupes @@ -84,6 +88,8 @@ %prep %setup -q +%patch -p1 +%patch1 -p1 %build NOCONFIGURE=1 gnome-autogen.sh ++++++ pix-1.8.2.tar.gz -> pix-2.0.3.tar.gz ++++++ ++++ 14687 lines of diff (skipped) ++++++ pix-exiv2-error.patch ++++++ 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 @@ 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) { ++++++ pix-exiv2-xmp_hpp.patch ++++++ 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 @@ -34,7 +34,8 @@ #include <sstream> #include <vector> #include <iomanip> -#include <exiv2/xmp.hpp> +#include <exiv2/xmp_exiv2.hpp> +#include <exiv2/version.hpp> #include <pix.h> #include "exiv2-utils.h"
