gentoo resync : 29.01.2021

4 files changed, 0 insertions, 133 deletions

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
deleted file mode 100644
index 613a028ee79b..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add configure option for ReGIS support.
-https://bugs.gentoo.org/643888
-
---- gnuplot-5.2.2-orig/configure.ac
-+++ gnuplot-5.2.2/configure.ac
-@@ -1057,6 +1057,13 @@
-   AC_DEFINE(HAVE_MIF,1,
-           [ Define to include support for mif terminal ],))
- 
-+dnl ReGIS terminal
-+AC_ARG_WITH(regis,dnl
-+[  --with-regis            ReGIS terminal])
-+AS_IF([test "x${with_regis}" = "xyes"],
-+  AC_DEFINE(HAVE_REGIS,1,
-+          [ Define to include support for ReGIS terminal ],))
-+
- AC_ARG_WITH(cairo,dnl
- [  --without-cairo         cairo-based terminals (default enabled)],,
-   [test -z "${with_cairo}" && with_cairo=yes])
-@@ -1350,6 +1357,12 @@
-   AC_MSG_RESULT([  mif terminal: no   (use --with-mif to enable)])
- fi
- 
-+if test "$with_regis" = yes; then
-+  AC_MSG_RESULT([  ReGIS terminal: yes])
-+else
-+  AC_MSG_RESULT([  ReGIS terminal: no (use --with-regis to enable)])
-+fi
-+
- if test "$is_msdos" = yes; then
-   AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
- fi
---- gnuplot-5.2.2-orig/src/term.h
-+++ gnuplot-5.2.2/src/term.h
-@@ -182,7 +182,7 @@
- #endif
- 
- /* REGIS graphics language */
--#ifdef VMS
-+#if defined(VMS) || defined(HAVE_REGIS)
- # include "regis.trm"
- #endif
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
deleted file mode 100644
index 2ce464f04499..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Patch backported from branch-5-4-stable.
-https://bugs.gentoo.org/690014
-
---- gnuplot-5.2.8-orig/term/caca.trm
-+++ gnuplot-5.2.8/term/caca.trm
-@@ -1909,8 +1909,11 @@
- 	CACA_result loop = CACA_loop;
- 	caca_event_t ev;
- 	const int event_mask =
--		CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT |
--		CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE;
-+		CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT
-+#ifdef USE_MOUSE
-+		| CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE
-+#endif
-+		;
- 	static int mx = 0, my = 0; /* current mouse position */
- 	static unsigned long last_event_time = 0;
- 
-@@ -2577,11 +2580,13 @@
- 		}
- 	}
- 
-+#ifdef USE_MOUSE
- 	if (changed) {
- 		/* Replot only if something changed. */
- 		CACA_zoom_or_replot = TRUE;
- 		process_event(GE_replot, 0, 0, 0, 0, 0);
- 	}
-+#endif
- }
- 
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
deleted file mode 100644
index e3da8fc40577..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/746419
-
-This backports the following commit from upstream git:
-
-commit 591c0f804b5a78421d28edf2adcd429c914bbca1
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Wed Sep 9 11:00:59 2020 -0700
-
-    successive failures of "set print <foo>" could cause double-free
-    Bug #2312
-
---- gnuplot-5.2.8-orig/src/command.c
-+++ gnuplot-5.2.8/src/command.c
-@@ -1867,6 +1867,7 @@
- #endif
- 	    if (0 > fclose(print_out))
- 		perror(print_out_name);
-+	print_out = stderr;
-     }
- 
-     free(print_out_name);
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
deleted file mode 100644
index a1df2ae49952..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/746419
-
-This backports and consolidates the following commits from upstream git:
-
-commit a7205eda482948a0408b0ed29cdde89593feedc7
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Sat Sep 12 10:18:10 2020 -0700
-
-    Better error handling for faulty font syntax
-
-    Commit 660e2fbd failed to deal with an error detected at the final character
-    of a text string.
-
-    Bugs #2303 #2308
-
-commit 660e2fbd681cb47acd42595f050fb2f938194b0e
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Sep 1 17:57:37 2020 -0700
-
-    Better error handling for faulty font syntax
-
-    A missing close-quote in an enhanced text font specification could
-    cause a segfault.
-    Bug #2303
-
---- gnuplot-5.2.8-orig/src/term.c
-+++ gnuplot-5.2.8/src/term.c
-@@ -2361,7 +2361,7 @@
- 			    ++p;
- 			if (*p != *start_of_fontname) {
- 			    int_warn(NO_CARET, "cannot interpret font name %s", start_of_fontname);
--			    p = start_of_fontname;
-+			    break;
- 			}
- 			start_of_fontname++;
- 			end_of_fontname = p++;