Date: Fri, 8 Mar 2019 21:46:54 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495079 - in head/graphics/gnome-color-manager: . files Message-ID: <201903082146.x28LksAG048991@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Mar 8 21:46:54 2019 New Revision: 495079 URL: https://svnweb.freebsd.org/changeset/ports/495079 Log: 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 Added: head/graphics/gnome-color-manager/files/ head/graphics/gnome-color-manager/files/patch-gentoo_00878b (contents, props changed) Modified: head/graphics/gnome-color-manager/Makefile Modified: head/graphics/gnome-color-manager/Makefile ============================================================================== --- head/graphics/gnome-color-manager/Makefile Fri Mar 8 21:40:42 2019 (r495078) +++ head/graphics/gnome-color-manager/Makefile Fri Mar 8 21:46:54 2019 (r495079) @@ -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 Added: head/graphics/gnome-color-manager/files/patch-gentoo_00878b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gnome-color-manager/files/patch-gentoo_00878b Fri Mar 8 21:46:54 2019 (r495079) @@ -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 */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903082146.x28LksAG048991>