[arch-commits] Commit in k3b/trunk (PKGBUILD fix-crash-with-qt-4.7.0.patch)
Andrea Scarpino
andrea at archlinux.org
Wed Sep 29 06:40:45 UTC 2010
Date: Wednesday, September 29, 2010 @ 02:40:45
Author: andrea
Revision: 92108
fix crash with Qt 4.7.0 (FS#20965)
Added:
k3b/trunk/fix-crash-with-qt-4.7.0.patch
Modified:
k3b/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 23 ++++++++++++++---------
fix-crash-with-qt-4.7.0.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-09-29 06:31:08 UTC (rev 92107)
+++ PKGBUILD 2010-09-29 06:40:45 UTC (rev 92108)
@@ -5,26 +5,31 @@
pkgname=k3b
pkgver=2.0.1
-pkgrel=2
+pkgrel=3
depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad'
- 'ffmpeg>=0.5' 'taglib>=1.4' 'libmpcdec>=1.2.5' 'libdvdread>=4.1.3'
- 'cdrdao' 'cdrkit' 'shared-mime-info' 'libxft')
+ 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit'
+ 'shared-mime-info' 'libxft')
makedepends=('cmake' 'pkgconfig' 'automoc4' )
pkgdesc="Feature-rich and easy to handle CD burning application"
+url="http://k3b.sourceforge.net/"
arch=("i686" "x86_64")
license=('GPL')
-install=k3b.install
-source=(http://downloads.sourceforge.net/sourceforge/k3b/${pkgname}-${pkgver}.tar.bz2)
-url="http://k3b.sourceforge.net/"
+install="${pkgname}.install"
optdepends=('dvd+rw-tools: for dvd burning support'
'vcdimager: for vcd burning support'
'transcode: for advanced mpeg conversion support'
'emovix: for bootable multimedia cd/dvd support')
-options=(!libtool)
-md5sums=('4e5b6665d91d4984cbfa814b797257cb')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'fix-crash-with-qt-4.7.0.patch')
+md5sums=('4e5b6665d91d4984cbfa814b797257cb'
+ 'd4f0b447d8054eaa927f2bc65026cbf5')
build() {
- cd ${srcdir}/
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i ${srcdir}/fix-crash-with-qt-4.7.0.patch
+
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
Added: fix-crash-with-qt-4.7.0.patch
===================================================================
--- fix-crash-with-qt-4.7.0.patch (rev 0)
+++ fix-crash-with-qt-4.7.0.patch 2010-09-29 06:40:45 UTC (rev 92108)
@@ -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
++ );
+ }
+ }
+
More information about the arch-commits
mailing list