summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-04 10:31:16 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-04 10:31:16 +0000
commitc5218c8812eeb63e0681f1556f69bbf103274247 (patch)
tree77cc69eac535ef70a4234a75cdafd8960957a817 /media-gfx
parentAdding net-nds/openldap:smbkrb5passwd and correcting net-nds/openldap:overlays (diff)
downloadgentoo-2-c5218c8812eeb63e0681f1556f69bbf103274247.tar.gz
gentoo-2-c5218c8812eeb63e0681f1556f69bbf103274247.tar.bz2
gentoo-2-c5218c8812eeb63e0681f1556f69bbf103274247.zip
Add patch to fix building with --as-needed, thanks David Philippi for patch (bug #144382) and patience.
(Portage version: 2.1.2_pre2-r2)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/digikam/ChangeLog7
-rw-r--r--media-gfx/digikam/digikam-0.9.0_beta2.ebuild4
-rw-r--r--media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch24
3 files changed, 33 insertions, 2 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 5feebf9dcd71..8b3f260964ee 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/digikam
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.60 2006/09/20 12:12:32 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.61 2006/10/04 10:31:16 flameeyes Exp $
+
+ 04 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/digikam-0.9.0_beta2-asneeded.patch, digikam-0.9.0_beta2.ebuild:
+ Add patch to fix building with --as-needed, thanks David Philippi for patch
+ (bug #144382) and patience.
*digikam-0.9.0_beta2 (20 Sep 2006)
diff --git a/media-gfx/digikam/digikam-0.9.0_beta2.ebuild b/media-gfx/digikam/digikam-0.9.0_beta2.ebuild
index 771088cdaf1d..b059a89a61f6 100644
--- a/media-gfx/digikam/digikam-0.9.0_beta2.ebuild
+++ b/media-gfx/digikam/digikam-0.9.0_beta2.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/digikam/digikam-0.9.0_beta2.ebuild,v 1.1 2006/09/20 12:12:32 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta2.ebuild,v 1.2 2006/10/04 10:31:16 flameeyes Exp $
inherit kde
@@ -55,6 +55,8 @@ SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
doc? ( linguas_en? ( mirror://gentoo/${P_DOC}-gentoo.tar.bz2 )
!linguas_en? ( ${SRC_URI} ) )"
+PATCHES="${FILESDIR}/${P}-asneeded.patch"
+
pkg_setup(){
slot_rebuild "media-libs/libkipi" && die
kde_pkg_setup
diff --git a/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch b/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch
new file mode 100644
index 000000000000..a876503db3e9
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch
@@ -0,0 +1,24 @@
+--- digikam-0.9.0-beta2/digikam/showfoto/Makefile.am.orig 2006-09-30 19:23:15.000000000 +0200
++++ digikam-0.9.0-beta2/digikam/showfoto/Makefile.am 2006-09-30 19:21:53.000000000 +0200
+@@ -22,9 +22,7 @@
+
+ showfoto_SOURCES = main.cpp showfoto.cpp
+
+-showfoto_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
+- $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2) \
+- $(top_builddir)/digikam/showfoto/setup/libsetup.la \
++showfoto_LDADD = $(top_builddir)/digikam/showfoto/setup/libsetup.la \
+ $(top_builddir)/digikam/libs/widgets/libwidgets.la \
+ $(top_builddir)/digikam/libs/dialogs/libdialog.la \
+ $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesshowfoto.la \
+@@ -33,7 +31,9 @@
+ $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
+ $(top_builddir)/digikam/utilities/imageeditor/editor/libshowfoto.la \
+ $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
+- $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la
++ $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
++ $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2)
+
+ showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+