Update to gnuplot-5.4.0

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

gnuplot-4.6.0-fonts.diff

@@ -1,10 +1,9 @@
 ---
  src/gplt_x11.c |   33 +++++++++++++++++++++++++++------
- src/variable.c |    2 ++
- 2 files changed, 29 insertions(+), 6 deletions(-)
+ 1 file changed, 27 insertions(+), 6 deletions(-)
 
 --- src/gplt_x11.c
-+++ src/gplt_x11.c	2018-05-07 07:11:03.618477998 +0000
++++ src/gplt_x11.c	2020-07-17 07:20:04.523781257 +0000
 @@ -99,15 +99,16 @@
   * patches by Masahito Yamaga <ma@yama-ga.com>
   */
@@ -38,8 +37,8 @@
  #ifdef EXPORT_SELECTION
  # undef EXPORT_SELECTION
  #endif /* EXPORT SELECTION */
-@@ -523,8 +530,8 @@ static char *gpFallbackFont __PROTO((voi
- static int gpXGetFontascent __PROTO((XFontStruct *cfont));
+@@ -521,8 +528,8 @@ static char *gpFallbackFont(void);
+ static int gpXGetFontascent(XFontStruct *cfont);
  
  enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */
 -static char default_font[196] = { '\0' };
@@ -49,16 +48,16 @@
  
  #define Nwidths 10
  static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-@@ -2289,6 +2296,8 @@ exec_cmd(plot_struct *plot, char *comman
+@@ -2285,6 +2292,8 @@ exec_cmd(plot_struct *plot, char *comman
  		/* Save the request default font */
  		c = &(buffer[strlen(buffer)-1]);
  		while (*c <= ' ') *c-- = '\0';
 +		if (strlen(&buffer[2]) == 0)
-+			break;
- 		strncpy(default_font, &buffer[2], strlen(&buffer[2])+1);
++		    break;
+ 		strncpy(default_font, &buffer[2], sizeof(default_font)-1);
  		FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
  		break;
-@@ -5772,7 +5781,7 @@ XFontStruct *gpXLoadQueryFont (Display *
+@@ -5739,7 +5748,7 @@ XFontStruct *gpXLoadQueryFont (Display *
  	    }
  #else
  	    if (first_time) {
@@ -67,7 +66,7 @@
  		first_time = FALSE;
  	    }
  	    while (n_miss-- > 0)
-@@ -5927,6 +5936,18 @@ char *fontname;
+@@ -5892,6 +5901,18 @@ char *fontname;
      }
  
  #ifdef USE_X11_MULTIBYTE
@@ -86,14 +85,3 @@
      if (fontname && strncmp(fontname, "mbfont:", 7) == 0) {
  	if (multibyte_fonts_usable) {
  	    usemultibyte = 1;
---- src/variable.c
-+++ src/variable.c	2018-05-07 07:11:03.622477923 +0000
-@@ -280,6 +280,8 @@ static const struct path_table fontpath_
-     { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
- #endif
-     /* Linux paths */
-+    { "/usr/share/fonts/Type1" },
-+    { "/usr/share/fonts/truetype" },
-     { "/usr/X11R6/lib/X11/fonts/Type1" },
-     { "/usr/X11R6/lib/X11/fonts/truetype" },
-     /* HP-UX */