Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1c26501cff42eaaecb27d51acccbd0b197718664
commit 1c26501cff42eaaecb27d51acccbd0b197718664 Author: bouleetbil <[email protected]> Date: Wed Oct 28 11:22:18 2009 +0100 k3b-1.0.5-3-i686 *rebuild with libdvdread>=4.1.3 diff --git a/source/kde/k3b/FixDuplicate.diff b/source/kde/k3b/FixDuplicate.diff new file mode 100644 index 0000000..8f63519 --- /dev/null +++ b/source/kde/k3b/FixDuplicate.diff @@ -0,0 +1,22 @@ +--- k3b-1.0.5/libk3b/core/Makefile.in~ 2008-05-27 10:34:44.000000000 +0200 ++++ k3b-1.0.5/libk3b/core/Makefile.in 2009-10-28 01:41:22.000000000 +0100 +@@ -387,7 +387,7 @@ + include_HEADERS = k3bcore.h k3bdefaultexternalprograms.h k3bexternalbinmanager.h \ + k3bprocess.h k3bversion.h k3bglobals.h k3bjob.h k3bthread.h \ + k3bthreadjob.h k3bglobalsettings.h k3bjobhandler.h \ +- k3b_export.h k3bjobhandler.h k3bsimplejobhandler.h ++ k3b_export.h k3bsimplejobhandler.h + + #>- METASOURCES = AUTO + #>- all: all-am +--- k3b-1.0.5/libk3b/core/Makefile.am~ 2008-05-27 10:24:09.000000000 +0200 ++++ k3b-1.0.5/libk3b/core/Makefile.am 2009-10-28 01:41:43.000000000 +0100 +@@ -13,7 +13,7 @@ + include_HEADERS = k3bcore.h k3bdefaultexternalprograms.h k3bexternalbinmanager.h \ + k3bprocess.h k3bversion.h k3bglobals.h k3bjob.h k3bthread.h \ + k3bthreadjob.h k3bglobalsettings.h k3bjobhandler.h \ +- k3b_export.h k3bjobhandler.h k3bsimplejobhandler.h ++ k3b_export.h k3bsimplejobhandler.h + + METASOURCES = AUTO + diff --git a/source/kde/k3b/FrugalBuild b/source/kde/k3b/FrugalBuild index 09b53d6..69dce91 100644 --- a/source/kde/k3b/FrugalBuild +++ b/source/kde/k3b/FrugalBuild @@ -4,11 +4,11 @@ pkgname=k3b pkgver=1.0.5 -pkgrel=2 +pkgrel=3 pkgdesc="The CD Kreator" depends=('flac>=1.1.4' 'libsamplerate' 'hal>=0.5.9-2' 'libmusicbrainz' 'taglib' 'ffmpeg>=20080427' 'cdrdao' \ 'kdelibs>=3.5.8' 'cdrtools' 'cdparanoia' 'normalize' 'sox>=14.2.0' 'dvd+rw-tools' 'libmad' \ - 'libvorbis' 'vcdimager' 'libsndfile' 'libdvdread' 'dbus-qt3' 'libmpcdec') + 'libvorbis' 'vcdimager' 'libsndfile' 'libdvdread>=4.1.3' 'dbus-qt3' 'libmpcdec') rodepends=('kdebase>=3.5.8') groups=('kde') archs=('i686' 'x86_64' 'ppc') @@ -16,11 +16,13 @@ _F_sourceforge_ext=".tar.bz2" _F_kde_reconf=1 Finclude kde sourceforge url="http://www.k3b.org/"; -source=($source README.Frugalware ffmpeg.diff) +source=($source README.Frugalware ffmpeg.diff kdelibs-am.patch FixDuplicate.diff) options=('scriptlet') Fconfopts="$Fconfopts --enable-mt" sha1sums=('c45d6f2a36b1bc7ea14101d444149c40fd4b700e' \ '8704ffb71684abde5b8288054ae25fda386244cc' \ - '022089fec916e01ea5d5851f3c4a5c373da35a25') + '022089fec916e01ea5d5851f3c4a5c373da35a25' \ + '7eaa33447731bc403d1ccee06196ea844da78d43' \ + '601262b406d311a17ba22f1aec9a67d69fa2aac2') # optimization OK diff --git a/source/kde/k3b/kdelibs-am.patch b/source/kde/k3b/kdelibs-am.patch new file mode 100644 index 0000000..5a23f3a --- /dev/null +++ b/source/kde/k3b/kdelibs-am.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300 ++++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300 +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
