From 1580a6fcf153bbf453221965d6340dfb19ad3db0 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 21 Apr 2016 14:35:03 +0200 Subject: media-gfx/geeqie: use upstream fix for gtk3 support Suggested by Tomasz Golinski in bug #579744 Package-Manager: portage-2.2.28 --- .../files/geeqie-1.2.3-fix_keywords_gtk3.patch | 88 ++++++++++++++++++++++ media-gfx/geeqie/geeqie-1.2.3-r1.ebuild | 78 +++++++++++++++++++ media-gfx/geeqie/geeqie-1.2.3.ebuild | 78 ------------------- 3 files changed, 166 insertions(+), 78 deletions(-) create mode 100644 media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch create mode 100644 media-gfx/geeqie/geeqie-1.2.3-r1.ebuild delete mode 100644 media-gfx/geeqie/geeqie-1.2.3.ebuild 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 +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: + + + +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-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild new file mode 100644 index 000000000000..fd71ec30a744 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org" +SRC_URI="http://www.geeqie.org/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif 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.2.3.ebuild b/media-gfx/geeqie/geeqie-1.2.3.ebuild deleted file mode 100644 index f5eb2d9e47ce..000000000000 --- a/media-gfx/geeqie/geeqie-1.2.3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit autotools - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org" -SRC_URI="http://www.geeqie.org/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc exif 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}"/${PN}-1.2.2-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" -} -- cgit v1.2.3