From 2d456182fa33f1287e1fb2463e77204b7d03356e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= <csardi.gabor@gmail.com>
Date: Mon, 25 Sep 2023 20:50:26 +0200
Subject: [PATCH] Add R 0.15 and R 0.16

---
 r-builds/docker-compose.yml | 22 ++++++++++++++++++++++
 r-builds/patch/R-0.15.patch | 32 ++++++++++++++++++++++++++++++++
 r-builds/patch/R-0.16.patch | 31 +++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 r-builds/patch/R-0.15.patch
 create mode 100644 r-builds/patch/R-0.16.patch

diff --git a/r-builds/docker-compose.yml b/r-builds/docker-compose.yml
index 3fdf691..8e7168e 100644
--- a/r-builds/docker-compose.yml
+++ b/r-builds/docker-compose.yml
@@ -1,5 +1,27 @@
 
 services:
+  r-0.15:
+    image: "rhub/evercran-build:0.15"
+    build:
+      context: .
+      dockerfile: Dockerfile-sarge
+      args:
+        R_VERSION: 0.15
+    command: bash -c 'cp /build/*.deb /output'
+    volumes:
+      - ./output:/output
+
+  r-0.16:
+    image: "rhub/evercran-build:0.16"
+    build:
+      context: .
+      dockerfile: Dockerfile-sarge
+      args:
+        R_VERSION: 0.16
+    command: bash -c 'cp /build/*.deb /output'
+    volumes:
+      - ./output:/output
+
   r-0.16.1:
     image: "rhub/evercran-build:0.16.1"
     build:
diff --git a/r-builds/patch/R-0.15.patch b/r-builds/patch/R-0.15.patch
new file mode 100644
index 0000000..228e241
--- /dev/null
+++ b/r-builds/patch/R-0.15.patch
@@ -0,0 +1,32 @@
+diff --git a/src/library/profile/Rprofile.unix b/src/library/profile/Rprofile.unix
+index f008e68..7783d77 100644
+--- a/src/library/profile/Rprofile.unix
++++ b/src/library/profile/Rprofile.unix
+@@ -17,4 +17,4 @@ version <- Version()
+ options(na.action="na.omit")
+ options(printcmd=getenv("R_PRINTCMD"))
+ options(papersize=getenv("R_PAPERSIZE"))
+-if(interactive()) x11()
++
+diff --git a/src/unix/system.c b/src/unix/system.c
+index d25825f..45c509e 100644
+--- a/src/unix/system.c
++++ b/src/unix/system.c
+@@ -256,7 +256,7 @@ int main(int ac, char **av)
+ #endif
+ 
+ #ifdef linux
+-	__setfpucw(_FPU_IEEE);
++	/* __setfpucw(_FPU_IEEE); */
+ #endif
+ 
+ #ifdef HAVE_LIBREADLINE
+@@ -323,7 +323,7 @@ qask:
+ #endif
+ 
+ #ifdef linux
+-	__setfpucw(_FPU_DEFAULT);
++	/* __setfpucw(_FPU_DEFAULT); */
+ #endif
+ 
+ 	exit(0);
diff --git a/r-builds/patch/R-0.16.patch b/r-builds/patch/R-0.16.patch
new file mode 100644
index 0000000..9097350
--- /dev/null
+++ b/r-builds/patch/R-0.16.patch
@@ -0,0 +1,31 @@
+diff --git a/src/library/profile/Rprofile.unix b/src/library/profile/Rprofile.unix
+index 97a62fc..ca998c1 100644
+--- a/src/library/profile/Rprofile.unix
++++ b/src/library/profile/Rprofile.unix
+@@ -9,4 +9,3 @@ version <- Version()
+ options(na.action="na.omit")
+ options(printcmd=getenv("R_PRINTCMD"))
+ options(papersize=getenv("R_PAPERSIZE"))
+-if(interactive()) x11()
+diff --git a/src/unix/system.c b/src/unix/system.c
+index f217b26..7d7902a 100644
+--- a/src/unix/system.c
++++ b/src/unix/system.c
+@@ -256,7 +256,7 @@ int main(int ac, char **av)
+ #endif
+ 
+ #ifdef linux
+-	__setfpucw(_FPU_IEEE);
++	/* __setfpucw(_FPU_IEEE); */
+ #endif
+ 
+ #ifdef HAVE_LIBREADLINE
+@@ -323,7 +323,7 @@ qask:
+ #endif
+ 
+ #ifdef linux
+-	__setfpucw(_FPU_DEFAULT);
++	/* __setfpucw(_FPU_DEFAULT); */
+ #endif
+ 
+ 	exit(0);