diff options
Diffstat (limited to 'dev-lang/R/files')
| -rw-r--r-- | dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch | 95 | ||||
| -rw-r--r-- | dev-lang/R/files/R-4.2.2-isspace-without-readline.patch | 22 | ||||
| -rw-r--r-- | dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch | 23 | ||||
| -rw-r--r-- | dev-lang/R/files/R-4.2.3-curl-8.patch | 59 |
4 files changed, 0 insertions, 199 deletions
diff --git a/dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch b/dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch deleted file mode 100644 index b5a953cb6057..000000000000 --- a/dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 6e48ab8b5006f3fdd8ef08f3f86406a02eabdc80 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 12 Sep 2022 08:31:46 -0400 -Subject: [PATCH 1/3] m4/R.m4: prefer xdg-open for R_BROWSER and R_PDFVIEWER. - -The xdg-open utility (if it is present) will launch the user's -preferred browsr or PDF viewer when fed an HTML page or a PDF -document, respectively. It therefore makes sense to prefer it over -(for example) firefox, which may be installed but not the user's -preferred browser. ---- - m4/R.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/R.m4 b/m4/R.m4 -index bdcfbea..c5052e7 100644 ---- a/m4/R.m4 -+++ b/m4/R.m4 -@@ -237,7 +237,7 @@ fi]) - ## xdg-open is the freedesktop.org interface to kfmclient/gnome-open - AC_DEFUN([R_PROG_BROWSER], - [if test -z "${R_BROWSER}"; then -- AC_PATH_PROGS(R_BROWSER, [firefox mozilla galeon opera xdg-open kfmclient gnome-moz-remote open]) -+ AC_PATH_PROGS(R_BROWSER, [xdg-open firefox mozilla galeon opera kfmclient gnome-moz-remote open]) - fi - if test -z "${R_BROWSER}"; then - warn_browser="I could not determine a browser" -@@ -255,7 +255,7 @@ AC_SUBST(R_BROWSER) - ## the FreeBSD acroread port. - AC_DEFUN([R_PROG_PDFVIEWER], - [AC_PATH_PROGS(R_PDFVIEWER, -- [${R_PDFVIEWER} acroread acroread4 xdg-open evince xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview]) -+ [${R_PDFVIEWER} xdg-open acroread acroread4 evince xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview]) - if test -z "${R_PDFVIEWER}"; then - warn_pdfviewer="I could not determine a PDF viewer" - AC_MSG_WARN([${warn_pdfviewer}]) --- -2.35.1 - -From 4e50ed9c976a4422a6d431d3d078164948f26bda Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 12 Sep 2022 08:36:41 -0400 -Subject: [PATCH 2/3] m4/R.m4: add epiphany, lynx, and links to the R_BROWSER - search list. - -The epiphany browser is today one of the more popular ones, being the -"official" GNOME browser. And lynx and links are nice text-based -fallbacks. ---- - m4/R.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/R.m4 b/m4/R.m4 -index c5052e7..e99b0f9 100644 ---- a/m4/R.m4 -+++ b/m4/R.m4 -@@ -237,7 +237,7 @@ fi]) - ## xdg-open is the freedesktop.org interface to kfmclient/gnome-open - AC_DEFUN([R_PROG_BROWSER], - [if test -z "${R_BROWSER}"; then -- AC_PATH_PROGS(R_BROWSER, [xdg-open firefox mozilla galeon opera kfmclient gnome-moz-remote open]) -+ AC_PATH_PROGS(R_BROWSER, [xdg-open firefox mozilla epiphany galeon opera kfmclient gnome-moz-remote open lynx links]) - fi - if test -z "${R_BROWSER}"; then - warn_browser="I could not determine a browser" --- -2.35.1 - -From 719294ed2548f79ab6a5861662716d853284f4d7 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 12 Sep 2022 08:38:03 -0400 -Subject: [PATCH 3/3] m4/R.m4: add atril to the R_PDFVIEWER list. - -Atril is the PDF viewer for the MATE desktop, essentially a fork of -the gnome-2.x evince viewer. ---- - m4/R.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/R.m4 b/m4/R.m4 -index e99b0f9..7e04ced 100644 ---- a/m4/R.m4 -+++ b/m4/R.m4 -@@ -255,7 +255,7 @@ AC_SUBST(R_BROWSER) - ## the FreeBSD acroread port. - AC_DEFUN([R_PROG_PDFVIEWER], - [AC_PATH_PROGS(R_PDFVIEWER, -- [${R_PDFVIEWER} xdg-open acroread acroread4 evince xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview]) -+ [${R_PDFVIEWER} xdg-open acroread acroread4 evince atril xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview]) - if test -z "${R_PDFVIEWER}"; then - warn_pdfviewer="I could not determine a PDF viewer" - AC_MSG_WARN([${warn_pdfviewer}]) --- -2.35.1 - diff --git a/dev-lang/R/files/R-4.2.2-isspace-without-readline.patch b/dev-lang/R/files/R-4.2.2-isspace-without-readline.patch deleted file mode 100644 index 0b32bef1352b..000000000000 --- a/dev-lang/R/files/R-4.2.2-isspace-without-readline.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6e36141598b78add7fb841480260b0a57ae79330 Mon Sep 17 00:00:00 2001 -From: smeyer <smeyer@00db46b3-68df-0310-9c12-caf00c1e9a41> -Date: Wed, 26 Oct 2022 08:22:41 +0000 -Subject: [PATCH] avoid implicit declaration of 'isspace' --without-readline - -git-svn-id: https://svn.r-project.org/R/trunk@83178 00db46b3-68df-0310-9c12-caf00c1e9a41 ---- - src/unix/sys-std.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/unix/sys-std.c b/src/unix/sys-std.c -index 7b93d63884a..f95ff0cf7b3 100644 ---- a/src/unix/sys-std.c -+++ b/src/unix/sys-std.c -@@ -1339,6 +1339,7 @@ Rstd_ShowFiles(int nfile, /* number of files */ - */ - - -+#include <ctype.h> /* for isspace */ - - int attribute_hidden Rstd_ChooseFile(int _new, char *buf, int len) - { diff --git a/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch b/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch deleted file mode 100644 index 756ec8ff5428..000000000000 --- a/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ee1428e77095e52a7396fa7b455f63b7c5b9495b Mon Sep 17 00:00:00 2001 -From: kalibera <kalibera@00db46b3-68df-0310-9c12-caf00c1e9a41> -Date: Tue, 27 Dec 2022 11:21:33 +0000 -Subject: [PATCH] Declare dependency to ensure include dir exists (PR#17743). - -git-svn-id: https://svn.r-project.org/R/trunk@83504 00db46b3-68df-0310-9c12-caf00c1e9a41 ---- - src/nmath/standalone/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nmath/standalone/Makefile.in b/src/nmath/standalone/Makefile.in -index 68b45006155..946795a0439 100644 ---- a/src/nmath/standalone/Makefile.in -+++ b/src/nmath/standalone/Makefile.in -@@ -151,7 +151,7 @@ install-strip: installdirs install-header install-pc - fi - @!(test -f libRmath.a) || $(SHELL) $(top_srcdir)/tools/copy-if-change libRmath.a $(DESTDIR)$(libdir)/libRmath.a - --install-header: -+install-header: installdirs - @(cd ../../include; $(MAKE) Rmath.h) - @WANT_R_FRAMEWORK_FALSE@ @$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(DESTDIR)$(includedir)/Rmath.h - @WANT_R_FRAMEWORK_TRUE@ @$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/include/Rmath.h diff --git a/dev-lang/R/files/R-4.2.3-curl-8.patch b/dev-lang/R/files/R-4.2.3-curl-8.patch deleted file mode 100644 index 92ee3b0d5702..000000000000 --- a/dev-lang/R/files/R-4.2.3-curl-8.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/902993 - ---- a/configure -+++ b/configure -@@ -48533,7 +48533,7 @@ - done - - if test "x${have_libcurl}" = "xyes"; then --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0" >&5 -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0 or version 8" >&5 - printf %s "checking if libcurl is version 7 and >= 7.28.0... " >&6; } - if test ${r_cv_have_curl728+y} - then : -@@ -48551,8 +48551,10 @@ - int main(int argc, const char * argv[]) - { - #ifdef LIBCURL_VERSION_MAJOR --#if LIBCURL_VERSION_MAJOR > 7 -+#if LIBCURL_VERSION_MAJOR > 8 - exit(1); -+#elif LIBCURL_VERSION_MAJOR == 8 -+ exit(0); - #elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28 - exit(0); - #else ---- a/m4/R.m4 -+++ b/m4/R.m4 -@@ -4300,15 +4300,17 @@ - AC_CHECK_HEADERS(curl/curl.h, [have_libcurl=yes], [have_libcurl=no]) - - if test "x${have_libcurl}" = "xyes"; then --AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0], [r_cv_have_curl728], -+AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0 or verion 8], [r_cv_have_curl728_8], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdlib.h> - #include <curl/curl.h> - int main(int argc, const char * argv[]) - { - #ifdef LIBCURL_VERSION_MAJOR --#if LIBCURL_VERSION_MAJOR > 7 -+#if LIBCURL_VERSION_MAJOR > 8 - exit(1); -+#elif LIBCURL_VERSION_MAJOR == 8 -+ exit(0); - #elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28 - exit(0); - #else -@@ -4318,9 +4320,9 @@ - exit(1); - #endif - } --]])], [r_cv_have_curl728=yes], [r_cv_have_curl728=no], [r_cv_have_curl728=no])]) -+]])], [r_cv_have_curl728_8=yes], [r_cv_have_curl728_8=no], [r_cv_have_curl728_8=no])]) - fi --if test "x${r_cv_have_curl728}" = xno; then -+if test "x${r_cv_have_curl728_8}" = xno; then - have_libcurl=no - fi - |