[arch-commits] Commit in cantor/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sun Jun 25 21:15:02 UTC 2017
Date: Sunday, June 25, 2017 @ 21:15:00
Author: arojas
Revision: 299252
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cantor/repos/extra-i686/PKGBUILD
(from rev 299251, cantor/trunk/PKGBUILD)
cantor/repos/extra-i686/cantor-julia-0.6.patch
(from rev 299251, cantor/trunk/cantor-julia-0.6.patch)
cantor/repos/extra-x86_64/PKGBUILD
(from rev 299251, cantor/trunk/PKGBUILD)
cantor/repos/extra-x86_64/cantor-julia-0.6.patch
(from rev 299251, cantor/trunk/cantor-julia-0.6.patch)
Deleted:
cantor/repos/extra-i686/PKGBUILD
cantor/repos/extra-x86_64/PKGBUILD
-------------------------------------+
/PKGBUILD | 120 ++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 55 ---------------
extra-i686/cantor-julia-0.6.patch | 14 +++
extra-x86_64/PKGBUILD | 55 ---------------
extra-x86_64/cantor-julia-0.6.patch | 14 +++
5 files changed, 148 insertions(+), 110 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-06-25 21:14:18 UTC (rev 299251)
+++ extra-i686/PKGBUILD 2017-06-25 21:15:00 UTC (rev 299252)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=17.04.2
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="https://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' 'julia')
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend'
- 'luajit: LUA backend'
- 'python: Python 3 backend'
- 'python2: Python 2 backend'
- 'sagemath: SageMath backend'
- 'julia: Julia backend')
-conflicts=('kdeedu-cantor')
-replaces=('kdeedu-cantor')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig})
-sha256sums=('f194eba838c08dea49877fecf17091f598b70f5357f4574388d91c8bc1392120'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
-
- if [[ $CARCH == 'i686' ]]; then
- export CFLAGS+=" -march=pentium4"
- export CXXFLAGS+=" -march=pentium4"
- fi
-
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF \
- -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 299251, cantor/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-25 21:15:00 UTC (rev 299252)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=17.04.2
+pkgrel=2
+pkgdesc="KDE Frontend to Mathematical Software"
+url="https://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' 'julia')
+optdepends=('maxima: Maxima backend'
+ 'octave: Octave backend'
+ 'r: R backend'
+ 'luajit: LUA backend'
+ 'python: Python 3 backend'
+ 'python2: Python 2 backend'
+ 'sagemath: SageMath backend'
+ 'julia: Julia backend')
+conflicts=('kdeedu-cantor')
+replaces=('kdeedu-cantor')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig} cantor-julia-0.6.patch)
+sha256sums=('f194eba838c08dea49877fecf17091f598b70f5357f4574388d91c8bc1392120'
+ 'SKIP'
+ '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# fix build with julia 0.6
+ patch -p1 -i ../cantor-julia-0.6.patch
+}
+
+build() {
+ cd build
+
+ if [[ $CARCH == 'i686' ]]; then
+ export CFLAGS+=" -march=pentium4"
+ export CXXFLAGS+=" -march=pentium4"
+ fi
+
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF \
+ -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/cantor-julia-0.6.patch (from rev 299251, cantor/trunk/cantor-julia-0.6.patch)
===================================================================
--- extra-i686/cantor-julia-0.6.patch (rev 0)
+++ extra-i686/cantor-julia-0.6.patch 2017-06-25 21:15:00 UTC (rev 299252)
@@ -0,0 +1,14 @@
+diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
+index dc8a48e5..91c2c338 100644
+--- a/src/backends/julia/juliaserver/juliaserver.cpp
++++ b/src/backends/julia/juliaserver/juliaserver.cpp
+@@ -40,7 +40,7 @@ JuliaServer::~JuliaServer()
+ void JuliaServer::login(const QString &path) const
+ {
+ QString dir_path = QFileInfo(path).dir().absolutePath();
+- jl_init(dir_path.toLatin1().constData());
++ jl_init_with_image(dir_path.toLatin1().constData(), NULL);
+ }
+
+ void JuliaServer::runJuliaCommand(const QString &command)
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-06-25 21:14:18 UTC (rev 299251)
+++ extra-x86_64/PKGBUILD 2017-06-25 21:15:00 UTC (rev 299252)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=17.04.2
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="https://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' 'julia')
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend'
- 'luajit: LUA backend'
- 'python: Python 3 backend'
- 'python2: Python 2 backend'
- 'sagemath: SageMath backend'
- 'julia: Julia backend')
-conflicts=('kdeedu-cantor')
-replaces=('kdeedu-cantor')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig})
-sha256sums=('f194eba838c08dea49877fecf17091f598b70f5357f4574388d91c8bc1392120'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
-
- if [[ $CARCH == 'i686' ]]; then
- export CFLAGS+=" -march=pentium4"
- export CXXFLAGS+=" -march=pentium4"
- fi
-
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF \
- -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 299251, cantor/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-06-25 21:15:00 UTC (rev 299252)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=17.04.2
+pkgrel=2
+pkgdesc="KDE Frontend to Mathematical Software"
+url="https://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' 'julia')
+optdepends=('maxima: Maxima backend'
+ 'octave: Octave backend'
+ 'r: R backend'
+ 'luajit: LUA backend'
+ 'python: Python 3 backend'
+ 'python2: Python 2 backend'
+ 'sagemath: SageMath backend'
+ 'julia: Julia backend')
+conflicts=('kdeedu-cantor')
+replaces=('kdeedu-cantor')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig} cantor-julia-0.6.patch)
+sha256sums=('f194eba838c08dea49877fecf17091f598b70f5357f4574388d91c8bc1392120'
+ 'SKIP'
+ '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# fix build with julia 0.6
+ patch -p1 -i ../cantor-julia-0.6.patch
+}
+
+build() {
+ cd build
+
+ if [[ $CARCH == 'i686' ]]; then
+ export CFLAGS+=" -march=pentium4"
+ export CXXFLAGS+=" -march=pentium4"
+ fi
+
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF \
+ -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/cantor-julia-0.6.patch (from rev 299251, cantor/trunk/cantor-julia-0.6.patch)
===================================================================
--- extra-x86_64/cantor-julia-0.6.patch (rev 0)
+++ extra-x86_64/cantor-julia-0.6.patch 2017-06-25 21:15:00 UTC (rev 299252)
@@ -0,0 +1,14 @@
+diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
+index dc8a48e5..91c2c338 100644
+--- a/src/backends/julia/juliaserver/juliaserver.cpp
++++ b/src/backends/julia/juliaserver/juliaserver.cpp
+@@ -40,7 +40,7 @@ JuliaServer::~JuliaServer()
+ void JuliaServer::login(const QString &path) const
+ {
+ QString dir_path = QFileInfo(path).dir().absolutePath();
+- jl_init(dir_path.toLatin1().constData());
++ jl_init_with_image(dir_path.toLatin1().constData(), NULL);
+ }
+
+ void JuliaServer::runJuliaCommand(const QString &command)
+
More information about the arch-commits
mailing list