diff --git a/SOURCES/gnome-color-manager-exiv2-027.patch b/SOURCES/gnome-color-manager-exiv2-027.patch new file mode 100644 index 0000000..c1b6bd6 --- /dev/null +++ b/SOURCES/gnome-color-manager-exiv2-027.patch @@ -0,0 +1,41 @@ +diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp +index 9854e79..7ec6994 100644 +--- a/src/gcm-helper-exiv.cpp ++++ b/src/gcm-helper-exiv.cpp +@@ -21,6 +21,12 @@ + + #include + #include ++ ++#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27) ++#define HAVE_EXIV2_ERROR_CODE ++#include ++#endif ++ + #include + #include + +@@ -51,7 +57,11 @@ main (int argc, char* const argv[]) + if (argc == 2) + filename = argv[1]; + if (filename.empty()) ++#ifdef HAVE_EXIV2_ERROR_CODE ++ throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); ++#else + throw Exiv2::Error(1, "No filename specified"); ++#endif + image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + +@@ -60,7 +70,11 @@ main (int argc, char* const argv[]) + if (exifData.empty()) { + std::string error(argv[1]); + error += ": No Exif data found in the file"; ++#ifdef HAVE_EXIV2_ERROR_CODE ++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); ++#else + throw Exiv2::Error(1, error); ++#endif + } + + /* try to find make, model and serial number */ diff --git a/SPECS/gnome-color-manager.spec b/SPECS/gnome-color-manager.spec index 4fdd3ae..5c12b34 100644 --- a/SPECS/gnome-color-manager.spec +++ b/SPECS/gnome-color-manager.spec @@ -1,12 +1,14 @@ Name: gnome-color-manager Version: 3.28.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Color management tools for GNOME License: GPLv2+ URL: http://mail.gnome.org/mailman/listinfo/gnome-color-manager-list Source0: http://download.gnome.org/sources/gnome-color-manager/3.28/%{name}-%{version}.tar.xz +Patch0: gnome-color-manager-exiv2-027.patch + BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: desktop-file-utils BuildRequires: gettext @@ -42,6 +44,8 @@ and generate color profiles in the GNOME desktop. %prep %setup -q +%patch0 -p1 -b .exiv2-027 + %build %meson %meson_build @@ -73,6 +77,14 @@ and generate color profiles in the GNOME desktop. %{_mandir}/man1/*.1* %changelog +* Tue Oct 29 2019 Tomas Pelka - 3.28.0-3 +- Rebuild again to correctly trigger side-tag gating (exiv2) + Resolves: bz#1757445 + +* Tue Oct 15 2019 Jan Grulich - 3.28.0-2 +- Rebuild (exiv2) + Resolves: bz#1757445 + * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0