[arch-commits] Commit in cantor/repos (4 files)

Antonio Rojas arojas at archlinux.org
Sun Jan 1 22:17:24 UTC 2017


    Date: Sunday, January 1, 2017 @ 22:17:23
  Author: arojas
Revision: 285171

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cantor/repos/testing-i686/PKGBUILD
    (from rev 285169, cantor/trunk/PKGBUILD)
  cantor/repos/testing-x86_64/PKGBUILD
    (from rev 285170, cantor/trunk/PKGBUILD)
Deleted:
  cantor/repos/testing-i686/PKGBUILD
  cantor/repos/testing-x86_64/PKGBUILD

-------------------------+
 /PKGBUILD               |  122 ++++++++++++++++++++++++++++++++++++++++++++++
 testing-i686/PKGBUILD   |   55 --------------------
 testing-x86_64/PKGBUILD |   55 --------------------
 3 files changed, 122 insertions(+), 110 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2017-01-01 22:17:15 UTC (rev 285170)
+++ testing-i686/PKGBUILD	2017-01-01 22:17:23 UTC (rev 285171)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=16.12.0
-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' '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=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig})
-sha1sums=('58498ba930688dd948c9796e06998bde9ec5c160'
-          '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/testing-i686/PKGBUILD (from rev 285169, cantor/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2017-01-01 22:17:23 UTC (rev 285171)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=16.12.0
+pkgrel=3
+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' '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=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig}
+        cantor-python3.6.patch::"https://cgit.kde.org/cantor.git/patch/?id=2c67377")
+sha1sums=('58498ba930688dd948c9796e06998bde9ec5c160'
+          'SKIP'
+          '4778cda4f5289f0bd9ab1c7943c9e16c7f82197a')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+
+# Fix python3 backend build with python 3.6
+  cd $pkgname-$pkgver
+  patch -p1 -i ../cantor-python3.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
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2017-01-01 22:17:15 UTC (rev 285170)
+++ testing-x86_64/PKGBUILD	2017-01-01 22:17:23 UTC (rev 285171)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=16.12.0
-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' '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=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig})
-sha1sums=('58498ba930688dd948c9796e06998bde9ec5c160'
-          '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/testing-x86_64/PKGBUILD (from rev 285170, cantor/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-01-01 22:17:23 UTC (rev 285171)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=16.12.0
+pkgrel=3
+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' '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=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig}
+        cantor-python3.6.patch::"https://cgit.kde.org/cantor.git/patch/?id=2c67377")
+sha1sums=('58498ba930688dd948c9796e06998bde9ec5c160'
+          'SKIP'
+          '4778cda4f5289f0bd9ab1c7943c9e16c7f82197a')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+
+# Fix python3 backend build with python 3.6
+  cd $pkgname-$pkgver
+  patch -p1 -i ../cantor-python3.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
+}



More information about the arch-commits mailing list