geeqie: update to 1.4.
This commit is contained in:
Christian Buschau
maxice8
parent
deee699027
commit
dc86d5198c
3 changed files with 98 additions and 60 deletions
|
|
@ -1,55 +0,0 @@
|
|||
--- 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
|
||||
}
|
||||
}
|
||||
84
srcpkgs/geeqie/patches/geeqie-1.4-exiv2-0.27.patch
Normal file
84
srcpkgs/geeqie/patches/geeqie-1.4-exiv2-0.27.patch
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
Source: https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
|
||||
Upstream: Yes
|
||||
Reason: FTBFS
|
||||
|
||||
From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001
|
||||
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
|
||||
Date: Wed, 2 Jan 2019 01:04:45 +0100
|
||||
Subject: [PATCH] fix build against exiv2-0.27.x
|
||||
|
||||
fixes #654
|
||||
---
|
||||
src/exiv2.cc | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/exiv2.cc b/src/exiv2.cc
|
||||
index b3c80657..f40b725e 100644
|
||||
--- a/src/exiv2.cc
|
||||
+++ b/src/exiv2.cc
|
||||
@@ -22,17 +22,27 @@
|
||||
|
||||
#ifdef HAVE_EXIV2
|
||||
|
||||
+// Don't include the <exiv2/version.hpp> file directly
|
||||
+// Early Exiv2 versions didn't have version.hpp and the macros.
|
||||
+#include <exiv2/exiv2.hpp>
|
||||
#include <exiv2/image.hpp>
|
||||
#include <exiv2/exif.hpp>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
// EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
|
||||
+#ifdef EXIV2_VERSION
|
||||
#ifndef EXIV2_TEST_VERSION
|
||||
-# define EXIV2_TEST_VERSION(major,minor,patch) \
|
||||
+#define EXIV2_TEST_VERSION(major,minor,patch) \
|
||||
( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
|
||||
#endif
|
||||
+#else
|
||||
+#define EXIV2_TEST_VERSION(major,minor,patch) (false)
|
||||
+#endif
|
||||
|
||||
+#if EXIV2_TEST_VERSION(0,27,0)
|
||||
+#define HAVE_EXIV2_ERROR_CODE
|
||||
+#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -40,6 +50,10 @@
|
||||
#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>
|
||||
@@ -374,7 +388,11 @@
|
||||
#endif
|
||||
Exiv2::Image *image = imageData_->image();
|
||||
|
||||
- if (!image) Exiv2::Error(21);
|
||||
+#ifdef HAVE_EXIV2_ERROR_CODE
|
||||
+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
|
||||
+#else
|
||||
+ if (!image) throw Exiv2::Error(21);
|
||||
+#endif
|
||||
image->setExifData(exifData_);
|
||||
image->setIptcData(iptcData_);
|
||||
#if EXIV2_TEST_VERSION(0,16,0)
|
||||
@@ -394,8 +412,12 @@
|
||||
sidecar->setXmpData(xmpData_);
|
||||
sidecar->writeMetadata();
|
||||
#else
|
||||
+#ifdef HAVE_EXIV2_ERROR_CODE
|
||||
+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
|
||||
+#else
|
||||
throw Exiv2::Error(3, "xmp");
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,19 +1,28 @@
|
|||
# Template file for 'geeqie'
|
||||
pkgname=geeqie
|
||||
version=1.3
|
||||
revision=5
|
||||
version=1.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-gtk3"
|
||||
hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel"
|
||||
makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel
|
||||
ffmpegthumbnailer-devel"
|
||||
depends="desktop-file-utils"
|
||||
short_desc="Lightweight GTK+ based image viewer"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
||||
license="GPL-2"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://www.geeqie.org/"
|
||||
distfiles="http://www.geeqie.org/geeqie-${version}.tar.xz"
|
||||
checksum=4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f
|
||||
CPPFLAGS="-D_FILE_OFFSET_BITS=64"
|
||||
checksum=5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32
|
||||
patch_args="-Np1"
|
||||
|
||||
post_extract() {
|
||||
# Missing from release tarball, and requires git tree to generate
|
||||
sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am
|
||||
|
||||
# Remove -Werror (gcc changes may add new warnings)
|
||||
sed -e '/CFLAGS/s/-Werror //g' -i configure.in
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
|
|
|
|||
Loading…
Reference in a new issue