git » kdeplasma-addons.git » commit f1dca76

new tarball with patch included

author Andrea Scarpino
2010-08-05 13:42:39 UTC
committer Andrea Scarpino
2010-08-05 13:42:39 UTC
parent d59d86c7b1f154eefd523de2496e2b2d79a0384e

new tarball with patch included

PKGBUILD +3 -9
lancelot-segfault.patch +0 -12

diff --git a/PKGBUILD b/PKGBUILD
index 0c4edcf..bc1d859 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -78,17 +78,11 @@ license=('GPL' 'LGPL')
 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} \
diff --git a/lancelot-segfault.patch b/lancelot-segfault.patch
deleted file mode 100644
index 1465392..0000000
--- a/lancelot-segfault.patch
+++ /dev/null
@@ -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);
- }
-