Date: Monday, June 15, 2015 @ 10:59:53 Author: arojas Revision: 240917
R 3.2 rebuild Added: cantor/trunk/r-3.2.patch Modified: cantor/trunk/PKGBUILD -------------+ PKGBUILD | 13 +++++++++---- r-3.2.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-15 08:52:46 UTC (rev 240916) +++ PKGBUILD 2015-06-15 08:59:53 UTC (rev 240917) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=15.04.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64') @@ -22,16 +22,21 @@ conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('55b75171071deead3d22553d058342976b5b1ecd') +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 ../cantor-${pkgver} \ + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ Added: r-3.2.patch =================================================================== --- r-3.2.patch (rev 0) +++ r-3.2.patch 2015-06-15 08:59:53 UTC (rev 240917) @@ -0,0 +1,44 @@ +From: Raymond Wooninck <tittiatc...@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 +