summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-11-20 20:47:19 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-11-20 20:47:19 +0000
commitc9e004f104583df875693420ad30eefb51574bd8 (patch)
treefd71ffb8de562cd719d5d39df283d89c97955cc4 /media-gfx
parentstable on amd64 (diff)
downloadgentoo-2-c9e004f104583df875693420ad30eefb51574bd8.tar.gz
gentoo-2-c9e004f104583df875693420ad30eefb51574bd8.tar.bz2
gentoo-2-c9e004f104583df875693420ad30eefb51574bd8.zip
as-needed patch thanks to Krzysztof Nowicki <krissn@op.pl> in bug 147731
(Portage version: 2.1.2_rc2-r1)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/showimg/ChangeLog6
-rw-r--r--media-gfx/showimg/files/showimg-0.9.5-as-needed.patch18
-rw-r--r--media-gfx/showimg/showimg-0.9.5.ebuild11
3 files changed, 32 insertions, 3 deletions
diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index 459d305902d6..8c4e53e3be32 100644
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/showimg
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.36 2006/09/05 18:34:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.37 2006/11/20 20:47:19 genstef Exp $
+
+ 20 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+ +files/showimg-0.9.5-as-needed.patch, showimg-0.9.5.ebuild:
+ as-needed patch thanks to Krzysztof Nowicki <krissn@op.pl> in bug 147731
05 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> showimg-0.9.5.ebuild:
Stable on sparc
diff --git a/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch b/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch
new file mode 100644
index 000000000000..acea1cc1e365
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch
@@ -0,0 +1,18 @@
+diff -Naur showimg-0.9.5.orig/showimg/kexi/kexidb/Makefile.am showimg-0.9.5/showimg/kexi/kexidb/Makefile.am
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/Makefile.am 2006-01-07 09:47:47.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/Makefile.am 2006-09-14 10:39:19.000000000 +0200
+@@ -25,7 +25,7 @@
+ # relationship.h parser/parser.h transaction.h \
+ # kexidb_export.h
+
+-libshowimgkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO)
++libshowimgkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(showimg_top_srcdir)/kexi/kexiutils/libshowimgkexiutils.la
+ libshowimgkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+ kde_servicetypes_DATA = showimg_kexidb_driver.desktop
+diff -Naur showimg-0.9.5.orig/showimg/kexi/Makefile.am showimg-0.9.5/showimg/kexi/Makefile.am
+--- showimg-0.9.5.orig/showimg/kexi/Makefile.am 2006-01-07 09:47:50.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/Makefile.am 2006-09-14 10:50:49.000000000 +0200
+@@ -1 +1 @@
+-SUBDIRS= 3rdparty kexidb kexiutils
++SUBDIRS= 3rdparty kexiutils kexidb
diff --git a/media-gfx/showimg/showimg-0.9.5.ebuild b/media-gfx/showimg/showimg-0.9.5.ebuild
index 14ac84f86f0f..079571de5330 100644
--- a/media-gfx/showimg/showimg-0.9.5.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5.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/showimg/showimg-0.9.5.ebuild,v 1.6 2006/09/05 18:34:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.7 2006/11/20 20:47:19 genstef Exp $
inherit kde eutils
@@ -28,7 +28,14 @@ DEPEND="|| ( kde-base/libkonq kde-base/kdebase )
media-libs/libexif"
need-kde 3.4
-src_compile(){
+
+src_unpack() {
+ unpack "${A}"
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+}
+
+src_compile() {
local myconf="--with-showimgdb \
$(use_enable exif kexif) \
$(use_enable kipi libkipi) \