gnome-color-manager: update to 3.32.0.

This commit is contained in:
Rasmus Thomsen 2019-03-09 08:56:30 +01:00 committed by Johannes
parent 59ea9ec501
commit 37712b2032
2 changed files with 3 additions and 57 deletions

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,7 +1,7 @@
# Template file for 'gnome-color-manager' # Template file for 'gnome-color-manager'
pkgname=gnome-color-manager pkgname=gnome-color-manager
version=3.30.0 version=3.32.0
revision=3 revision=1
build_style=meson build_style=meson
configure_args="-Denable-tests=true -Denable-exiv=true -Denable-packagekit=false" configure_args="-Denable-tests=true -Denable-exiv=true -Denable-packagekit=false"
hostmakedepends="pkg-config intltool itstool libglib-devel gnome-doc-utils glib-devel" hostmakedepends="pkg-config intltool itstool libglib-devel gnome-doc-utils glib-devel"
@ -14,5 +14,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-color-manager" homepage="https://gitlab.gnome.org/GNOME/gnome-color-manager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=90bbb881acccdfa0a9e74c4ac72b4514385048037456923a2db66d3f30c6ab80 checksum=7c3c178faacfcbf11d56de22cd265946a7d58aa10e3cd968c2938e2fbf50fdee
patch_args="-Np1"