media-gfx/geeqie: use upstream fix for gtk3 support

Suggested by Tomasz Golinski in bug #579744

Package-Manager: portage-2.2.28

2 files changed, 89 insertions, 1 deletions

diff --git a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
new file mode 100644
index 000000000000..695effaffaef
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
@@ -0,0 +1,88 @@
+From a174e816ae993e7ee9731651b2674dbfdec9ed95 Mon Sep 17 00:00:00 2001
+From: Colin Clark <cclark@mcb.net>
+Date: Wed, 30 Mar 2016 15:36:32 +0100
+Subject: [PATCH] Bug fix #227 + enable user to set height of Keywords pane
+
+Bug #227 Keywords section of Info sidebar doesn't work on GTK3 build
+https://sourceforge.net/p/geeqie/bugs/227/
+
+Permit the user to set the height of the Keywords pane in the Info
+sidebar by editing the line:
+
+<pane_keywords id = "keywords" title = "Keywords" expanded = "true" key
+= "Xmp.dc.subject" height = "200"/>
+
+in the configuration file geeqierc.xml
+---
+ src/bar_keywords.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/bar_keywords.c b/src/bar_keywords.c
+index f58f348..0eee90c 100644
+--- a/src/bar_keywords.c
++++ b/src/bar_keywords.c
+@@ -113,6 +113,7 @@ struct _PaneKeywordsData
+ 	guint idle_id; /* event source id */
+ 	FileData *fd;
+ 	gchar *key;
++	gint height;
+ };
+ 
+ typedef struct _ConfDialogData ConfDialogData;
+@@ -249,6 +250,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
+ 	write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pkd->pane.title)));
+ 	WRITE_BOOL(pkd->pane, expanded);
+ 	WRITE_CHAR(*pkd, key);
++	WRITE_INT(*pkd, height);
+ 	WRITE_STRING("/>");
+ }
+ 
+@@ -1263,7 +1265,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data)
+ }
+ 
+ 
+-static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded)
++static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height)
+ {
+ 	PaneKeywordsData *pkd;
+ 	GtkWidget *hbox;
+@@ -1285,6 +1287,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
+ 
+ 	pkd->pane.expanded = expanded;
+ 
++	pkd->height = height;
+ 	pkd->key = g_strdup(key);
+ 
+ 	pkd->expand_checked = TRUE;
+@@ -1295,6 +1298,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
+ 	g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
+ 	g_signal_connect(G_OBJECT(pkd->widget), "destroy",
+ 			 G_CALLBACK(bar_pane_keywords_destroy), pkd);
++	gtk_widget_set_size_request(pkd->widget, -1, height);
+ 	gtk_widget_show(hbox);
+ 
+ 	scrolled = gtk_scrolled_window_new(NULL, NULL);
+@@ -1417,6 +1421,7 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
+ 	gchar *title = NULL;
+ 	gchar *key = g_strdup(COMMENT_KEY);
+ 	gboolean expanded = TRUE;
++	gint height = 200;
+ 	GtkWidget *ret;
+ 
+ 	while (*attribute_names)
+@@ -1428,13 +1433,14 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
+ 		if (READ_CHAR_FULL("title", title)) continue;
+ 		if (READ_CHAR_FULL("key", key)) continue;
+ 		if (READ_BOOL_FULL("expanded", expanded)) continue;
++		if (READ_INT_FULL("height", height)) continue;
+ 
+ 
+ 		log_printf("unknown attribute %s = %s\n", option, value);
+ 		}
+ 
+ 	bar_pane_translate_title(PANE_KEYWORDS, id, &title);
+-	ret = bar_pane_keywords_new(id, title, key, expanded);
++	ret = bar_pane_keywords_new(id, title, key, expanded, height);
+ 	g_free(id);
+ 	g_free(title);
+ 	g_free(key);
diff --git a/media-gfx/geeqie/geeqie-1.2.3.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
index f5eb2d9e47ce..fd71ec30a744 100644
--- a/media-gfx/geeqie/geeqie-1.2.3.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.2-fix_keywords_gtk3.patch
+	"${FILESDIR}"/${P}-fix_keywords_gtk3.patch
 )
 
 src_prepare() {