[packages/R/DEVEL-4.3] - up to 4.3.3, test still fails

[qboosh]

commit 9aa1728b73dd73dc4785868c9e53e9c4ccc8f8f0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Aug 20 20:06:42 2024 +0200

    - up to 4.3.3, test still fails

 R-timezone.patch |  9 +++++----
 R.spec           | 12 +++++-------
 curl8.patch      | 53 -----------------------------------------------------
 3 files changed, 10 insertions(+), 64 deletions(-)
---
diff --git a/R.spec b/R.spec
index c3cff1a..b20b211 100644
--- a/R.spec
+++ b/R.spec
@@ -2,8 +2,8 @@
 # Conditional build
 %bcond_without	openmp	# OpenMP support
 %bcond_without	tcl	# Tcl/Tk support
-%bcond_without	tests	# do not run "make check"
-%bcond_without	doc	# do not build documentation
+%bcond_without	tests	# test suite
+%bcond_without	doc	# PDF documentation
 #
 # NOTE:
 # - /etc/localtime must be present for tests to work
@@ -14,16 +14,15 @@
 Summary:	A language for data analysis and graphics
 Summary(pl.UTF-8):	Język do analizy danych oraz grafiki
 Name:		R
-Version:	4.2.3
+Version:	4.3.3
 Release:	1
 License:	mixed (distributable), mostly GPL v2+
 Group:		Development/Languages
-Source0:	https://cran.r-project.org/src/base/R-4/%{name}-%{version}.tar.gz
-# Source0-md5:	ebfc90b1552581f2b7c9a50f934e6bb0
+Source0:	https://cran.r-project.org/src/base/R-4/%{name}-%{version}.tar.xz
+# Source0-md5:	5602f5996107c346dba12a16e866d2e2
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
 Patch0:		%{name}-timezone.patch
-Patch1:		curl8.patch
 URL:		https://www.r-project.org/
 # yes, it is, or tests will fail
 BuildRequires:	/etc/localtime
@@ -120,7 +119,6 @@ Narzędzia R w Javie.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %{__aclocal} -I m4
diff --git a/R-timezone.patch b/R-timezone.patch
index 34f414a..9156d8d 100644
--- a/R-timezone.patch
+++ b/R-timezone.patch
@@ -1,12 +1,13 @@
---- R-3.6.3/src/library/base/R/datetime.R.orig	2019-03-29 00:02:16.000000000 +0100
-+++ R-3.6.3/src/library/base/R/datetime.R	2020-04-26 21:37:03.276695328 +0200
-@@ -70,62 +70,6 @@
+--- R-4.3.3/src/library/base/R/datetime.R.orig	2024-08-18 22:04:40.459721089 +0200
++++ R-4.3.3/src/library/base/R/datetime.R	2024-08-19 06:21:30.138228198 +0200
+@@ -91,63 +91,6 @@ Sys.timezone <- function(location = TRUE
          } else tzdir <- ""
      }
  
 -    ## First try timedatectl: should work on any modern Linux
 -    ## as part of systemd (and probably nowhere else)
--    if (nzchar(Sys.which("timedatectl"))) {
+-    ## https://www.freedesktop.org/software/systemd/man/sd_booted.html
+-    if (dir.exists("/run/systemd/system") && nzchar(Sys.which("timedatectl"))) {
 -        inf <- system("timedatectl", intern = TRUE)
 -        ## typical format:
 -        ## "       Time zone: Europe/London (GMT, +0000)"
diff --git a/curl8.patch b/curl8.patch
deleted file mode 100644
index 3fa0bee..0000000
--- a/curl8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-------------------------------------------------------------------------
-r84049 | ripley | 2023-03-25 10:01:30 +0100 (sob, 25 mar 2023) | 1 line
-
-allow libcurl 8 as its API/ABI is said to be unchanged
-
-Index: configure
-===================================================================
---- configure	(revision 84048)
-+++ configure	(revision 84049)
-@@ -51680,8 +51680,8 @@
- 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 @@
- {
- #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
-Index: m4/R.m4
-===================================================================
---- m4/R.m4	(revision 84048)
-+++ m4/R.m4	(revision 84049)
-@@ -4620,7 +4620,7 @@
- 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 @@
- {
- #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
-
-------------------------------------------------------------------------
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/R.git/commitdiff/9aa1728b73dd73dc4785868c9e53e9c4ccc8f8f0