[arch-commits] Commit in cantor/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Sun Aug 23 15:25:16 UTC 2015
Date: Sunday, August 23, 2015 @ 17:25:15
Author: arojas
Revision: 244742
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cantor/repos/extra-i686/PKGBUILD
(from rev 244741, cantor/trunk/PKGBUILD)
cantor/repos/extra-i686/cantor.install
(from rev 244741, cantor/trunk/cantor.install)
cantor/repos/extra-i686/fix-qalculate-build.patch
(from rev 244741, cantor/trunk/fix-qalculate-build.patch)
cantor/repos/extra-x86_64/PKGBUILD
(from rev 244741, cantor/trunk/PKGBUILD)
cantor/repos/extra-x86_64/cantor.install
(from rev 244741, cantor/trunk/cantor.install)
cantor/repos/extra-x86_64/fix-qalculate-build.patch
(from rev 244741, cantor/trunk/fix-qalculate-build.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 | 48 --------------
extra-i686/cantor.install | 12 ---
extra-i686/fix-qalculate-build.patch | 33 +++++++++
extra-x86_64/PKGBUILD | 48 --------------
extra-x86_64/cantor.install | 12 ---
extra-x86_64/fix-qalculate-build.patch | 33 +++++++++
8 files changed, 196 insertions(+), 120 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-08-23 15:24:37 UTC (rev 244741)
+++ extra-i686/PKGBUILD 2015-08-23 15:25:15 UTC (rev 244742)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=15.08.0
-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 https://bugs.kde.org/show_bug.cgi?id=350729
-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=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35')
-
-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 244741, cantor/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-08-23 15:25:15 UTC (rev 244742)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=15.08.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' '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" 'fix-qalculate-build.patch')
+sha1sums=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35'
+ '1a632b5f86b7efff66d3024ff3ac4585339551ef')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Fix qalculate backend build https://bugs.kde.org/show_bug.cgi?id=350729
+ patch -p1 -i ../fix-qalculate-build.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-08-23 15:24:37 UTC (rev 244741)
+++ extra-i686/cantor.install 2015-08-23 15:25:15 UTC (rev 244742)
@@ -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 244741, cantor/trunk/cantor.install)
===================================================================
--- extra-i686/cantor.install (rev 0)
+++ extra-i686/cantor.install 2015-08-23 15:25:15 UTC (rev 244742)
@@ -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/fix-qalculate-build.patch (from rev 244741, cantor/trunk/fix-qalculate-build.patch)
===================================================================
--- extra-i686/fix-qalculate-build.patch (rev 0)
+++ extra-i686/fix-qalculate-build.patch 2015-08-23 15:25:15 UTC (rev 244742)
@@ -0,0 +1,33 @@
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Fri, 07 Aug 2015 17:02:55 +0000
+Subject: Fix building the qalculate backend
+X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=ceadbd453cfb4263755931635cb9b02d7aa29efa
+---
+Fix building the qalculate backend
+
+Thanks to Christoph Feck who suggested the fix.
+
+BUG: 350729
+REVIEW: 124829
+---
+
+
+--- a/src/backends/qalculate/qalculateexpression.cpp
++++ b/src/backends/qalculate/qalculateexpression.cpp
+@@ -773,12 +773,12 @@
+ if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
+ plotParameters.filetype == PLOT_FILETYPE_PS ||
+ (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
+- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
++ plotParameters.filename.substr(p-4,4) == ".eps") ||
+ (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
+- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
++ plotParameters.filename.substr(p-3,3) == ".ps"))
+ setResult(new Cantor::EpsResult(QUrl(QString::fromStdString(plotParameters.filename))));
+ else
+- setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename)));
++ setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename))));
+ #else
+ setResult(new Cantor::ImageResult(QUrl::fromLocalFile(QString::fromStdString(plotParameters.filename))));
+ #endif
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-08-23 15:24:37 UTC (rev 244741)
+++ extra-x86_64/PKGBUILD 2015-08-23 15:25:15 UTC (rev 244742)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=15.08.0
-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 https://bugs.kde.org/show_bug.cgi?id=350729
-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=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35')
-
-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 244741, cantor/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-08-23 15:25:15 UTC (rev 244742)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=15.08.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' '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" 'fix-qalculate-build.patch')
+sha1sums=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35'
+ '1a632b5f86b7efff66d3024ff3ac4585339551ef')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Fix qalculate backend build https://bugs.kde.org/show_bug.cgi?id=350729
+ patch -p1 -i ../fix-qalculate-build.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-08-23 15:24:37 UTC (rev 244741)
+++ extra-x86_64/cantor.install 2015-08-23 15:25:15 UTC (rev 244742)
@@ -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 244741, cantor/trunk/cantor.install)
===================================================================
--- extra-x86_64/cantor.install (rev 0)
+++ extra-x86_64/cantor.install 2015-08-23 15:25:15 UTC (rev 244742)
@@ -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/fix-qalculate-build.patch (from rev 244741, cantor/trunk/fix-qalculate-build.patch)
===================================================================
--- extra-x86_64/fix-qalculate-build.patch (rev 0)
+++ extra-x86_64/fix-qalculate-build.patch 2015-08-23 15:25:15 UTC (rev 244742)
@@ -0,0 +1,33 @@
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Fri, 07 Aug 2015 17:02:55 +0000
+Subject: Fix building the qalculate backend
+X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=ceadbd453cfb4263755931635cb9b02d7aa29efa
+---
+Fix building the qalculate backend
+
+Thanks to Christoph Feck who suggested the fix.
+
+BUG: 350729
+REVIEW: 124829
+---
+
+
+--- a/src/backends/qalculate/qalculateexpression.cpp
++++ b/src/backends/qalculate/qalculateexpression.cpp
+@@ -773,12 +773,12 @@
+ if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
+ plotParameters.filetype == PLOT_FILETYPE_PS ||
+ (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
+- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
++ plotParameters.filename.substr(p-4,4) == ".eps") ||
+ (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
+- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
++ plotParameters.filename.substr(p-3,3) == ".ps"))
+ setResult(new Cantor::EpsResult(QUrl(QString::fromStdString(plotParameters.filename))));
+ else
+- setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename)));
++ setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename))));
+ #else
+ setResult(new Cantor::ImageResult(QUrl::fromLocalFile(QString::fromStdString(plotParameters.filename))));
+ #endif
+
More information about the arch-commits
mailing list