Upgrade libsass from 3.6.4 to 3.6.5

Closes #122 by way of sass/libsass#3129
rstudio · Jan 11, 2023 · 6cb8239 · 6cb8239
1 parent 81f61c3
commit 6cb8239
Show file tree

Hide file tree

Showing 35 changed files with 984 additions and 970 deletions.
diff --git a/scripts/apply_libsass_patches.R b/scripts/apply_libsass_patches.R
@@ -4,12 +4,19 @@
 
 library(rprojroot)
 
-patch_dir <- rprojroot::find_package_root_file("scripts/patches")
+# Remove libsass test files (the entire `test` directory) since they contain unicode
+# directory paths, and R CMD check provides a warning.
+unlink(
+  find_package_root_file("src/libsass/test"),
+  recursive = TRUE
+)
+
+patch_dir <- find_package_root_file("scripts/patches")
 
 for (patch in list.files(patch_dir, full.names = TRUE)) {
   tryCatch({
     message(sprintf("Applying %s", basename(patch)))
-    system(sprintf("git apply '%s'", patch))
+    system(sprintf("git apply --reject --whitespace=fix '%s'", patch))
   },
   error = function(e) {
     quit(save = "no", status = 1)