[arch-commits] Commit in cantor/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Tue Jun 30 20:25:29 UTC 2015
Date: Tuesday, June 30, 2015 @ 22:25:29
Author: arojas
Revision: 241518
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cantor/repos/extra-i686/PKGBUILD
(from rev 241517, cantor/trunk/PKGBUILD)
cantor/repos/extra-i686/cantor.install
(from rev 241517, cantor/trunk/cantor.install)
cantor/repos/extra-i686/r-3.2.patch
(from rev 241517, cantor/trunk/r-3.2.patch)
cantor/repos/extra-x86_64/PKGBUILD
(from rev 241517, cantor/trunk/PKGBUILD)
cantor/repos/extra-x86_64/cantor.install
(from rev 241517, cantor/trunk/cantor.install)
cantor/repos/extra-x86_64/r-3.2.patch
(from rev 241517, cantor/trunk/r-3.2.patch)
Deleted:
cantor/repos/extra-i686/PKGBUILD
cantor/repos/extra-i686/cantor.install
cantor/repos/extra-i686/r-3.2.patch
cantor/repos/extra-x86_64/PKGBUILD
cantor/repos/extra-x86_64/cantor.install
cantor/repos/extra-x86_64/r-3.2.patch
-----------------------------+
/PKGBUILD | 106 ++++++++++++++++++++++++++++++++++++++++++
/cantor.install | 24 +++++++++
/r-3.2.patch | 88 ++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 53 ---------------------
extra-i686/cantor.install | 12 ----
extra-i686/r-3.2.patch | 44 -----------------
extra-x86_64/PKGBUILD | 53 ---------------------
extra-x86_64/cantor.install | 12 ----
extra-x86_64/r-3.2.patch | 44 -----------------
9 files changed, 218 insertions(+), 218 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-30 20:25:10 UTC (rev 241517)
+++ extra-i686/PKGBUILD 2015-06-30 20:25:29 UTC (rev 241518)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=15.04.2
-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' 'libqalculate' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff')
-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" 'r-3.2.patch')
-sha1sums=('55b75171071deead3d22553d058342976b5b1ecd'
- '97fa0a72f1b9b23d658f754b821da12215b255e7')
-
-prepare() {
- mkdir -p build
-
-# Fix build with R 3.2
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/r-3.2.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 "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: cantor/repos/extra-i686/PKGBUILD (from rev 241517, cantor/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-30 20:25:29 UTC (rev 241518)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=15.04.3
+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' 'libqalculate' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff')
+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" 'r-3.2.patch')
+sha1sums=('fdb9897a63561e6b3cda11dccc971bc674ea6a67'
+ '97fa0a72f1b9b23d658f754b821da12215b255e7')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with R 3.2
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/r-3.2.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 "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/cantor.install
===================================================================
--- extra-i686/cantor.install 2015-06-30 20:25:10 UTC (rev 241517)
+++ extra-i686/cantor.install 2015-06-30 20:25:29 UTC (rev 241518)
@@ -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 241517, cantor/trunk/cantor.install)
===================================================================
--- extra-i686/cantor.install (rev 0)
+++ extra-i686/cantor.install 2015-06-30 20:25:29 UTC (rev 241518)
@@ -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-i686/r-3.2.patch
===================================================================
--- extra-i686/r-3.2.patch 2015-06-30 20:25:10 UTC (rev 241517)
+++ extra-i686/r-3.2.patch 2015-06-30 20:25:29 UTC (rev 241518)
@@ -1,44 +0,0 @@
-From: Raymond Wooninck <tittiatcoke at gmail.com>
-Date: Mon, 25 May 2015 13:19:20 +0000
-Subject: Fix build with latest R (version 3.2)
-X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=88b14d85b9504af29fa34ac41109db6ff1d8bdf5
----
-Fix build with latest R (version 3.2)
-
-REVIEW: 123531
----
-
-
---- a/src/backends/R/rserver/rcallbacks.cpp
-+++ b/src/backends/R/rserver/rcallbacks.cpp
-@@ -26,6 +26,7 @@
- #include <QStringList>
-
- #include <stdio.h>
-+#include <Rinterface.h>
-
- RServer* server;
- Expression* currentExpression;
-
---- a/src/backends/R/rserver/rcallbacks.h
-+++ b/src/backends/R/rserver/rcallbacks.h
-@@ -30,7 +30,6 @@
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
-
- //This File implements the necessary callbacks for R
-
---- a/src/backends/R/rserver/rserver.cpp
-+++ b/src/backends/R/rserver/rserver.cpp
-@@ -42,7 +42,6 @@
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
-
- // Not making a member to prevent pulling R headers into rserver.h
-
Copied: cantor/repos/extra-i686/r-3.2.patch (from rev 241517, cantor/trunk/r-3.2.patch)
===================================================================
--- extra-i686/r-3.2.patch (rev 0)
+++ extra-i686/r-3.2.patch 2015-06-30 20:25:29 UTC (rev 241518)
@@ -0,0 +1,44 @@
+From: Raymond Wooninck <tittiatcoke at gmail.com>
+Date: Mon, 25 May 2015 13:19:20 +0000
+Subject: Fix build with latest R (version 3.2)
+X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=88b14d85b9504af29fa34ac41109db6ff1d8bdf5
+---
+Fix build with latest R (version 3.2)
+
+REVIEW: 123531
+---
+
+
+--- a/src/backends/R/rserver/rcallbacks.cpp
++++ b/src/backends/R/rserver/rcallbacks.cpp
+@@ -26,6 +26,7 @@
+ #include <QStringList>
+
+ #include <stdio.h>
++#include <Rinterface.h>
+
+ RServer* server;
+ Expression* currentExpression;
+
+--- a/src/backends/R/rserver/rcallbacks.h
++++ b/src/backends/R/rserver/rcallbacks.h
+@@ -30,7 +30,6 @@
+ #include <Rversion.h>
+ #include <Rdefines.h>
+ #define R_INTERFACE_PTRS
+-#include <Rinterface.h>
+ #include <R_ext/Parse.h>
+
+ //This File implements the necessary callbacks for R
+
+--- a/src/backends/R/rserver/rserver.cpp
++++ b/src/backends/R/rserver/rserver.cpp
+@@ -42,7 +42,6 @@
+ #include <Rversion.h>
+ #include <Rdefines.h>
+ #define R_INTERFACE_PTRS
+-#include <Rinterface.h>
+ #include <R_ext/Parse.h>
+
+ // Not making a member to prevent pulling R headers into rserver.h
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-30 20:25:10 UTC (rev 241517)
+++ extra-x86_64/PKGBUILD 2015-06-30 20:25:29 UTC (rev 241518)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=15.04.2
-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' 'libqalculate' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff')
-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" 'r-3.2.patch')
-sha1sums=('55b75171071deead3d22553d058342976b5b1ecd'
- '97fa0a72f1b9b23d658f754b821da12215b255e7')
-
-prepare() {
- mkdir -p build
-
-# Fix build with R 3.2
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/r-3.2.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 "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: cantor/repos/extra-x86_64/PKGBUILD (from rev 241517, cantor/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-30 20:25:29 UTC (rev 241518)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=15.04.3
+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' 'libqalculate' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff')
+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" 'r-3.2.patch')
+sha1sums=('fdb9897a63561e6b3cda11dccc971bc674ea6a67'
+ '97fa0a72f1b9b23d658f754b821da12215b255e7')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with R 3.2
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/r-3.2.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 "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/cantor.install
===================================================================
--- extra-x86_64/cantor.install 2015-06-30 20:25:10 UTC (rev 241517)
+++ extra-x86_64/cantor.install 2015-06-30 20:25:29 UTC (rev 241518)
@@ -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 241517, cantor/trunk/cantor.install)
===================================================================
--- extra-x86_64/cantor.install (rev 0)
+++ extra-x86_64/cantor.install 2015-06-30 20:25:29 UTC (rev 241518)
@@ -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/r-3.2.patch
===================================================================
--- extra-x86_64/r-3.2.patch 2015-06-30 20:25:10 UTC (rev 241517)
+++ extra-x86_64/r-3.2.patch 2015-06-30 20:25:29 UTC (rev 241518)
@@ -1,44 +0,0 @@
-From: Raymond Wooninck <tittiatcoke at gmail.com>
-Date: Mon, 25 May 2015 13:19:20 +0000
-Subject: Fix build with latest R (version 3.2)
-X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=88b14d85b9504af29fa34ac41109db6ff1d8bdf5
----
-Fix build with latest R (version 3.2)
-
-REVIEW: 123531
----
-
-
---- a/src/backends/R/rserver/rcallbacks.cpp
-+++ b/src/backends/R/rserver/rcallbacks.cpp
-@@ -26,6 +26,7 @@
- #include <QStringList>
-
- #include <stdio.h>
-+#include <Rinterface.h>
-
- RServer* server;
- Expression* currentExpression;
-
---- a/src/backends/R/rserver/rcallbacks.h
-+++ b/src/backends/R/rserver/rcallbacks.h
-@@ -30,7 +30,6 @@
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
-
- //This File implements the necessary callbacks for R
-
---- a/src/backends/R/rserver/rserver.cpp
-+++ b/src/backends/R/rserver/rserver.cpp
-@@ -42,7 +42,6 @@
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
-
- // Not making a member to prevent pulling R headers into rserver.h
-
Copied: cantor/repos/extra-x86_64/r-3.2.patch (from rev 241517, cantor/trunk/r-3.2.patch)
===================================================================
--- extra-x86_64/r-3.2.patch (rev 0)
+++ extra-x86_64/r-3.2.patch 2015-06-30 20:25:29 UTC (rev 241518)
@@ -0,0 +1,44 @@
+From: Raymond Wooninck <tittiatcoke at gmail.com>
+Date: Mon, 25 May 2015 13:19:20 +0000
+Subject: Fix build with latest R (version 3.2)
+X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=88b14d85b9504af29fa34ac41109db6ff1d8bdf5
+---
+Fix build with latest R (version 3.2)
+
+REVIEW: 123531
+---
+
+
+--- a/src/backends/R/rserver/rcallbacks.cpp
++++ b/src/backends/R/rserver/rcallbacks.cpp
+@@ -26,6 +26,7 @@
+ #include <QStringList>
+
+ #include <stdio.h>
++#include <Rinterface.h>
+
+ RServer* server;
+ Expression* currentExpression;
+
+--- a/src/backends/R/rserver/rcallbacks.h
++++ b/src/backends/R/rserver/rcallbacks.h
+@@ -30,7 +30,6 @@
+ #include <Rversion.h>
+ #include <Rdefines.h>
+ #define R_INTERFACE_PTRS
+-#include <Rinterface.h>
+ #include <R_ext/Parse.h>
+
+ //This File implements the necessary callbacks for R
+
+--- a/src/backends/R/rserver/rserver.cpp
++++ b/src/backends/R/rserver/rserver.cpp
+@@ -42,7 +42,6 @@
+ #include <Rversion.h>
+ #include <Rdefines.h>
+ #define R_INTERFACE_PTRS
+-#include <Rinterface.h>
+ #include <R_ext/Parse.h>
+
+ // Not making a member to prevent pulling R headers into rserver.h
+
More information about the arch-commits
mailing list