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

[Andrea Scarpino]

    Date: Thursday, August 5, 2010 @ 09:42:39
  Author: andrea
Revision: 86835

new tarball with patch included

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-05 13:41:09 UTC (rev 86834)
+++ PKGBUILD	2010-08-05 13:42:39 UTC (rev 86835)
@@ -78,17 +78,11 @@
 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"
-	'lancelot-segfault.patch')
-sha1sums=('fabcc32ee038b18d71cc0f7f4ba4424c15a07e98'
-          '5710e832c7889ce9352d473a291ff888e3b9734e')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('48386ebf8a049f2456bf0e88ba46fced0351cd02')
 
 build() {
-        # fix already included in 4.5.1
-        cd ${srcdir}/${pkgbase}-${pkgver}
-        patch -Np4 -i ${srcdir}/lancelot-segfault.patch || return 1
-
-	cd $srcdir
+        cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Deleted: lancelot-segfault.patch
===================================================================
--- lancelot-segfault.patch	2010-08-05 13:41:09 UTC (rev 86834)
+++ lancelot-segfault.patch	2010-08-05 13:42:39 UTC (rev 86835)
@@ -1,12 +0,0 @@
---- 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);
- }
-