Update to gnuplot 5.4.1

OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=121

052cbd17.patch

@@ -1,25 +0,0 @@
-From 052cbd17c3cbbc602ee080b2617d32a8417d7563 Mon Sep 17 00:00:00 2001
-From: Ethan A Merritt <merritt@u.washington.edu>
-Date: Wed, 9 Sep 2020 11:00:59 -0700
-Subject: [PATCH] successive failures of "set print <foo>" could cause
- double-free Bug #2312
-
----
- src/command.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/command.c src/command.c
-index c6a923b5a..9701de995 100644
---- src/command.c
-+++ src/command.c
-@@ -1914,6 +1914,7 @@ print_set_output(char *name, TBOOLEAN datablock, TBOOLEAN append_p)
- #endif
- 	    if (0 > fclose(print_out))
- 		perror(print_out_name);
-+	print_out = stderr;
-     }
- 
-     free(print_out_name);
--- 
-2.26.2
-

1f36c4fb.patch

@@ -1,42 +0,0 @@
-From 1f36c4fbb3e8e0beb213b4a29ab463e43db9ef42 Mon Sep 17 00:00:00 2001
-From: Ethan A Merritt <merritt@u.washington.edu>
-Date: Fri, 11 Sep 2020 17:38:55 -0700
-Subject: [PATCH] prevent buffer overflow of enhanced text fragment
-
-The generic enhanced text buffering uses a shared buffer with fixed length.
-Add a check on the current position before adding each character in an
-enhanced text fragment.  Affects terminals
-  caca canvas dumb emf gd pc pdf pm tkcanvas x11 win
-Does not affect terminals with customized text handling
-  qt wxt cairo
-
-Bugs #2310 #2311
----
- src/term.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git src/term.c src/term.c
-index 7fd46fa04..70a2a7f25 100644
---- src/term.c
-+++ src/term.c
-@@ -185,6 +185,7 @@ char *enhanced_cur_text = NULL;
- double enhanced_fontscale = 1.0;
- char enhanced_escape_format[16] = "";
- double enhanced_max_height = 0.0, enhanced_min_height = 0.0;
-+#define ENHANCED_TEXT_MAX (&enhanced_text[MAX_LINE_LEN])
- /* flag variable to disable enhanced output of filenames, mainly. */
- TBOOLEAN ignore_enhanced_text = FALSE;
- 
-@@ -2021,6 +2022,9 @@ test_term()
- void
- do_enh_writec(int c)
- {
-+    /* Guard against buffer overflow */
-+    if (enhanced_cur_text >= ENHANCED_TEXT_MAX)
-+	return;
-     /* note: c is meant to hold a char, but is actually an int, for
-      * the same reasons applying to putc() and friends */
-     *enhanced_cur_text++ = c;
--- 
-2.26.2
-

963c7df3.patch

@@ -1,28 +0,0 @@
-From 963c7df3e0c5266efff260d0dff757dfe03d3632 Mon Sep 17 00:00:00 2001
-From: Ethan A Merritt <merritt@u.washington.edu>
-Date: Tue, 1 Sep 2020 17:57:37 -0700
-Subject: [PATCH] Better error handling for faulty font syntax
-
-A missing close-quote in an enhanced text font specification could
-cause a segfault.
-Bug #2303
----
- src/term.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/term.c src/term.c
-index fb99a9a6f..7fd46fa04 100644
---- src/term.c
-+++ src/term.c
-@@ -2175,7 +2175,7 @@ enhanced_recursion(
- 			    ++p;
- 			if (*p != *start_of_fontname) {
- 			    int_warn(NO_CARET, "cannot interpret font name %s", start_of_fontname);
--			    p = start_of_fontname;
-+			    p = start_of_fontname + 1;
- 			}
- 			start_of_fontname++;
- 			end_of_fontname = p++;
--- 
-2.26.2
-

a31c3b70.patch

@@ -1,29 +0,0 @@
-From a31c3b70d8d4f887f906afe35accbc9a59ebcd37 Mon Sep 17 00:00:00 2001
-From: Ethan A Merritt <merritt@u.washington.edu>
-Date: Sat, 12 Sep 2020 10:18:10 -0700
-Subject: [PATCH] Better error handling for faulty font syntax
-
-Commit 963c7df3 failed to deal with an error detected at the final character
-of a text string.
-
-Bugs #2303 #2308
----
- src/term.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/term.c src/term.c
-index 70a2a7f25..b9237784d 100644
---- src/term.c
-+++ src/term.c
-@@ -2179,7 +2179,7 @@ enhanced_recursion(
- 			    ++p;
- 			if (*p != *start_of_fontname) {
- 			    int_warn(NO_CARET, "cannot interpret font name %s", start_of_fontname);
--			    p = start_of_fontname + 1;
-+			    break;
- 			}
- 			start_of_fontname++;
- 			end_of_fontname = p++;
--- 
-2.26.2
-

gnuplot-5.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47
-size 5622595

gnuplot-5.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e
+size 5608076

gnuplot-gd.patch

@@ -7,12 +7,12 @@ Index: gnuplot-5.2.2/configure.ac
 
 --- gnuplot-5.4.0/configure.ac
 +++ gnuplot-5.4.0/configure.ac	2020-07-17 07:31:14.828189953 +0000
-@@ -535,63 +535,17 @@ AC_ARG_WITH(gd,dnl
+@@ -541,63 +541,17 @@ AC_ARG_WITH(gd,dnl
-   with_gd=yes)
  
  if test "$with_gd" != no; then
+   PKG_CHECK_MODULES_NOFAIL(libgd, [gdlib])
 -  AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
--  if test -n "$GDLIB_CONFIG"; then
+-  if test $pkg_failed == no && test -n "$GDLIB_CONFIG"; then
 -    libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
 -    libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
 -    libgd_LIBS=`$GDLIB_CONFIG --libs`

gnuplot.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Thu Dec 10 07:11:15 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Update to gnuplot 5.4.1
+  * NEW "with rgbimage" and "with rgbalpha" accept single column ARGB input
+  * NEW add toggle in toolbar widget for qt terminal option "ctrl-q"
+  * NEW keyword "smooth kdensity period <val>"
+  * NEW time format %tD encodes days relative to time 0
+  * NEW pm3d quadrangles in 2D projection are clipped smoothly to x and y
+  * CHANGE gif animation 'optimize' option is deprecated Bugs #1992 #2070 #2348
+  * CHANGE svg increase coordinate precision to two decimal points Bug #2369
+  * FIX y autoscaling of default "with filledcurves" #Bug 2294
+  * FIX placement of mirrored x and y tics in mode 'set view projection ...'
+  * FIX pm3d lighting calculation for degenerate quadrangles
+  * FIX botched deprecation of old syntax for "call" arguments Bug #2298 #2368
+  * FIX pm3d "depthorder" affects 'set obj polygon' with >4 vertices Bug #2297
+  * FIX loss of precision for asin(x), asinh(x) with real x << 0 Bug #2302
+  * FIX error handling of bad font name in enhanced text Bugs #2303 #2308
+  * FIX incomplete domain for complex acosh(x), real x < -1 was treated as NaN
+  * FIX error handling of fuzzed input  Bugs #2306 #2307 #2309 #2312 #2344
+  * FIX add range check for plot of binned data (allows clipping on y)
+  * FIX "unzoom" applied to autoscaled volatile data
+  * FIX no default for binary columns needed if there is a 'using' spec Bug #2315
+  * FIX buffer overflow of enhanced text fragment  Bugs #2310 #2311
+  * FIX qnorm and Hann functions applied in dgrid3d Bugs #2277 #2318
+  * FIX handling of dashtype given as a string with leading whitespace Bug #2336
+  * FIX preserve key position across isolated instance of "title at x,y" Bug #2342
+  * FIX contour labels had spurious point symbols
+  * FIX allow "pointtype variable" in combination with jitter Bug #2354
+  * FIX cgm: sanity for non-zero font size Bug #2358
+  * FIX more checks for valid UTF-8 Bugs #2362 #2364
+- Remove patches now upstream
+  * 052cbd17.patch
+  * 1f36c4fb.patch
+  * 963c7df3.patch
+  * a31c3b70.patch
+- Port patch gnuplot-gd.patch
+
 -------------------------------------------------------------------
 Mon Sep 28 10:14:01 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 

gnuplot.spec

@@ -75,7 +75,7 @@ BuildRequires:  tex(pdftex.def)
 BuildRequires:  tex(subfigure.sty)
 %endif
 URL:            http://www.gnuplot.info/
-Version:        5.4.0
+Version:        5.4.1
 Release:        0
 %global         underscore 5_4
 %if "%{flavor}" == ""
@@ -103,10 +103,6 @@ Patch4:         gnuplot-4.6.0-demo.diff
 Patch5:         gnuplot-wx3.diff
 Patch6:         gnuplot-QtCore-PIC.dif
 Patch7:         gnuplot-gd.patch
-Patch10:        963c7df3.patch
-Patch11:        052cbd17.patch
-Patch12:        1f36c4fb.patch
-Patch13:        a31c3b70.patch
 %define _x11lib     %{_libdir}
 %define _x11data    %{_datadir}/X11
 %define _libx11     %{_exec_prefix}/lib/X11
@@ -141,10 +137,6 @@ cp %{_sourcedir}/picins.sty docs
 %patch5 -p1 -b .w3x
 %patch6 -p0 -b .pic
 %patch7 -p1 -b .gd
-%patch10
-%patch11
-%patch12
-%patch13
 %build
 autoreconf -fi