[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2020-03-22 Thread Antonio Rojas via arch-commits 
Date: Sunday, March 22, 2020 @ 08:47:48
  Author: arojas
Revision: 378295

julia 1.4 rebuild

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-22 00:09:29 UTC (rev 378294)
+++ PKGBUILD2020-03-22 08:47:48 UTC (rev 378295)
@@ -4,7 +4,7 @@
 
 pkgname=cantor
 pkgver=20.03.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/;
 arch=(x86_64)

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2018-11-22 Thread Antonio Rojas via arch-commits 
Date: Thursday, November 22, 2018 @ 18:03:35
  Author: arojas
Revision: 340299

Add qt5-xmlpatterns dependency, no longer pulled by qt5-declarative

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-22 17:50:14 UTC (rev 340298)
+++ PKGBUILD2018-11-22 18:03:35 UTC (rev 340299)
@@ -4,13 +4,13 @@
 
 pkgname=cantor
 pkgver=18.11.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/;
 arch=(x86_64)
 license=(GPL LGPL FDL)
 groups=(kde-applications kdeedu)
-depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate 
hicolor-icon-theme discount)
+depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate 
hicolor-icon-theme discount qt5-xmlpatterns)
 makedepends=(extra-cmake-modules python python2 kdoctools luajit r julia)
 optdepends=('maxima: Maxima backend'
 'octave: Octave backend'

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2018-04-11 Thread Antonio Rojas via arch-commits 
Date: Wednesday, April 11, 2018 @ 10:53:59
  Author: arojas
Revision: 321547

libqalculate 2.4.0 rebuild

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-11 10:45:35 UTC (rev 321546)
+++ PKGBUILD2018-04-11 10:53:59 UTC (rev 321547)
@@ -5,7 +5,7 @@
 
 pkgname=cantor
 pkgver=18.03.90
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/;
 arch=(x86_64)

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2018-03-31 Thread Antonio Rojas via arch-commits 
Date: Saturday, March 31, 2018 @ 23:49:47
  Author: arojas
Revision: 320795

libqalculate 2.3.0 rebuild

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-31 23:47:34 UTC (rev 320794)
+++ PKGBUILD2018-03-31 23:49:47 UTC (rev 320795)
@@ -5,7 +5,7 @@
 
 pkgname=cantor
 pkgver=18.03.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/;
 arch=(x86_64)

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2017-12-07 Thread Antonio Rojas via arch-commits 
Date: Thursday, December 7, 2017 @ 16:50:36
  Author: arojas
Revision: 311780

libqalculate 2.2 rebuild

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-07 16:47:56 UTC (rev 311779)
+++ PKGBUILD2017-12-07 16:50:36 UTC (rev 311780)
@@ -5,7 +5,7 @@
 
 pkgname=cantor
 pkgver=17.11.90
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/;
 arch=(x86_64)

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2017-07-24 Thread Antonio Rojas 
Date: Monday, July 24, 2017 @ 17:30:51
  Author: arojas
Revision: 301223

libqalculate 1.0.0 rebuild

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-24 17:29:19 UTC (rev 301222)
+++ PKGBUILD2017-07-24 17:30:51 UTC (rev 301223)
@@ -4,7 +4,7 @@
 
 pkgname=cantor
 pkgver=17.07.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/;
 arch=('i686' 'x86_64')

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2016-11-19 Thread Antonio Rojas 
Date: Saturday, November 19, 2016 @ 18:16:05
  Author: arojas
Revision: 281594

Enable julia backend

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-19 17:23:59 UTC (rev 281593)
+++ PKGBUILD2016-11-19 18:16:05 UTC (rev 281594)
@@ -4,7 +4,7 @@
 
 pkgname=cantor
 pkgver=16.11.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/;
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@
 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')
+makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r' 
'julia')
 optdepends=('maxima: Maxima backend'
 'octave: Octave backend'
 'r: R backend'
@@ -24,15 +24,24 @@
 replaces=('kdeedu-cantor')
 
source=("http://download.kde.org/unstable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig})
 sha1sums=('5cedf8b109dc0946b4f38eb8fc769060583708d7'
- 'SKIP')
+  'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 

 
 prepare() {
   mkdir -p build
+
+# Fix build
+  sed '/tests/d' -i $pkgname-$pkgver/src/backends/julia/CMakeLists.txt
 }
 
 build() {
   cd build
+
+  if [[ $CARCH == 'i686' ]]; then
+export CFLAGS+=" -march=pentium4"
+export CXXFLAGS+=" -march=pentium4"
+  fi
+
   cmake ../$pkgname-$pkgver \
 -DCMAKE_BUILD_TYPE=Release \
 -DBUILD_TESTING=OFF \

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2016-07-26 Thread Antonio Rojas 
Date: Tuesday, July 26, 2016 @ 19:21:50
  Author: arojas
Revision: 272493

libqalculate 0.9.9 rebuild

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-26 19:17:50 UTC (rev 272492)
+++ PKGBUILD2016-07-26 19:21:50 UTC (rev 272493)
@@ -4,7 +4,7 @@
 
 pkgname=cantor
 pkgver=16.07.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/;
 arch=('i686' 'x86_64')

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD)

2015-07-29 Thread Antonio Rojas 
Date: Wednesday, July 29, 2015 @ 08:46:40
  Author: arojas
Revision: 242637

Disable qalculate backend, doesn't build

Modified:
  cantor/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-29 00:12:00 UTC (rev 242636)
+++ PKGBUILD2015-07-29 06:46:40 UTC (rev 242637)
@@ -10,7 +10,7 @@
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde-applications' 'kdeedu')
-depends=('analitza' 'libspectre' 'libqalculate' 'kdelibs4support' 'kpty' 
'ktexteditor' 'knewstuff')
+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'

[arch-commits] Commit in cantor/kde-unstable (PKGBUILD r-3.2.patch)

2015-07-28 Thread Antonio Rojas 
Date: Wednesday, July 29, 2015 @ 00:49:07
  Author: arojas
Revision: 242629

Remove merged patch

Modified:
  cantor/kde-unstable/PKGBUILD
Deleted:
  cantor/kde-unstable/r-3.2.patch

-+
 PKGBUILD|9 ++---
 r-3.2.patch |   44 
 2 files changed, 2 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-28 22:42:58 UTC (rev 242628)
+++ PKGBUILD2015-07-28 22:49:07 UTC (rev 242629)
@@ -22,16 +22,11 @@
 conflicts=('kdeedu-cantor')
 replaces=('kdeedu-cantor')
 install=${pkgname}.install
-source=(http://download.kde.org/unstable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz;
 'r-3.2.patch')
-sha1sums=('4454de83a7542efecc009aa6b16d09d008bf86cc'
-  '97fa0a72f1b9b23d658f754b821da12215b255e7')
+source=(http://download.kde.org/unstable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz;)
+sha1sums=('4454de83a7542efecc009aa6b16d09d008bf86cc')
 
 prepare() {
   mkdir -p build
-
-# Fix build with R 3.2
-  cd $pkgname-$pkgver
-  patch -p1 -i $srcdir/r-3.2.patch
 }
 
 build() {

Deleted: r-3.2.patch
===
--- r-3.2.patch 2015-07-28 22:42:58 UTC (rev 242628)
+++ r-3.2.patch 2015-07-28 22:49:07 UTC (rev 242629)
@@ -1,44 +0,0 @@
-From: Raymond Wooninck tittiatc...@gmail.com
-Date: Mon, 25 May 2015 13:19:20 +
-Subject: Fix build with latest R (version 3.2)
-X-Git-Url: 
http://quickgit.kde.org/?p=cantor.gita=commitdiffh=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
-