Fix building with -DK3B_ENABLE_DVD_RIPPING=OFF wrt #289906, thanks to Lars Wendler for reporting.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 25 insertions, 4 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/Manifest b/app-cdr/k3b/Manifest
index 90e8b98b8081..f2aba99167b9 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -4,12 +4,13 @@ AUX k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch 1049 RMD160 022fecbc707775adc782b
 AUX k3b-1.0.5-libmpcdecsv7.patch 1452 RMD160 a471ea325226e5ced0c84d6a9ea1f27dcbc21e17 SHA1 6f09c5a943416d1652f6a5ffa7bb99d3ee576dba SHA256 7c9061027d7c49f637d768b4a45039f0a653895929e35c16ea04a5da936f75a7
 AUX k3b-1.0.5-transcode-1.1.patch 1097 RMD160 08fcc3769803a400bc5d00be223b9f37fdc7e7d0 SHA1 68547f4e312dc30c6440bed126a4408716b78e13 SHA256 8317afcf5e26dd5195065f2eb3b062e41804c46afe9d3c906012dee6249290f4
 AUX k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch 493 RMD160 146162f40fffe127ae29ce215aa15d0fc76eed16 SHA1 307d466477ab0a367322ebd7f3592de6b9815e76 SHA256 b99be0f50afcf779b46af5b5e17f9716fb1e61127b42eb5cebd022921a2342b0
+AUX k3b-1.68.0_alpha3-missing_ifdef.patch 422 RMD160 6f56c7aea78c3d4484238cfd8332af1a24660f3c SHA1 10a969b93ec053c89b9f30c139fcb8c1a69bf2d3 SHA256 f871eee6c54e5bae3d7e62cfb8dd65ac6f6b3c5f4427465beacb96afd4182692
 DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
 DIST k3b-1.66.0alpha2.tar.bz2 3865548 RMD160 dd1a11bb91a3af1138d74728decbf638401bd884 SHA1 d17ec5743a6f913b7a5cf14b08593844d858fc7e SHA256 2f66ccae344d832c8522a88d6aede2b73e694c9fe1fe87610c0ff0a76f08671d
 DIST k3b-1.68.0alpha3.tar.bz2 3899288 RMD160 a2c3d6e45834f8403236ac857920f60973e07a1f SHA1 014d7de53d497a8cd6068f42bd2cccf23a36ad9a SHA256 6fd3b3b25c89236001b30609777007517a6e4c67c8ccded71373a3165e770629
 DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
 EBUILD k3b-1.0.5-r6.ebuild 3877 RMD160 eda4811891f7619cfad475607f7c1f0e9c299618 SHA1 58516242c2d108de9467b85b5160c54cbda9f83d SHA256 0915c4678cf844438d11b70ff86664dc488bba966c93345364bc855554c086f2
 EBUILD k3b-1.66.0_alpha2-r1.ebuild 3072 RMD160 60154c9c1c3565e0f4b9e75741747f5175c9887c SHA1 74ae95bacdadd74e17e8ea6ef47564227b7cb79d SHA256 b70d1e34d8329f1cee517ed26054d39b862d2cfc998daa128eff61cea63bb3eb
-EBUILD k3b-1.68.0_alpha3.ebuild 2800 RMD160 6a8d23f2886f18b435d022106ec59cd4172ea255 SHA1 5eb3ecc0befde08644230e1e1d930018bc6f6a38 SHA256 91890bb88344e5c7074cade8dfffc05d855d2cee6b74b36561c5c912ce743043
-MISC ChangeLog 33885 RMD160 8e2edab5e87a566ebf7daa9cd16a78759f054e08 SHA1 fb6d5b833dcf801d3ddeac7e2151aa1b387e7a11 SHA256 ec365ae4ca8ae2a1c88414e049c83922bf03eb5c34c1b112562d72b8a0ece2c6
+EBUILD k3b-1.68.0_alpha3.ebuild 2852 RMD160 ba8f67f4ea7819fdc433354ef39ca69a9a7b444f SHA1 68f7d84a1fdccfc86064f4874410d455b1047a37 SHA256 86c7a42fe3a03a2e0be99bb43225b40c2701c4cdb0034df5c2a3db04851330a0
+MISC ChangeLog 34116 RMD160 465462ceddb114ef80d67b1bc5717d41192c324c SHA1 4eb09215784651a254aa19f29897e4eff91d2b02 SHA256 f5945567466a58bcdf4f794a6d1d834ae14995868c961db99c538e0fbd5613d2
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
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() {