Revision bump to fix crashing when using qt-4.7

Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64

4 files changed, 159 insertions, 2 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 5c0e5fb962c4..370034fcba54 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.255 2010/10/06 16:27:07 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.256 2010/12/13 14:04:16 scarabeus Exp $
+
+*k3b-2.0.1-r1 (13 Dec 2010)
+
+  13 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> +k3b-2.0.1-r1.ebuild,
+  +files/2.0.1-fix-crash-with-qt-4.7.0.patch:
+  Revision bump to fix crashing when using qt-4.7
 
   06 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org> k3b-2.0.1.ebuild:
   A bit more cleanup, whitespaces
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 368f81150ac7..4d06813ebc2e 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,6 +1,8 @@
+AUX 2.0.1-fix-crash-with-qt-4.7.0.patch 1522 RMD160 233a6b498819e749026b5508a63bfaff04556ed6 SHA1 0bd7e4bffca51f6046956141fdd192acf4b65d6c SHA256 5316bdee44a0569b9fd62299268673c77ae7ab4330dde50103f19215b89a76e6
 DIST k3b-2.0.0.tar.bz2 12441752 RMD160 203f73fe2c57181e7cac6578ff57e4039459eb9c SHA1 afe1b10a520849941c1489ccb1ed7c3b8f828e78 SHA256 df71fcb97ac29344c43a819d39ae9fb96e874c6dc40e905a1788d632d327344b
 DIST k3b-2.0.1.tar.bz2 12269204 RMD160 8f85510c65a0da305b3a7c06ac0dd88e0631e66f SHA1 44da8d11b36945aeb9495c9150d8227fa906d6c2 SHA256 8631460e617833a1f907145271ae4e3224c53e391339f273d2bd340c451ccdb7
 EBUILD k3b-2.0.0.ebuild 3016 RMD160 acaf05de74078979671068e912721a2c31cefafe SHA1 9cd95ee8887db74c0a3b46f07235ae8cfed05c2f SHA256 b7013baa7c046c1b7a89090a567088a5e3c7fa99e95d685268a17d3d0a042e31
+EBUILD k3b-2.0.1-r1.ebuild 3337 RMD160 8c958889d06ad798045b912e93feb7b5b908ce1a SHA1 832495c52e898971c93a59c039517f000af0cfde SHA256 28472763aa0fa5f45367bb978e3cc664ac02b1748e91aa984d6f3c3277ba452c
 EBUILD k3b-2.0.1.ebuild 3271 RMD160 ecfabf19c7d0cfd5f62a4aa3c95e04f1aa4d8c36 SHA1 ba5ad87bfaa8509a409c7e11d63bc2eaeb762068 SHA256 a276231438334f2e938ec163345990b64e78220007b90ac35836442244f4ca25
-MISC ChangeLog 36992 RMD160 6fd30f88d69ddc9edf6c4c91313bdb32bd764dc4 SHA1 27ee42c4e5410cc01ac4166dea01df11c0e2d4e1 SHA256 e3f4b895646c89309f46abd17b06e93a688dbc5e12c65360deb8480548a66174
+MISC ChangeLog 37195 RMD160 6a54ec9d4536769d12155f782cdf4efb337023ba SHA1 b9e7e33af682be8bcc0e248900a14e6170180cef SHA256 640553553126c152a931712cd527c19c23aa04c562ee048095305f9f7fc7d2dc
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
diff --git a/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch b/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
new file mode 100644
index 000000000000..a99b5c639cae
--- /dev/null
+++ b/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
@@ -0,0 +1,37 @@
+Index: src/option/k3bpluginoptiontab.cpp
+===================================================================
+--- src/option/k3bpluginoptiontab.cpp	(revision 1168967)
++++ src/option/k3bpluginoptiontab.cpp	(working copy)
+@@ -43,12 +43,28 @@
+     layout->addWidget( label );
+     layout->addWidget( pluginSelector );
+ 
++    // find all categories
++    QHash<QString, QString> categoryNames;
++
+     foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
+-        kDebug() << "Adding plugin" << plugin->pluginInfo().name();
+-        pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(),
++        categoryNames[ plugin->category() ] = plugin->categoryName();
++    }
++
++    // add all plugins in each category
++    foreach( const QString &category, categoryNames.keys() ) {
++        QList<KPluginInfo> plugins;
++
++        foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
++            if ( plugin->category() == category ) {
++                plugins << plugin->pluginInfo();
++                kDebug() << "Adding plugin" << plugin->pluginInfo().name();
++            }
++        }
++        pluginSelector->addPlugins( plugins,
+                                     KPluginSelector::ReadConfigFile,
+-                                    plugin->categoryName(),
+-                                    plugin->category() );
++                                    categoryNames[ category ],
++                                    category
++                                  );
+     }
+ }
+ 
diff --git a/app-cdr/k3b/k3b-2.0.1-r1.ebuild b/app-cdr/k3b/k3b-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..cbe301197fa8
--- /dev/null
+++ b/app-cdr/k3b/k3b-2.0.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.1-r1.ebuild,v 1.1 2010/12/13 14:04:16 scarabeus Exp $
+
+EAPI=3
+
+CMAKE_MIN_VERSION=2.8.0
+MULTIMEDIA_REQUIRED=always
+WEBKIT_REQUIRED=always
+KMNAME="extragear/multimedia"
+
+# Translations are only in the tarballs, not in the svn repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
+	gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
+	se sk sl sv th tr uk zh_CN zh_TW"
+
+	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
+
+	DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO )
+
+	S=${WORKDIR}/${P/_*}
+else
+	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
+fi
+
+inherit kde4-base
+
+DESCRIPTION="The CD/DVD Kreator for KDE"
+HOMEPAGE="http://www.k3b.org/"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug dvd emovix encode ffmpeg flac mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
+
+DEPEND="
+	$(add_kdebase_dep libkcddb)
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	encode? ( lame? ( media-sound/lame ) )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	musicbrainz? ( media-libs/musicbrainz:1 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5 )
+	vorbis? ( media-libs/libvorbis )
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	media-sound/cdparanoia
+	sys-apps/hal
+	virtual/cdrtools
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	emovix? ( media-video/emovix )
+	encode? ( sox? ( media-sound/sox ) )
+	vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PV}-fix-crash-with-qt-4.7.0.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		-DK3B_BUILD_K3BSETUP=OFF
+		$(cmake-utils_use debug K3B_DEBUG)
+		$(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ)
+		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
+		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
+		-DK3B_BUILD_API_DOCS=OFF
+		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
+		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
+		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
+		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+	)
+
+	if use encode; then
+		mycmakeargs+=(
+			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+			$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
+			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+		)
+	fi
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}