diff options
-rw-r--r-- | media-gfx/gthumb/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch | 38 | ||||
-rw-r--r-- | media-gfx/gthumb/gthumb-2.11.5.ebuild | 7 |
3 files changed, 50 insertions, 3 deletions
diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog index e83ae72dc759..8f1bd3ae7099 100644 --- a/media-gfx/gthumb/ChangeLog +++ b/media-gfx/gthumb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/gthumb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.113 2010/07/13 12:12:18 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.114 2010/07/14 18:18:48 pacho Exp $ + + 14 Jul 2010; Pacho Ramos <pacho@gentoo.org> gthumb-2.11.5.ebuild, + +files/gthumb-2.11.5-configure-exiv2.patch: + Apply upstream patch to fix building without exif USE flag (bug #328221 by + Diego E. 'Flameeyes' Pettenò and Alexander Goetz), fix libbrasero + configure option. *gthumb-2.11.5 (13 Jul 2010) diff --git a/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch b/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch new file mode 100644 index 000000000000..37319e490af3 --- /dev/null +++ b/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch @@ -0,0 +1,38 @@ +From a61e394d59e96267c6cef12be796f6832d212c39 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega <paobac@src.gnome.org> +Date: Wed, 14 Jul 2010 11:51:57 +0000 +Subject: do not link to the exiv2 extension if it's not built + +[bug #624326] +--- +diff --git a/extensions/exiv2_tools/Makefile.am b/extensions/exiv2_tools/Makefile.am +index 7bf5ae6..26a127f 100644 +--- a/extensions/exiv2_tools/Makefile.am ++++ b/extensions/exiv2_tools/Makefile.am +@@ -5,7 +5,7 @@ SUBDIRS = data + extensiondir = $(pkglibdir)/extensions + extension_LTLIBRARIES = libexiv2_tools.la + +-libexiv2_tools_la_SOURCES = \ ++libexiv2_tools_la_SOURCES = \ + exiv2-utils.h \ + exiv2-utils.cpp \ + gth-edit-exiv2-page.c \ +diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am +index de5095c..87b2d06 100644 +--- a/extensions/importer/Makefile.am ++++ b/extensions/importer/Makefile.am +@@ -45,7 +45,10 @@ libimporter_la_SOURCES = \ + + libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb + libimporter_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) +-libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../exiv2_tools/libexiv2_tools.la ../image_rotation/libimage_rotation.la ++libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la ++if ENABLE_EXIV2 ++libimporter_la_LIBADD += ../exiv2_tools/libexiv2_tools.la ++endif + libimporter_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) + + extensioninidir = $(extensiondir) +-- +cgit v0.8.3.1 diff --git a/media-gfx/gthumb/gthumb-2.11.5.ebuild b/media-gfx/gthumb/gthumb-2.11.5.ebuild index 9bab69c0c1a5..db6218593a8a 100644 --- a/media-gfx/gthumb/gthumb-2.11.5.ebuild +++ b/media-gfx/gthumb/gthumb-2.11.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.11.5.ebuild,v 1.1 2010/07/13 12:12:19 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.11.5.ebuild,v 1.2 2010/07/14 18:18:48 pacho Exp $ EAPI="3" @@ -49,7 +49,7 @@ pkg_setup() { G2CONF="${G2CONF} --disable-static --disable-clutter - $(use_enable cdr brasero) + $(use_enable cdr libbrasero) $(use_enable exif exiv2) $(use_enable gstreamer) $(use_enable gnome-keyring) @@ -66,6 +66,9 @@ src_prepare() { # Do not require unstable libunique epatch "${FILESDIR}/${PN}-2.11.2.1-configure.patch" + # Do not link to the exiv2 extension if it's not built + epatch "${FILESDIR}/${P}-configure-exiv2.patch" + intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf } |