diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-08-26 10:32:13 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-08-26 10:32:13 +0000 |
| commit | 5826eb6017e4772e68549088536d3760ba4e8b20 (patch) | |
| tree | 88ed9408729a8664b3faeaf30cb5d793cc60bafc /kde-base | |
| parent | Pruned old versions. (diff) | |
| download | gentoo-2-5826eb6017e4772e68549088536d3760ba4e8b20.tar.gz gentoo-2-5826eb6017e4772e68549088536d3760ba4e8b20.tar.bz2 gentoo-2-5826eb6017e4772e68549088536d3760ba4e8b20.zip | |
Add patch to fix bug #103773.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdemultimedia/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile-kscd.patch | 12 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild | 7 |
3 files changed, 24 insertions, 2 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index 21cadd471b52..2cb155cac208 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.169 2005/08/25 14:45:34 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.170 2005/08/26 10:32:13 greg_g Exp $ + + 26 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdemultimedia-3.5_alpha1-compile-kscd.patch, + kdemultimedia-3.5_alpha1.ebuild: + Add patch to fix bug #103773. 25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdemultimedia-3.4.1-r1.ebuild: diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile-kscd.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile-kscd.patch new file mode 100644 index 000000000000..e70a2b3f7fd4 --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile-kscd.patch @@ -0,0 +1,12 @@ +diff -Nur kdemultimedia-3.4.90.orig/kscd/Makefile.am kdemultimedia-3.4.90/kscd/Makefile.am +--- kdemultimedia-3.4.90.orig/kscd/Makefile.am 2005-08-06 11:39:30.000000000 +0200 ++++ kdemultimedia-3.4.90/kscd/Makefile.am 2005-08-26 11:23:19.000000000 +0200 +@@ -25,7 +25,7 @@ + kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) + kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \ + $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \ +- $(top_builddir)/kscd/libkcompactdisc.la ++ libkcompactdisc.la + + profiledata_DATA = kscd.profile.xml + profiledatadir = $(kde_datadir)/profiles diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild index 10dd8f43eacd..f9be12f49bbe 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:26:27 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild,v 1.2 2005/08/26 10:32:13 greg_g Exp $ inherit kde-dist @@ -36,8 +36,13 @@ DEPEND="${DEPEND} src_unpack() { kde_src_unpack + # See kde bug 111545. + epatch "${FILESDIR}/${P}-compile-kscd.patch" + # Applied upstream. epatch "${FILESDIR}/${P}-compile.patch" + + # For the patches above. make -f admin/Makefile.common || die } |