From 973eedc7f6c9da09f06db9a6e025d834920b5f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Mon, 19 Feb 2024 19:23:32 +0100 Subject: [PATCH 1/3] Fix devel builds for libdeflate Closes #194. --- builder/package.ubuntu-2204 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builder/package.ubuntu-2204 b/builder/package.ubuntu-2204 index 2ae13f3..8152153 100644 --- a/builder/package.ubuntu-2204 +++ b/builder/package.ubuntu-2204 @@ -11,6 +11,11 @@ if [[ "${R_VERSION}" =~ ^3 ]]; then - libpcre3-dev' fi +deflate_libs='# - libdeflate-dev' +if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then + deflate_libs='- libdeflate-dev' +fi + cat < /tmp/nfpm.yml name: r-${R_VERSION} version: 1 @@ -35,6 +40,7 @@ depends: - libc6 - libcairo2 - libcurl4 +${deflate_libs} - libglib2.0-0 - libgomp1 - libicu-dev From 90b81606fd4f8294f9e74d1747e7f5850157f5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Mon, 19 Feb 2024 14:59:37 +0100 Subject: [PATCH 2/3] The xfig() device is deprecated in R 4.4.0 So we do not test it any more. Cf. https://github.com/wch/r-source/commit/d04d9dbcf44858eeb3589a826020a6a343c210c1 --- test/test.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test.R b/test/test.R index 8be20c1..be4144e 100644 --- a/test/test.R +++ b/test/test.R @@ -34,8 +34,10 @@ tryCatch(capabilities(), warning = function(w) { # Check graphics devices # https://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/Devices.html -for (dev_name in c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", - "xfig", "pictex", "cairo_pdf", "cairo_ps")) { +devices <- c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", + if (getRversion() < "4.4.0") "xfig", + "pictex", "cairo_pdf", "cairo_ps") +for (dev_name in devices) { # Skip unsupported graphics devices (e.g. tiff in R >= 3.3 on CentOS 6) if (dev_name %in% names(capabilities()) && capabilities(dev_name) == FALSE) { next From 453876ff20954b2dfd2a18887a2340fada5ba5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Mon, 19 Feb 2024 15:21:04 +0100 Subject: [PATCH 3/3] pictex device is also deprecated in R 4.4.0 Do not test that, either. [ci skip] --- test/test.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test.R b/test/test.R index be4144e..d7ace39 100644 --- a/test/test.R +++ b/test/test.R @@ -35,8 +35,8 @@ tryCatch(capabilities(), warning = function(w) { # Check graphics devices # https://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/Devices.html devices <- c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", - if (getRversion() < "4.4.0") "xfig", - "pictex", "cairo_pdf", "cairo_ps") + if (getRversion() < "4.4.0") c("xfig", "pictex"), + "cairo_pdf", "cairo_ps") for (dev_name in devices) { # Skip unsupported graphics devices (e.g. tiff in R >= 3.3 on CentOS 6) if (dev_name %in% names(capabilities()) && capabilities(dev_name) == FALSE) {