academic/R: Updated for version 4.2.3 + fix build with curl 8.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo 2023-03-26 09:57:20 +07:00
parent ec89cd6295
commit 4ba59fceae
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
3 changed files with 45 additions and 4 deletions

View File

@ -0,0 +1,39 @@
From 37765d46ef9ebfc0ce07a9a6d125649c07196d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Thu, 23 Mar 2023 10:13:27 +0100
Subject: [PATCH] curl v8
---
configure | 2 +-
m4/R.m4 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index f30284e..fbd8168 100755
--- a/configure
+++ b/configure
@@ -47606,7 +47606,7 @@ int main(int argc, const char * argv[])
{
#ifdef LIBCURL_VERSION_MAJOR
#if LIBCURL_VERSION_MAJOR > 7
- exit(1);
+ exit(0);
#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
exit(0);
#else
diff --git a/m4/R.m4 b/m4/R.m4
index 55ace6a..9d37330 100644
--- a/m4/R.m4
+++ b/m4/R.m4
@@ -4308,7 +4308,7 @@ int main(int argc, const char * argv[])
{
#ifdef LIBCURL_VERSION_MAJOR
#if LIBCURL_VERSION_MAJOR > 7
- exit(1);
+ exit(0);
#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
exit(0);
#else
--
2.39.2

View File

@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=R
VERSION=${VERSION:-4.2.2}
VERSION=${VERSION:-4.2.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -91,6 +91,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/R-4.2.3-curl-v8.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \

View File

@ -1,8 +1,8 @@
PRGNAM="R"
VERSION="4.2.2"
VERSION="4.2.3"
HOMEPAGE="https://www.r-project.org/"
DOWNLOAD="https://cran.r-project.org/src/base/R-4/R-4.2.2.tar.gz"
MD5SUM="b154500667b5ebb480f1086dd817f017"
DOWNLOAD="https://cran.r-project.org/src/base/R-4/R-4.2.3.tar.gz"
MD5SUM="ebfc90b1552581f2b7c9a50f934e6bb0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""