From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
Date: Sun, 17 Mar 2019 13:22:19 +0000 (UTC) [thread overview]
Message-ID: <1552828929.e7c05267514f7ce91416cdcfd96a089f38381474.asturm@gentoo> (raw)
commit: e7c05267514f7ce91416cdcfd96a089f38381474
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 13:20:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 13:22:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c05267
media-gfx/geeqie: Drop 1.3
Broken by exiv2.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/geeqie/Manifest | 1 -
media-gfx/geeqie/files/geeqie-1.3-stdstring.patch | 63 -----------------
media-gfx/geeqie/geeqie-1.3-r1.ebuild | 82 -----------------------
3 files changed, 146 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 67f91905245..95acd2ee962 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,2 +1 @@
-DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
diff --git a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
deleted file mode 100644
index fb58db6a528..00000000000
--- a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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;
diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
deleted file mode 100644
index dd9b8e0511a..00000000000
--- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="${EPREFIX}"/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"
-}
next reply other threads:[~2019-03-17 13:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-17 13:22 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-25 8:02 [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/ Bernard Cafarelli
2024-03-25 20:07 Bernard Cafarelli
2024-03-09 10:25 Bernard Cafarelli
2024-01-23 21:18 Bernard Cafarelli
2024-01-11 11:57 Bernard Cafarelli
2023-07-07 16:45 Bernard Cafarelli
2022-10-18 14:57 Bernard Cafarelli
2022-10-17 21:39 Bernard Cafarelli
2021-04-27 21:30 Bernard Cafarelli
2020-01-24 14:16 Bernard Cafarelli
2019-01-10 21:54 Andreas Sturmlechner
2017-11-27 14:03 Bernard Cafarelli
2016-04-13 9:14 Bernard Cafarelli
2016-01-04 9:27 Bernard Cafarelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1552828929.e7c05267514f7ce91416cdcfd96a089f38381474.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox