Date: Tuesday, February 9, 2010 @ 02:31:53
Author: pierre
Revision: 67644
Merged revisions 67111,67175,67510 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdeedu/trunk
........
r67111 | andrea | 2010-02-03 16:42:05 +0100 (Mi, 03 Feb 2010) | 1 line
added maxima,r,kdeedu-kalgebra as optdepends in kdeedu-cantor (FS#18138)
........
r67175 | pierre | 2010-02-04 13:29:06 +0100 (Do, 04 Feb 2010) | 1 line
KDE 4.4.0; first try
........
r67510 | pierre | 2010-02-07 16:16:13 +0100 (So, 07 Feb 2010) | 1 line
fix FS#18208
........
Modified:
kdeedu/repos/testing-i686/ (properties)
kdeedu/repos/testing-i686/PKGBUILD
----------+
PKGBUILD | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
Property changes on: kdeedu/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /kdeedu/trunk:1-66940
+ /kdeedu/trunk:1-67643
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2010-02-09 07:31:14 UTC (rev 67643)
+++ testing-i686/PKGBUILD 2010-02-09 07:31:53 UTC (rev 67644)
@@ -24,8 +24,8 @@
'kdeedu-parley'
'kdeedu-rocs'
'kdeedu-step')
-pkgver=4.3.98
-pkgrel=1
+pkgver=4.4.0
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -33,16 +33,17 @@
makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio'
'kdelibs'
'kdebase-runtime' 'openbabel' 'libqalculate' 'gsl' 'boost'
'indilib' 'r'
'libspectre' 'python')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
-md5sums=('8f509d8cf2b8b9820fc3c802c2078c0a')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
+md5sums=('ce6a1b694e881f12553b2409504b8694')
build() {
cd $srcdir
mkdir build
cd build
+ # rpath is needed for cantor to find R
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_PREFIX=/usr
make
}
@@ -58,8 +59,11 @@
}
package_kdeedu-cantor() {
- pkgdesc='KDE Frontend to Mathematical Software.'
- depends=('kdeedu-libkdeedu' 'kdeedu-kalgebra' 'libspectre' 'r')
+ pkgdesc='KDE Frontend to Mathematical Software'
+ depends=('kdeedu-libkdeedu' 'libspectre')
+ optdepends=('kdeedu-kalgebra: backend'
+ 'maxima: backend'
+ 'r: backend')
install='kdeedu.install'
cd $srcdir/build/cantor
make DESTDIR=$pkgdir install
