diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2007-05-08 14:17:47 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2007-05-08 14:17:47 +0000 |
| commit | 13db28d2a586ba781461ba51d5f599ef83367fc2 (patch) | |
| tree | 04fc87649aaab7e380c8464dd0f11a33b2777ca1 /media-gfx | |
| parent | Stable for HPPA (bug #177213). (diff) | |
| download | gentoo-2-13db28d2a586ba781461ba51d5f599ef83367fc2.tar.gz gentoo-2-13db28d2a586ba781461ba51d5f599ef83367fc2.tar.bz2 gentoo-2-13db28d2a586ba781461ba51d5f599ef83367fc2.zip | |
Fix building with --as-needed; bug #157893
(Portage version: 2.1.2.7)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gtkam/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/gtkam/files/gtkam-0.1.12-as-needed.patch | 25 | ||||
| -rw-r--r-- | media-gfx/gtkam/gtkam-0.1.12-r2.ebuild | 6 |
3 files changed, 34 insertions, 3 deletions
diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog index 98a5d0057545..6380ea4bef42 100644 --- a/media-gfx/gtkam/ChangeLog +++ b/media-gfx/gtkam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gtkam # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.46 2007/01/31 19:01:02 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.47 2007/05/08 14:17:47 dang Exp $ + + 08 May 2007; Daniel Gryniewicz <dang@gentoo.org> + +files/gtkam-0.1.12-as-needed.patch, gtkam-0.1.12-r2.ebuild: + Fix building with --as-needed; bug #157893 31 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org> +files/gtkam.png, gtkam-0.1.14.ebuild: diff --git a/media-gfx/gtkam/files/gtkam-0.1.12-as-needed.patch b/media-gfx/gtkam/files/gtkam-0.1.12-as-needed.patch new file mode 100644 index 000000000000..f254f421c2d9 --- /dev/null +++ b/media-gfx/gtkam/files/gtkam-0.1.12-as-needed.patch @@ -0,0 +1,25 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtkam-0.1.12.orig/test/Makefile.am gtkam-0.1.12/test/Makefile.am +--- gtkam-0.1.12.orig/test/Makefile.am 2003-10-27 17:45:25.000000000 -0500 ++++ gtkam-0.1.12/test/Makefile.am 2007-05-08 10:11:23.000000000 -0400 +@@ -5,5 +5,5 @@ INCLUDES = \ + + noinst_PROGRAMS = test-fsel test-cancel + +-test_fsel_LDADD = $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(top_builddir)/src/libgtkam.a $(INTLLIBS) +-test_cancel_LDADD = $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(top_builddir)/src/libgtkam.a $(INTLLIBS) ++test_fsel_LDADD = $(top_builddir)/src/libgtkam.a $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(INTLLIBS) ++test_cancel_LDADD = $(top_builddir)/src/libgtkam.a $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(INTLLIBS) +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtkam-0.1.12.orig/test/Makefile.in gtkam-0.1.12/test/Makefile.in +--- gtkam-0.1.12.orig/test/Makefile.in 2004-05-21 21:29:15.000000000 -0400 ++++ gtkam-0.1.12/test/Makefile.in 2007-05-08 10:11:21.000000000 -0400 +@@ -111,8 +111,8 @@ INCLUDES = -I$(top_srcdir) -I$(top_s + + noinst_PROGRAMS = test-fsel test-cancel + +-test_fsel_LDADD = $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(top_builddir)/src/libgtkam.a $(INTLLIBS) +-test_cancel_LDADD = $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(top_builddir)/src/libgtkam.a $(INTLLIBS) ++test_fsel_LDADD = $(top_builddir)/src/libgtkam.a $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(INTLLIBS) ++test_cancel_LDADD = $(top_builddir)/src/libgtkam.a $(GTKAM_LIBS) $(EXIF_LIBS) $(BONOBO_LIBS) $(INTLLIBS) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild b/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild index 0fa63d90652f..c22467f69b39 100644 --- a/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild +++ b/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild,v 1.9 2006/11/23 00:10:35 tomk Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild,v 1.10 2007/05/08 14:17:47 dang Exp $ inherit eutils gnome2 @@ -39,6 +39,8 @@ src_unpack() { epatch "${FILESDIR}/${PN}-0.1.10-norpm.patch" epatch "${FILESDIR}/${PN}-0.1.12-helpdoc.patch" epatch "${FILESDIR}/${PN}-0.1.12-desktop-image.patch" + # Fix building with as-needed; bug #157893 + epatch "${FILESDIR}/${PN}-0.1.12-as-needed.patch" } src_install() { |