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

Antonio Rojas arojas at archlinux.org
Tue Jul 28 22:49:07 UTC 2015


    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
===================================================================
--- PKGBUILD	2015-07-28 22:42:58 UTC (rev 242628)
+++ PKGBUILD	2015-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 <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