commit 82ea215e10ce62199d52ab88abcb1038810b553a Author: Juergen Daubert <jue@jue.li> Date: Mon Jul 29 10:51:53 2019 +0200 geeqie: update to 1.5 diff --git a/geeqie/.footprint b/geeqie/.footprint index 386cbcaa5..48d934bd1 100644 --- a/geeqie/.footprint +++ b/geeqie/.footprint @@ -3,9 +3,15 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/geeqie drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/geeqie/ --rwxr-xr-x root/root usr/lib/geeqie/geeqie-import +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-camera-import +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-camera-import-hook-script +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-export-jpeg +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-image-crop +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-random-image -rwxr-xr-x root/root usr/lib/geeqie/geeqie-rotate -rwxr-xr-x root/root usr/lib/geeqie/geeqie-symlink +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-tethered-photography +-rwxr-xr-x root/root usr/lib/geeqie/geeqie-tethered-photography-hook-script -rwxr-xr-x root/root usr/lib/geeqie/geeqie-ufraw -rwxr-xr-x root/root usr/lib/geeqie/geocode-parameters.awk drwxr-xr-x root/root usr/share/ @@ -13,13 +19,16 @@ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/geeqie.desktop drwxr-xr-x root/root usr/share/geeqie/ drwxr-xr-x root/root usr/share/geeqie/applications/ --rw-r--r-- root/root usr/share/geeqie/applications/geeqie-import-geeqie.desktop --rw-r--r-- root/root usr/share/geeqie/applications/geeqie-import-gqview.desktop +-rw-r--r-- root/root usr/share/geeqie/applications/camera-import.desktop +-rw-r--r-- root/root usr/share/geeqie/applications/export-jpeg.desktop -rw-r--r-- root/root usr/share/geeqie/applications/geeqie-ufraw-id.desktop -rw-r--r-- root/root usr/share/geeqie/applications/geeqie-ufraw-recursive.desktop -rw-r--r-- root/root usr/share/geeqie/applications/geeqie-ufraw.desktop +-rw-r--r-- root/root usr/share/geeqie/applications/image-crop.desktop +-rw-r--r-- root/root usr/share/geeqie/applications/random-image.desktop -rw-r--r-- root/root usr/share/geeqie/applications/rotate.desktop -rw-r--r-- root/root usr/share/geeqie/applications/symlink.desktop +-rw-r--r-- root/root usr/share/geeqie/applications/tethered-photography.desktop -rw-r--r-- root/root usr/share/geeqie/template.desktop drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/geeqie/.signature b/geeqie/.signature index 30d75adae..caffebde8 100644 --- a/geeqie/.signature +++ b/geeqie/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QIrWGogPlYVarQAxrkyj3bh+NgUCYb+vd1ji6RZPmDfQ8+7+AXJ+7cWMjgPY+F7tgfwJ5G6NE/SKptiZ7f6RAU= -SHA256 (Pkgfile) = b3191bab2fb55232740392de0067c5f683eb14ad57519085e9d829b399e9dcb8 -SHA256 (.footprint) = 93037ff3c570489c268b6e87047108517ccf0d781e1ca21aa4f04faacbd63d50 -SHA256 (geeqie-1.4.tar.xz) = 5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32 -SHA256 (geeqie-exiv2-0.27.patch) = 255a29cc4ecaadcb3f8ae37be3d004f48e75fa7aa3aa6beb3f4052ce8ab860e2 +RWSE3ohX2g5d/fP/7ItqPuftbkisC3VWzDPXg1NKVfek/wKvtK+mv/CjPOG2tyJzHGioMEyY7zYssSymfL1xB1xrZyWSp9HcTQY= +SHA256 (Pkgfile) = df6ad101a01cf2801e548ac140e63afb84e628e88d5c17d763cffe50db8ea5c4 +SHA256 (.footprint) = a8ffe8d4d84794f18e6a6c17c7b354488d815248db9dd21c0acc72e8d3db3969 +SHA256 (geeqie-1.5.tar.xz) = 9736c8cbf21cc39d0a9c720934cdd33fe2756dc903c2a12cfc78b8822d2d1bf5 diff --git a/geeqie/Pkgfile b/geeqie/Pkgfile index 424a603a8..728476e25 100644 --- a/geeqie/Pkgfile +++ b/geeqie/Pkgfile @@ -4,27 +4,17 @@ # Depends on: gtk name=geeqie -version=1.4 -release=2 -source=(http://geeqie.org/$name-$version.tar.xz - $name-exiv2-0.27.patch) +version=1.5 +release=1 +source=(http://geeqie.org/$name-$version.tar.xz) build() { cd $name-$version - patch -p1 -i $SRC/$name-exiv2-0.27.patch - sed -e '/HAVE_MARKDOWN/,/endif/d' -e '/^.PHONY:/,$d' -i Makefile.am - export LINGUAS=" " - export CFLAGS="$CFLAGS $(pkg-config --cflags gtk+-2.0)" - export LDFLAGS="$LDFLAGS $(pkg-config --libs gtk+-2.0)" - export CXXFLAGS="$CXXFLAGS $CFLAGS" - - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix=/usr --disable-gtk3 + ./configure --prefix=/usr make make DESTDIR=$PKG install - - sed -ri '/\[.+\]=/d' $PKG/usr/share/{geeqie/,}applications/*.desktop + rm -r $PKG/usr/share/doc } diff --git a/geeqie/geeqie-exiv2-0.27.patch b/geeqie/geeqie-exiv2-0.27.patch deleted file mode 100644 index e606ad1b9..000000000 --- a/geeqie/geeqie-exiv2-0.27.patch +++ /dev/null @@ -1,98 +0,0 @@ -From f9213c8ad796cf4571b2606435c32753040ec645 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <Rasmus.thomsen@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 - } - }