snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

geeqie: rebuild against exiv2-0.27.0_1 

[ci skip]
This commit is contained in:
Rasmus Thomsen 2019-01-01 23:32:59 +01:00 committed by Helmut Pozimski
parent 875f958dfa
commit e4d69b6294
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
srcpkgs/geeqie/patches/exiv-0.27.patch Normal file
View File

@ -0,0 +1,55 @@
--- src/exiv2.cc
+++ src/exiv2.cc
@@ -22,23 +22,29 @@
#ifdef HAVE_EXIV2
+#include <exiv2/exiv2.hpp>
#include <exiv2/image.hpp>
#include <exiv2/exif.hpp>
+#include <exiv2/error.hpp>
#include <iostream>
-
-// EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
-#ifndef EXIV2_TEST_VERSION
+#ifdef EXIV2_VERSION
+# ifndef EXIV2_TEST_VERSION
# define EXIV2_TEST_VERSION(major,minor,patch) \
- ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
+ ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
+# endif
+#else
+# define EXIV2_TEST_VERSION(major,minor,patch) (false)
#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
+#if EXIV2_TEST_VERSION(0,27,0)
+#define EXV_PACKAGE "exiv2"
+#endif
#if !EXIV2_TEST_VERSION(0,17,90)
#include <exiv2/tiffparser.hpp>
#include <exiv2/tiffcomposite.hpp>
@@ -358,7 +364,7 @@ public:
#endif
Exiv2::Image *image = imageData_->image();
- if (!image) Exiv2::Error(21);
+ if (!image) Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
image->setExifData(exifData_);
image->setIptcData(iptcData_);
#if EXIV2_TEST_VERSION(0,16,0)
@@ -378,7 +384,7 @@ public:
sidecar->setXmpData(xmpData_);
sidecar->writeMetadata();
#else
- throw Exiv2::Error(3, "xmp");
+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
#endif
}
}

2
srcpkgs/geeqie/template
View File

@ -1,7 +1,7 @@
# Template file for 'geeqie'
pkgname=geeqie
version=1.3
revision=4
revision=5
build_style=gnu-configure
hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel"
makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel