* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2016-04-21 12:35 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2016-04-21 12:35 UTC (permalink / raw
To: gentoo-commits
commit: 1580a6fcf153bbf453221965d6340dfb19ad3db0
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 12:35:03 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 12:35:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1580a6fc
media-gfx/geeqie: use upstream fix for gtk3 support
Suggested by Tomasz Golinski in bug #579744
Package-Manager: portage-2.2.28
.../files/geeqie-1.2.3-fix_keywords_gtk3.patch | 88 ++++++++++++++++++++++
...{geeqie-1.2.3.ebuild => geeqie-1.2.3-r1.ebuild} | 2 +-
2 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
new file mode 100644
index 0000000..695effa
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
@@ -0,0 +1,88 @@
+From a174e816ae993e7ee9731651b2674dbfdec9ed95 Mon Sep 17 00:00:00 2001
+From: Colin Clark <cclark@mcb.net>
+Date: Wed, 30 Mar 2016 15:36:32 +0100
+Subject: [PATCH] Bug fix #227 + enable user to set height of Keywords pane
+
+Bug #227 Keywords section of Info sidebar doesn't work on GTK3 build
+https://sourceforge.net/p/geeqie/bugs/227/
+
+Permit the user to set the height of the Keywords pane in the Info
+sidebar by editing the line:
+
+<pane_keywords id = "keywords" title = "Keywords" expanded = "true" key
+= "Xmp.dc.subject" height = "200"/>
+
+in the configuration file geeqierc.xml
+---
+ src/bar_keywords.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/bar_keywords.c b/src/bar_keywords.c
+index f58f348..0eee90c 100644
+--- a/src/bar_keywords.c
++++ b/src/bar_keywords.c
+@@ -113,6 +113,7 @@ struct _PaneKeywordsData
+ guint idle_id; /* event source id */
+ FileData *fd;
+ gchar *key;
++ gint height;
+ };
+
+ typedef struct _ConfDialogData ConfDialogData;
+@@ -249,6 +250,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
+ write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pkd->pane.title)));
+ WRITE_BOOL(pkd->pane, expanded);
+ WRITE_CHAR(*pkd, key);
++ WRITE_INT(*pkd, height);
+ WRITE_STRING("/>");
+ }
+
+@@ -1263,7 +1265,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data)
+ }
+
+
+-static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded)
++static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height)
+ {
+ PaneKeywordsData *pkd;
+ GtkWidget *hbox;
+@@ -1285,6 +1287,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
+
+ pkd->pane.expanded = expanded;
+
++ pkd->height = height;
+ pkd->key = g_strdup(key);
+
+ pkd->expand_checked = TRUE;
+@@ -1295,6 +1298,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
+ g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
+ g_signal_connect(G_OBJECT(pkd->widget), "destroy",
+ G_CALLBACK(bar_pane_keywords_destroy), pkd);
++ gtk_widget_set_size_request(pkd->widget, -1, height);
+ gtk_widget_show(hbox);
+
+ scrolled = gtk_scrolled_window_new(NULL, NULL);
+@@ -1417,6 +1421,7 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
+ gchar *title = NULL;
+ gchar *key = g_strdup(COMMENT_KEY);
+ gboolean expanded = TRUE;
++ gint height = 200;
+ GtkWidget *ret;
+
+ while (*attribute_names)
+@@ -1428,13 +1433,14 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
+ if (READ_CHAR_FULL("title", title)) continue;
+ if (READ_CHAR_FULL("key", key)) continue;
+ if (READ_BOOL_FULL("expanded", expanded)) continue;
++ if (READ_INT_FULL("height", height)) continue;
+
+
+ log_printf("unknown attribute %s = %s\n", option, value);
+ }
+
+ bar_pane_translate_title(PANE_KEYWORDS, id, &title);
+- ret = bar_pane_keywords_new(id, title, key, expanded);
++ ret = bar_pane_keywords_new(id, title, key, expanded, height);
+ g_free(id);
+ g_free(title);
+ g_free(key);
diff --git a/media-gfx/geeqie/geeqie-1.2.3.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
similarity index 97%
rename from media-gfx/geeqie/geeqie-1.2.3.ebuild
rename to media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
index f5eb2d9..fd71ec3 100644
--- a/media-gfx/geeqie/geeqie-1.2.3.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
PATCHES=(
- "${FILESDIR}"/${PN}-1.2.2-fix_keywords_gtk3.patch
+ "${FILESDIR}"/${P}-fix_keywords_gtk3.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2016-06-27 17:30 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2016-06-27 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 865cea8418f1e3a9fbaa37cee94f9c986bc07430
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 16:28:34 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 17:20:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865cea84
media-gfx/geeqie: 1.3 version bump
Backport a patch to fix RAW image support with C++11
(reported by Dominic Eschweiler)
Also add USE flags for experimental GPU acceleration
and map support
Package-Manager: portage-2.3.0
media-gfx/geeqie/Manifest | 1 +
media-gfx/geeqie/files/geeqie-1.3-stdstring.patch | 63 +++++++++++++++++
media-gfx/geeqie/geeqie-1.3.ebuild | 83 +++++++++++++++++++++++
media-gfx/geeqie/metadata.xml | 2 +
4 files changed, 149 insertions(+)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index cb93df5..9b4fe7a 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,2 +1,3 @@
DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318
DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566
+DIST geeqie-1.3.tar.xz 1141820 SHA256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 WHIRLPOOL 8b3e54ae6cf8f8a633225df4f5058c29a7dd56adc63c9594cb995929d4cebb3b07d76a257a454506330f32673ac9a57ce63eb3fbf33126ed4cbccc7542910720
diff --git a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
new file mode 100644
index 0000000..fb58db6
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
@@ -0,0 +1,63 @@
+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.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild
new file mode 100644
index 0000000..f278e24
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.3.ebuild
@@ -0,0 +1,83 @@
+# 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"
+}
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index b188953..4ccccdc 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -7,6 +7,8 @@
</maintainer>
<longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription>
<use>
+ <flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+ <flag name="map">Enable items map display - experimental</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2019-12-10 21:36 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2019-12-10 21:36 UTC (permalink / raw
To: gentoo-commits
commit: bbb11689ce25f0c290c50905a0b5c40f82838bef
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 21:23:49 2019 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 21:34:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb11689
media-gfx/geeqie: drop old
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 2 -
media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch | 80 ------------------
media-gfx/geeqie/geeqie-1.4-r1.ebuild | 97 ----------------------
media-gfx/geeqie/geeqie-1.5.ebuild | 95 ---------------------
4 files changed, 274 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 95c4f2f3591..da65766b857 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,3 +1 @@
-DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
-DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
deleted file mode 100644
index b9a3bde0db2..00000000000
--- a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
-Date: Wed, 2 Jan 2019 01:04:45 +0100
-Subject: [PATCH] fix build against exiv2-0.27.x
-
-fixes #654
----
- src/exiv2.cc | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index b3c80657..f40b725e 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -22,17 +22,27 @@
-
- #ifdef HAVE_EXIV2
-
-+// 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 <exiv2/image.hpp>
- #include <exiv2/exif.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,6 +50,10 @@
- #include <fcntl.h>
- #include <sys/mman.h>
-
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define EXV_PACKAGE "exiv2"
-+#endif
-+
- #if !EXIV2_TEST_VERSION(0,17,90)
- #include <exiv2/tiffparser.hpp>
- #include <exiv2/tiffcomposite.hpp>
-@@ -374,7 +388,11 @@
- #endif
- Exiv2::Image *image = imageData_->image();
-
-- if (!image) Exiv2::Error(21);
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
-+#else
-+ if (!image) throw Exiv2::Error(21);
-+#endif
- image->setExifData(exifData_);
- image->setIptcData(iptcData_);
- #if EXIV2_TEST_VERSION(0,16,0)
-@@ -394,8 +412,12 @@
- 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
- }
- }
-
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
deleted file mode 100644
index 5cf44c8bfe1..00000000000
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-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 ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
-
-RDEPEND="
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- 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 )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
- map? ( gpu-accel )"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044
-
-src_prepare() {
- default
-
- # Missing from release tarball, and requires git tree to generate
- sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die
-
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- local myconf="--disable-dependency-tracking
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- $(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.md
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- 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"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild
deleted file mode 100644
index 5323596a4a9..00000000000
--- a/media-gfx/geeqie/geeqie-1.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-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 ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- 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 )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
- dev-util/glib-utils"
-BDEPEND="
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
- map? ( gpu-accel )"
-
-src_prepare() {
- default
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf="--disable-dependency-tracking
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- $(use_enable gpu-accel)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(use_enable map)
- $(use_enable nls)
- $(use_enable pdf)
- $(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.md
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- 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"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2022-10-20 11:42 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2022-10-20 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 21fc342983e74aa9f69f3f1293edba0d582d7ae1
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 11:41:40 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 11:41:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fc3429
media-gfx/geeqie: drop 1.5.1-r1, 1.6-r1, 1.6_p20211016, 1.7.2
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 4 -
.../geeqie/files/geeqie-1.5.1-no_common.patch | 75 -----------------
media-gfx/geeqie/files/geeqie-1.6-yelp.patch | 25 ------
media-gfx/geeqie/geeqie-1.5.1-r1.ebuild | 96 ---------------------
media-gfx/geeqie/geeqie-1.6-r1.ebuild | 91 --------------------
media-gfx/geeqie/geeqie-1.6_p20211016.ebuild | 97 ----------------------
media-gfx/geeqie/geeqie-1.7.2.ebuild | 95 ---------------------
media-gfx/geeqie/metadata.xml | 1 -
8 files changed, 484 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 103cf41721d8..212a13e2c4ee 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,7 +1,3 @@
-DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
-DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
-DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d
-DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d
DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
diff --git a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch
deleted file mode 100644
index 058e22686250..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 543ea6d903a50c353d9e129d380240f277a670aa Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 23 Jan 2020 08:24:52 +0000
-Subject: [PATCH] src/options: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
- CXXLD geeqie
-ld: ui_fileops.o:(.bss+0x0):
- multiple definition of `options'; ui_bookmark.o:(.bss+0x0): first defined here
-ld: ui_fileops.o:(.bss+0x8):
- multiple definition of `command_line'; ui_bookmark.o:(.bss+0x8): first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Anthony Parsons
-Bug: https://bugs.gentoo.org/706132
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/bar_exif.h | 3 ---
- src/options.c | 3 +++
- src/options.h | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/bar_exif.h b/src/bar_exif.h
-index 63c30d4b..1395e842 100644
---- a/src/bar_exif.h
-+++ b/src/bar_exif.h
-@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n
- void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);
-
- /* these are exposed for when duplication of the exif bar's text is needed */
--
--const gchar **bar_exif_key_list;
--const gint bar_exif_key_count;
- GList *bar_pane_exif_list();
-
- #endif
-diff --git a/src/options.c b/src/options.c
-index 99459381..bab26acb 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -32,6 +32,9 @@
- #include "ui_fileops.h"
- #include "window.h"
-
-+ConfOptions *options;
-+CommandLine *command_line;
-+
- ConfOptions *init_options(ConfOptions *options)
- {
- gint i;
-diff --git a/src/options.h b/src/options.h
-index fcfe961a..02ff8fac 100644
---- a/src/options.h
-+++ b/src/options.h
-@@ -329,8 +329,8 @@ struct _ConfOptions
- GList *disabled_plugins;
- };
-
--ConfOptions *options;
--CommandLine *command_line;
-+extern ConfOptions *options;
-+extern CommandLine *command_line;
-
- ConfOptions *init_options(ConfOptions *options);
- void setup_default_options(ConfOptions *options);
---
-2.25.0
-
diff --git a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch
deleted file mode 100644
index e1d7797d1d50..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a33d8c40e9e56597f68e83be3336036992996738 Mon Sep 17 00:00:00 2001
-From: Matthew Miller <mattdm@mattdm.org>
-Date: Thu, 8 Apr 2021 20:21:39 -0400
-Subject: [PATCH] Fix doc building with newer yelp
-
-This adds `-i`, because otherwise it will complain about missing files (which
-we copy into place later), and adds a trailing slash to the output directory,
-because `yelp-build` now puts the files into the wrong place otherwise.
----
- doc/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 3d044bd8..78b96233 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook icons
- html/GuideIndex.html: docbook/GuideIndex.xml
- rm -rf html; mkdir html; cp $(srcdir)/icons/* html/
- if [ -x "$(GNOME_DOC_TOOL)" ]; then \
-- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
-+ "$(GNOME_DOC_TOOL)" html -i -o html/ $(srcdir)/docbook/GuideIndex.xml ; \
- else \
- echo "yelp-tools not found, html is not built" ; \
- fi
diff --git a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
deleted file mode 100644
index ad5ba6872166..000000000000
--- a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single xdg
-
-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 ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( ${LUA_DEPS} )
- map? ( media-libs/libchamplain:0.12 )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- gpu-accel? ( gtk3 )
- map? ( gpu-accel )"
-
-PATCHES=( "${FILESDIR}"/${P}-no_common.patch )
-
-src_prepare() {
- default
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- $(use_enable gpu-accel)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(use_enable map)
- $(use_enable nls)
- $(use_enable pdf)
- $(use_enable tiff)
- )
-
- if use exif || use xmp; then
- myeconfargs+=( --enable-exiv2 )
- else
- myeconfargs+=( --disable-exiv2)
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -f "${D}/usr/share/doc/${PF}/COPYING"
- # Application needs access to the uncompressed file
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_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"
-}
diff --git a/media-gfx/geeqie/geeqie-1.6-r1.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild
deleted file mode 100644
index 39c6dc86cac5..000000000000
--- a/media-gfx/geeqie/geeqie-1.6-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single xdg
-
-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 ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp"
-
-RDEPEND="
- virtual/libintl
- x11-libs/gtk+:2
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( ${LUA_DEPS} )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${P}-yelp.patch )
-
-src_prepare() {
- default
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- --disable-gpu-accel
- --disable-gtk3
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- --disable-map
- $(use_enable nls)
- $(use_enable pdf)
- $(use_enable tiff)
- )
-
- if use exif || use xmp; then
- myeconfargs+=( --enable-exiv2 )
- else
- myeconfargs+=( --disable-exiv2)
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -f "${D}/usr/share/doc/${PF}/COPYING"
- # Application needs access to the uncompressed file
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_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"
-}
diff --git a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild b/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild
deleted file mode 100644
index 116b8a480772..000000000000
--- a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-MY_PV="0edb0f1265b193ec08ffbde7a1a7871526d29d92"
-# Needs full git checkout to generate ChangeLog, this tarball has it
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
- virtual/libintl
- x11-libs/gtk+:3
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( ${LUA_DEPS} )
- map? ( media-libs/libchamplain:0.12 )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- map? ( gpu-accel )"
-
-src_prepare() {
- default
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
- # Remove force rebuild of Lua API ref
- sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- --enable-gtk3
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- $(use_enable gpu-accel)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(use_enable map)
- $(use_enable nls)
- $(use_enable pdf)
- $(use_enable tiff)
- )
-
- if use exif || use xmp; then
- myeconfargs+=( --enable-exiv2 )
- else
- myeconfargs+=( --disable-exiv2)
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -f "${D}/usr/share/doc/${PF}/COPYING"
- # Application needs access to the uncompressed file
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_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"
-}
diff --git a/media-gfx/geeqie/geeqie-1.7.2.ebuild b/media-gfx/geeqie/geeqie-1.7.2.ebuild
deleted file mode 100644
index 60becabb68fa..000000000000
--- a/media-gfx/geeqie/geeqie-1.7.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
- virtual/libintl
- x11-libs/gtk+:3
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( ${LUA_DEPS} )
- map? ( media-libs/libchamplain:0.12 )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- map? ( gpu-accel )"
-
-src_prepare() {
- default
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
- # Remove force rebuild of Lua API ref
- sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- --enable-gtk3
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- $(use_enable gpu-accel)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(use_enable map)
- $(use_enable nls)
- $(use_enable pdf)
- $(use_enable tiff)
- )
-
- if use exif || use xmp; then
- myeconfargs+=( --enable-exiv2 )
- else
- myeconfargs+=( --disable-exiv2)
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -f "${D}/usr/share/doc/${PF}/COPYING" || die
- # Application needs access to the uncompressed file
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_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"
-}
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index 3ee5d0faec97..459105e7b023 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -9,7 +9,6 @@
<use>
<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
<flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
- <flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
<flag name="jpegxl">Enable support for JPEG XL image format</flag>
<flag name="map">Enable items GPS map display</flag>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2022-10-24 21:29 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2022-10-24 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 92f3e7f2f6f53346dfbebd12f75b5266bbfc97d5
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 21:28:54 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 21:29:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f3e7f2
media-gfx/geeqie: fix xxdi.pl support
Also sync doc drop from live ebuild
Closes: https://bugs.gentoo.org/878089
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 2 +-
media-gfx/geeqie/geeqie-2.0.1-r1.ebuild | 10 +++++-----
media-gfx/geeqie/geeqie-9999.ebuild | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
index 440de7189344..bf6a7d77975f 100644
--- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
@@ -14,4 +14,4 @@ diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/
cd "$(dirname "$1")" || return 1
-xxd -i "$(basename "$1")" "$build_dir/$2"
-+${XXD} "$(basename "$1")" "$build_dir/$2"
++${XXD} "$(basename "$1")" > "$build_dir/$2"
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
index 8a99ae4480da..7dcf1197b2ae 100644
--- a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
RDEPEND="gnome-extra/zenity
virtual/libintl
x11-libs/gtk+:3
djvu? ( app-text/djvu )
- doc? ( app-text/yelp-tools )
exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
heif? ( >=media-libs/libheif-1.3.2 )
@@ -28,8 +27,7 @@ RDEPEND="gnome-extra/zenity
jpeg? ( media-libs/libjpeg-turbo:= )
jpegxl? ( >=media-libs/libjxl-0.3.7 )
lcms? ( media-libs/lcms:2 )
- lua? ( ${LUA_DEPS}
- doc? ( app-doc/doxygen ) )
+ lua? ( ${LUA_DEPS} )
map? ( media-libs/clutter-gtk
media-libs/libchamplain:0.12[gtk] )
pdf? ( >=app-text/poppler-0.62[cairo] )
@@ -61,6 +59,9 @@ pkg_setup() {
src_prepare() {
default
+ # Disable doc build - not useful most of the time per upstream
+ sed -e "/subdir('doc')/d" -i meson.build || die
+
# Lua version
sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
}
@@ -71,7 +72,6 @@ src_configure() {
-Dgq_htmldir="share/doc/${PF}/html"
$(meson_use debug)
$(meson_feature djvu)
- $(meson_feature doc)
$(meson_feature exif exiv2)
$(meson_feature ffmpegthumbnailer videothumbnailer)
$(meson_feature heif)
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index ffac439db08a..9d85f853281b 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -55,6 +55,9 @@ pkg_setup() {
src_prepare() {
default
+ # Fix xxdi.pl support
+ sed -e 's/"$build_dir/> \0/' scripts/generate-ClayRGB1998-icc-h.sh || die
+
# Disable doc build - not useful most of the time per upstream
sed -e "/subdir('doc')/d" -i meson.build || die
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2023-08-21 6:52 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2023-08-21 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 82484bb5f8153ec6e46722f8f26e34acd2b492d5
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 06:51:22 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 06:52:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82484bb5
media-gfx/geeqie: backport support for exiv2-0.28.0
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../geeqie/files/geeqie-2.1-exiv2-0.28.0.patch | 151 +++++++++++++++++++++
media-gfx/geeqie/geeqie-2.1-r1.ebuild | 111 +++++++++++++++
2 files changed, 262 insertions(+)
diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
new file mode 100644
index 000000000000..13b6a171257d
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
@@ -0,0 +1,151 @@
+From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001
+From: Kevin Backhouse <kevinbackhouse@github.com>
+Date: Wed, 21 Jun 2023 12:23:33 +0100
+Subject: [PATCH] Add ExifData as extra argument to
+ exif_item_get_data_as_text().
+
+---
+ src/advanced-exif.cc | 2 +-
+ src/exif-common.cc | 2 +-
+ src/exif.cc | 8 ++++----
+ src/exif.h | 2 +-
+ src/exiv2.cc | 4 ++--
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
+index 79a54b12..e3d3067a 100644
+--- a/src/advanced-exif.cc
++++ b/src/advanced-exif.cc
+@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew)
+ tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item));
+ tag_name = exif_item_get_tag_name(item);
+ format = exif_item_get_format_name(item, TRUE);
+- text = exif_item_get_data_as_text(item);
++ text = exif_item_get_data_as_text(item, exif);
+ utf8_text = utf8_validate_or_convert(text);
+ g_free(text);
+ elements = g_strdup_printf("%d", exif_item_get_elements(item));
+diff --git a/src/exif-common.cc b/src/exif-common.cc
+index 6a4c9740..b6f07ca6 100644
+--- a/src/exif-common.cc
++++ b/src/exif-common.cc
+@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key)
+ if (key_valid) return text;
+
+ item = exif_get_item(exif, key);
+- if (item) return exif_item_get_data_as_text(item);
++ if (item) return exif_item_get_data_as_text(item, exif);
+
+ return nullptr;
+ }
+diff --git a/src/exif.cc b/src/exif.cc
+index 8708ff53..cda2cb1a 100644
+--- a/src/exif.cc
++++ b/src/exif.cc
+@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
+ return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
+ }
+
+-gchar *exif_item_get_data_as_text(ExifItem *item)
++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
+ {
+ return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
+ }
+@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key)
+ return NULL;
+ }
+
+-static void exif_write_item(FILE *f, ExifItem *item)
++static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif)
+ {
+ gchar *text;
+
+- text = exif_item_get_data_as_text(item);
++ text = exif_item_get_data_as_text(item, exif);
+ if (text)
+ {
+ gchar *tag = exif_item_get_tag_name(item);
+@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list)
+ item = (ExifItem*)(work->data);
+ work = work->next;
+
+- exif_write_item(f, item);
++ exif_write_item(f, item, exif);
+ }
+ }
+ g_fprintf(f, "----------------------------------------------------\n");
+diff --git a/src/exif.h b/src/exif.h
+index fcc7d8f5..4b03c201 100644
+--- a/src/exif.h
++++ b/src/exif.h
+@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len);
+ gchar *exif_item_get_description(ExifItem *item);
+ guint exif_item_get_format_id(ExifItem *item);
+ const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief);
+-gchar *exif_item_get_data_as_text(ExifItem *item);
++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif);
+ gint exif_item_get_integer(ExifItem *item, gint *value);
+ ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n);
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index 33b779e7..dc62e8e0 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
+ }
+
+
+-gchar *exif_item_get_data_as_text(ExifItem *item)
++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
+ {
+ try {
+ if (!item) return nullptr;
+ auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item);
+ #if EXIV2_TEST_VERSION(0,17,0)
+- return utf8_validate_or_convert(metadatum->print().c_str());
++ return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str());
+ #else
+ std::stringstream str;
+ Exiv2::Exifdatum *exifdatum;
+From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001
+From: Colin Clark <colin.clark@cclark.uk>
+Date: Wed, 21 Jun 2023 14:24:41 +0100
+Subject: [PATCH] Remove exiv2 0.28.0 restriction
+
+https://github.com/BestImageViewer/geeqie/pull/1119
+
+The bug was fixed in the above commit.
+---
+ meson.build | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a4cab49c..412399fe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -280,15 +280,7 @@ else
+ endif
+
+ exiv2_dep = []
+-# See https://github.com/BestImageViewer/geeqie/issues/1090
+-# for the reason for 0.28.0 exclusion
+-req_version = ['>=0.11', '!=0.28.0']
+-
+-req_version_str = ''
+-foreach req_version_str_ : req_version
+- req_version_str += req_version_str_
+-endforeach
+-
++req_version = '>=0.11'
+ option = get_option('exiv2')
+ if not option.disabled()
+ exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
+@@ -296,7 +288,7 @@ if not option.disabled()
+ conf_data.set('HAVE_EXIV2', 1)
+ summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
+ else
+- summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
++ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+ else
+ summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
new file mode 100644
index 000000000000..ef29faa38032
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson optfeature xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+
+RDEPEND="gnome-extra/zenity
+ virtual/libintl
+ x11-libs/gtk+:3
+ djvu? ( app-text/djvu )
+ exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+ heif? ( >=media-libs/libheif-1.3.2 )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpegxl? ( >=media-libs/libjxl-0.3.7:= )
+ lcms? ( media-libs/lcms:2 )
+ lua? ( ${LUA_DEPS} )
+ map? ( media-libs/clutter-gtk
+ media-libs/libchamplain:0.12[gtk] )
+ pdf? ( >=app-text/poppler-0.62[cairo] )
+ raw? ( >=media-libs/libraw-0.20:= )
+ spell? ( app-text/gspell )
+ tiff? ( media-libs/tiff:= )
+ webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
+ zip? ( >=app-arch/libarchive-3.4.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ || ( dev-util/xxdi app-editors/vim-core )
+ dev-util/glib-utils
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-lua_hpp.patch
+ "${FILESDIR}"/${P}-exiv2-0.28.0.patch
+)
+
+pkg_setup() {
+ # Do not require setting LUA_SINGLE_TARGET if lua is not used
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Disable doc build - not useful most of the time per upstream
+ sed -e "/subdir('doc')/d" -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dgq_helpdir="share/doc/${PF}"
+ -Dgq_htmldir="share/doc/${PF}/html"
+ $(meson_use debug)
+ $(meson_feature djvu)
+ $(meson_feature exif exiv2)
+ $(meson_feature ffmpegthumbnailer videothumbnailer)
+ $(meson_feature heif)
+ $(meson_feature jpeg)
+ $(meson_feature jpeg2k j2k)
+ $(meson_feature jpegxl)
+ $(meson_feature lcms cms)
+ $(meson_feature lua)
+ $(meson_feature map gps-map)
+ $(meson_feature pdf)
+ $(meson_feature raw libraw)
+ $(meson_feature spell)
+ $(meson_feature tiff)
+ $(meson_feature zip archive)
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ # Manually generated ChangeLog
+ dodoc "${WORKDIR}"/${P}-docs/*
+
+ # The application needs access to some uncompressed doc files.
+ docompress -x /usr/share/doc/${PF}/AUTHORS
+ docompress -x /usr/share/doc/${PF}/ChangeLog
+ docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
+ optfeature "Lens ID plugin" media-libs/exiftool
+ optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
+ optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
+ optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
+ optfeature "Print preview functionality" app-text/evince
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
@ 2024-07-16 20:27 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2024-07-16 20:27 UTC (permalink / raw
To: gentoo-commits
commit: c9c614a8e49431f59e273c6213bf1fcbfa9b8086
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 20:25:25 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 20:27:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c614a8
media-gfx/geeqie: drop 2.1-r1, 2.2, 2.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 6 -
.../geeqie/files/geeqie-2.1-exiv2-0.28.0.patch | 151 ---------------------
media-gfx/geeqie/files/geeqie-2.1-locale.patch | 22 ---
media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch | 19 ---
media-gfx/geeqie/files/geeqie-2.3-locale.patch | 11 --
media-gfx/geeqie/geeqie-2.1-r1.ebuild | 117 ----------------
media-gfx/geeqie/geeqie-2.2.ebuild | 115 ----------------
media-gfx/geeqie/geeqie-2.3.ebuild | 119 ----------------
8 files changed, 560 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index f2a4ecce649a..a8bb11e9e73c 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,8 +1,2 @@
-DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
-DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
-DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a
-DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
-DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943
-DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899
DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb
DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b
diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
deleted file mode 100644
index 13b6a171257d..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001
-From: Kevin Backhouse <kevinbackhouse@github.com>
-Date: Wed, 21 Jun 2023 12:23:33 +0100
-Subject: [PATCH] Add ExifData as extra argument to
- exif_item_get_data_as_text().
-
----
- src/advanced-exif.cc | 2 +-
- src/exif-common.cc | 2 +-
- src/exif.cc | 8 ++++----
- src/exif.h | 2 +-
- src/exiv2.cc | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
-index 79a54b12..e3d3067a 100644
---- a/src/advanced-exif.cc
-+++ b/src/advanced-exif.cc
-@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew)
- tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item));
- tag_name = exif_item_get_tag_name(item);
- format = exif_item_get_format_name(item, TRUE);
-- text = exif_item_get_data_as_text(item);
-+ text = exif_item_get_data_as_text(item, exif);
- utf8_text = utf8_validate_or_convert(text);
- g_free(text);
- elements = g_strdup_printf("%d", exif_item_get_elements(item));
-diff --git a/src/exif-common.cc b/src/exif-common.cc
-index 6a4c9740..b6f07ca6 100644
---- a/src/exif-common.cc
-+++ b/src/exif-common.cc
-@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key)
- if (key_valid) return text;
-
- item = exif_get_item(exif, key);
-- if (item) return exif_item_get_data_as_text(item);
-+ if (item) return exif_item_get_data_as_text(item, exif);
-
- return nullptr;
- }
-diff --git a/src/exif.cc b/src/exif.cc
-index 8708ff53..cda2cb1a 100644
---- a/src/exif.cc
-+++ b/src/exif.cc
-@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
- return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
- }
-
--gchar *exif_item_get_data_as_text(ExifItem *item)
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
- {
- return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
- }
-@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key)
- return NULL;
- }
-
--static void exif_write_item(FILE *f, ExifItem *item)
-+static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif)
- {
- gchar *text;
-
-- text = exif_item_get_data_as_text(item);
-+ text = exif_item_get_data_as_text(item, exif);
- if (text)
- {
- gchar *tag = exif_item_get_tag_name(item);
-@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list)
- item = (ExifItem*)(work->data);
- work = work->next;
-
-- exif_write_item(f, item);
-+ exif_write_item(f, item, exif);
- }
- }
- g_fprintf(f, "----------------------------------------------------\n");
-diff --git a/src/exif.h b/src/exif.h
-index fcc7d8f5..4b03c201 100644
---- a/src/exif.h
-+++ b/src/exif.h
-@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len);
- gchar *exif_item_get_description(ExifItem *item);
- guint exif_item_get_format_id(ExifItem *item);
- const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief);
--gchar *exif_item_get_data_as_text(ExifItem *item);
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif);
- gint exif_item_get_integer(ExifItem *item, gint *value);
- ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n);
-
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index 33b779e7..dc62e8e0 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
- }
-
-
--gchar *exif_item_get_data_as_text(ExifItem *item)
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
- {
- try {
- if (!item) return nullptr;
- auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item);
- #if EXIV2_TEST_VERSION(0,17,0)
-- return utf8_validate_or_convert(metadatum->print().c_str());
-+ return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str());
- #else
- std::stringstream str;
- Exiv2::Exifdatum *exifdatum;
-From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001
-From: Colin Clark <colin.clark@cclark.uk>
-Date: Wed, 21 Jun 2023 14:24:41 +0100
-Subject: [PATCH] Remove exiv2 0.28.0 restriction
-
-https://github.com/BestImageViewer/geeqie/pull/1119
-
-The bug was fixed in the above commit.
----
- meson.build | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a4cab49c..412399fe 100644
---- a/meson.build
-+++ b/meson.build
-@@ -280,15 +280,7 @@ else
- endif
-
- exiv2_dep = []
--# See https://github.com/BestImageViewer/geeqie/issues/1090
--# for the reason for 0.28.0 exclusion
--req_version = ['>=0.11', '!=0.28.0']
--
--req_version_str = ''
--foreach req_version_str_ : req_version
-- req_version_str += req_version_str_
--endforeach
--
-+req_version = '>=0.11'
- option = get_option('exiv2')
- if not option.disabled()
- exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
-@@ -296,7 +288,7 @@ if not option.disabled()
- conf_data.set('HAVE_EXIV2', 1)
- summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
- else
-- summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
-+ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
- endif
- else
- summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch
deleted file mode 100644
index 10ae6b0169c5..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@gatalith.at>
-Date: Sat, 17 Jun 2023 18:47:28 +0200
-Subject: [PATCH] Add missing header for setlocale().
-
----
- src/misc.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/misc.cc b/src/misc.cc
-index 9942605ce..a2ad3eb69 100644
---- a/src/misc.cc
-+++ b/src/misc.cc
-@@ -18,6 +18,8 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#include <locale.h>
-+
- #include "main.h"
- #include "misc.h"
-
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
deleted file mode 100644
index a0c816b5fb3c..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- src/lua.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/lua.cc b/src/lua.cc
-index 84aa549a..458b658a 100644
---- a/src/lua.cc
-+++ b/src/lua.cc
-@@ -24,9 +24,7 @@
-
- #define _XOPEN_SOURCE
-
--#include <lua.h>
--#include <lauxlib.h>
--#include <lualib.h>
-+#include <lua.hpp>
-
- #include <stdio.h>
- #include <glib.h>
diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
deleted file mode 100644
index 05f8bdcfdaea..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.3-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc
---- geeqie-2.3.orig/src/misc.cc 2024-03-06 16:56:22.000000000 +0100
-+++ geeqie-2.3/src/misc.cc 2024-03-25 21:03:18.655779225 +0100
-@@ -23,6 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
-+#include <clocale>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
deleted file mode 100644
index 2a7751b70258..000000000000
--- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
- https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
- virtual/libintl
- x11-libs/gtk+:3
- djvu? ( app-text/djvu )
- exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- heif? ( >=media-libs/libheif-1.3.2 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( >=media-libs/libjxl-0.3.7:= )
- lcms? ( media-libs/lcms:2 )
- lua? ( ${LUA_DEPS} )
- map? ( media-libs/clutter-gtk
- media-libs/libchamplain:0.12[gtk] )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- raw? ( >=media-libs/libraw-0.20:= )
- spell? ( app-text/gspell )
- tiff? ( media-libs/tiff:= )
- webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
- zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- || ( dev-util/xxdi app-editors/vim-core )
- dev-util/glib-utils
- sys-devel/gettext
- virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-locale.patch
- "${FILESDIR}"/${P}-lua_hpp.patch
- "${FILESDIR}"/${P}-exiv2-0.28.0.patch
-)
-
-pkg_setup() {
- # Do not require setting LUA_SINGLE_TARGET if lua is not used
- use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Disable doc build - not useful most of the time per upstream
- sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/585432
- # https://github.com/BestImageViewer/geeqie/issues/1270
- filter-lto
-
- local emesonargs=(
- -Dgq_helpdir="share/doc/${PF}"
- -Dgq_htmldir="share/doc/${PF}/html"
- $(meson_use debug)
- $(meson_feature djvu)
- $(meson_feature exif exiv2)
- $(meson_feature ffmpegthumbnailer videothumbnailer)
- $(meson_feature heif)
- $(meson_feature jpeg)
- $(meson_feature jpeg2k j2k)
- $(meson_feature jpegxl)
- $(meson_feature lcms cms)
- $(meson_feature lua)
- $(meson_feature map gps-map)
- $(meson_feature pdf)
- $(meson_feature raw libraw)
- $(meson_feature spell)
- $(meson_feature tiff)
- $(meson_feature zip archive)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Manually generated ChangeLog
- dodoc "${WORKDIR}"/${P}-docs/*
-
- # The application needs access to some uncompressed doc files.
- docompress -x /usr/share/doc/${PF}/AUTHORS
- docompress -x /usr/share/doc/${PF}/ChangeLog
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
- optfeature "Lens ID plugin" media-libs/exiftool
- optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
- optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
- optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
- optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild
deleted file mode 100644
index db97d02cdbaa..000000000000
--- a/media-gfx/geeqie/geeqie-2.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
- https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-# Doc build:
-# clone git at matching tag
-# mkdir build; ./gen_changelog.sh . build;
-# pandoc README.md -o build/README.html
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
- virtual/libintl
- x11-libs/gtk+:3
- djvu? ( app-text/djvu )
- exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- heif? ( >=media-libs/libheif-1.3.2 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( >=media-libs/libjxl-0.3.7:= )
- lcms? ( media-libs/lcms:2 )
- lua? ( ${LUA_DEPS} )
- map? ( media-libs/clutter-gtk
- media-libs/libchamplain:0.12[gtk] )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- raw? ( >=media-libs/libraw-0.20:= )
- spell? ( app-text/gspell )
- tiff? ( media-libs/tiff:= )
- webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
- zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- || ( dev-util/xxdi app-editors/vim-core )
- dev-util/glib-utils
- sys-devel/gettext
- virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-pkg_setup() {
- # Do not require setting LUA_SINGLE_TARGET if lua is not used
- use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Disable doc build - not useful most of the time per upstream
- sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/585432
- # https://github.com/BestImageViewer/geeqie/issues/1270
- filter-lto
-
- local emesonargs=(
- -Dgq_helpdir="share/doc/${PF}"
- -Dgq_htmldir="share/doc/${PF}/html"
- $(meson_use debug)
- $(meson_feature djvu)
- $(meson_feature exif exiv2)
- $(meson_feature ffmpegthumbnailer videothumbnailer)
- $(meson_feature heif)
- $(meson_feature jpeg)
- $(meson_feature jpeg2k j2k)
- $(meson_feature jpegxl)
- $(meson_feature lcms cms)
- $(meson_feature lua)
- $(meson_feature map gps-map)
- $(meson_feature pdf)
- $(meson_feature raw libraw)
- $(meson_feature spell)
- $(meson_feature tiff)
- $(meson_feature zip archive)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Manually generated ChangeLog
- dodoc "${WORKDIR}"/${P}-docs/*
-
- # The application needs access to some uncompressed doc files.
- docompress -x /usr/share/doc/${PF}/AUTHORS
- docompress -x /usr/share/doc/${PF}/ChangeLog
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
- optfeature "Lens ID plugin" media-libs/exiftool
- optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
- optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
- optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
- optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild
deleted file mode 100644
index dae22816e4fd..000000000000
--- a/media-gfx/geeqie/geeqie-2.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
- https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-# Doc build:
-# clone git at matching tag
-# mkdir build; ./gen_changelog.sh . build;
-# pandoc README.md -o build/README.html
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
- virtual/libintl
- x11-libs/gtk+:3
- djvu? ( app-text/djvu )
- exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- heif? ( >=media-libs/libheif-1.3.2 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( >=media-libs/libjxl-0.3.7:= )
- lcms? ( media-libs/lcms:2 )
- lua? ( ${LUA_DEPS} )
- map? ( media-libs/clutter-gtk
- media-libs/libchamplain:0.12[gtk] )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- raw? ( >=media-libs/libraw-0.20:= )
- spell? ( app-text/gspell )
- tiff? ( media-libs/tiff:= )
- webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
- zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- || ( dev-util/xxdi app-editors/vim-core )
- dev-util/glib-utils
- sys-devel/gettext
- virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch
- "${FILESDIR}"/${P}-locale.patch
- )
-
-pkg_setup() {
- # Do not require setting LUA_SINGLE_TARGET if lua is not used
- use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Disable doc build - not useful most of the time per upstream
- sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/585432
- # https://github.com/BestImageViewer/geeqie/issues/1270
- filter-lto
-
- local emesonargs=(
- -Dgq_helpdir="share/doc/${PF}"
- -Dgq_htmldir="share/doc/${PF}/html"
- $(meson_use debug)
- $(meson_feature djvu)
- $(meson_feature exif exiv2)
- $(meson_feature ffmpegthumbnailer videothumbnailer)
- $(meson_feature heif)
- $(meson_feature jpeg)
- $(meson_feature jpeg2k j2k)
- $(meson_feature jpegxl)
- $(meson_feature lcms cms)
- $(meson_feature lua)
- $(meson_feature map gps-map)
- $(meson_feature pdf)
- $(meson_feature raw libraw)
- $(meson_feature spell)
- $(meson_feature tiff)
- $(meson_feature zip archive)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Manually generated ChangeLog
- dodoc "${WORKDIR}"/${P}-docs/*
-
- # The application needs access to some uncompressed doc files.
- docompress -x /usr/share/doc/${PF}/AUTHORS
- docompress -x /usr/share/doc/${PF}/ChangeLog
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
- optfeature "Lens ID plugin" media-libs/exiftool
- optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
- optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
- optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
- optfeature "Print preview functionality" app-text/evince
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-16 20:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 20:27 [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2023-08-21 6:52 Bernard Cafarelli
2022-10-24 21:29 Bernard Cafarelli
2022-10-20 11:42 Bernard Cafarelli
2019-12-10 21:36 Bernard Cafarelli
2016-06-27 17:30 Bernard Cafarelli
2016-04-21 12:35 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox