Accepting request 695754 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 695586 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/695754
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-color-manager?expand=0&rev=65

Fix-build-with-Exiv2-027.patch

@@ -1,52 +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

gnome-color-manager-3.30.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90bbb881acccdfa0a9e74c4ac72b4514385048037456923a2db66d3f30c6ab80
-size 2611088

gnome-color-manager-3.32.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c3c178faacfcbf11d56de22cd265946a7d58aa10e3cd968c2938e2fbf50fdee
+size 2602104

gnome-color-manager.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Mar  8 12:14:34 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.32.0:
+  + Use newer meson features to fix a build warning.
+  + Fix build with Exiv2 0.27.
+  + Updated translations.
+- Drop Fix-build-with-Exiv2-027.patch: Fixed upstream.
+- Update URL to gitlab home. Old URL is no longer available.
+
 -------------------------------------------------------------------
 Fri Jan 18 10:03:39 UTC 2019 - bjorn.lie@gmail.com
 

gnome-color-manager.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-color-manager
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Luis Medinas, Portugal
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,25 +13,23 @@
 # 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:           gnome-color-manager
-Version:        3.30.0
+Version:        3.32.0
 Release:        0
 Summary:        Color management tools for GNOME
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-URL:            http://projects.gnome.org/gnome-color-manager
+URL:            https://gitlab.gnome.org/GNOME/gnome-color-manager
-Source:         http://download.gnome.org/sources/gnome-color-manager/3.30/%{name}-%{version}.tar.xz
+Source:         https://download.gnome.org/sources/gnome-color-manager/3.32/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM Fix-build-with-Exiv2-027.patch -- Fix build with Exiv2 0.27
-Patch0:         Fix-build-with-Exiv2-027.patch
 
 BuildRequires:  docbook-utils
 BuildRequires:  gcc-c++
 BuildRequires:  libtiff-devel
-BuildRequires:  meson
+BuildRequires:  meson >= 0.46.0
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files