diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-03-08 21:46:54 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-03-08 21:46:54 +0000 |
| commit | da28a08007574698219fd448a4d974a4e806cb44 (patch) | |
| tree | 4f5f3d31dc52ca751620ad1f4b2700b85a59e858 /graphics/gnome-color-manager | |
| parent | audio/dsbmixer: Update to 1.3.3 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=495079
Diffstat (limited to 'graphics/gnome-color-manager')
| -rw-r--r-- | graphics/gnome-color-manager/Makefile | 2 | ||||
| -rw-r--r-- | graphics/gnome-color-manager/files/patch-gentoo_00878b | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile index 7235acc297cf..d5d2499fa55e 100644 --- a/graphics/gnome-color-manager/Makefile +++ b/graphics/gnome-color-manager/Makefile @@ -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 diff --git a/graphics/gnome-color-manager/files/patch-gentoo_00878b b/graphics/gnome-color-manager/files/patch-gentoo_00878b new file mode 100644 index 000000000000..9c1550f78d6a --- /dev/null +++ b/graphics/gnome-color-manager/files/patch-gentoo_00878b @@ -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 */ + |