[arch-commits] Commit in kdeedu/trunk (PKGBUILD remove-libkdeedu-libscience.patch)

[Andrea Scarpino]

    Date: Friday, June 10, 2011 @ 13:21:18
  Author: andrea
Revision: 127099

Remove libscience from kdeedu-libkdeedu to avoid conflicts (FS#24666)

Added:
  kdeedu/trunk/remove-libkdeedu-libscience.patch
Modified:
  kdeedu/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |    9 ++++++---
 remove-libkdeedu-libscience.patch |   10 ++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-10 17:12:13 UTC (rev 127098)
+++ PKGBUILD	2011-06-10 17:21:18 UTC (rev 127099)
@@ -25,7 +25,7 @@
          'kdeedu-rocs'
          'kdeedu-step')
 pkgver=4.6.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -34,13 +34,16 @@
 	'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
 	'python2' 'avogadro')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'gpsd-2.96.patch')
+        'gpsd-2.96.patch'
+        'remove-libkdeedu-libscience.patch')
 sha1sums=('c58c2afbedccfa12d25e47202da995940cc9acb4'
-          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
+          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e'
+          'cd4e18f2b30d42f6e2bcc518ad72fd49839fd8dc')
 
 build() {
     cd ${srcdir}/${pkgbase}-${pkgver}
     patch -Np1 -i ${srcdir}/gpsd-2.96.patch
+    patch -p1 -i ${srcdir}/remove-libkdeedu-libscience.patch
 
     cd ${srcdir}
 	mkdir build

Added: remove-libkdeedu-libscience.patch
===================================================================
--- remove-libkdeedu-libscience.patch	                        (rev 0)
+++ remove-libkdeedu-libscience.patch	2011-06-10 17:21:18 UTC (rev 127099)
@@ -0,0 +1,10 @@
+--- kdeedu-4.6.4/libkdeedu/CMakeLists.txt~	2011-06-10 16:59:34.922935038 +0000
++++ kdeedu-4.6.4/libkdeedu/CMakeLists.txt	2011-06-10 16:59:56.279802081 +0000
+@@ -8,7 +8,6 @@
+ 
+ add_subdirectory(keduvocdocument)
+ add_subdirectory(kdeeduui)
+-add_subdirectory(libscience)
+ add_subdirectory(data)
+ #add_subdirectory(widgets)
+ add_subdirectory(qtmmlwidget)