[arch-commits] Commit in kdeplasma-addons/trunk (PKGBUILD lancelot-segfault.patch)

[Ronald van Haren]

    Date: Tuesday, August 3, 2010 @ 09:14:59
  Author: ronald
Revision: 86719

add lancelot segfault fix when kopete is not installed

Added:
  kdeplasma-addons/trunk/lancelot-segfault.patch
Modified:
  kdeplasma-addons/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   10 ++++++++--
 lancelot-segfault.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-03 12:25:49 UTC (rev 86718)
+++ PKGBUILD	2010-08-03 13:14:59 UTC (rev 86719)
@@ -78,10 +78,16 @@
 groups=('kde' 'kdeplasma-addons')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
 	'kdeedu-marble' 'eigen' 'scim' 'qwt' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('fabcc32ee038b18d71cc0f7f4ba4424c15a07e98')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+	'lancelot-segfault.patch')
+sha1sums=('fabcc32ee038b18d71cc0f7f4ba4424c15a07e98'
+          '5710e832c7889ce9352d473a291ff888e3b9734e')
 
 build() {
+        # fix already included in 4.5.1
+        cd ${srcdir}/${pkgbase}-${pkgver}
+        patch -Np4 -i ${srcdir}/lancelot-segfault.patch || return 1
+
 	cd $srcdir
 	mkdir build
 	cd build

Added: lancelot-segfault.patch
===================================================================
--- lancelot-segfault.patch	                        (rev 0)
+++ lancelot-segfault.patch	2010-08-03 13:14:59 UTC (rev 86719)
@@ -0,0 +1,12 @@
+--- branches/KDE/4.5/kdeplasma-addons/libs/lancelot-datamodels/BaseModel.cpp	2010/07/29 11:58:11	1156621
++++ branches/KDE/4.5/kdeplasma-addons/libs/lancelot-datamodels/BaseModel.cpp	2010/07/29 11:58:49	1156622
+@@ -165,7 +165,7 @@
+ {
+     const KService::Ptr service = KService::serviceByStorageId(serviceName);
+ 
+-    qDebug() << "BaseModel::addService Applic:" << service->isValid() << " " << serviceName;
++    // qDebug() << "BaseModel::addService Applic:" << service->isValid() << " " << serviceName;
+ 
+     return addService(service);
+ }
+