Date: Sunday, February 7, 2016 @ 20:21:15 Author: arojas Revision: 258946
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cantor/repos/extra-i686/PKGBUILD (from rev 258945, cantor/trunk/PKGBUILD) cantor/repos/extra-i686/cantor.install (from rev 258945, cantor/trunk/cantor.install) cantor/repos/extra-x86_64/PKGBUILD (from rev 258945, cantor/trunk/PKGBUILD) cantor/repos/extra-x86_64/cantor.install (from rev 258945, cantor/trunk/cantor.install) Deleted: cantor/repos/extra-i686/PKGBUILD cantor/repos/extra-i686/cantor.install cantor/repos/extra-x86_64/PKGBUILD cantor/repos/extra-x86_64/cantor.install -----------------------------+ /PKGBUILD | 108 ++++++++++++++++++++++++++++++++++++++++++ /cantor.install | 24 +++++++++ extra-i686/PKGBUILD | 48 ------------------ extra-i686/cantor.install | 12 ---- extra-x86_64/PKGBUILD | 48 ------------------ extra-x86_64/cantor.install | 12 ---- 6 files changed, 132 insertions(+), 120 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-02-07 19:20:45 UTC (rev 258945) +++ extra-i686/PKGBUILD 2016-02-07 19:21:15 UTC (rev 258946) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=cantor -pkgver=15.12.1 -pkgrel=1 -pkgdesc="KDE Frontend to Mathematical Software" -url="http://kde.org/applications/education/cantor/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde-applications' 'kdeedu') -depends=('analitza' 'libspectre' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate' 'hicolor-icon-theme') -makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r') -optdepends=('maxima: Maxima backend' - 'octave: Octave backend' - 'r: R backend' - 'luajit: LUA backend' - 'python: Python 3 backend' - 'python2: Python 2 backend' - 'sagemath: SageMath backend') -conflicts=('kdeedu-cantor') -replaces=('kdeedu-cantor') -install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('aea99e9fd5924996181b935f4ce3566c1517b241') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: cantor/repos/extra-i686/PKGBUILD (from rev 258945, cantor/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-02-07 19:21:15 UTC (rev 258946) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=cantor +pkgver=15.12.1 +pkgrel=2 +pkgdesc="KDE Frontend to Mathematical Software" +url="http://kde.org/applications/education/cantor/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde-applications' 'kdeedu') +depends=('analitza' 'libspectre' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate' 'hicolor-icon-theme') +makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r') +optdepends=('maxima: Maxima backend' + 'octave: Octave backend' + 'r: R backend' + 'luajit: LUA backend' + 'python: Python 3 backend' + 'python2: Python 2 backend' + 'sagemath: SageMath backend') +conflicts=('kdeedu-cantor') +replaces=('kdeedu-cantor') +install=${pkgname}.install +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz" + cantor-sagemath.patch::"https://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=5d185d21&o=plain") +sha1sums=('aea99e9fd5924996181b935f4ce3566c1517b241' + 'd325a8fe8567ff8ed03518043ebfe547448d81c2') + +prepare() { + mkdir -p build + +# Fix sagemath backend http://bugs.kde.org/show_bug.cgi?id=348128 + cd $pkgname-$pkgver + patch -p1 -i ../cantor-sagemath.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/cantor.install =================================================================== --- extra-i686/cantor.install 2016-02-07 19:20:45 UTC (rev 258945) +++ extra-i686/cantor.install 2016-02-07 19:21:15 UTC (rev 258946) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: cantor/repos/extra-i686/cantor.install (from rev 258945, cantor/trunk/cantor.install) =================================================================== --- extra-i686/cantor.install (rev 0) +++ extra-i686/cantor.install 2016-02-07 19:21:15 UTC (rev 258946) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-02-07 19:20:45 UTC (rev 258945) +++ extra-x86_64/PKGBUILD 2016-02-07 19:21:15 UTC (rev 258946) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=cantor -pkgver=15.12.1 -pkgrel=1 -pkgdesc="KDE Frontend to Mathematical Software" -url="http://kde.org/applications/education/cantor/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde-applications' 'kdeedu') -depends=('analitza' 'libspectre' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate' 'hicolor-icon-theme') -makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r') -optdepends=('maxima: Maxima backend' - 'octave: Octave backend' - 'r: R backend' - 'luajit: LUA backend' - 'python: Python 3 backend' - 'python2: Python 2 backend' - 'sagemath: SageMath backend') -conflicts=('kdeedu-cantor') -replaces=('kdeedu-cantor') -install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('aea99e9fd5924996181b935f4ce3566c1517b241') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: cantor/repos/extra-x86_64/PKGBUILD (from rev 258945, cantor/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-02-07 19:21:15 UTC (rev 258946) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=cantor +pkgver=15.12.1 +pkgrel=2 +pkgdesc="KDE Frontend to Mathematical Software" +url="http://kde.org/applications/education/cantor/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde-applications' 'kdeedu') +depends=('analitza' 'libspectre' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate' 'hicolor-icon-theme') +makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r') +optdepends=('maxima: Maxima backend' + 'octave: Octave backend' + 'r: R backend' + 'luajit: LUA backend' + 'python: Python 3 backend' + 'python2: Python 2 backend' + 'sagemath: SageMath backend') +conflicts=('kdeedu-cantor') +replaces=('kdeedu-cantor') +install=${pkgname}.install +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz" + cantor-sagemath.patch::"https://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=5d185d21&o=plain") +sha1sums=('aea99e9fd5924996181b935f4ce3566c1517b241' + 'd325a8fe8567ff8ed03518043ebfe547448d81c2') + +prepare() { + mkdir -p build + +# Fix sagemath backend http://bugs.kde.org/show_bug.cgi?id=348128 + cd $pkgname-$pkgver + patch -p1 -i ../cantor-sagemath.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/cantor.install =================================================================== --- extra-x86_64/cantor.install 2016-02-07 19:20:45 UTC (rev 258945) +++ extra-x86_64/cantor.install 2016-02-07 19:21:15 UTC (rev 258946) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: cantor/repos/extra-x86_64/cantor.install (from rev 258945, cantor/trunk/cantor.install) =================================================================== --- extra-x86_64/cantor.install (rev 0) +++ extra-x86_64/cantor.install 2016-02-07 19:21:15 UTC (rev 258946) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}