[arch-commits] Commit in cantor/trunk (PKGBUILD fix-qalculate-build.patch)

[Antonio Rojas]

    Date: Sunday, August 23, 2015 @ 17:24:37
  Author: arojas
Revision: 244741

Fix build of qalculate backend

Added:
  cantor/trunk/fix-qalculate-build.patch
Modified:
  cantor/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   13 +++++++++----
 fix-qalculate-build.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-23 15:12:18 UTC (rev 244740)
+++ PKGBUILD	2015-08-23 15:24:37 UTC (rev 244741)
@@ -4,13 +4,13 @@
 
 pkgname=cantor
 pkgver=15.08.0
-pkgrel=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 https://bugs.kde.org/show_bug.cgi?id=350729
+depends=('analitza' 'libspectre' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate')
 makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r')
 optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
@@ -22,11 +22,16 @@
 conflicts=('kdeedu-cantor')
 replaces=('kdeedu-cantor')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35')
+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() {

Added: fix-qalculate-build.patch
===================================================================
--- fix-qalculate-build.patch	                        (rev 0)
+++ fix-qalculate-build.patch	2015-08-23 15:24:37 UTC (rev 244741)
@@ -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
+