graphics/gnome-color-manager: prepare for exiv2-0.27

Import gentoo's (via Mageia) patch:
https://gitweb.gentoo.org/repo/gentoo.git/tree/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch?id=f6715ca3cbae4a86fa3d1bf06b8715ab9993b62d

PR:		235943
This commit is contained in:
Tobias C. Berner 2019-03-08 21:46:54 +00:00
parent ade3c53095
commit da28a08007
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=495079
2 changed files with 43 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= gnome-color-manager
PORTVERSION= 3.28.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome

View File

@ -0,0 +1,42 @@
Patch kindly borrowed from Mageia.
https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
--- src/gcm-helper-exiv.cpp 2018-09-04 13:50:05.000000000 +0200
+++ src/gcm-helper-exiv.cpp 2018-12-31 15:39:52.288495398 +0100
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <iostream>
#include <iomanip>
@@ -51,7 +50,11 @@
if (argc == 2)
filename = argv[1];
if (filename.empty())
+#if EXIV2_TEST_VERSION(0,27,0)
+ 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 +63,11 @@
if (exifData.empty()) {
std::string error(argv[1]);
error += ": No Exif data found in the file";
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
+#else
throw Exiv2::Error(1, error);
+#endif
}
/* try to find make, model and serial number */