* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2017-11-27 14:03 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2017-11-27 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 742e0eafb7aa138d3bfab98088bf6df39dfdabdc
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 14:03:01 2017 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 14:03:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742e0eaf
media-gfx/geeqie: drop old
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-gfx/geeqie/Manifest | 4 +-
.../files/geeqie-1.2.2-fix_keywords_gtk3.patch | 12 ---
.../files/geeqie-1.2.3-fix_keywords_gtk3.patch | 88 ----------------------
media-gfx/geeqie/geeqie-1.2.2-r2.ebuild | 75 ------------------
media-gfx/geeqie/geeqie-1.2.3-r1.ebuild | 77 -------------------
media-gfx/geeqie/geeqie-1.3.ebuild | 82 --------------------
6 files changed, 1 insertion(+), 337 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 9b4fe7af62e..51c758b516d 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,3 +1 @@
-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
+DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
deleted file mode 100644
index 99bc10d9b57..00000000000
--- a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/bar_keywords.c 2015-05-23 14:20:43.000000000 +0200
-+++ b/src/bar_keywords.c 2015-12-30 00:34:21.453531792 +0100
-@@ -1295,6 +1295,9 @@
- 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);
-+#if GTK_CHECK_VERSION(3,0,0)
-+ gtk_widget_set_size_request(pkd->widget, -1, 400);
-+#endif
- gtk_widget_show(hbox);
-
- scrolled = gtk_scrolled_window_new(NULL, NULL);
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
deleted file mode 100644
index 695effaffae..00000000000
--- a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
deleted file mode 100644
index de6fb6131af..00000000000
--- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-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 gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
- 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"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix_keywords_gtk3.patch
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # clutter does not compile, gps depends on clutter
- local myconf="--disable-dependency-tracking
- --with-readmedir=/usr/share/doc/${PF}
- --disable-clutter
- --disable-gps
- $(use_enable debug debug-log)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(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/geeqie-1.2.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
deleted file mode 100644
index 947373854fe..00000000000
--- a/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 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 gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
- 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"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix_keywords_gtk3.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}
- --disable-clutter
- --disable-gps
- $(use_enable debug debug-log)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(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/geeqie-1.3.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild
deleted file mode 100644
index c9e69adfdca..00000000000
--- a/media-gfx/geeqie/geeqie-1.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 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=/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"
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2024-09-25 8:02 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2024-09-25 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 5fab7f7a24c65dc936981b204cda628825e6b8c1
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 07:31:37 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 08:02:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fab7f7a
media-gfx/geeqie: add 2.5
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 2 +
.../geeqie/files/geeqie-2.5-test-ancillary.patch | 27 +++++
media-gfx/geeqie/geeqie-2.5.ebuild | 112 +++++++++++++++++++++
3 files changed, 141 insertions(+)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index a8bb11e9e73c..0b638975cbf3 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,2 +1,4 @@
DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb
DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b
+DIST geeqie-2.5-docs.tar.xz 395716 BLAKE2B 177130f3a5afbf5791372fc2550f4443456a2bb3aad755774cf337362c38b1b20183eda311e245493a0ad9b8975747721ec5639d46135a9ee3f27318db360126 SHA512 0b8f6b165ec0feb38c2479054b1fa079bd08f053cf439cf19e0419f11b1fa3ba533adbb781022f401f599f9d83aca44e8613d63b82b6848f14fc7076736b9d1a
+DIST geeqie-2.5.tar.xz 2224492 BLAKE2B 911ea2e338c470255c70e83257b693c51b1171ed24f4b737d291cfd5ff20d8b7b39ba69e46f831ede33ce30d41945bb3de754b2a1c245dcff98f16633f31e562 SHA512 c1be6c5d9f7f7609dfab97320d79a4830eb866f000c3c52ea8ab2b69a1ba793b322dbab3f614572e1d6fc815d64bfeaf3ddd39dd633a5c87d7008b6afe35be21
diff --git a/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch
new file mode 100644
index 000000000000..ce0802d418ca
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch
@@ -0,0 +1,27 @@
+diff -Naur geeqie-2.5.orig/meson.build geeqie-2.5/meson.build
+--- geeqie-2.5.orig/meson.build 2024-09-21 17:11:19.000000000 +0200
++++ geeqie-2.5/meson.build 2024-09-25 09:30:11.624093709 +0200
+@@ -844,12 +844,6 @@
+ summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+
+-# Ancillary files test
+-test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true)
+-test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100, suite : 'analysis')
+-
+-summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+-
+ # Unit tests
+ if conf_data.get('ENABLE_UNIT_TESTS', 0) == 1
+ test('Unit tests', isolate_test_sh, args: [geeqie_exe.full_path(), '--run-unit-tests'], suite : 'unit')
+diff -Naur geeqie-2.5.orig/scripts/untranslated-text.sh geeqie-2.5/scripts/untranslated-text.sh
+--- geeqie-2.5.orig/scripts/untranslated-text.sh 2024-09-21 17:11:19.000000000 +0200
++++ geeqie-2.5/scripts/untranslated-text.sh 2024-09-25 09:30:44.567101060 +0200
+@@ -68,6 +68,7 @@
+ MonoSpace
+ N_(
+ NikonTag
++Néstor
+ Pause
+ PixbufRenderer
+ PluginsMenu
diff --git a/media-gfx/geeqie/geeqie-2.5.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild
new file mode 100644
index 000000000000..8b572c0532f3
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 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="https://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.5-test-ancillary.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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2024-03-25 20:07 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2024-03-25 20:07 UTC (permalink / raw
To: gentoo-commits
commit: d7ce3a914c4c749f64fbbf5ee0a0ea8f2aee7674
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 20:07:07 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 20:07:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ce3a91
media-gfx/geeqie: fix musl compilation again
Closes: https://bugs.gentoo.org/927682
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-2.3-locale.patch | 11 +++++++++++
media-gfx/geeqie/geeqie-2.3.ebuild | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
new file mode 100644
index 000000000000..05f8bdcfdaea
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
@@ -0,0 +1,11 @@
+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.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild
index 2b9b96fbe6a9..dae22816e4fd 100644
--- a/media-gfx/geeqie/geeqie-2.3.ebuild
+++ b/media-gfx/geeqie/geeqie-2.3.ebuild
@@ -49,7 +49,9 @@ BDEPEND="
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch )
+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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2024-03-09 10:25 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2024-03-09 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 3bdf8d1bf7a753f7367a8274ec90026b47d34889
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 10:24:33 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 10:24:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bdf8d1b
media-gfx/geeqie: skip locally broken test
Closes: https://bugs.gentoo.org/926560
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch | 13 +++++++++++++
media-gfx/geeqie/geeqie-2.3.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch b/media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch
new file mode 100644
index 000000000000..4d02d8ef91af
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch
@@ -0,0 +1,13 @@
+diff -Naur geeqie-2.3.orig/meson.build geeqie-2.3/meson.build
+--- geeqie-2.3.orig/meson.build 2024-03-06 16:56:22.000000000 +0100
++++ geeqie-2.3/meson.build 2024-03-09 11:21:17.870229854 +0100
+@@ -742,9 +742,3 @@
+ else
+ summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+-
+-# Ancillary files test
+-test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true)
+-test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100)
+-
+-summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild
index db97d02cdbaa..2b9b96fbe6a9 100644
--- a/media-gfx/geeqie/geeqie-2.3.ebuild
+++ b/media-gfx/geeqie/geeqie-2.3.ebuild
@@ -49,6 +49,8 @@ BDEPEND="
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch )
+
pkg_setup() {
# Do not require setting LUA_SINGLE_TARGET if lua is not used
use lua && lua-single_pkg_setup
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2024-01-23 21:18 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2024-01-23 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 252054c821aa8caf844a1c61b79fc42deff53afc
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 21:18:06 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 21:18:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252054c8
media-gfx/geeqie: fix compilation with musl
Missing locale.h include, already fixed usptream in master
Closes: https://bugs.gentoo.org/921193
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-2.1-locale.patch | 22 ++++++++++++++++++++++
media-gfx/geeqie/geeqie-2.1-r1.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch
new file mode 100644
index 000000000000..10ae6b0169c5
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.1-locale.patch
@@ -0,0 +1,22 @@
+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/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
index 9acadcda8fe6..e19752f02bbd 100644
--- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
PATCHES=(
+ "${FILESDIR}"/${P}-locale.patch
"${FILESDIR}"/${P}-lua_hpp.patch
"${FILESDIR}"/${P}-exiv2-0.28.0.patch
)
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2024-01-11 11:57 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2024-01-11 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 7dbebf592df2cfac7e1e4ec51108a48074db132e
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 11:57:09 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 11:57:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbebf59
media-gfx/geeqie: drop 2.0.1-r4, 2.1
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 2 -
.../geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 17 ---
.../geeqie/files/geeqie-2.0.1-doc_option.patch | 81 ---------------
media-gfx/geeqie/geeqie-2.0.1-r4.ebuild | 115 ---------------------
media-gfx/geeqie/geeqie-2.1.ebuild | 110 --------------------
5 files changed, 325 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 633043002b47..2b1c26d88543 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,4 +1,2 @@
-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
DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
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
deleted file mode 100644
index bf6a7d77975f..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh
---- geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh 2022-08-12 11:32:26.000000000 +0200
-+++ geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh 2022-10-17 23:04:08.203219782 +0200
-@@ -12,9 +12,12 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
-+# Allow standalone replacement for xxd
-+command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i"
-+
- # To generate the required code, xxd has to run in the same folder as the source
- build_dir="$PWD"
-
- cd "$(dirname "$1")" || return 1
-
--xxd -i "$(basename "$1")" "$build_dir/$2"
-+${XXD} "$(basename "$1")" > "$build_dir/$2"
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
deleted file mode 100644
index e12ab036b4c9..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur geeqie-2.0.1.orig/doc/meson.build geeqie-2.0.1/doc/meson.build
---- geeqie-2.0.1.orig/doc/meson.build 2022-08-12 11:32:25.000000000 +0200
-+++ geeqie-2.0.1/doc/meson.build 2022-10-18 16:26:33.776338232 +0200
-@@ -20,21 +20,16 @@
- guideindex_ln = join_paths(destdir, 'index.html')
-
- # Not-found notification already handled by ../meson.build
--if gnome_doc_tool.found()
-+if not get_option('doc').disabled() and gnome_doc_tool.found()
- run_command(gnome_doc_tool, 'html', '-o', destdir, '-p', iconsdir, guideindex_xml, check : false)
- run_command(find_program('ln'), '-s', '-f', guideindex_html, guideindex_ln, check : false)
- endif
-
- install_subdir(destdir, install_dir : helpdir, exclude_directories : 'lua-api/latex')
-
--doxygen = find_program('doxygen', required : false)
--if doxygen.found()
-+if not get_option('doc').disabled() and doxygen.found()
- srcdir = join_paths(meson.source_root())
- destdir = join_paths(meson.build_root(), 'doc', 'html', 'lua-api')
-
- run_command(find_program('create-doxygen-lua-api.sh'), srcdir, destdir, check : false)
--
-- summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true)
--else
-- summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
- endif
-diff -Naur geeqie-2.0.1.orig/meson.build geeqie-2.0.1/meson.build
---- geeqie-2.0.1.orig/meson.build 2022-08-12 11:32:25.000000000 +0200
-+++ geeqie-2.0.1/meson.build 2022-10-18 16:25:38.063273607 +0200
-@@ -62,12 +62,6 @@
- # External programs
- gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true)
- glib_genmarshal = find_program('glib-genmarshal', required : true)
--gnome_doc_tool = find_program('yelp-build', required : false)
--if gnome_doc_tool.found()
-- summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true)
--else
-- summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true)
--endif
-
- debug = get_option('debug')
-
-@@ -138,6 +132,26 @@
- gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true)
- glib_dep = dependency('glib-2.0', version : '>=2.52', required: true)
-
-+#option = get_option('doc')
-+if not get_option('doc').disabled()
-+ gnome_doc_tool = find_program('yelp-build', required : false)
-+ if gnome_doc_tool.found()
-+ summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true)
-+ else
-+ summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true)
-+ endif
-+
-+ doxygen = find_program('doxygen', required : false)
-+ if doxygen.found()
-+ summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true)
-+ else
-+ summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
-+ endif
-+else
-+ summary({'help' : ['disabled - Help files created:', false]}, section : 'Documentation', bool_yn : true)
-+ summary({'lua-api' : ['disabled - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
-+endif
-+
- libarchive_dep = []
- req_version = '>=3.4.0'
- option = get_option('archive')
-diff -Naur geeqie-2.0.1.orig/meson_options.txt geeqie-2.0.1/meson_options.txt
---- geeqie-2.0.1.orig/meson_options.txt 2022-08-12 11:32:25.000000000 +0200
-+++ geeqie-2.0.1/meson_options.txt 2022-10-18 16:25:38.063273607 +0200
-@@ -26,6 +26,7 @@
- option('archive', type : 'feature', value : 'auto', description : 'archive files e.g. zip, gz')
- option('cms', type : 'feature', value : 'auto', description : 'color management system')
- option('djvu', type : 'feature', value : 'auto', description : 'djvu')
-+option('doc', type : 'feature', value : 'auto', description : 'doc')
- option('exiv2', type : 'feature', value : 'auto', description : 'exiv2')
- option('videothumbnailer', type : 'feature', value : 'auto', description : 'video thumbnailer')
- option('gps-map', type : 'feature', value : 'auto', description : 'gps map')
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
deleted file mode 100644
index ed4f98a13ba5..000000000000
--- a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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}-ChangeLog.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~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? ( >=media-libs/libwebp-0.6.1:= )
- 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}-allow_xxdi.patch
- "${FILESDIR}"/${P}-doc_option.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
-
- # Lua version
- sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -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 webp)
- $(meson_feature zip archive)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Manually generated ChangeLog
- dodoc "${WORKDIR}"/${P}-ChangeLog/*
-
- # 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.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild
deleted file mode 100644
index 51a0ef4fdf25..000000000000
--- a/media-gfx/geeqie/geeqie-2.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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
-)
-
-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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2023-07-07 16:45 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2023-07-07 16:45 UTC (permalink / raw
To: gentoo-commits
commit: fb6f43da4a1fa2c3d442baaa32016593bbe816e1
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 7 16:43:55 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Jul 7 16:45:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6f43da
media-gfx/geeqie: use lua.hpp to fix lua plugin compilation
This can be replaced later by upstream official fix
Bug: https://bugs.gentoo.org/909302
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch | 19 +++++++++++++++++++
media-gfx/geeqie/geeqie-2.1.ebuild | 7 ++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
new file mode 100644
index 000000000000..a0c816b5fb3c
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
@@ -0,0 +1,19 @@
+---
+ 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/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild
index 9553979fc1d4..62d485ca97b3 100644
--- a/media-gfx/geeqie/geeqie-2.1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.1.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}"/${P}-lua_hpp.patch
+)
+
pkg_setup() {
# Do not require setting LUA_SINGLE_TARGET if lua is not used
use lua && lua-single_pkg_setup
@@ -55,9 +59,6 @@ src_prepare() {
# 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
}
src_configure() {
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2022-10-18 14:57 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2022-10-18 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 93a6d36e174bd835bd6d81f34991dd88575024b3
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 14:40:28 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 14:56:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a6d36e
media-gfx/geeqie:
Do not check LUA_SINGLE_TARGET with USE=-lua
Add build option for doc
Fix USE=map dependencies (and remove USE=gpu-accel)
Closes: https://bugs.gentoo.org/877545
Closes: https://bugs.gentoo.org/877553
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../geeqie/files/geeqie-2.0.1-doc_option.patch | 81 ++++++++++++++++++++++
...{geeqie-2.0.1.ebuild => geeqie-2.0.1-r1.ebuild} | 28 +++++---
media-gfx/geeqie/geeqie-9999.ebuild | 32 +++++----
media-gfx/geeqie/metadata.xml | 4 +-
4 files changed, 118 insertions(+), 27 deletions(-)
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
new file mode 100644
index 000000000000..e12ab036b4c9
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
@@ -0,0 +1,81 @@
+diff -Naur geeqie-2.0.1.orig/doc/meson.build geeqie-2.0.1/doc/meson.build
+--- geeqie-2.0.1.orig/doc/meson.build 2022-08-12 11:32:25.000000000 +0200
++++ geeqie-2.0.1/doc/meson.build 2022-10-18 16:26:33.776338232 +0200
+@@ -20,21 +20,16 @@
+ guideindex_ln = join_paths(destdir, 'index.html')
+
+ # Not-found notification already handled by ../meson.build
+-if gnome_doc_tool.found()
++if not get_option('doc').disabled() and gnome_doc_tool.found()
+ run_command(gnome_doc_tool, 'html', '-o', destdir, '-p', iconsdir, guideindex_xml, check : false)
+ run_command(find_program('ln'), '-s', '-f', guideindex_html, guideindex_ln, check : false)
+ endif
+
+ install_subdir(destdir, install_dir : helpdir, exclude_directories : 'lua-api/latex')
+
+-doxygen = find_program('doxygen', required : false)
+-if doxygen.found()
++if not get_option('doc').disabled() and doxygen.found()
+ srcdir = join_paths(meson.source_root())
+ destdir = join_paths(meson.build_root(), 'doc', 'html', 'lua-api')
+
+ run_command(find_program('create-doxygen-lua-api.sh'), srcdir, destdir, check : false)
+-
+- summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true)
+-else
+- summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
+ endif
+diff -Naur geeqie-2.0.1.orig/meson.build geeqie-2.0.1/meson.build
+--- geeqie-2.0.1.orig/meson.build 2022-08-12 11:32:25.000000000 +0200
++++ geeqie-2.0.1/meson.build 2022-10-18 16:25:38.063273607 +0200
+@@ -62,12 +62,6 @@
+ # External programs
+ gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true)
+ glib_genmarshal = find_program('glib-genmarshal', required : true)
+-gnome_doc_tool = find_program('yelp-build', required : false)
+-if gnome_doc_tool.found()
+- summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true)
+-else
+- summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true)
+-endif
+
+ debug = get_option('debug')
+
+@@ -138,6 +132,26 @@
+ gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true)
+ glib_dep = dependency('glib-2.0', version : '>=2.52', required: true)
+
++#option = get_option('doc')
++if not get_option('doc').disabled()
++ gnome_doc_tool = find_program('yelp-build', required : false)
++ if gnome_doc_tool.found()
++ summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true)
++ else
++ summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true)
++ endif
++
++ doxygen = find_program('doxygen', required : false)
++ if doxygen.found()
++ summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true)
++ else
++ summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
++ endif
++else
++ summary({'help' : ['disabled - Help files created:', false]}, section : 'Documentation', bool_yn : true)
++ summary({'lua-api' : ['disabled - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
++endif
++
+ libarchive_dep = []
+ req_version = '>=3.4.0'
+ option = get_option('archive')
+diff -Naur geeqie-2.0.1.orig/meson_options.txt geeqie-2.0.1/meson_options.txt
+--- geeqie-2.0.1.orig/meson_options.txt 2022-08-12 11:32:25.000000000 +0200
++++ geeqie-2.0.1/meson_options.txt 2022-10-18 16:25:38.063273607 +0200
+@@ -26,6 +26,7 @@
+ option('archive', type : 'feature', value : 'auto', description : 'archive files e.g. zip, gz')
+ option('cms', type : 'feature', value : 'auto', description : 'color management system')
+ option('djvu', type : 'feature', value : 'auto', description : 'djvu')
++option('doc', type : 'feature', value : 'auto', description : 'doc')
+ option('exiv2', type : 'feature', value : 'auto', description : 'exiv2')
+ option('videothumbnailer', type : 'feature', value : 'auto', description : 'video thumbnailer')
+ option('gps-map', type : 'feature', value : 'auto', description : 'gps map')
diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
similarity index 85%
rename from media-gfx/geeqie/geeqie-2.0.1.ebuild
rename to media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
index 0e4c3907aa5c..8a99ae4480da 100644
--- a/media-gfx/geeqie/geeqie-2.0.1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
@@ -14,7 +14,7 @@ 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 gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
RDEPEND="gnome-extra/zenity
virtual/libintl
@@ -23,7 +23,6 @@ RDEPEND="gnome-extra/zenity
doc? ( app-text/yelp-tools )
exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
heif? ( >=media-libs/libheif-1.3.2 )
jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 )
jpeg? ( media-libs/libjpeg-turbo:= )
@@ -31,7 +30,8 @@ RDEPEND="gnome-extra/zenity
lcms? ( media-libs/lcms:2 )
lua? ( ${LUA_DEPS}
doc? ( app-doc/doxygen ) )
- map? ( media-libs/libchamplain:0.12 )
+ 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 )
@@ -46,13 +46,18 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- map? ( gpu-accel )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
PATCHES=(
- "${FILESDIR}/${P}-allow_xxdi.patch"
+ "${FILESDIR}"/${P}-allow_xxdi.patch
+ "${FILESDIR}"/${P}-doc_option.patch
)
+pkg_setup() {
+ # Do not require setting LUA_SINGLE_TARGET if lua is not used
+ use lua && lua-single_pkg_setup
+}
+
src_prepare() {
default
@@ -65,22 +70,23 @@ src_configure() {
-Dgq_helpdir="share/doc/${PF}"
-Dgq_htmldir="share/doc/${PF}/html"
$(meson_use debug)
- $(meson_feature zip archive)
- $(meson_feature lcms cms)
$(meson_feature djvu)
+ $(meson_feature doc)
$(meson_feature exif exiv2)
$(meson_feature ffmpegthumbnailer videothumbnailer)
- $(meson_feature gpu-accel gps-map)
$(meson_feature heif)
- $(meson_feature jpeg2k j2k)
$(meson_feature jpeg)
+ $(meson_feature jpeg2k j2k)
$(meson_feature jpegxl)
- $(meson_feature raw libraw)
+ $(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 webp)
+ $(meson_feature zip archive)
)
meson_src_configure
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index 2c4b54ad1991..5a49b5e60c1c 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
RDEPEND="gnome-extra/zenity
virtual/libintl
@@ -24,7 +24,6 @@ RDEPEND="gnome-extra/zenity
doc? ( app-text/yelp-tools )
exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
heif? ( >=media-libs/libheif-1.3.2 )
jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 )
jpeg? ( media-libs/libjpeg-turbo:= )
@@ -32,7 +31,8 @@ RDEPEND="gnome-extra/zenity
lcms? ( media-libs/lcms:2 )
lua? ( ${LUA_DEPS}
doc? ( app-doc/doxygen ) )
- map? ( media-libs/libchamplain:0.12 )
+ 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 )
@@ -47,13 +47,17 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- map? ( gpu-accel )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}/${PN}-2.0.1-allow_xxdi.patch"
)
+pkg_setup() {
+ # Do not require setting LUA_SINGLE_TARGET if lua is not used
+ use lua && lua-single_pkg_setup
+}
+
src_prepare() {
default
@@ -66,22 +70,23 @@ src_configure() {
-Dgq_helpdir="share/doc/${PF}"
-Dgq_htmldir="share/doc/${PF}/html"
$(meson_use debug)
- $(meson_feature zip archive)
- $(meson_feature lcms cms)
$(meson_feature djvu)
+ $(meson_feature doc)
$(meson_feature exif exiv2)
$(meson_feature ffmpegthumbnailer videothumbnailer)
- $(meson_feature gpu-accel gps-map)
$(meson_feature heif)
- $(meson_feature jpeg2k j2k)
$(meson_feature jpeg)
+ $(meson_feature jpeg2k j2k)
$(meson_feature jpegxl)
- $(meson_feature raw libraw)
+ $(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 webp)
+ $(meson_feature zip archive)
)
meson_src_configure
@@ -100,10 +105,9 @@ pkg_postinst() {
xdg_pkg_postinst
optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
- optfeature "Export JPEG plugin" media-gfx/exiv2
optfeature "Lens ID plugin" media-libs/exiftool
- optfeature "Image crop plugin" "media-gfx/exiv2 media-libs/exiftool media-gfx/imagemagick"
- optfeature "Image rotate plugin (JPEG)" "media-gfx/exiv2 media-gfx/fbida"
- optfeature "Image rotate plugin (TIFF/PNG)" "media-gfx/exiv2 media-gfx/imagemagick"
+ 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/metadata.xml b/media-gfx/geeqie/metadata.xml
index 684ebb361389..3ee5d0faec97 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -10,8 +10,8 @@
<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 files</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 map display - experimental</flag>
+ <flag name="map">Enable items GPS map display</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2022-10-17 21:39 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2022-10-17 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 5010be8da3881400821413ff328367933908331b
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Sat Aug 27 11:30:58 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 21:38:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5010be8d
media-gfx/geeqie: 2.0.1 bump version and major ebuild rewrite
It is now required to use the meson build system.
Multiple new USE flags (and some removed), this version only supports
gtk3
Closes: https://bugs.gentoo.org/866968
Closes: https://bugs.gentoo.org/877435
Package-Manager: Portage-3.0.30-r3, Repoman-3.0.3-r2
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/27033
Co-Authored-By:: Bernard Cafarelli <voyageur <AT> gentoo.org>
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 2 +
.../geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 17 ++++
media-gfx/geeqie/geeqie-2.0.1.ebuild | 110 +++++++++++++++++++++
media-gfx/geeqie/metadata.xml | 2 +
4 files changed, 131 insertions(+)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index bcf1bedba4d1..103cf41721d8 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -3,3 +3,5 @@ DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55ae
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-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
new file mode 100644
index 000000000000..440de7189344
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
@@ -0,0 +1,17 @@
+diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh
+--- geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh 2022-08-12 11:32:26.000000000 +0200
++++ geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh 2022-10-17 23:04:08.203219782 +0200
+@@ -12,9 +12,12 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
++# Allow standalone replacement for xxd
++command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i"
++
+ # To generate the required code, xxd has to run in the same folder as the source
+ build_dir="$PWD"
+
+ cd "$(dirname "$1")" || return 1
+
+-xxd -i "$(basename "$1")" "$build_dir/$2"
++${XXD} "$(basename "$1")" "$build_dir/$2"
diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild b/media-gfx/geeqie/geeqie-2.0.1.ebuild
new file mode 100644
index 000000000000..4f6f2af33d64
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.0.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 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/${P}-ChangeLog.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel 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 )
+ gpu-accel? ( media-libs/clutter-gtk )
+ 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}
+ doc? ( app-doc/doxygen ) )
+ map? ( media-libs/libchamplain:0.12 )
+ pdf? ( >=app-text/poppler-0.62[cairo] )
+ raw? ( >=media-libs/libraw-0.20 )
+ spell? ( app-text/gspell )
+ tiff? ( media-libs/tiff:0 )
+ webp? ( >=media-libs/libwebp-0.6.1 )
+ zip? ( >=app-arch/libarchive-3.4.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ || ( dev-util/xxdi app-editors/vim-core )
+ dev-util/glib-utils
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ map? ( gpu-accel )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-allow_xxdi.patch"
+)
+
+src_prepare() {
+ default
+
+ # Lua version
+ sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dgq_helpdir="share/doc/${PF}"
+ -Dgq_htmldir="share/doc/${PF}/html"
+ $(meson_use debug)
+ $(meson_feature zip archive)
+ $(meson_feature lcms cms)
+ $(meson_feature djvu)
+ $(meson_feature exif exiv2)
+ $(meson_feature ffmpegthumbnailer videothumbnailer)
+ $(meson_feature gpu-accel gps-map)
+ $(meson_feature heif)
+ $(meson_feature jpeg2k j2k)
+ $(meson_feature jpeg)
+ $(meson_feature jpegxl)
+ $(meson_feature raw libraw)
+ $(meson_feature lua)
+ $(meson_feature pdf)
+ $(meson_feature spell)
+ $(meson_feature tiff)
+ $(meson_feature webp)
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ # Manually generated ChangeLog
+ dodoc "${WORKDIR}"/${P}-ChangeLog/*
+
+ # 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/metadata.xml b/media-gfx/geeqie/metadata.xml
index 6bc08d24362e..684ebb361389 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -10,6 +10,8 @@
<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 files</flag>
+ <flag name="jpegxl">Enable support for JPEG XL image format</flag>
<flag name="map">Enable items map display - experimental</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2021-04-27 21:30 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2021-04-27 21:30 UTC (permalink / raw
To: gentoo-commits
commit: b2432b263b4f698572288e0444b6b7ce8e918bfa
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 21:24:42 2021 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 21:29:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2432b26
media-gfx/geeqie: fix install with newer yelp
Closes: https://bugs.gentoo.org/785142
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-1.6-yelp.patch | 25 +++++++++++++++++++++++++
media-gfx/geeqie/geeqie-1.6.ebuild | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch
new file mode 100644
index 00000000000..e1d7797d1d5
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch
@@ -0,0 +1,25 @@
+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.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild
index 39216c02793..1ba491ef5cd 100644
--- a/media-gfx/geeqie/geeqie-1.6.ebuild
+++ b/media-gfx/geeqie/geeqie-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,8 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
gpu-accel? ( gtk3 )
map? ( gpu-accel )"
+PATCHES=( "${FILESDIR}"/${P}-yelp.patch )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2020-01-24 14:16 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2020-01-24 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 0ad537e99690027d0f2c80609e968ff42b0e0778
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 14:02:59 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 14:03:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad537e9
media-gfx/geeqie: fix build with -fno-common/gcc10, thanks slyfox
Also sync stable and live ebuilds
Closes: https://bugs.gentoo.org/706132
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../geeqie/files/geeqie-1.5.1-no_common.patch | 75 ++++++++++++++++++++++
media-gfx/geeqie/geeqie-1.5.1.ebuild | 22 ++++---
media-gfx/geeqie/geeqie-9999.ebuild | 9 ++-
3 files changed, 94 insertions(+), 12 deletions(-)
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
new file mode 100644
index 00000000000..058e2268625
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch
@@ -0,0 +1,75 @@
+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/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
index 88c65fbe11e..85d8651bf87 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,9 +30,9 @@ RDEPEND="
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"
+DEPEND="${RDEPEND}"
BDEPEND="
+ dev-util/glib-utils
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )"
@@ -40,6 +40,8 @@ BDEPEND="
REQUIRED_USE="gpu-accel? ( gtk3 )
map? ( gpu-accel )"
+PATCHES=( "${FILESDIR}"/${P}-no_common.patch )
+
src_prepare() {
default
@@ -50,7 +52,8 @@ src_prepare() {
}
src_configure() {
- local myconf="--disable-dependency-tracking
+ local myeconfargs=(
+ --disable-dependency-tracking
--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
$(use_enable debug debug-log)
$(use_enable ffmpegthumbnailer)
@@ -63,19 +66,20 @@ src_configure() {
$(use_enable map)
$(use_enable nls)
$(use_enable pdf)
- $(use_enable tiff)"
+ $(use_enable tiff)
+ )
if use exif || use xmp; then
- myconf="${myconf} --enable-exiv2"
+ myeconfargs+=( --enable-exiv2 )
else
- myconf="${myconf} --disable-exiv2"
+ myeconfargs+=( --disable-exiv2)
fi
- econf ${myconf}
+ econf "${myeconfargs[@]}"
}
src_install() {
- emake DESTDIR="${D}" install
+ default
rm -f "${D}/usr/share/doc/${PF}/COPYING"
# Application needs access to the uncompressed file
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index f40ac89c824..a0e3b2f1b76 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map tiff xmp"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
RDEPEND="
virtual/libintl
@@ -28,6 +28,7 @@ RDEPEND="
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:= ) )"
@@ -35,8 +36,8 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-util/glib-utils
dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
REQUIRED_USE="gpu-accel? ( gtk3 )
map? ( gpu-accel )"
@@ -63,6 +64,8 @@ src_configure() {
$(use_enable lua)
$(use_enable lirc)
$(use_enable map)
+ $(use_enable nls)
+ $(use_enable pdf)
$(use_enable tiff)
)
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2019-03-17 13:22 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2019-03-17 13:22 UTC (permalink / raw
To: gentoo-commits
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"
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2019-01-10 21:54 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2019-01-10 21:54 UTC (permalink / raw
To: gentoo-commits
commit: b9c04877a81a1355e6ef3b75129374734f4ed842
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 21:22:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 21:54:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c04877
media-gfx/geeqie: Fix build with exiv2-0.27
Patch is already upstream, see also:
https://github.com/BestImageViewer/geeqie/issues/654
Closes: https://bugs.gentoo.org/674044
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch | 80 ++++++++++++++++++++++
media-gfx/geeqie/geeqie-1.4-r1.ebuild | 4 +-
2 files changed, 83 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..b9a3bde0db2
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
@@ -0,0 +1,80 @@
+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
index 3080dded12b..a503145669b 100644
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="gpu-accel? ( gtk3 )
map? ( gpu-accel )"
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2016-04-13 9:14 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2016-04-13 9:14 UTC (permalink / raw
To: gentoo-commits
commit: e0dc868530cd2b24e4a66ce4eeef12c126429b1e
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 09:13:23 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 09:13:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dc8685
media-gfx/geeqie: drop old versions
Package-Manager: portage-2.2.28
media-gfx/geeqie/Manifest | 2 -
.../files/geeqie-1.2-fix-lcms2-integration.patch | 35 ----------
.../geeqie/files/geeqie-1.2-fix_version.patch | 11 ---
media-gfx/geeqie/geeqie-1.2-r1.ebuild | 79 ----------------------
media-gfx/geeqie/geeqie-1.2.1.ebuild | 71 -------------------
media-gfx/geeqie/geeqie-1.2.2-r1.ebuild | 74 --------------------
media-gfx/geeqie/geeqie-1.2.2.ebuild | 71 -------------------
7 files changed, 343 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 4c72771..cb93df5 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,4 +1,2 @@
-DIST geeqie-1.2.1.tar.gz 1943377 SHA256 4611edfb25147d8cc98c0b64bef14a8fc7ab0996b662a1e19097eae21f6bf1d9 SHA512 d14069a333eb49f2bba1865d19facf2731b8d46fb95727c168cdb035bb8dcec55440f57170ed67e6d52349e92141066ea2293ca2040622970b30a3505a6902a4 WHIRLPOOL 85624263ebcaf8de54a4847110761cadc0b01a347b221ff9c303b63d556b8c62fd468d3426a98dabb01b035ebc442cab0075fa525660c9410662f12a95cbc1b7
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.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0
diff --git a/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch b/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch
deleted file mode 100644
index 5f13c92..0000000
--- a/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a1afabd3ce740872a857234b91eeb64fcf239f6a Mon Sep 17 00:00:00 2001
-From: Klaus Ethgen <Klaus@Ethgen.de>
-Date: Sat, 27 Sep 2014 12:07:10 +0100
-Subject: [PATCH] Fix lcms2 integration
-
-Thanks Michael Schwendt <mschwendt@gmail.com> for the bug reporting and
-the patch.
----
- src/color-man.c | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/color-man.c b/src/color-man.c
-index 7788c7a..e4f1bab 100644
---- a/src/color-man.c
-+++ b/src/color-man.c
-@@ -432,10 +432,12 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p
- if (profile)
- {
- #ifdef HAVE_LCMS2
-- cmsUInt8Number profileID[17];
-- profileID[16] = '\0';
-- cmsGetHeaderProfileID(profile, profileID);
-- return g_strdup((gchar *) profileID);
-+ cmsUInt32Number r;
-+ char buffer[20];
-+ buffer[0] = '\0';
-+ r = cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", &buffer, 20);
-+ buffer[19] = '\0'; /* Just to be sure */
-+ return g_strdup(buffer);
- #else
- return g_strdup(cmsTakeProductName(profile));
- #endif
---
-1.7.1
-
diff --git a/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch b/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch
deleted file mode 100644
index 1d40ea0..0000000
--- a/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig 2014-10-26 20:33:53.431516625 +0100
-+++ configure.in 2014-10-26 20:33:58.790520392 +0100
-@@ -15,7 +15,7 @@
- dnl GNU General Public License for more details.
-
- AC_PREREQ(2.57)
--AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net)
-+AC_INIT(geeqie, 1.2, geeqie-devel@lists.sourceforge.net)
-
- # Check for rightly dirs
- AC_CONFIG_SRCDIR([src/main.c])
diff --git a/media-gfx/geeqie/geeqie-1.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
deleted file mode 100644
index a3a810d..0000000
--- a/media-gfx/geeqie/geeqie-1.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools base eutils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-# Grab from tag snapshot: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc exif jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="x11-libs/gtk+:2
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
- 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"
-
-S=${WORKDIR}/${PN}-${PN}
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-lcms2-integration.patch
- "${FILESDIR}"/${P}-fix_version.patch
-)
-
-src_prepare() {
- base_src_prepare
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # Force disable experimental stuff
- local myconf="--disable-dependency-tracking
- --with-readmedir=/usr/share/doc/${PF}
- --disable-gtk3
- --disable-clutter
- --disable-gps
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(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/${MY_P}/COPYING"
-}
-
-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.2.1.ebuild b/media-gfx/geeqie/geeqie-1.2.1.ebuild
deleted file mode 100644
index b654441..0000000
--- a/media-gfx/geeqie/geeqie-1.2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-# Grab from tag snapshot: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc exif gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
- 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"
-
-src_prepare() {
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # Force disable experimental stuff
- local myconf="--disable-dependency-tracking
- --with-readmedir=/usr/share/doc/${PF}
- --disable-clutter
- --disable-gps
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(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/${MY_P}/COPYING"
-}
-
-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.2.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
deleted file mode 100644
index d60ed58..0000000
--- a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-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 gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
- 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"
-
-src_prepare() {
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # clutter does not compile, gps depends on clutter
- local myconf="--disable-dependency-tracking
- --with-readmedir=/usr/share/doc/${PF}
- --disable-clutter
- --disable-gps
- $(use_enable debug debug-log)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(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/geeqie-1.2.2.ebuild b/media-gfx/geeqie/geeqie-1.2.2.ebuild
deleted file mode 100644
index 9212c0f..0000000
--- a/media-gfx/geeqie/geeqie-1.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-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 gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
- 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"
-
-src_prepare() {
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # clutter does not compile, gps depends on clutter
- local myconf="--disable-dependency-tracking
- --with-readmedir=/usr/share/doc/${PF}
- --disable-clutter
- --disable-gps
- $(use_enable debug debug-log)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(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/${MY_P}/COPYING"
-}
-
-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"
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
@ 2016-01-04 9:27 Bernard Cafarelli
0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2016-01-04 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 4c6a7c9c7a0c89ed5ca0fa78a49991ea37f6a2d9
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 09:27:03 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 09:27:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6a7c9c
media-gfx/geeqie: fix keywords widget with GTK3
Patch provided by Tomasz Golinski <tomaszg <AT> alpha.uwb.edu.pl>
Bug: 561912
Package-Manager: portage-2.2.26
.../files/geeqie-1.2.2-fix_keywords_gtk3.patch | 12 ++++
media-gfx/geeqie/geeqie-1.2.2-r2.ebuild | 76 ++++++++++++++++++++++
2 files changed, 88 insertions(+)
diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
new file mode 100644
index 0000000..99bc10d
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
@@ -0,0 +1,12 @@
+--- a/src/bar_keywords.c 2015-05-23 14:20:43.000000000 +0200
++++ b/src/bar_keywords.c 2015-12-30 00:34:21.453531792 +0100
+@@ -1295,6 +1295,9 @@
+ 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);
++#if GTK_CHECK_VERSION(3,0,0)
++ gtk_widget_set_size_request(pkd->widget, -1, 400);
++#endif
+ gtk_widget_show(hbox);
+
+ scrolled = gtk_scrolled_window_new(NULL, NULL);
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
new file mode 100644
index 0000000..91b99a3
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+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 gtk3 jpeg lcms lirc lua tiff xmp"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ virtual/libintl
+ doc? ( app-text/gnome-doc-utils )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ lirc? ( app-misc/lirc )
+ lua? ( >=dev-lang/lua-5.1:= )
+ 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"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix_keywords_gtk3.patch
+
+ epatch_user
+
+ eautoreconf
+}
+
+src_configure() {
+ # clutter does not compile, gps depends on clutter
+ local myconf="--disable-dependency-tracking
+ --with-readmedir=/usr/share/doc/${PF}
+ --disable-clutter
+ --disable-gps
+ $(use_enable debug debug-log)
+ $(use_enable gtk3)
+ $(use_enable jpeg)
+ $(use_enable lcms)
+ $(use_enable lua)
+ $(use_enable lirc)
+ $(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"
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-09-25 8:02 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-27 14:03 [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2024-09-25 8:02 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-03-17 13:22 Andreas Sturmlechner
2019-01-10 21:54 Andreas Sturmlechner
2016-04-13 9:14 Bernard Cafarelli
2016-01-04 9:27 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox