--- /dev/null
+From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001
+From: David Kalnischkies <david@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@Ethgen.de>
+---
+ src/exiv2.cc | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index 1dbe118..49b8e07 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;
--- /dev/null
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ virtual/libintl
+ doc? ( app-text/gnome-doc-utils )
+ gpu-accel? ( media-libs/clutter-gtk )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ lirc? ( app-misc/lirc )
+ lua? ( >=dev-lang/lua-5.1:= )
+ map? ( media-libs/libchamplain:0.12 )
+ xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+ !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
+ tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+REQUIRED_USE="gpu-accel? ( gtk3 )
+ map? ( gpu-accel )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-stdstring.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # clutter does not compile, gps depends on clutter
+ local myconf="--disable-dependency-tracking
+ --with-readmedir=/usr/share/doc/${PF}
+ $(use_enable debug debug-log)
+ $(use_enable gpu-accel)
+ $(use_enable gtk3)
+ $(use_enable jpeg)
+ $(use_enable lcms)
+ $(use_enable lua)
+ $(use_enable lirc)
+ $(use_enable map)
+ $(use_enable tiff)"
+
+ if use exif || use xmp; then
+ myconf="${myconf} --enable-exiv2"
+ else
+ myconf="${myconf} --disable-exiv2"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -f "${D}/usr/share/doc/${PF}/COPYING"
+ # Application needs access to the uncompressed file
+ docompress -x /usr/share/doc/${PF}/README
+}
+
+pkg_postinst() {
+ elog "Some plugins may require additional packages"
+ elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+ elog "- RAW images plugin: media-gfx/ufraw"
+}
projects / gentoo.git / commitdiff