diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2006-07-05 22:39:55 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2006-07-05 22:39:55 +0000 |
| commit | 80816dce6c4e4abf645bf8120e04dfef3d089955 (patch) | |
| tree | 7c6bfd90b139c81c2f087918a877a02290e83672 /media-gfx/gthumb | |
| parent | Version bump, new snapshot greatly simplified ebuild fixes numerous bugs I ca... (diff) | |
| download | gentoo-2-80816dce6c4e4abf645bf8120e04dfef3d089955.tar.gz gentoo-2-80816dce6c4e4abf645bf8120e04dfef3d089955.tar.bz2 gentoo-2-80816dce6c4e4abf645bf8120e04dfef3d089955.zip | |
Link libphotoimporter.so against libgphoto, so that it can load at runtime with --as-needed
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'media-gfx/gthumb')
| -rw-r--r-- | media-gfx/gthumb/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/gthumb/files/gthumb-2.6.9-as-needed.patch | 26 | ||||
| -rw-r--r-- | media-gfx/gthumb/gthumb-2.6.9.ebuild | 5 |
3 files changed, 35 insertions, 3 deletions
diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog index 118fb45566bd..66a5bc8de5c2 100644 --- a/media-gfx/gthumb/ChangeLog +++ b/media-gfx/gthumb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/gthumb # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.56 2006/05/07 20:11:52 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.57 2006/07/05 22:39:55 dang Exp $ + + 05 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> + +files/gthumb-2.6.9-as-needed.patch, gthumb-2.6.9.ebuild: + Link libphotoimporter.so against libgphoto, so that it can load at runtime + with --as-needed *gthumb-2.6.9 (07 May 2006) diff --git a/media-gfx/gthumb/files/gthumb-2.6.9-as-needed.patch b/media-gfx/gthumb/files/gthumb-2.6.9-as-needed.patch new file mode 100644 index 000000000000..5f1838785738 --- /dev/null +++ b/media-gfx/gthumb/files/gthumb-2.6.9-as-needed.patch @@ -0,0 +1,26 @@ +diff --exclude-from=/home/dang/.diffrc -u -ruN gthumb-2.6.9.orig/Makefile.am gthumb-2.6.9/Makefile.am +--- gthumb-2.6.9.orig/Makefile.am 2006-02-17 03:49:24.000000000 -0500 ++++ gthumb-2.6.9/Makefile.am 2006-07-05 17:29:42.000000000 -0400 +@@ -11,6 +11,10 @@ + + distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' | grep -v 'omf' | grep -v 'figures' + ++libgthumb_la_LIBADD = \ ++ $(TIFF_LIBS) \ ++ $(GTHUMB_LIBS) ++ + + EXTRA_DIST = \ + AUTHORS \ +diff --exclude-from=/home/dang/.diffrc -u -ruN gthumb-2.6.9.orig/src/Makefile.am gthumb-2.6.9/src/Makefile.am +--- gthumb-2.6.9.orig/src/Makefile.am 2006-02-17 03:49:30.000000000 -0500 ++++ gthumb-2.6.9/src/Makefile.am 2006-07-05 17:28:49.000000000 -0400 +@@ -159,7 +159,7 @@ + libwebexporter_la_DEPENDENCIES = gthumb$(EXEEXT) + + libphotoimporter_la_SOURCES = dlg-photo-importer.c dlg-photo-importer.h +-libphotoimporter_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS) ++libphotoimporter_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS) $(LIBGPHOTO_LIBS) + libphotoimporter_la_LIBADD = $(top_builddir)/libgthumb/libgthumb.la $(GTHUMB_LIBS) + libphotoimporter_la_DEPENDENCIES = gthumb$(EXEEXT) + diff --git a/media-gfx/gthumb/gthumb-2.6.9.ebuild b/media-gfx/gthumb/gthumb-2.6.9.ebuild index 6bbd92cd14a9..568bb1d7e69b 100644 --- a/media-gfx/gthumb/gthumb-2.6.9.ebuild +++ b/media-gfx/gthumb/gthumb-2.6.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.9.ebuild,v 1.1 2006/05/07 20:11:52 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.9.ebuild,v 1.2 2006/07/05 22:39:55 dang Exp $ inherit gnome2 eutils autotools @@ -53,7 +53,8 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-2.6.8-options.patch # as-needed #130284 - epatch "${FILESDIR}"/${PN}-2.6.8-as-needed.patch + # New as-needed, including gphoto fixes + epatch "${FILESDIR}"/${PN}-2.6.9-as-needed.patch eautoreconf } |