Date: Saturday, May 18, 2019 @ 08:33:58 Author: felixonmars Revision: 353584
archrelease: copy trunk to staging-x86_64 Added: geeqie/repos/staging-x86_64/ geeqie/repos/staging-x86_64/PKGBUILD (from rev 353583, geeqie/trunk/PKGBUILD) geeqie/repos/staging-x86_64/geeqie-exiv2-0.27.patch (from rev 353583, geeqie/trunk/geeqie-exiv2-0.27.patch) geeqie/repos/staging-x86_64/geeqie-no-changelog.patch (from rev 353583, geeqie/trunk/geeqie-no-changelog.patch) ---------------------------+ PKGBUILD | 39 +++++++++++++++++ geeqie-exiv2-0.27.patch | 98 ++++++++++++++++++++++++++++++++++++++++++++ geeqie-no-changelog.patch | 14 ++++++ 3 files changed, 151 insertions(+) Copied: geeqie/repos/staging-x86_64/PKGBUILD (from rev 353583, geeqie/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-05-18 08:33:58 UTC (rev 353584) @@ -0,0 +1,39 @@ +# Maintainer: Eric BĂ©langer <e...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> + +pkgname=geeqie +pkgver=1.4 +pkgrel=4 +pkgdesc="A lightweight image browser and viewer" +arch=('x86_64') +url="http://www.geeqie.org/" +license=('GPL2') +depends=('exiv2' 'gtk2' 'ffmpegthumbnailer') +makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'python') +optdepends=('librsvg: SVG rendering' + 'fbida: for jpeg rotation') +validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') +source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz{,.asc} geeqie-no-changelog.patch + geeqie-exiv2-0.27.patch) +sha256sums=('5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32' + 'SKIP' + 'f6eb2725a47fc750d95455d4bbf4be5a0ae45307d3ada571937212a25b2b4301' + '255a29cc4ecaadcb3f8ae37be3d004f48e75fa7aa3aa6beb3f4052ce8ab860e2') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../geeqie-no-changelog.patch # Workaround missing changelog (Fedora) + patch -p1 -i ../geeqie-exiv2-0.27.patch # Fix build with exiv2 0.27 + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: geeqie/repos/staging-x86_64/geeqie-exiv2-0.27.patch (from rev 353583, geeqie/trunk/geeqie-exiv2-0.27.patch) =================================================================== --- staging-x86_64/geeqie-exiv2-0.27.patch (rev 0) +++ staging-x86_64/geeqie-exiv2-0.27.patch 2019-05-18 08:33:58 UTC (rev 353584) @@ -0,0 +1,98 @@ +From f9213c8ad796cf4571b2606435c32753040ec645 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen <rasmus.thom...@protonmail.com> +Date: Sun, 6 Jan 2019 17:40:31 +0000 +Subject: [PATCH] Fix #654, 655: fix build against exiv2-0.27.x + +https://github.com/BestImageViewer/geeqie/pull/655 +--- + src/exiv2.cc | 45 +++++++++++++++++++++------------------------ + 1 file changed, 21 insertions(+), 24 deletions(-) + +diff --git a/src/exiv2.cc b/src/exiv2.cc +index b3c80657..2992740c 100644 +--- a/src/exiv2.cc ++++ b/src/exiv2.cc +@@ -22,17 +22,25 @@ + + #ifdef HAVE_EXIV2 + +-#include <exiv2/image.hpp> +-#include <exiv2/exif.hpp> ++// 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 <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,27 +48,8 @@ + #include <fcntl.h> + #include <sys/mman.h> + +-#if !EXIV2_TEST_VERSION(0,17,90) +-#include <exiv2/tiffparser.hpp> +-#include <exiv2/tiffcomposite.hpp> +-#include <exiv2/tiffvisitor.hpp> +-#include <exiv2/tiffimage.hpp> +-#include <exiv2/cr2image.hpp> +-#include <exiv2/crwimage.hpp> +-#if EXIV2_TEST_VERSION(0,16,0) +-#include <exiv2/orfimage.hpp> +-#endif +-#if EXIV2_TEST_VERSION(0,13,0) +-#include <exiv2/rafimage.hpp> +-#endif +-#include <exiv2/futils.hpp> +-#else +-#include <exiv2/preview.hpp> +-#endif +- +-#if EXIV2_TEST_VERSION(0,17,0) +-#include <exiv2/convert.hpp> +-#include <exiv2/xmpsidecar.hpp> ++#if EXIV2_TEST_VERSION(0,27,0) ++#define EXV_PACKAGE "exiv2" + #endif + + extern "C" { +@@ -374,7 +363,11 @@ struct _ExifDataProcessed : public _ExifData + #endif + Exiv2::Image *image = imageData_->image(); + ++#ifdef HAVE_EXIV2_ERROR_CODE ++ if (!image) Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); ++#else + if (!image) Exiv2::Error(21); ++#endif + image->setExifData(exifData_); + image->setIptcData(iptcData_); + #if EXIV2_TEST_VERSION(0,16,0) +@@ -393,8 +386,12 @@ struct _ExifDataProcessed : public _ExifData + + 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 + } + } Copied: geeqie/repos/staging-x86_64/geeqie-no-changelog.patch (from rev 353583, geeqie/trunk/geeqie-no-changelog.patch) =================================================================== --- staging-x86_64/geeqie-no-changelog.patch (rev 0) +++ staging-x86_64/geeqie-no-changelog.patch 2019-05-18 08:33:58 UTC (rev 353584) @@ -0,0 +1,14 @@ +--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 ++++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 +@@ -10,9 +10,9 @@ + readmedir = @readmedir@ + + if HAVE_MARKDOWN +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html + else +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS + endif + + desktopdir = $(datadir)/applications