Update to 3.32.0

This commit is contained in:
Kalev Lember 2019-03-11 09:58:43 +01:00
parent 5e9c2419cc
commit e5292d98d8
4 changed files with 8 additions and 61 deletions

1
.gitignore vendored
View File

@ -59,3 +59,4 @@ gnome-color-manager-2.31.4.tar.bz2
/gnome-color-manager-3.26.0.tar.xz
/gnome-color-manager-3.28.0.tar.xz
/gnome-color-manager-3.30.0.tar.xz
/gnome-color-manager-3.32.0.tar.xz

View File

@ -1,53 +0,0 @@
From 6ef6bf5e3909531b874f86cb95381fa0668cf90b Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw@src.gnome.org>
Date: Sun, 18 Nov 2018 14:09:08 +0800
Subject: [PATCH] Fix build with Exiv2 0.27
The first parameter of Exiv2::Error has changed from an int to an
Exiv2::ErrorCode enum.
---
src/gcm-helper-exiv.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
index 9854e79..ffbc82c 100644
--- a/src/gcm-helper-exiv.cpp
+++ b/src/gcm-helper-exiv.cpp
@@ -24,6 +24,10 @@
#include <iostream>
#include <iomanip>
+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27)
+#define HAVE_EXIV2_ERROR_CODE
+#endif
+
int
main (int argc, char* const argv[])
{
@@ -51,7 +55,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 +68,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 */
--
2.18.1

View File

@ -1,15 +1,11 @@
Name: gnome-color-manager
Version: 3.30.0
Release: 3%{?dist}
Version: 3.32.0
Release: 1%{?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.30/%{name}-%{version}.tar.xz
# Fix the build with exiv2 0.27
# https://gitlab.gnome.org/GNOME/gnome-color-manager/merge_requests/1
Patch0: gnome-color-manager-exiv2-0.27.patch
Source0: http://download.gnome.org/sources/gnome-color-manager/3.32/%{name}-%{version}.tar.xz
BuildRequires: gcc
BuildRequires: gcc-c++
@ -79,6 +75,9 @@ and generate color profiles in the GNOME desktop.
%{_mandir}/man1/*.1*
%changelog
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
* Wed Jan 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 3.30.0-3
- rebuild (exiv2)

View File

@ -1 +1 @@
SHA512 (gnome-color-manager-3.30.0.tar.xz) = ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc
SHA512 (gnome-color-manager-3.32.0.tar.xz) = e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38