commit: 0c2e1a1bbf9ca79f49ba3ba20e20ee6c6922b3ad
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 7 10:10:35 2025 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Jun 7 10:10:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2e1a1b
media-gfx/geeqie: backport some upstream fixes
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../geeqie/files/geeqie-2.6-incorrect_init.patch | 25 +++++++++++++++++
.../geeqie/files/geeqie-2.6-start_thumbnail.patch | 31 ++++++++++++++++++++++
.../{geeqie-2.6.ebuild => geeqie-2.6-r1.ebuild} | 5 +++-
3 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/media-gfx/geeqie/files/geeqie-2.6-incorrect_init.patch
b/media-gfx/geeqie/files/geeqie-2.6-incorrect_init.patch
new file mode 100644
index 000000000000..925c44e69dc9
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.6-incorrect_init.patch
@@ -0,0 +1,25 @@
+From 609904da196d833d1657e8eda51f31528373c281 Mon Sep 17 00:00:00 2001
+From: Colin Clark <[email protected]>
+Date: Tue, 27 May 2025 11:10:36 +0100
+Subject: [PATCH] Fix #1743: Slow since 2.6
+
+https://github.com/BestImageViewer/geeqie/issues/1743
+
+Incorrect init. function used.
+---
+ src/main.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cc b/src/main.cc
+index 41e37b69..9365a729 100644
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -1053,7 +1053,7 @@ gint main(gint argc, gchar *argv[])
+
+ if (!gq_disable_clutter || tolower(gq_disable_clutter[0]) != 'y')
+ {
+- if (clutter_init(nullptr, nullptr) != CLUTTER_INIT_SUCCESS)
++ if (gtk_clutter_init(nullptr, nullptr) != CLUTTER_INIT_SUCCESS)
+ {
+ fprintf(stderr,
+ _("Can't initialize clutter-gtk. \n \
diff --git a/media-gfx/geeqie/files/geeqie-2.6-start_thumbnail.patch
b/media-gfx/geeqie/files/geeqie-2.6-start_thumbnail.patch
new file mode 100644
index 000000000000..c16cdc9920fe
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.6-start_thumbnail.patch
@@ -0,0 +1,31 @@
+From 0dd297128f1843e5700ed3f0d8b95d3056a3d5a3 Mon Sep 17 00:00:00 2001
+From: Colin Clark <[email protected]>
+Date: Tue, 3 Jun 2025 15:09:04 +0100
+Subject: [PATCH] Fix #1765: No thumbnails shown in browser view on geeqie
+ start
+
+https://github.com/BestImageViewer/geeqie/issues/1765
+
+Not a fix, just a workaround.
+---
+ src/main.cc | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/main.cc b/src/main.cc
+index 9600cd42..6345533f 100644
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -892,6 +892,13 @@ void activate_cb(GtkApplication *, gpointer)
+ if (lw->window)
+ {
+ gtk_widget_show(lw->window);
++
++ /** @FIXME This is not a fix - it is a workaround
++ * https://github.com/BestImageViewer/geeqie/issues/1765
++ * The reason for the bug is unknown.
++ * The origin is in commit 0ec522a0 - convert Geeqie to
GtkApplication
++ */
++ layout_refresh(lw);
+ }
+ }
+
diff --git a/media-gfx/geeqie/geeqie-2.6.ebuild
b/media-gfx/geeqie/geeqie-2.6-r1.ebuild
similarity index 95%
rename from media-gfx/geeqie/geeqie-2.6.ebuild
rename to media-gfx/geeqie/geeqie-2.6-r1.ebuild
index 88724a7ef994..ba2aa1e66664 100644
--- a/media-gfx/geeqie/geeqie-2.6.ebuild
+++ b/media-gfx/geeqie/geeqie-2.6-r1.ebuild
@@ -49,7 +49,10 @@ BDEPEND="
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-PATCHES=( "${FILESDIR}"/${PN}-2.5-test-ancillary.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.5-test-ancillary.patch
+ "${FILESDIR}"/${P}-incorrect_init.patch
+ "${FILESDIR}"/${P}-start_thumbnail.patch
+ )
pkg_setup() {
# Do not require setting LUA_SINGLE_TARGET if lua is not used
