diff options
Diffstat (limited to 'extra/kdeedu')
-rw-r--r-- | extra/kdeedu/PKGBUILD | 77 | ||||
-rw-r--r-- | extra/kdeedu/remove-libkdeedu-libscience.patch | 10 |
2 files changed, 45 insertions, 42 deletions
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index a5a24fb20..449a41c1c 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ +# $Id: PKGBUILD 130257 2011-07-04 19:27:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdeedu pkgname=('kdeedu-blinken' 'kdeedu-cantor' - 'kdeedu-data' 'kdeedu-kalgebra' 'kdeedu-kalzium' 'kdeedu-kanagram' @@ -25,8 +24,8 @@ pkgname=('kdeedu-blinken' 'kdeedu-parley' 'kdeedu-rocs' 'kdeedu-step') -pkgver=4.6.3 -pkgrel=2 +pkgver=4.6.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -35,13 +34,16 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' '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') -sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396' - 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') + 'gpsd-2.96.patch' + 'remove-libkdeedu-libscience.patch') +sha1sums=('64247eb68b2710a66baaf824d798e46b34ca4d4f' + '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 @@ -59,7 +61,7 @@ package_kdeedu-blinken() { install='kdeedu.install' cd $srcdir/build/blinken make DESTDIR=$pkgdir install - cd $srcdir/build/doc/blinken + cd $srcdir/build/blinken/doc make DESTDIR=$pkgdir install } @@ -72,14 +74,7 @@ package_kdeedu-cantor() { install='kdeedu.install' cd $srcdir/build/cantor make DESTDIR=$pkgdir install - cd $srcdir/build/doc/cantor - make DESTDIR=$pkgdir install -} - -package_kdeedu-data() { - pkgdesc='Data for KDE Educational Software' - groups=() - cd $srcdir/build/data + cd $srcdir/build/cantor/doc make DESTDIR=$pkgdir install } @@ -89,7 +84,7 @@ package_kdeedu-kalgebra() { install='kdeedu.install' cd $srcdir/build/kalgebra make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalgebra + cd $srcdir/build/kalgebra/doc make DESTDIR=$pkgdir install } @@ -99,17 +94,17 @@ package_kdeedu-kalzium() { install='kdeedu.install' cd $srcdir/build/kalzium make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalzium + cd $srcdir/build/kalzium/doc make DESTDIR=$pkgdir install } package_kdeedu-kanagram() { pkgdesc='KDE Letter Order Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + depends=('kdebase-runtime' 'kdeedu-libkdeedu') install='kdeedu.install' cd $srcdir/build/kanagram make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kanagram + cd $srcdir/build/kanagram/doc make DESTDIR=$pkgdir install } @@ -119,7 +114,7 @@ package_kdeedu-kbruch() { install='kdeedu.install' cd $srcdir/build/kbruch make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbruch + cd $srcdir/build/kbruch/doc make DESTDIR=$pkgdir install } @@ -129,17 +124,17 @@ package_kdeedu-kgeography() { install='kdeedu.install' cd $srcdir/build/kgeography make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgeography + cd $srcdir/build/kgeography/doc make DESTDIR=$pkgdir install } package_kdeedu-khangman() { pkgdesc='KDE Hangman Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + depends=('kdebase-runtime' 'kdeedu-libkdeedu') install='kdeedu.install' cd $srcdir/build/khangman make DESTDIR=$pkgdir install - cd $srcdir/build/doc/khangman + cd $srcdir/build/khangman/doc make DESTDIR=$pkgdir install } @@ -149,7 +144,7 @@ package_kdeedu-kig() { install='kdeedu.install' cd $srcdir/build/kig make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kig + cd $srcdir/build/kig/doc make DESTDIR=$pkgdir install # Use the python2 executable @@ -162,7 +157,7 @@ package_kdeedu-kiten() { install='kdeedu.install' cd $srcdir/build/kiten make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiten + cd $srcdir/build/kiten/doc make DESTDIR=$pkgdir install } @@ -172,7 +167,7 @@ package_kdeedu-klettres() { install='kdeedu.install' cd $srcdir/build/klettres make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klettres + cd $srcdir/build/klettres/doc make DESTDIR=$pkgdir install } @@ -182,7 +177,7 @@ package_kdeedu-kmplot() { install='kdeedu.install' cd $srcdir/build/kmplot make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmplot + cd $srcdir/build/kmplot/doc make DESTDIR=$pkgdir install } @@ -192,7 +187,7 @@ package_kdeedu-kstars() { install='kdeedu.install' cd $srcdir/build/kstars make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kstars + cd $srcdir/build/kstars/doc make DESTDIR=$pkgdir install } @@ -202,7 +197,7 @@ package_kdeedu-ktouch() { install='kdeedu.install' cd $srcdir/build/ktouch make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktouch + cd $srcdir/build/ktouch/doc make DESTDIR=$pkgdir install } @@ -212,17 +207,17 @@ package_kdeedu-kturtle() { install='kdeedu.install' cd $srcdir/build/kturtle make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kturtle + cd $srcdir/build/kturtle/doc make DESTDIR=$pkgdir install } package_kdeedu-kwordquiz() { pkgdesc='A flashcard and vocabulary learning program' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + depends=('kdebase-runtime' 'kdeedu-libkdeedu') install='kdeedu.install' cd $srcdir/build/kwordquiz make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kwordquiz + cd $srcdir/build/kwordquiz/doc make DESTDIR=$pkgdir install } @@ -231,10 +226,10 @@ package_kdeedu-libkdeedu() { groups=() depends=('kdelibs') install='kdeedu.install' + replaces=('kdeedu-data') + conflicts=('kdeedu-data') cd $srcdir/build/libkdeedu make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake } package_kdeedu-marble() { @@ -243,19 +238,17 @@ package_kdeedu-marble() { install='kdeedu.install' cd $srcdir/build/marble make DESTDIR=$pkgdir install - cd $srcdir/build/doc/marble + cd $srcdir/build/marble/doc make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake } package_kdeedu-parley() { pkgdesc='Vocabulary Trainer' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python') + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python') install='kdeedu.install' cd $srcdir/build/parley make DESTDIR=$pkgdir install - cd $srcdir/build/doc/parley + cd $srcdir/build/parley/doc make DESTDIR=$pkgdir install } @@ -265,7 +258,7 @@ package_kdeedu-rocs() { install='kdeedu.install' cd $srcdir/build/rocs make DESTDIR=$pkgdir install - cd $srcdir/build/doc/rocs + cd $srcdir/build/rocs/doc make DESTDIR=$pkgdir install } @@ -275,6 +268,6 @@ package_kdeedu-step() { install='kdeedu.install' cd $srcdir/build/step make DESTDIR=$pkgdir install - cd $srcdir/build/doc/step + cd $srcdir/build/step/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdeedu/remove-libkdeedu-libscience.patch b/extra/kdeedu/remove-libkdeedu-libscience.patch new file mode 100644 index 000000000..a8643d49f --- /dev/null +++ b/extra/kdeedu/remove-libkdeedu-libscience.patch @@ -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) |