diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2012-06-15 09:36:53 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-06-15 09:36:53 +0000 |
commit | fa82f290dcbd4bfd5c849a82e83571a92cd867a5 (patch) | |
tree | 5451859ece4741d5f2b6ed1e495fb91a9b3e9906 /media-gfx/geeqie | |
parent | Stable for amd64, wrt bug #420725 (diff) | |
download | gentoo-2-fa82f290dcbd4bfd5c849a82e83571a92cd867a5.tar.gz gentoo-2-fa82f290dcbd4bfd5c849a82e83571a92cd867a5.tar.bz2 gentoo-2-fa82f290dcbd4bfd5c849a82e83571a92cd867a5.zip |
Fix scrolling when walking up directory list with upstream bugtracker patch, bug #420891. Switch to base eclass and PATCHES list
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/geeqie')
-rw-r--r-- | media-gfx/geeqie/ChangeLog | 9 | ||||
-rw-r--r-- | media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch | 22 | ||||
-rw-r--r-- | media-gfx/geeqie/geeqie-1.0-r4.ebuild | 69 |
3 files changed, 99 insertions, 1 deletions
diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog index bafc5ef1d494..4cf0a2f9da89 100644 --- a/media-gfx/geeqie/ChangeLog +++ b/media-gfx/geeqie/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/geeqie # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.22 2012/06/07 23:08:30 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.23 2012/06/15 09:36:53 voyageur Exp $ + +*geeqie-1.0-r4 (15 Jun 2012) + + 15 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org> +geeqie-1.0-r4.ebuild, + +files/geeqie-1.0-up_path_restore.patch: + Fix scrolling when walking up directory list with upstream bugtracker patch, + bug #420891. Switch to base eclass and PATCHES list *geeqie-1.0-r3 (07 Jun 2012) diff --git a/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch b/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch new file mode 100644 index 000000000000..22cc71d129f5 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch @@ -0,0 +1,22 @@ +Index: src/view_dir_list.c +=================================================================== +--- src/view_dir_list.c (revision 1917) ++++ src/view_dir_list.c (working copy) +@@ -309,7 +309,7 @@ + base = remove_level_from_path(vd->dir_fd->path); + if (strcmp(base, dir_fd->path) == 0) + { +- old_path = g_strdup(vd->dir_fd->name); ++ old_path = g_strdup(vd->dir_fd->path); + } + g_free(base); + } +@@ -329,7 +329,7 @@ + while (work && !found) + { + FileData *fd = work->data; +- if (strcmp(old_path, fd->name) == 0) found = fd; ++ if (strcmp(old_path, fd->path) == 0) found = fd; + work = work->next; + } + diff --git a/media-gfx/geeqie/geeqie-1.0-r4.ebuild b/media-gfx/geeqie/geeqie-1.0-r4.ebuild new file mode 100644 index 000000000000..f5375c5f38a9 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.0-r4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r4.ebuild,v 1.1 2012/06/15 09:36:53 voyageur Exp $ + +EAPI=4 +inherit autotools base eutils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://geeqie.sourceforge.net/" +SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc exif lcms lirc xmp" + +RDEPEND="x11-libs/gtk+:2 + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + lcms? ( =media-libs/lcms-1* ) + lirc? ( app-misc/lirc ) + xmp? ( >=media-gfx/exiv2-0.17[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${P}-automake-1.11.patch + "${FILESDIR}"/${P}-copy_chown.patch + "${FILESDIR}"/${P}-filedata_compare.patch + "${FILESDIR}"/${P}-fix_fullscreen.patch + "${FILESDIR}"/${P}-lfs_support.patch + "${FILESDIR}"/${P}-ui_pathsel.patch + "${FILESDIR}"/${P}-vflist-refresh.patch + "${FILESDIR}"/${P}-up_path_restore.patch +) + +src_prepare() { + base_src_prepare + eautoreconf +} + +src_configure() { + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + $(use_enable lcms) + $(use_enable lirc)" + + 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" +} |