diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-26 23:20:10 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-26 23:20:10 +0000 |
commit | 97749787519282104c9b1003d22bf3050fc362c3 (patch) | |
tree | 70d5b4673fed52c86536c4b4c77e467d6e249a07 /app-cdr | |
parent | Add missing gettext dependency, bug #289944. Clean up old revisions. (diff) | |
download | gentoo-2-97749787519282104c9b1003d22bf3050fc362c3.tar.gz gentoo-2-97749787519282104c9b1003d22bf3050fc362c3.tar.bz2 gentoo-2-97749787519282104c9b1003d22bf3050fc362c3.zip |
Fix building with -DK3B_ENABLE_DVD_RIPPING=OFF wrt #289906, thanks to Lars Wendler for reporting.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r-- | app-cdr/k3b/ChangeLog | 7 | ||||
-rw-r--r-- | app-cdr/k3b/files/k3b-1.68.0_alpha3-missing_ifdef.patch | 13 | ||||
-rw-r--r-- | app-cdr/k3b/k3b-1.68.0_alpha3.ebuild | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index f6d765ea6bf3..c518f04a87da 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.232 2009/10/16 09:07:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.233 2009/10/26 23:20:09 ssuominen Exp $ + + 26 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> + k3b-1.68.0_alpha3.ebuild, +files/k3b-1.68.0_alpha3-missing_ifdef.patch: + Fix building with -DK3B_ENABLE_DVD_RIPPING=OFF wrt #289906, thanks to Lars + Wendler for reporting. *k3b-1.68.0_alpha3 (16 Oct 2009) diff --git a/app-cdr/k3b/files/k3b-1.68.0_alpha3-missing_ifdef.patch b/app-cdr/k3b/files/k3b-1.68.0_alpha3-missing_ifdef.patch new file mode 100644 index 000000000000..ac7ad0316542 --- /dev/null +++ b/app-cdr/k3b/files/k3b-1.68.0_alpha3-missing_ifdef.patch @@ -0,0 +1,13 @@ +diff -ur k3b-1.68.0.orig/src/k3bdirview.cpp k3b-1.68.0/src/k3bdirview.cpp +--- k3b-1.68.0.orig/src/k3bdirview.cpp 2009-09-26 18:02:55.000000000 +0300 ++++ k3b-1.68.0/src/k3bdirview.cpp 2009-10-27 01:12:06.000000000 +0200 +@@ -55,7 +55,9 @@ + + AudioCdView* cdView; + VideoCdView* videoView; ++#ifdef ENABLE_DVD_RIPPING + VideoDVDRippingView* movieView; ++#endif + FileView* fileView; + DiskInfoView* infoView; + diff --git a/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild b/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild index d85db3756e6f..820d6fe29732 100644 --- a/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild +++ b/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild,v 1.2 2009/10/16 09:10:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild,v 1.3 2009/10/26 23:20:09 ssuominen Exp $ EAPI=2 WEBKIT_REQUIRED=always @@ -42,6 +42,8 @@ RDEPEND="${DEPEND} DOCS="FAQ KNOWNBUGS PERMISSIONS" +PATCHES=( "${FILESDIR}/${P}-missing_ifdef.patch" ) + S=${WORKDIR}/${P/_*} src_configure() { |