Update R packages (#1464)

* Update fansi * Update base64enc * Update cli * Update colorspace * Update digest * Update ellipsis * Update farver * Update fastmap * Update lattice * Update magrittr * Update mass * Update nlme * Update rlang * Update utf8
emscripten-forge · Dec 14, 2024 · 5e32693 · 5e32693
1 parent c54cd21
commit 5e32693
Show file tree

Hide file tree

Showing 18 changed files with 392 additions and 396 deletions.
diff --git a/recipes/recipes_emscripten/r-base64enc/recipe.yaml b/recipes/recipes_emscripten/r-base64enc/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   name: r-base64enc
   version: 0.1-3
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version|replace('-', '_') }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,27 +10,29 @@ source:
   sha256: 6d856d8a364bcdc499a0bf38bfd283b7c743d08f0b288174fba7dbf0a04b688d
 
 build:
-  number: 4
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 5
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version|replace('-', '_') }}
   build:
-    - cross-r-base >= ${{ r_base_version }}
-    - ${{ compiler('c') }}
-  host:
-    - r-base >= ${{ r_base_version }}
-  run:
-    - r-base >= ${{ r_base_version }}
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+      - cross-r-base >= ${{ r_base_version }}
+      - ${{ compiler('c') }}
+    host:
+      - r-base >= ${{ r_base_version }}
+    run:
+      - r-base >= ${{ r_base_version }}
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: http://www.rforge.net/base64enc

diff --git a/recipes/recipes_emscripten/r-cli/recipe.yaml b/recipes/recipes_emscripten/r-cli/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   version: 3.6.3
   name: r-cli
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,27 +10,29 @@ source:
   sha256: 4295085f11221c54b1dd2b1d39a675a85dfd9f900294297567e1d36f65ac4841
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 2
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version }}
   build:
-    - cross-r-base >= ${{ r_base_version }}
-    - ${{ compiler('c') }}
-  host:
-    - r-base >= ${{ r_base_version }}
-  run:
-    - r-base >= ${{ r_base_version }}
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+      - cross-r-base >= ${{ r_base_version }}
+      - ${{ compiler('c') }}
+    host:
+      - r-base >= ${{ r_base_version }}
+    run:
+      - r-base >= ${{ r_base_version }}
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: https://cli.r-lib.org

diff --git a/recipes/recipes_emscripten/r-colorspace/recipe.yaml b/recipes/recipes_emscripten/r-colorspace/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   version: 2.1-1
   name: r-colorspace
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version|replace('-', '_') }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,27 +10,29 @@ source:
   sha256: e721cee5f4d6e4b0fc8eb18265e316b4f856fd3be02f0775a26032663758cd0b
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 2
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version|replace('-', '_') }}
   build:
-    - cross-r-base >= ${{ r_base_version }}
-    - ${{ compiler('c') }}
-  host:
-    - r-base >= ${{ r_base_version }}
-  run:
-    - r-base >= ${{ r_base_version }}
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+      - cross-r-base >= ${{ r_base_version }}
+      - ${{ compiler('c') }}
+    host:
+      - r-base >= ${{ r_base_version }}
+    run:
+      - r-base >= ${{ r_base_version }}
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: http://colorspace.R-Forge.R-project.org

diff --git a/recipes/recipes_emscripten/r-digest/recipe.yaml b/recipes/recipes_emscripten/r-digest/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   name: r-digest
   version: 0.6.37
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,36 +10,38 @@ source:
   sha256: 82c4d149994b8a4a9af930f5a8e47420829935abed41f3f9030e94b6a48f0321
 
 build:
-  number: 3
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 4
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version }}
   build:
-    - cross-r-base >= ${{ r_base_version }}
-    - ${{ compiler('c') }}
-    - ${{ compiler('cxx') }}
-  host:
-    - r-base >= ${{ r_base_version }}
-  run:
-    - r-base >= ${{ r_base_version }}
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+      - cross-r-base >= ${{ r_base_version }}
+      - ${{ compiler('c') }}
+      - ${{ compiler('cxx') }}
+    host:
+      - r-base >= ${{ r_base_version }}
+    run:
+      - r-base >= ${{ r_base_version }}
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: https://dirk.eddelbuettel.com/code/digest.html
   repository: https://github.com/eddelbuettel/digest
   license: GPL-2.0
   license_family: GPL2
   license_file: GPL-2
-  summary: Compact hash representations of arbritrary R objects.
+  summary: Compact hash representations of arbitrary R objects.
 
 extra:
   recipe-maintainers:

diff --git a/recipes/recipes_emscripten/r-ellipsis/recipe.yaml b/recipes/recipes_emscripten/r-ellipsis/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   name: r-ellipsis
   version: 0.3.2
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,30 +10,32 @@ source:
   sha256: a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 2
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version }}
   build:
-  - cross-r-base >= ${{ r_base_version }}
-  - r-rlang
-  - ${{ compiler('c') }}
-  host:
-  - r-base >= ${{ r_base_version }}
-  - r-rlang
-  run:
-  - r-base >= ${{ r_base_version }}
-  - r-rlang
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+    - cross-r-base >= ${{ r_base_version }}
+    - r-rlang
+    - ${{ compiler('c') }}
+    host:
+    - r-base >= ${{ r_base_version }}
+    - r-rlang
+    run:
+    - r-base >= ${{ r_base_version }}
+    - r-rlang
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: https://ellipsis.r-lib.org

diff --git a/recipes/recipes_emscripten/r-fansi/patches/0001-Ignore-custom-limit-checks.patch b/recipes/recipes_emscripten/r-fansi/patches/0001-Ignore-custom-limit-checks.patch
@@ -0,0 +1,23 @@
+From 246a64768dd17781fb68c0d6ed7e698225dd7ca1 Mon Sep 17 00:00:00 2001
+From: Isabel Paredes <[email protected]>
+Date: Fri, 13 Dec 2024 23:34:11 +0100
+Subject: [PATCH] Ignore custom limit checks
+
+FIXME: this is not the proper solution but it works for xeus-r
+---
+ src/assumptions.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/assumptions.c b/src/assumptions.c
+index 1187151..5df0773 100644
+--- a/src/assumptions.c
++++ b/src/assumptions.c
+@@ -37,7 +37,7 @@ static void check_limits(void) {
+     // Unsigned
+     FANSI_lim.lim_size_t.max < 1U || FANSI_lim.lim_size_t.min != 0U
+   )
+-    error("Invalid custom limit; contact maintainer.");  // nocov
++    printf("ERROR: Invalid custom limit; contact maintainer.");  // nocov
+ }
+ // nocov start
+ // by definition none of the errors should be thrown, so no sense in