From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001 From: Luke Hannan Date: Fri, 7 Aug 2020 12:27:09 +0200 Subject: [PATCH 1/5] R: update to 4.0.2. --- common/shlibs | 2 +- srcpkgs/R/patches/ppc.patch | 33 --------------------------------- srcpkgs/R/template | 11 ++++++----- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/R/patches/ppc.patch diff --git a/common/shlibs b/common/shlibs index b10eae70847..4f1c94a8985 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1 libedac.so.1 libedac-0.18_1 libxlsreader.so.1 libxls-1.4.0_1 -libR.so R-3.3.0_2 +libR.so R-4.0.2_1 libmarkdown.so.2 discount-2.2.0_3 libkeystone.so.0 keystone-0.9_1 libmate-slab.so.0 libmate-control-center-1.14.0_2 diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch deleted file mode 100644 index f8c6faba4a3..00000000000 --- a/srcpkgs/R/patches/ppc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001 -From: maechler -Date: Wed, 25 Mar 2020 09:06:23 +0000 -Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__ - -git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41 ---- - src/main/arithmetic.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c -index fc7496a8908..196431c7675 100644 ---- src/main/arithmetic.c -+++ src/main/arithmetic.c -@@ -1,6 +1,6 @@ - /* - * R : A Computer Language for Statistical Data Analysis -- * Copyright (C) 1998--2019 The R Core Team. -+ * Copyright (C) 1998--2020 The R Core Team. - * Copyright (C) 2003--2019 The R Foundation - * Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka - * -@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic() - - - #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE) --# ifdef __PPC64__ -+# ifdef __powerpc__ - // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE -+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__ - # define q_1_eps (1 / LDBL_EPSILON) - # else - static LDOUBLE q_1_eps = 1 / LDBL_EPSILON; diff --git a/srcpkgs/R/template b/srcpkgs/R/template index 424154fad12..47bee4dabe0 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,15 +1,16 @@ # Template file for 'R' pkgname=R -version=3.6.3 -revision=2 +version=4.0.2 +revision=1 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R --with-lapack --with-blas --enable-R-shlib --with-tcltk + --enable-memory-profiling LIBnn=lib" hostmakedepends="gcc-fortran pkg-config perl less which" makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel - lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel + lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel libcurl-devel tcl-devel tk-devel libxml2-devel" depends="xdg-utils less which" short_desc="System for statistical computation and graphics" @@ -17,8 +18,8 @@ maintainer="Florian Wagner " license="GPL-2.0-or-later" homepage="https://www.r-project.org/" changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html" -distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz" -checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f +distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz" +checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75 nocross=yes shlib_provides="libR.so" From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001 From: Luke Hannan Date: Fri, 7 Aug 2020 14:06:23 +0200 Subject: [PATCH 2/5] R-cran-R6: revbump for R-4.0.2 --- srcpkgs/R-cran-R6/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template index 70e4b9776bb..8c06f5a3cf7 100644 --- a/srcpkgs/R-cran-R6/template +++ b/srcpkgs/R-cran-R6/template @@ -1,7 +1,7 @@ # Template file for 'R-cran-R6' pkgname=R-cran-R6 version=2.4.1 -revision=1 +revision=2 build_style=R-cran short_desc="Classes with Reference Semantics" maintainer="Florian Wagner " From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001 From: Luke Hannan Date: Fri, 7 Aug 2020 14:08:49 +0200 Subject: [PATCH 3/5] R-cran-RColorBrewer: revbump for R-4.0.2 --- srcpkgs/R-cran-RColorBrewer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template index 6f905881c29..b64c8bcf5da 100644 --- a/srcpkgs/R-cran-RColorBrewer/template +++ b/srcpkgs/R-cran-RColorBrewer/template @@ -1,7 +1,7 @@ # Template file for 'R-cran-RColorBrewer' pkgname=R-cran-RColorBrewer version=1.1r2 -revision=1 +revision=2 build_style=R-cran short_desc="ColorBrewer Palettes" maintainer="Florian Wagner " From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001 From: Luke Hannan Date: Fri, 7 Aug 2020 14:11:16 +0200 Subject: [PATCH 4/5] R-cran-Rcpp: revbump for R-4.0.2 --- srcpkgs/R-cran-Rcpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template index 7cee0242095..e19cd395809 100644 --- a/srcpkgs/R-cran-Rcpp/template +++ b/srcpkgs/R-cran-Rcpp/template @@ -1,7 +1,7 @@ # Template file for 'R-cran-Rcpp' pkgname=R-cran-Rcpp version=1.0.5 -revision=1 +revision=2 build_style=R-cran short_desc="Seamless R and C++ Integration" maintainer="Florian Wagner " From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001 From: Luke Hannan Date: Fri, 7 Aug 2020 14:20:17 +0200 Subject: [PATCH 5/5] R-cran-assertthat: revbump for R-4.0.2 --- srcpkgs/R-cran-assertthat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template index 83d44266c0e..6e8161baa7d 100644 --- a/srcpkgs/R-cran-assertthat/template +++ b/srcpkgs/R-cran-assertthat/template @@ -1,7 +1,7 @@ # Template file for 'R-cran-assertthat' pkgname=R-cran-assertthat version=0.2.1 -revision=1 +revision=2 build_style=R-cran short_desc="Easy Pre and Post Assertions" maintainer="Florian Wagner "