[arch-commits] Commit in geeqie/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, June 27, 2017 @ 08:11:43
  Author: foutrelis
Revision: 299289

upgpkg: geeqie 1.3-2

Add follow up fix for reading RAW files (FS#47414).

Added:
  geeqie/trunk/0001-Work-around-changed-c-11-std-string-implementation.patch
Modified:
  geeqie/trunk/PKGBUILD

---------------------------------------------------------------+
 0001-Work-around-changed-c-11-std-string-implementation.patch |   66 ++++++++++
 PKGBUILD                                                      |   16 +-
 2 files changed, 78 insertions(+), 4 deletions(-)

Added: 0001-Work-around-changed-c-11-std-string-implementation.patch
===================================================================
--- 0001-Work-around-changed-c-11-std-string-implementation.patch	                        (rev 0)
+++ 0001-Work-around-changed-c-11-std-string-implementation.patch	2017-06-27 08:11:43 UTC (rev 299289)
@@ -0,0 +1,66 @@
+From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001
+From: David Kalnischkies <david at kalnischkies.de>
+Date: Fri, 27 May 2016 12:04:40 +0100
+Subject: [PATCH] Work around changed c++11 std::string implementation
+
+Bug was already partly fixed by 96db62d but there was even more
+positions that was unseen by Solomon.
+
+The patch is originally from Debian bug report #800350.
+
+Signed-off-by: Klaus Ethgen <Klaus at Ethgen.de>
+---
+ src/exiv2.cc | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index 1dbe1182..49b8e07c 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -25,6 +25,7 @@
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
+ #include <iostream>
++#include <string>
+ 
+ // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
+ #ifndef EXIV2_TEST_VERSION
+@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
+ 
+ 	if (!exif->image()) return NULL;
+ 
++	std::string const path = exif->image()->io().path();
+ 	/* given image pathname, first do simple (and fast) file extension test */
+-	gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE);
++	gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE);
+ 
+ 	if (!is_raw && requested_width == 0) return NULL;
+ 
+@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
+ 	if (!exif) return NULL;
+ 	if (!exif->image()) return NULL;
+ 
+-	const char* path = exif->image()->io().path().c_str();
++	std::string const path = exif->image()->io().path();
+ 
+ 	/* given image pathname, first do simple (and fast) file extension test */
+-	if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL;
++	if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL;
+ 
+ 	try {
+ 		struct stat st;
+@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
+ 
+ 		RawFile rf(exif->image()->io());
+ 		offset = rf.preview_offset();
+-		DEBUG_1("%s: offset %lu", path, offset);
++		DEBUG_1("%s: offset %lu", path.c_str(), offset);
+ 
+-		fd = open(path, O_RDONLY);
++		fd = open(path.c_str(), O_RDONLY);
+ 		if (fd == -1)
+ 			{
+ 			return NULL;
+-- 
+2.13.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-27 06:56:50 UTC (rev 299288)
+++ PKGBUILD	2017-06-27 08:11:43 UTC (rev 299289)
@@ -4,7 +4,7 @@
 
 pkgname=geeqie
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight image browser and viewer"
 arch=('i686' 'x86_64')
 url="http://www.geeqie.org/"
@@ -15,12 +15,20 @@
 	    'fbida: for jpeg rotation'
 	    'exiv2: for tiff and png rotation')
 validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C')
-source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz{,.asc})
-sha1sums=('f991b44d8587f2f42d5793700c5f6882bed6abf9' 'SKIP')
+source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz{,.asc}
+        0001-Work-around-changed-c-11-std-string-implementation.patch)
+sha1sums=('f991b44d8587f2f42d5793700c5f6882bed6abf9'
+          'SKIP'
+          '45dea6145ab6d74ed69a81a6e5871300f51450eb')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../0001-Work-around-changed-c-11-std-string-implementation.patch
+  ./autogen.sh
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
   ./configure --prefix=/usr
   make
 }