From f9000e27038ffe468c1f93113167cf2c6fe1f704 Mon Sep 17 00:00:00 2001 From: George Stagg Date: Mon, 24 Jun 2024 12:40:26 +0100 Subject: [PATCH] R 4.4.1 --- Dockerfile | 2 +- R/R-VERSION | 2 +- .../{R-4.4.0 => R-4.4.1}/emscripten-avoid-testing-issues.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-configure.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-dataviewer.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-disable-bcEval.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-disable-system.diff | 0 .../{R-4.4.0 => R-4.4.1}/emscripten-fix-blas-dlsym-search.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-includes.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-input.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-jumpctxt.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-lazyload.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-makefiles.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-r-home-stderr.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-unimplmented.diff | 0 patches/{R-4.4.0 => R-4.4.1}/emscripten-xhr-download.diff | 0 patches/{R-4.4.0 => R-4.4.1}/fix-sink-release.diff | 0 patches/{R-4.4.0 => R-4.4.1}/flang-avoid-maxloc.diff | 0 patches/{R-4.4.0 => R-4.4.1}/fontconfig-typeof.diff | 0 patches/{R-4.4.0 => R-4.4.1}/series | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-avoid-testing-issues.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-configure.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-dataviewer.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-disable-bcEval.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-disable-system.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-fix-blas-dlsym-search.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-includes.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-input.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-jumpctxt.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-lazyload.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-makefiles.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-r-home-stderr.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-unimplmented.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/emscripten-xhr-download.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/fix-sink-release.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/flang-avoid-maxloc.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/fontconfig-typeof.diff (100%) rename patches/{R-4.4.0 => R-4.4.1}/series (100%) diff --git a/Dockerfile b/Dockerfile index e6da79b5..4879e55a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,7 +67,7 @@ RUN curl -L https://rig.r-pkg.org/deb/rig.gpg -o /etc/apt/trusted.gpg.d/rig.gpg # Because $HOME gets masked by GHA with the host $HOME ENV R_LIBS_USER=/opt/R/current/lib/R/site-library # Don't install pak. Rig installs it into the user lib, but we want it in the system lib -RUN rig add 4.4.0 --without-pak +RUN rig add 4.4.1 --without-pak # Install pak and rwasm into the system lib RUN /opt/R/current/bin/R -q -e 'install.packages("pak", lib = .Library)' RUN /opt/R/current/bin/R -q -e 'pak::pak("r-wasm/rwasm", lib = .Library)' diff --git a/R/R-VERSION b/R/R-VERSION index fdc66988..cca25a93 100644 --- a/R/R-VERSION +++ b/R/R-VERSION @@ -1 +1 @@ -4.4.0 +4.4.1 diff --git a/patches/R-4.4.0/emscripten-avoid-testing-issues.diff b/patches/R-4.4.1/emscripten-avoid-testing-issues.diff similarity index 100% rename from patches/R-4.4.0/emscripten-avoid-testing-issues.diff rename to patches/R-4.4.1/emscripten-avoid-testing-issues.diff diff --git a/patches/R-4.4.0/emscripten-configure.diff b/patches/R-4.4.1/emscripten-configure.diff similarity index 100% rename from patches/R-4.4.0/emscripten-configure.diff rename to patches/R-4.4.1/emscripten-configure.diff diff --git a/patches/R-4.4.0/emscripten-dataviewer.diff b/patches/R-4.4.1/emscripten-dataviewer.diff similarity index 100% rename from patches/R-4.4.0/emscripten-dataviewer.diff rename to patches/R-4.4.1/emscripten-dataviewer.diff diff --git a/patches/R-4.4.0/emscripten-disable-bcEval.diff b/patches/R-4.4.1/emscripten-disable-bcEval.diff similarity index 100% rename from patches/R-4.4.0/emscripten-disable-bcEval.diff rename to patches/R-4.4.1/emscripten-disable-bcEval.diff diff --git a/patches/R-4.4.0/emscripten-disable-system.diff b/patches/R-4.4.1/emscripten-disable-system.diff similarity index 100% rename from patches/R-4.4.0/emscripten-disable-system.diff rename to patches/R-4.4.1/emscripten-disable-system.diff diff --git a/patches/R-4.4.0/emscripten-fix-blas-dlsym-search.diff b/patches/R-4.4.1/emscripten-fix-blas-dlsym-search.diff similarity index 100% rename from patches/R-4.4.0/emscripten-fix-blas-dlsym-search.diff rename to patches/R-4.4.1/emscripten-fix-blas-dlsym-search.diff diff --git a/patches/R-4.4.0/emscripten-includes.diff b/patches/R-4.4.1/emscripten-includes.diff similarity index 100% rename from patches/R-4.4.0/emscripten-includes.diff rename to patches/R-4.4.1/emscripten-includes.diff diff --git a/patches/R-4.4.0/emscripten-input.diff b/patches/R-4.4.1/emscripten-input.diff similarity index 100% rename from patches/R-4.4.0/emscripten-input.diff rename to patches/R-4.4.1/emscripten-input.diff diff --git a/patches/R-4.4.0/emscripten-jumpctxt.diff b/patches/R-4.4.1/emscripten-jumpctxt.diff similarity index 100% rename from patches/R-4.4.0/emscripten-jumpctxt.diff rename to patches/R-4.4.1/emscripten-jumpctxt.diff diff --git a/patches/R-4.4.0/emscripten-lazyload.diff b/patches/R-4.4.1/emscripten-lazyload.diff similarity index 100% rename from patches/R-4.4.0/emscripten-lazyload.diff rename to patches/R-4.4.1/emscripten-lazyload.diff diff --git a/patches/R-4.4.0/emscripten-makefiles.diff b/patches/R-4.4.1/emscripten-makefiles.diff similarity index 100% rename from patches/R-4.4.0/emscripten-makefiles.diff rename to patches/R-4.4.1/emscripten-makefiles.diff diff --git a/patches/R-4.4.0/emscripten-r-home-stderr.diff b/patches/R-4.4.1/emscripten-r-home-stderr.diff similarity index 100% rename from patches/R-4.4.0/emscripten-r-home-stderr.diff rename to patches/R-4.4.1/emscripten-r-home-stderr.diff diff --git a/patches/R-4.4.0/emscripten-unimplmented.diff b/patches/R-4.4.1/emscripten-unimplmented.diff similarity index 100% rename from patches/R-4.4.0/emscripten-unimplmented.diff rename to patches/R-4.4.1/emscripten-unimplmented.diff diff --git a/patches/R-4.4.0/emscripten-xhr-download.diff b/patches/R-4.4.1/emscripten-xhr-download.diff similarity index 100% rename from patches/R-4.4.0/emscripten-xhr-download.diff rename to patches/R-4.4.1/emscripten-xhr-download.diff diff --git a/patches/R-4.4.0/fix-sink-release.diff b/patches/R-4.4.1/fix-sink-release.diff similarity index 100% rename from patches/R-4.4.0/fix-sink-release.diff rename to patches/R-4.4.1/fix-sink-release.diff diff --git a/patches/R-4.4.0/flang-avoid-maxloc.diff b/patches/R-4.4.1/flang-avoid-maxloc.diff similarity index 100% rename from patches/R-4.4.0/flang-avoid-maxloc.diff rename to patches/R-4.4.1/flang-avoid-maxloc.diff diff --git a/patches/R-4.4.0/fontconfig-typeof.diff b/patches/R-4.4.1/fontconfig-typeof.diff similarity index 100% rename from patches/R-4.4.0/fontconfig-typeof.diff rename to patches/R-4.4.1/fontconfig-typeof.diff diff --git a/patches/R-4.4.0/series b/patches/R-4.4.1/series similarity index 100% rename from patches/R-4.4.0/series rename to patches/R-4.4.1/series