[arch-commits] Commit in cantor/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Tue Oct 13 07:12:27 UTC 2015
Date: Tuesday, October 13, 2015 @ 09:12:27
Author: arojas
Revision: 249025
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cantor/repos/extra-i686/PKGBUILD
(from rev 249024, cantor/trunk/PKGBUILD)
cantor/repos/extra-i686/cantor.install
(from rev 249024, cantor/trunk/cantor.install)
cantor/repos/extra-i686/python-3.5.patch
(from rev 249024, cantor/trunk/python-3.5.patch)
cantor/repos/extra-x86_64/PKGBUILD
(from rev 249024, cantor/trunk/PKGBUILD)
cantor/repos/extra-x86_64/cantor.install
(from rev 249024, cantor/trunk/cantor.install)
cantor/repos/extra-x86_64/python-3.5.patch
(from rev 249024, cantor/trunk/python-3.5.patch)
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 | 106 ++++++++++++++++++++++++++++++++++++++++
/cantor.install | 24 +++++++++
extra-i686/PKGBUILD | 53 --------------------
extra-i686/cantor.install | 12 ----
extra-i686/python-3.5.patch | 12 ++++
extra-x86_64/PKGBUILD | 53 --------------------
extra-x86_64/cantor.install | 12 ----
extra-x86_64/python-3.5.patch | 12 ++++
8 files changed, 154 insertions(+), 130 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-10-13 07:11:42 UTC (rev 249024)
+++ extra-i686/PKGBUILD 2015-10-13 07:12:27 UTC (rev 249025)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=15.08.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' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate')
-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" python-3.5.patch)
-sha1sums=('bcc5cb39bb9febf51bf70b3e8ebe03e58f1ca692'
- 'd6d04b323e4d301587ebb82e88672c0cee923bc1')
-
-prepare() {
- mkdir -p build
-
-# Fix build against python 3.5
- cd $pkgname-$pkgver
- patch -p1 -i ../python-3.5.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
-}
Copied: cantor/repos/extra-i686/PKGBUILD (from rev 249024, cantor/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-10-13 07:12:27 UTC (rev 249025)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=15.08.2
+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' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate')
+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" python-3.5.patch)
+sha1sums=('3f20136986443b3cf15376ea8a3b0f1bf81eb051'
+ 'd6d04b323e4d301587ebb82e88672c0cee923bc1')
+
+prepare() {
+ mkdir -p build
+
+# Fix build against python 3.5
+ cd $pkgname-$pkgver
+ patch -p1 -i ../python-3.5.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 2015-10-13 07:11:42 UTC (rev 249024)
+++ extra-i686/cantor.install 2015-10-13 07:12:27 UTC (rev 249025)
@@ -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 249024, cantor/trunk/cantor.install)
===================================================================
--- extra-i686/cantor.install (rev 0)
+++ extra-i686/cantor.install 2015-10-13 07:12:27 UTC (rev 249025)
@@ -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
+}
Copied: cantor/repos/extra-i686/python-3.5.patch (from rev 249024, cantor/trunk/python-3.5.patch)
===================================================================
--- extra-i686/python-3.5.patch (rev 0)
+++ extra-i686/python-3.5.patch 2015-10-13 07:12:27 UTC (rev 249025)
@@ -0,0 +1,12 @@
+diff -ru cantor.orig/cmake/FindPythonLibs3.cmake cantor/cmake/FindPythonLibs3.cmake
+--- cantor.orig/cmake/FindPythonLibs3.cmake 2015-09-20 11:54:42.206749420 +0200
++++ cantor/cmake/FindPythonLibs3.cmake 2015-09-20 11:55:00.896859349 +0200
+@@ -5,7 +5,7 @@
+ find_path(PYTHONLIBS3_INCLUDE_DIR Python.h
+ HINTS ${PYTHONLIBS3_INCLUDEDIR} ${PYTHONLIBS3_INCLUDE_DIRS})
+
+-find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m
++find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m
+ HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
+
+ set(PYTHONLIBS3_LIBRARIES ${PYTHONLIBS3_LIBRARY} )
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-10-13 07:11:42 UTC (rev 249024)
+++ extra-x86_64/PKGBUILD 2015-10-13 07:12:27 UTC (rev 249025)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=15.08.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' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate')
-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" python-3.5.patch)
-sha1sums=('bcc5cb39bb9febf51bf70b3e8ebe03e58f1ca692'
- 'd6d04b323e4d301587ebb82e88672c0cee923bc1')
-
-prepare() {
- mkdir -p build
-
-# Fix build against python 3.5
- cd $pkgname-$pkgver
- patch -p1 -i ../python-3.5.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
-}
Copied: cantor/repos/extra-x86_64/PKGBUILD (from rev 249024, cantor/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-10-13 07:12:27 UTC (rev 249025)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=15.08.2
+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' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate')
+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" python-3.5.patch)
+sha1sums=('3f20136986443b3cf15376ea8a3b0f1bf81eb051'
+ 'd6d04b323e4d301587ebb82e88672c0cee923bc1')
+
+prepare() {
+ mkdir -p build
+
+# Fix build against python 3.5
+ cd $pkgname-$pkgver
+ patch -p1 -i ../python-3.5.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 2015-10-13 07:11:42 UTC (rev 249024)
+++ extra-x86_64/cantor.install 2015-10-13 07:12:27 UTC (rev 249025)
@@ -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 249024, cantor/trunk/cantor.install)
===================================================================
--- extra-x86_64/cantor.install (rev 0)
+++ extra-x86_64/cantor.install 2015-10-13 07:12:27 UTC (rev 249025)
@@ -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
+}
Copied: cantor/repos/extra-x86_64/python-3.5.patch (from rev 249024, cantor/trunk/python-3.5.patch)
===================================================================
--- extra-x86_64/python-3.5.patch (rev 0)
+++ extra-x86_64/python-3.5.patch 2015-10-13 07:12:27 UTC (rev 249025)
@@ -0,0 +1,12 @@
+diff -ru cantor.orig/cmake/FindPythonLibs3.cmake cantor/cmake/FindPythonLibs3.cmake
+--- cantor.orig/cmake/FindPythonLibs3.cmake 2015-09-20 11:54:42.206749420 +0200
++++ cantor/cmake/FindPythonLibs3.cmake 2015-09-20 11:55:00.896859349 +0200
+@@ -5,7 +5,7 @@
+ find_path(PYTHONLIBS3_INCLUDE_DIR Python.h
+ HINTS ${PYTHONLIBS3_INCLUDEDIR} ${PYTHONLIBS3_INCLUDE_DIRS})
+
+-find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m
++find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m
+ HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
+
+ set(PYTHONLIBS3_LIBRARIES ${PYTHONLIBS3_LIBRARY} )
More information about the arch-commits
mailing list