diff options
-rw-r--r-- | media-gfx/eog/ChangeLog | 10 | ||||
-rw-r--r-- | media-gfx/eog/eog-2.24.0.ebuild | 76 | ||||
-rw-r--r-- | media-gfx/eog/files/eog-2.24.0-unrecognized-chunks.patch | 19 | ||||
-rw-r--r-- | media-gfx/eog/metadata.xml | 3 |
4 files changed, 107 insertions, 1 deletions
diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog index 649d1836ffdb..916eb71422c9 100644 --- a/media-gfx/eog/ChangeLog +++ b/media-gfx/eog/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/eog # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.213 2008/10/18 22:48:00 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.214 2008/10/19 18:57:26 eva Exp $ + +*eog-2.24.0 (19 Oct 2008) + + 19 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> + +files/eog-2.24.0-unrecognized-chunks.patch, +eog-2.24.0.ebuild, + metadata.xml: + New version for GNOME 2.24. Mostly bug fixes, plugins' API now has a + gtk-doc documentation, uses gio/gvfs. 18 Oct 2008; Brent Baude <ranger@gentoo.org> eog-2.22.3-r1.ebuild: Marking eog-2.22.3-r1 ppc stable for bug 236971 diff --git a/media-gfx/eog/eog-2.24.0.ebuild b/media-gfx/eog/eog-2.24.0.ebuild new file mode 100644 index 000000000000..b2cf6ed5cc7d --- /dev/null +++ b/media-gfx/eog/eog-2.24.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.24.0.ebuild,v 1.1 2008/10/19 18:57:26 eva Exp $ + +inherit eutils gnome2 + +DESCRIPTION="The Eye of GNOME image viewer" +HOMEPAGE="http://www.gnome.org/projects/eog/" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~amd64 ~x86" +IUSE="dbus doc exif lcms python xmp" + +RDEPEND=">=x11-libs/gtk+-2.13.1 + >=dev-libs/glib-2.15.3 + >=gnome-base/libgnomeui-2.10 + >=gnome-base/libglade-2.3.6 + >=gnome-base/gconf-2.5.90 + >=media-libs/libart_lgpl-2.3.16 + >=gnome-base/gnome-desktop-2.10 + >=x11-themes/gnome-icon-theme-2.19.1 + >=x11-misc/shared-mime-info-0.20 + dbus? ( >=dev-libs/dbus-glib-0.71 ) + exif? ( + >=media-libs/libexif-0.6.14 + media-libs/jpeg ) + lcms? ( media-libs/lcms ) + python? ( + >=dev-lang/python-2.3 + >=dev-python/pygobject-2.11.5 + >=dev-python/pygtk-2.9.7 + >=dev-python/gnome-python-2.18.2 ) + xmp? ( >=media-libs/exempi-2 )" + +DEPEND="${RDEPEND} + app-text/gnome-doc-utils + sys-devel/gettext + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.17 + doc? ( >=dev-util/gtk-doc-1.10 )" + +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO" + +pkg_setup() { + G2CONF="${G2CONF} + $(use_with exif libjpeg) + $(use_with exif libexif) + $(use_with dbus dbus-glib-1) + $(use_with lcms cms) + $(use_enable python) + $(use_with xmp) + --disable-scrollkeeper + --disable-schemas-install" +} + +src_unpack() { + gnome2_src_unpack + + # Don't fail on unrecognized chunks, bug #237835 + epatch "${FILESDIR}/${P}-unrecognized-chunks.patch" +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! built_with_use =x11-libs/gtk+-2* jpeg; then + ewarn "For JPEG file support to work, x11-libs/gtk+ must be rebuilt" + ewarn "with the 'jpeg' USE flag enabled." + fi + + if ! built_with_use =x11-libs/gtk+-2* tiff; then + ewarn "For TIFF file support to work, x11-libs/gtk+ must be rebuilt" + ewarn "with the 'tiff' USE flag enabled." + fi +} diff --git a/media-gfx/eog/files/eog-2.24.0-unrecognized-chunks.patch b/media-gfx/eog/files/eog-2.24.0-unrecognized-chunks.patch new file mode 100644 index 000000000000..56df1f913145 --- /dev/null +++ b/media-gfx/eog/files/eog-2.24.0-unrecognized-chunks.patch @@ -0,0 +1,19 @@ +--- + 2008-09-30 Felix Riemann <friemann@svn.gnome.org> + + * src/eog-metadata-reader-jpg.c: (eog_metadata_reader_jpg_consume): + Don't overwrite the last read chunk when skipping over unrecognized + APP1 chunks. Avoids memory corruption and subsequent segfaults. + +Index: trunk/src/eog-metadata-reader-jpg.c +==================================================================== +--- trunk/src/eog-metadata-reader-jpg.c 2008/09/30 11:58:28 4810 ++++ trunk/src/eog-metadata-reader-jpg.c 2008/09/30 13:49:31 4811 +@@ -321,6 +321,7 @@ + case EJA_OTHER: + default: + /* skip unknown data */ ++ chunk = NULL; + priv->state = EMR_SKIP_BYTES; + break; + } diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml index e17e20c0a3e7..749d07071daf 100644 --- a/media-gfx/eog/metadata.xml +++ b/media-gfx/eog/metadata.xml @@ -2,6 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> +<use> + <flag name='xmp'>Adds support for XMP metadata</flag> +</use> <longdescription lang="en"> The Eye of GNOME image viewer is the official image viewer for the GNOME Desktop environment. With it, you can view single image files, as well as large image collections. |