diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/r/APKBUILD | 9 | ||||
| -rw-r--r-- | user/r/curl-8-support.patch | 62 |
2 files changed, 68 insertions, 3 deletions
diff --git a/user/r/APKBUILD b/user/r/APKBUILD index d3b8e0ba6..b41cd4411 100644 --- a/user/r/APKBUILD +++ b/user/r/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=r -pkgver=4.2.0 +pkgver=4.2.3 pkgrel=0 pkgdesc="Environment for statistical computing and graphics" url="https://www.r-project.org/" @@ -13,7 +13,9 @@ makedepends="byacc bzip2-dev cairo-dev curl-dev gfortran icu-dev libice-dev libtirpc-dev libx11-dev libxt-dev pango-dev pcre-dev pcre2-dev xz-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://cran.r-project.org/src/base/R-${pkgver%%.*}/R-$pkgver.tar.gz" +source="https://cran.r-project.org/src/base/R-${pkgver%%.*}/R-$pkgver.tar.gz + curl-8-support.patch + " builddir="$srcdir/R-$pkgver" build() { @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd R-4.2.0.tar.gz" +sha512sums="060bb4e1d1f1a5a0383a3b4372ac9247c0a20285020da17cebeb40ddc54da12d5f369ea243ea04d2c6970986fe22b3f9c37fbdfb3405cd8aa4f2353091ea9c5c R-4.2.3.tar.gz +051dcaae4f082e8e6138a748dcf880aa0d6f8ee371025f3b09068f21530be36271a69cf2f5973c2f0832c4c865b9425c62bbeb59a2243a8ddff05969a743ddf8 curl-8-support.patch" diff --git a/user/r/curl-8-support.patch b/user/r/curl-8-support.patch new file mode 100644 index 000000000..f70960691 --- /dev/null +++ b/user/r/curl-8-support.patch @@ -0,0 +1,62 @@ +This patch differs from upstream in the following ways: + + * it does not modify doc/manual/R-admin.texi + +From da6638896413bcbb5970b2335b92582853f94e3c Mon Sep 17 00:00:00 2001 +From: ripley <ripley@00db46b3-68df-0310-9c12-caf00c1e9a41> +Date: Sat, 25 Mar 2023 09:01:30 +0000 +Subject: [PATCH] allow libcurl 8 as its API/ABI is said to be unchanged + +git-svn-id: https://svn.r-project.org/R/trunk@84049 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + configure | 6 +++--- + doc/manual/R-admin.texi | 13 ++++++------- + m4/R.m4 | 4 ++-- + 3 files changed, 11 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index c71e78d5017..f5e8e4992f7 100755 +--- a/configure ++++ b/configure +@@ -51680,8 +51680,8 @@ fi + done + + if test "x${have_libcurl}" = "xyes"; then +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0" >&5 +-printf %s "checking if libcurl is version 7 and >= 7.28.0... " >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is >= 7.28.0" >&5 ++printf %s "checking if libcurl is >= 7.28.0... " >&6; } + if test ${r_cv_have_curl728+y} + then : + printf %s "(cached) " >&6 +@@ -51699,7 +51699,7 @@ int main(void) + { + #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 214dc1a8c7d..c4b9aa8f1c1 100644 +--- a/m4/R.m4 ++++ b/m4/R.m4 +@@ -4620,7 +4620,7 @@ LIBS="${CURL_LIBS} ${LIBS}" + AC_CHECK_HEADERS(curl/curl.h, [have_libcurl=yes], [have_libcurl=no]) + + if test "x${have_libcurl}" = "xyes"; then +-AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0], [r_cv_have_curl728], ++AC_CACHE_CHECK([if libcurl is >= 7.28.0], [r_cv_have_curl728], + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <stdlib.h> + #include <curl/curl.h> +@@ -4628,7 +4628,7 @@ int main(void) + { + #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 |