Clean files not present in factory

Merge remote-tracking branch 'upstream/factory' into slfo-main
Accepting request 1330783 from Publishing
2026-02-17 11:10:00 +01:00 · 2026-02-17 11:10:00 +01:00 · 2026-02-06 18:05:00 +00:00 · 2026-01-28 08:57:20 +00:00 · 2025-06-11 16:34:29 +00:00 · 2025-06-11 08:05:15 +00:00
23 changed files with 347 additions and 573 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-## Default LFS
+*.changes merge=merge-changes
 *.7z filter=lfs diff=lfs merge=lfs -text
 *.bsp filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
@@ -12,6 +12,7 @@
 *.pdf filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.rpm filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
 *.tbz filter=lfs diff=lfs merge=lfs -text
 *.tbz2 filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-.osc
+*.obscpio
+*.osc
+_build.*
+.pbuild
--- a/Gnuplot6.pdf
+++ b/Gnuplot6.pdf
--- a/7
+++ b/7
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">4</size>
+    </disk>
+  </hardware>
+</constraints>
--- a/fix4bug1240325.patch
+++ b/fix4bug1240325.patch
@@ -1,75 +0,0 @@
-commit b456a3ef618f55a20b3071d336cb20514274f1d4
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Mar 11 12:31:54 2025 -0700
-
-    guard against invalid read from plot->labels
-    
-    If a plot style uses points and the point chosen has PT_CHARACTER
-    then the program looks for a possible font in plot->labels->font.
-    These plot styles contain a flag bit HAS_POINT (gp_types.h).
-    The program makes sure to initialize plot->labels for these styles.
-    However a problem arises when a plot style that doesn't use points
-    nevertheless triggers this same attempted font lookup by using a
-    linetype that happens to use pointtype PT_CHARACTER.
-    I think this is only possible with 'splot' but I added parallel
-    checks for 'plot' as well.
-    
-    Bug 2776
-
-diff --git src/boundary.c src/boundary.c
-index e787de3f1..941635f7a 100644
--- src/boundary.c
-+++ src/boundary.c
-@@ -1468,7 +1468,7 @@ do_key_sample_point(
- 	    (*t->pointsize)(pointsize);
- 	if (on_page(xl + key_point_offset, yl)) {
- 	    if (this_plot->lp_properties.p_type == PT_CHARACTER) {
-		if (this_plot->labels->textcolor.type != TC_DEFAULT)
-+		if (this_plot->labels && this_plot->labels->textcolor.type != TC_DEFAULT)
- 		    apply_pm3dcolor(&(this_plot->labels->textcolor));
- 		(*t->put_text) (xl + key_point_offset, yl, 
- 				this_plot->lp_properties.p_char);
-diff --git src/graph3d.c src/graph3d.c
-index bda614b7a..74ae8d558 100644
--- src/graph3d.c
-+++ src/graph3d.c
-@@ -2164,7 +2164,7 @@ plot3d_points(struct surface_points *plot)
-     /* Set whatever we can that applies to every point in the loop */
-     if (plot->lp_properties.p_type == PT_CHARACTER) {
- 	ignore_enhanced(TRUE);
-	if (plot->labels->font && plot->labels->font[0])
-+	if (plot->labels && plot->labels->font && plot->labels->font[0])
- 	    (*t->set_font) (plot->labels->font);
- 	(*t->justify_text) (CENTRE);
-     }
-@@ -2260,7 +2260,7 @@ plot3d_points(struct surface_points *plot)
- 
-     /* Return to initial state */
-     if (plot->lp_properties.p_type == PT_CHARACTER) {
-	if (plot->labels->font && plot->labels->font[0])
-+	if (plot->labels && plot->labels->font && plot->labels->font[0])
- 	    (*t->set_font) ("");
- 	ignore_enhanced(FALSE);
-     }
-diff --git src/graphics.c src/graphics.c
-index 083cb61f4..f68ef7096 100644
--- src/graphics.c
-+++ src/graphics.c
-@@ -2649,7 +2649,7 @@ plot_points(struct curve_points *plot)
-     /* Set whatever we can that applies to every point in the loop */
-     if (plot->lp_properties.p_type == PT_CHARACTER) {
- 	ignore_enhanced(TRUE);
-	if (plot->labels->font && plot->labels->font[0])
-+	if (plot->labels && plot->labels->font && plot->labels->font[0])
- 	    (*t->set_font) (plot->labels->font);
- 	(*t->justify_text) (CENTRE);
-     }
-@@ -2781,7 +2781,7 @@ plot_points(struct curve_points *plot)
- 
-     /* Return to initial state */
-     if (plot->lp_properties.p_type == PT_CHARACTER) {
-	if (plot->labels->font && plot->labels->font[0])
-+	if (plot->labels && plot->labels->font && plot->labels->font[0])
- 	    (*t->set_font) ("");
- 	ignore_enhanced(FALSE);
-     }
--- a/fix4bug1240326.patch
+++ b/fix4bug1240326.patch
@@ -1,30 +0,0 @@
-commit 226809aebb345e74d371bb43a2b434b490be527a
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Wed Jan 15 11:56:13 2025 -0800
-
-    dumb:  more stringent tests against y bound of dumb terminal charcell array
-    
-    Bug 2756
-
-diff --git term/dumb.trm term/dumb.trm
-index 498e27fc6..fdc94fbf5 100644
--- term/dumb.trm
-+++ term/dumb.trm
-@@ -801,7 +801,7 @@ DUMB_put_text(unsigned int x, unsigned int y, const char *str)
- {
-     int i, length;
- 
-    if (y > dumb_ymax)
-+    if (y < 0 || y > dumb_ymax)
- 	return;
- 
-     length = gp_strlen(str);
-@@ -949,7 +949,7 @@ ENHdumb_FLUSH()
- 	y += i;
- 
- 	/* print the string fragment, perhaps invisibly */
-	if (ENHdumb_show && y < dumb_ymax) {
-+	if (ENHdumb_show && (0 <= y && y < dumb_ymax)) {
- 	    for (i = 0; i < len && x < dumb_xmax; i++, x++) {
- 		utf8_copy_one( (char *)(&DUMB_PIXEL(x, y)), gp_strchrn(str,i));
- #ifndef NO_DUMB_COLOR_SUPPORT
--- a/fix4bug1240327.patch
+++ b/fix4bug1240327.patch
@@ -1,84 +0,0 @@
-commit b78cc829a18e9436daaa859c96f3970157f3171e
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Jan 14 21:23:19 2025 -0800
-
-    use snprintf to protect against garbage user-supplied mouse format
-    
-    Bug 2754
-
-diff --git src/mouse.c src/mouse.c
-index 4d1362130..95266738b 100644
--- src/mouse.c
-+++ src/mouse.c
-@@ -270,7 +270,7 @@ static void alert(void);
- static void MousePosToGraphPosReal(int xx, int yy, double *x, double *y, double *x2, double *y2);
- static char *xy_format(void);
- static char *zoombox_format(void);
-static char *GetAnnotateString(char *s, double x, double y, int mode, char *fmt);
-+static char *GetAnnotateString(char *s, size_t len, double x, double y, int mode, char *fmt);
- static char *xDateTimeFormat(double x, char *b, int mode);
- static void GetRulerString(char *p, double x, double y);
- static void apply_zoom(struct t_zoom * z);
-@@ -524,7 +524,7 @@ zoombox_format()
- /* formats the information for an annotation (middle mouse button clicked)
-  */
- static char *
-GetAnnotateString(char *s, double x, double y, int mode, char *fmt)
-+GetAnnotateString(char *s, size_t len, double x, double y, int mode, char *fmt)
- {
-     if (axis_array[FIRST_X_AXIS].datatype == DT_DMS
-     ||  axis_array[FIRST_Y_AXIS].datatype == DT_DMS) {
-@@ -579,11 +579,11 @@ GetAnnotateString(char *s, double x, double y, int mode, char *fmt)
- 	    r = rmin + x/cos(phi);
- 
- 	if (fmt)
-	    sprintf(s, fmt, theta, r);
-+	    snprintf(s, len, fmt, theta, r);
- 	else
- 	    sprintf(s, "theta: %.1f%s  r: %g", theta, degree_sign, r);
-     } else if ((mode == MOUSE_COORDINATES_ALT) && fmt) {
-	sprintf(s, fmt, x, y);	/* user defined format */
-+	snprintf(s, len, fmt, x, y);	/* user defined format */
-     } else if (mode == MOUSE_COORDINATES_FUNCTION) {
- 	/* EXPERIMENTAL !!! */
- 	t_value original_x, original_y;
-@@ -606,7 +606,7 @@ GetAnnotateString(char *s, double x, double y, int mode, char *fmt)
- 	gpfree_string(&readout);
-     } else {
- 	/* Default format ("set mouse mouseformat" is not active) */
-	sprintf(s, xy_format(), x, y);	/* usual x,y values */
-+	snprintf(s, len, xy_format(), x, y);	/* usual x,y values */
-     }
-     return s + strlen(s);
- }
-@@ -1020,10 +1020,10 @@ UpdateStatuslineWithMouseSetting(mouse_setting_t * ms)
- 	strcat(format, ms->fmt);
- 	strcat(format, ", ");
- 	strcat(format, ms->fmt);
-	sprintf(s0, format, surface_rot_x, surface_rot_z, surface_scale, surface_zscale);
-+	snprintf(s0, 255, format, surface_rot_x, surface_rot_z, surface_scale, surface_zscale);
-     } else if (!TICS_ON(axis_array[SECOND_X_AXIS].ticmode) && !TICS_ON(axis_array[SECOND_Y_AXIS].ticmode)) {
- 	/* only first X and Y axis are in use */
-	sp = GetAnnotateString(s0, real_x, real_y, mouse_mode, mouse_alt_string);
-+	sp = GetAnnotateString(s0, 255, real_x, real_y, mouse_mode, mouse_alt_string);
- 	if (ruler.on)
- 	    GetRulerString(sp, real_x, real_y);
-     } else {
-@@ -2286,7 +2286,7 @@ event_buttonrelease(struct gp_event_t *ge)
- 	     * only place, if the user didn't drag (rotate) the plot */
- 
- 	    if (!is_3d_plot || !motion) {
-		GetAnnotateString(s0, real_x, real_y, mouse_mode, mouse_alt_string);
-+		GetAnnotateString(s0, 255, real_x, real_y, mouse_mode, mouse_alt_string);
- 		term->set_clipboard(s0);
- 		if (display_ipc_commands()) {
- 		    fprintf(stderr, "put `%s' to clipboard.\n", s0);
-@@ -2302,7 +2302,7 @@ event_buttonrelease(struct gp_event_t *ge)
- 	    /* draw temporary annotation or label. For 3d plots this is
- 	     * only done if the user didn't drag (scale) the plot */
- 	    if (!is_3d_plot || !motion) {
-		GetAnnotateString(s0, real_x, real_y, mouse_mode, mouse_alt_string);
-+		GetAnnotateString(s0, 255, real_x, real_y, mouse_mode, mouse_alt_string);
- 		if (mouse_setting.label) {
- 		    if (modifier_mask & Mod_Ctrl) {
- 			remove_label(mouse_x, mouse_y);
--- a/fix4bug1240328.patch
+++ b/fix4bug1240328.patch
@@ -1,107 +0,0 @@
-commit ed647df512786b3c94429dd5c864715301e03ea5
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Mar 11 16:31:23 2025 -0700
-
-    guard against trying to format a huge number as a time
-    
-    The time formatting code does not handle time_in_seconds > 1.e12
-    (sometime in the year 33658).
-    
-    Bug 2779
-
-diff --git src/mouse.c src/mouse.c
-index ba0609290..a6110f5ff 100644
--- src/mouse.c
-+++ src/mouse.c
-@@ -619,6 +619,11 @@ static char *
- xDateTimeFormat(double x, char *b, int mode)
- {
-     struct tm tm;
-+    if (fabs(x) > 1.e12) {  /* Some time in the year 33688 */
-+	int_warn(NO_CARET, "time value out of range");
-+	*b = '\0';
-+	return b;
-+    }
- 
-     switch (mode) {
-     case MOUSE_COORDINATES_XDATE:
-commit 3270021820ff6ac7a6d77b77fe69777129937994
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Wed Mar 12 19:56:13 2025 -0700
-
-    check valid range on time value before trying to format it
-    
-    Absurdly large time values (number of seconds) cause failures in the
-    routines that populate a time structure and format the result.
-    The program does complain about an invalid time value but only
-    after the failures have already occurred.
-    E.g.
-            print strftime("%Y", 1.e14)
-    
-    Now a check for fabs(time) > 1.e12 is the first thing in f_strftime().
-    
-    Bug 2779
-
-diff --git src/internal.c src/internal.c
-index 53be8d409..2d8812e49 100644
--- src/internal.c
-+++ src/internal.c
-@@ -1905,30 +1905,37 @@ f_strftime(union argument *arg)
- 	int_error(NO_CARET,
- 		  "First parameter to strftime must be a format string");
- 
-    /* Prepare format string.
-     * Make sure the resulting string not empty by adding a space.
-     * Otherwise, the return value of gstrftime doesn't give enough
-     * information.
-     */
-    fmtlen = strlen(fmt.v.string_val) + 1;
-    fmtstr = gp_alloc(fmtlen + 1, "f_strftime: fmt");
-    strncpy(fmtstr, fmt.v.string_val, fmtlen);
-    strncat(fmtstr, " ", fmtlen);
-    buflen = 80 + 2*fmtlen;
-    buffer = gp_alloc(buflen, "f_strftime: buffer");
-
-    /* Get time_str */
-    length = gstrftime(buffer, buflen, fmtstr, real(&val));
-    if (length == 0 || length >= buflen)
-	int_error(NO_CARET, "String produced by time format is too long");
-
-    /* Remove trailing space */
-    assert(buffer[length-1] == ' ');
-    buffer[length-1] = NUL;
-+    /* Range check */
-+    if (!(fabs(real(&val)) < 1.e12)) {
-+	int_warn(NO_CARET, "time value out of range");
-+	buffer = strdup("    ");
-+
-+    } else {
-+	/* Prepare format string.
-+	 * Make sure the resulting string not empty by adding a space.
-+	 * Otherwise, the return value of gstrftime doesn't give enough
-+	 * information.
-+	 */
-+	fmtlen = strlen(fmt.v.string_val) + 1;
-+	fmtstr = gp_alloc(fmtlen + 1, "f_strftime: fmt");
-+	strncpy(fmtstr, fmt.v.string_val, fmtlen);
-+	strncat(fmtstr, " ", fmtlen);
-+	buflen = 80 + 2*fmtlen;
-+	buffer = gp_alloc(buflen, "f_strftime: buffer");
-+
-+	/* Get time_str */
-+	length = gstrftime(buffer, buflen, fmtstr, real(&val));
-+	if (length == 0 || length >= buflen)
-+	    int_error(NO_CARET, "String produced by time format is too long");
-+
-+	/* Remove trailing space */
-+	assert(buffer[length-1] == ' ');
-+	buffer[length-1] = NUL;
-+	free(fmtstr);
-+    }
- 
-     gpfree_string(&val);
-     gpfree_string(&fmt);
-    free(fmtstr);
- 
-     push(Gstring(&val, buffer));
-     free(buffer);
--- a/fix4bug1240329.patch
+++ b/fix4bug1240329.patch
@@ -1,33 +0,0 @@
-commit b2343fd02c4fff94957f0151b73daa0a1f7fec49
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Jan 14 21:54:14 2025 -0800
-
-    canvas:  handle nonlinear x2 or y2 axis with an incomplete definition
-    
-    Actually "handle" means "ignore".
-    But now it doesn't segfault trying to probe a non-existant link function.
-    
-    Bug 2755
-
-diff --git term/canvas.trm term/canvas.trm
-index a919b09bd..bfe567832 100644
--- term/canvas.trm
-+++ term/canvas.trm
-@@ -646,7 +646,7 @@ CANVAS_text()
- 	} else
- 	    fprintf(gpoutfile, "gnuplot.plot_axis_x2min = \"none\"\n");
- 	if (axis_array[SECOND_X_AXIS].linked_to_primary
-	&&  axis_array[FIRST_X_AXIS].link_udf->at) {
-+	&&  axis_array[FIRST_X_AXIS].link_udf && axis_array[FIRST_X_AXIS].link_udf->at) {
- 	    fprintf(gpoutfile, "gnuplot.x2_mapping = function(x) { return x; };");
- 	    fprintf(gpoutfile, "  // replace returned value with %s\n",
- 			axis_array[FIRST_X_AXIS].link_udf->definition);
-@@ -657,7 +657,7 @@ CANVAS_text()
- 	} else
- 	    fprintf(gpoutfile, "gnuplot.plot_axis_y2min = \"none\"\n");
- 	if (axis_array[SECOND_Y_AXIS].linked_to_primary
-	&&  axis_array[FIRST_Y_AXIS].link_udf->at) {
-+	&&  axis_array[FIRST_Y_AXIS].link_udf && axis_array[FIRST_Y_AXIS].link_udf->at) {
- 	    fprintf(gpoutfile, "gnuplot.y2_mapping = function(y) { return y; };");
- 	    fprintf(gpoutfile, "  // replace returned value with %s\n",
- 			axis_array[FIRST_Y_AXIS].link_udf->definition);
--- a/fix4bug1240330.patch
+++ b/fix4bug1240330.patch
@@ -1,34 +0,0 @@
-commit af96c2c1b20383684b1ec2084dab7936f7053031
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Jan 14 20:56:37 2025 -0800
-
-    x11: protect against double fclose() if two errors in a row
-    
-    Bug 2753
-
-diff --git term/x11.trm term/x11.trm
-index 18ad4ad85..cbe01dd0e 100644
--- term/x11.trm
-+++ term/x11.trm
-@@ -854,8 +854,9 @@ X11_atexit()
- 	/* dont wait(), since they might be -persist */
- 	X11_ipc = NULL;
- #ifdef PIPE_IPC
-	close(ipc_back_fd);
-	ipc_back_fd = -1;
-+	if (ipc_back_fd >= 0)
-+	    close(ipc_back_fd);
-+	ipc_back_fd = IPC_BACK_CLOSED;
- #endif
-     }
- }
-@@ -1374,7 +1375,8 @@ X11_graphics()
- #ifdef PIPE_IPC
-     /* if we know the outboard driver has stopped, restart it */
-     if (ipc_back_fd == IPC_BACK_CLOSED) {
-	fclose(X11_ipc);
-+	if (X11_ipc > 0)
-+	    fclose(X11_ipc);
- 	X11_ipc = NULL;
- 	X11_init();
-     }
--- a/fix4bug1241684.patch
+++ b/fix4bug1241684.patch
@@ -1,57 +0,0 @@
-commit a5897feadc4be73b0ffd8458556c47117bd24d03
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Mar 25 22:51:54 2025 -0700
-
-    hpgl: font name parsing overruns the string by one char
-    
-    if no comma is present in the font name.
-    E.g.
-       set term pcl
-       set title "Title" font "sans"    # no comma in font name
-       plot x
-    
-    Bug 2781
-
-diff --git term/hpgl.trm term/hpgl.trm
-index 8e763d174..d432f7e39 100644
--- term/hpgl.trm
-+++ term/hpgl.trm
-@@ -1653,28 +1653,22 @@ TERM_PUBLIC int
- HPGL2_set_font(const char *font)
- {
-     char name[MAX_ID_LEN + 1];
-    int sep;
-    int int_size;
-    double size;
-+    char *sep;
-+    double size = HPGL2_point_size;
- 
-     if (font == NULL)
- 	font = "";
- 
-    sep = strcspn(font, ",");
-     strncpy(name, font, sizeof(name)-1);
- 
-    if (sep < sizeof(name))
-	name[sep] = NUL;
-
-/* determine font size, use default from options if invalid */
-    int_size = 0;
-    /* FIXME: use strtod instead */
-    sscanf(&(font[sep + 1]), "%d", &int_size);
-    if (int_size > 0)
-	size = int_size;
-    else
-	size = HPGL2_point_size;
-
-+    /* determine font size, use default from options if invalid */
-+    sep = strchr(font, ',');
-+    if (sep) {
-+	double req_size = strtod(sep+1, NULL);
-+	if (req_size > 0)
-+	    size = req_size;
-+	*sep = '\0';
-+    }
-     return HPGL2_set_font_size(name, size);
- }
- 
--- a/gnuplot-4.6.0-demo.diff
+++ b/gnuplot-4.6.0-demo.diff
@@ -115,7 +115,7 @@
     envptr = loadpath;
 --- src/show.c
 +++ src/show.c	2020-07-17 07:25:00.022670914 +0000
-@@ -1139,6 +1139,15 @@ show_version(FILE *fp)
+@@ -1138,6 +1138,15 @@ show_version(FILE *fp)
 	    p 			/* type "help seeking-assistance" */
 	    );
 
--- a/gnuplot-4.6.0-fonts.diff
+++ b/gnuplot-4.6.0-fonts.diff
@@ -1,12 +1,24 @@
+Change default font and fix potential buffer overflow
+
+For X11 multi-byte we want to ensure there is a good default font selected,
+so we change the default font to font variants present on openSUSE systems.
+
+Prevent buffer overflow when changing the default font to a maliciously
+crafted font name.
+
+Make output for missing character sets less verbose by preferring debug
+prints
 ---
 src/gplt_x11.c |   33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

--- src/gplt_x11.c
-+++ src/gplt_x11.c	2020-07-17 07:20:04.523781257 +0000
-@@ -99,15 +99,16 @@
-  * patches by Masahito Yamaga <ma@yama-ga.com>
-  */
+Index: src/gplt_x11.c
+===================================================================
+--- src/gplt_x11.c.orig
+++ src/gplt_x11.c
+@@ -106,15 +106,16 @@
+ #include "stdfn.h"
+ #include "gp_types.h"
 
 +#ifndef _GNU_SOURCE
 +#define _GNU_SOURCE
@@ -24,7 +36,7 @@
 #include <X11/XKBlib.h>	/* for XkbKeycodeToKeysym */
 
 #include <assert.h>
-@@ -118,6 +119,12 @@
+@@ -122,6 +123,12 @@
 #include "gplt_x11.h"
 #include "version.h"
 
@@ -37,7 +49,7 @@
 #ifdef EXPORT_SELECTION
 # undef EXPORT_SELECTION
 #endif /* EXPORT SELECTION */
-@@ -522,8 +529,8 @@ static char *gpFallbackFont(void);
+@@ -526,8 +533,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' */
@@ -48,7 +60,7 @@
 
 #define Nwidths 10
 static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-@@ -2290,6 +2297,8 @@ exec_cmd(plot_struct *plot, char *comman
+@@ -2294,6 +2301,8 @@ exec_cmd(plot_struct *plot, char *comman
 		/* Save the request default font */
 		c = &(buffer[strlen(buffer)-1]);
 		while (*c <= ' ') *c-- = '\0';
@@ -57,7 +69,7 @@
 		strncpy(default_font, &buffer[2], sizeof(default_font)-1);
 		FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
 		break;
-@@ -5810,7 +5819,7 @@ XFontStruct *gpXLoadQueryFont (Display *
+@@ -5814,7 +5823,7 @@ XFontStruct *gpXLoadQueryFont (Display *
 	    }
 #else
 	    if (first_time) {
@@ -66,7 +78,7 @@
 		first_time = FALSE;
 	    }
 	    while (n_miss-- > 0)
-@@ -5962,6 +5971,18 @@ char *fontname;
+@@ -5966,6 +5975,18 @@ pr_font( char *fontname )
     }
 
 #ifdef USE_X11_MULTIBYTE
--- a/gnuplot-4.6.0.dif
+++ b/gnuplot-4.6.0.dif
@@ -7,9 +7,11 @@
 gnuplot-6.0.0/src/term.h       |    6 +++---
 6 files changed, 35 insertions(+), 12 deletions(-)

--- gnuplot-6.0.0/configure.ac
-+++ gnuplot-6.0.0/configure.ac	2024-01-09 08:20:41.748328467 +0000
-@@ -383,7 +383,7 @@ if test "$with_readline" != no; then
+Index: gnuplot-6.0.4/configure.ac
+===================================================================
+--- gnuplot-6.0.4.orig/configure.ac
+++ gnuplot-6.0.4/configure.ac
+@@ -391,7 +391,7 @@ if test "$with_readline" != no; then
     dnl check for terminal library
     dnl this is a very cool solution from octave's configure.in
     gp_tcap=""
@@ -18,52 +20,10 @@
       AC_CHECK_LIB(${termlib}, tputs, [gp_tcap="$gp_tcap -l$termlib"])
       case "$gp_tcap" in
         *-l${termlib}*)
--- gnuplot-6.0.0/docs/Makefile.am
-+++ gnuplot-6.0.0/docs/Makefile.am	2024-01-08 10:32:22.372964142 +0000
-@@ -29,7 +29,7 @@
- #
- 
- # default is what is needed for interactive gnuplot
-gih_DATA = gnuplot.gih
-+gih_DATA = gnuplot.gih gnuplot-fr.gih
- gihdir = @GIHDIR@
- 
- noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2hlp \
-@@ -113,7 +113,7 @@ svg_figures html/*.html html/*.svg html/
- webp_figures html/*.webp html/figure_mask.png                           \
- psdoc/*.aux psdoc/*.dvi psdoc/*.log                                     \
- psdoc/ps_fontfile_doc.pdf psdoc/ps_fontfile_doc.ps psdoc/ps_symbols.ps  \
-windows/*.png gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
-+windows/*.png gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
- 
-@@ -273,17 +273,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
- doc2hlp_SOURCES = doc2hlp.c termdoc.c
- 
- ### gnuplot interactive help format
-gih: gnuplot.gih
-+gih: gnuplot.gih gnuplot-fr.gih
- 
- gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
- 	$(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
- 
-+gnuplot-fr.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc
-+	$(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
-+
- doc2gih_SOURCES = doc2gih.c termdoc.c
- 
- # To include all terminals in the .gih file
-allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
-+allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc $(srcdir)/gnuplot-fr.doc
- 	@echo "generate gnuplot.gih with all terminals"
- 	$(AM_V_at)./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
-+	$(AM_V_at)./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
- 
- alldoc2gih_SOURCES = doc2gih.c termdoc.c
- alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
--- gnuplot-6.0.0/src/gadgets.h
-+++ gnuplot-6.0.0/src/gadgets.h	2024-01-08 09:16:58.124450437 +0000
+Index: gnuplot-6.0.4/src/gadgets.h
+===================================================================
+--- gnuplot-6.0.4.orig/src/gadgets.h
+++ gnuplot-6.0.4/src/gadgets.h
@@ -533,7 +533,7 @@ extern TBOOLEAN	clip_lines2;
 extern TBOOLEAN	clip_points;
 extern TBOOLEAN	clip_radial;
@@ -73,9 +33,11 @@
 extern int samples_1;
 extern int samples_2;
 
--- gnuplot-6.0.0/src/gplt_x11.c
-+++ gnuplot-6.0.0/src/gplt_x11.c	2024-01-08 09:16:58.124450437 +0000
-@@ -2514,9 +2514,12 @@ exec_cmd(plot_struct *plot, char *comman
+Index: gnuplot-6.0.4/src/gplt_x11.c
+===================================================================
+--- gnuplot-6.0.4.orig/src/gplt_x11.c
+++ gnuplot-6.0.4/src/gplt_x11.c
+@@ -2518,9 +2518,12 @@ exec_cmd(plot_struct *plot, char *comman
 	}
     }
     /*   X11_justify_text(mode) - set text justification mode  */
@@ -91,9 +53,11 @@
     else if (*buffer == 'A')
 	sscanf(buffer + 1, "%lf", &plot->angle);
 
--- gnuplot-6.0.0/src/plot.c
-+++ gnuplot-6.0.0/src/plot.c	2024-01-08 09:16:58.124450437 +0000
-@@ -298,6 +298,22 @@ main(int argc_orig, char **argv)
+Index: gnuplot-6.0.4/src/plot.c
+===================================================================
+--- gnuplot-6.0.4.orig/src/plot.c
+++ gnuplot-6.0.4/src/plot.c
+@@ -299,6 +299,22 @@ main(int argc_orig, char **argv)
     rl_getc_function = getc_wrapper;
 #endif
 
@@ -116,8 +80,10 @@
 #if defined(HAVE_LIBREADLINE)
     /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
      * It is used to parse a 'gnuplot' specific section in '~/.inputrc'
--- gnuplot-6.0.0/src/term.h
-+++ gnuplot-6.0.0/src/term.h	2024-01-08 09:16:58.124450437 +0000
+Index: gnuplot-6.0.4/src/term.h
+===================================================================
+--- gnuplot-6.0.4.orig/src/term.h
+++ gnuplot-6.0.4/src/term.h
@@ -233,9 +233,9 @@
 #include "emf.trm"
 
--- a/gnuplot-6.0.2.tar.gz
+++ b/gnuplot-6.0.2.tar.gz
--- a/gnuplot-6.0.3-backward_compat.patch
+++ b/gnuplot-6.0.3-backward_compat.patch
@@ -0,0 +1,17 @@
+---
+ src/command.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: src/command.c
+===================================================================
+--- src/command.c.orig
+++ src/command.c
+@@ -2655,7 +2655,7 @@ reread_command()
+ #ifdef BACKWARD_COMPATIBILITY
+     FILE *fp;
+     c_token++;
+-    if (evaluate_inside_functionblock || multiplot || multiplot_playback)
+    if (evaluate_inside_functionblock || in_multiplot || multiplot_playback)
+ 	int_error(NO_CARET, "reread command not possible here");
+     fp = lf_top();
+     if (fp != (FILE *) NULL)
--- a/gnuplot-6.0.4.tar.gz
+++ b/gnuplot-6.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:458d94769625e73d5f6232500f49cbadcb2b183380d43d2266a0f9701aeb9c5b
+size 7549894
--- a/gnuplot-PIE.patch
+++ b/gnuplot-PIE.patch
@@ -1,11 +1,7 @@
-Index: gnuplot-5.4.1/src/Makefile.am
+Index: gnuplot-6.0.4/src/Makefile.am
 ===================================================================
---
- gnuplot-6.0.0/src/Makefile.am |    5 +++++
- 1 file changed, 5 insertions(+)
-
--- gnuplot-6.0.0/src/Makefile.am
-+++ gnuplot-6.0.0/src/Makefile.am	2024-01-08 15:22:45.413763257 +0000
+--- gnuplot-6.0.4.orig/src/Makefile.am
+++ gnuplot-6.0.4/src/Makefile.am
@@ -67,6 +67,7 @@ voxelgrid.c voxelgrid.h vplot.c vplot.h
 watch.c watch.h xdg.c xdg.h
 
@@ -22,15 +18,15 @@ Index: gnuplot-5.4.1/src/Makefile.am
 endif
 
 getcolor_x11.o: getcolor.c
-@@ -102,6 +104,7 @@ $(EXTRA_gnuplot_SOURCES)
+@@ -101,6 +103,7 @@ $(EXTRA_gnuplot_SOURCES)
+ 
 if BUILD_WXWIDGETS
 gnuplot_SOURCES += wxterminal/wxt_gui.cpp
- gnuplot_LDADD += -lX11
 +gnuplot_LDFLAGS += -pie
 endif
 
 if BUILD_GPCAIRO
-@@ -189,6 +192,7 @@ qtterminal/QtGnuplotApplication.cpp qtte
+@@ -188,6 +191,7 @@ qtterminal/QtGnuplotApplication.cpp qtte
 qtterminal/QtGnuplotScene.cpp qtterminal/QtGnuplotItems.cpp \
 qtterminal/QtGnuplotEvent.cpp
 gnuplot_qt_LDADD = $(QT_LIBS)
@@ -38,7 +34,7 @@ Index: gnuplot-5.4.1/src/Makefile.am
 
 #
 # embedded Qt widget example program
-@@ -204,6 +208,7 @@ qt_embed_example_SOURCES = qtterminal/qt
+@@ -203,6 +207,7 @@ qt_embed_example_SOURCES = qtterminal/qt
        qtterminal/QtGnuplotScene.cpp qtterminal/QtGnuplotItems.cpp \
        qtterminal/QtGnuplotInstance.cpp
 qt_embed_example_LDADD = $(QT_LIBS)
--- a/gnuplot-doc.changes
+++ b/gnuplot-doc.changes
@@ -1,3 +1,113 @@
+-------------------------------------------------------------------
+Thu Jan  8 15:49:56 UTC 2026 - Jan Fooken <jan.fooken@suse.com>
+
+- Update to gnuplot 6.0.4
+  * NEW variable Inf is pre-set to floating point INFINITY
+  * NEW "sharpen" filter handles vertical edges in a step function
+  * NEW gprintf format specifiers %C and %Ci
+        %C  formats a complex value as {a, b}
+            This is the format used by the gnuplot "print" command
+        %Ci formats a complex value as a + bi
+            Both the real and imaginary parts are printed using libc format %g
+            with optional width and precision
+  * NEW Allow installation of 64bit version on Windows on ARM systems
+  * NEW mingw: optionally use the MSYS2/CLANG64 environment
+        Support for cross-compilation for Windows on ARM
+  * CHANGE update configure and headers for better compatibility with c23/gcc15
+  * CHANGE splot with pm3d fillcolor <x> generates a matching key sample
+  * CHANGE gprintf %H format is distinct from %h in utf8 context
+           %H uses dot operator between mantissa and exponent
+  * CHANGE kitty, sixel: default size to 100% width, 75% height of terminal window
+  * CHANGE partially deprecate the "sample" keyword for plot commands
+           The plot command accepts axis ranges as the first thing after "plot".
+           If present, they update the primary axis ranges x y x2 y2.
+           If a second colon is found in the range, as in [t=min:max:increment],
+           this is unambiguously a sample range rather than an axis range so
+           the "sample" keyword is not required.                          Bug 2666
+  * CHANGE do not break contour lines into 100-segment fragments
+           This fixes a bug when saved contour lines are used as polygons.
+           To maintain previous placement of contour labels, use
+           "set cntrlabl interval 100".
+  * FIX sixel: improved support for a transparent background           Bug 2828
+  * FIX kitty: support animation on a transparent background
+  * FIX webp:  support animation on a transparent background
+  * FIX backport fixes for color assignment to pm3d surfaces
+        "set pm3d implicit" + "with lines" treated the same as "with pm3d"
+        adds support for "fc background"
+        pm3d interpolate > 1 inherits rgb color assignments from the parent tile
+  * FIX fill style of colorbox should match fill style of pm3d surface
+  * FIX svg: fillstyle solid <frac> was incorrectly treated as transparent
+  * FIX transparent fill color in 3D boxes and polygons                Bug 2812
+  * FIX alpha channel colors on ARM platforms                          Bug 2812
+  * FIX resolve ambiguous syntax in "set dashtype i (n,m)"             Bug 2814
+  * FIX svg: font size changes within a text fragment could be lost    Bug 2816
+  * FIX "reset session" must terminate multiplot mode
+  * FIX determination of above/below in polar mode filledcurves        Bug 2825
+  * FIX always flush hidden3d line cache if present                    Bug 2836
+  * FIX incorrect evaluation of a**b for integer a, integer b < 0
+        in the case of "set overflow NaN" or "set overflow undefined"
+  * FIX loss of precision in some ranges for asin acos asinh acosh     Bug 2839
+- Replace Gnuplot6.pdf with gnuplot.pdf
+- Switch lualatex / texlive-luatex to generate the PDF documentation
+- Remove very old French documentation
+- Remove patches now upstream:
+  * fix4bug1241684.patch
+- Remove obsolete patches:
+  * gnuplot-wx3.diff
+
+-------------------------------------------------------------------
+Wed Jun 11 08:02:18 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch gnuplot-6.0.3-backward_compat.patch 
+
+-------------------------------------------------------------------
+Wed Jun 11 06:45:38 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Update to gnuplot 6.0.3
+  * NEW backport "contourfill {at base} {fs {no}border}"
+  * NEW backport "save changes <filename>"
+        This variant saves only the differences between the current
+        state and the state at the start of the session.
+  * NEW backport "plot <data> ... if (filter_condition)"
+        Input lines that satisfy the if condition are processed as usual.
+        Lines that fail are essentially ignored.
+  * NEW backport watchpoint label improvements from 6.1
+        Each watch target can have its own label, generated by a user function
+  * CHANGE 3D polygon objects can have per-object fill border properties.
+        The restriction that all 3D polygons share a single set of
+        properties from "set pm3d" remains true for "splot with polygons".
+  * CHANGE multiplot mousing and replot improvements back-ported from version 6.1
+  * CHANGE wxt: remove --with-wx-multithreaded configuration option
+  * CHANGE restrictions on watchpoint function target removed; any function is OK
+  * CHANGE "with hsteps" takes default width from "set boxwidth"
+  * CHANGE column(0) returns an integer (not complex) value
+  * FIX Support for combined hidden3d + pm3d depthorder back-ported from 6.1
+        This allows placing contours on a depth-sorted pm3d surface    Bug 2762
+  * FIX "with yerrorbars" error bar span should not affect OUTRANGE    Bug 2749
+  * FIX qt: opaque key caused incorrect interactive toggling           Bug 2761
+  * FIX 6.0.2 regression in "splot ... using 1:2:3:4 lc palette"       Bug 2784
+  * FIX placement of category labels along x-axis of boxplots          Bug 2789
+  * FIX qt, cairo: "set colorbox invert" produced empty colorbox
+  * FIX placement of minor tics along logscale axis with narrow range  Bug 2765
+  * FIX OK to have missing corners in an image from a sparse matrix    Bug 2791
+  * FIX error handling for various cases involving function blocks     Bug 2797
+- Remove patches now upstream
+  * fix4bug1240325.patch
+  * fix4bug1240326.patch
+  * fix4bug1240327.patch
+  * fix4bug1240328.patch
+  * fix4bug1240329.patch
+  * fix4bug1240330.patch
+
+-------------------------------------------------------------------
+Wed May 28 08:56:43 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Build with qt6 instead of qt5
+- Add _constraints file to make sure there's enough disk space
+  for building
+- Use gcc-13 when building for Leap since qt6 needs a C++17
+  compiler
+
 -------------------------------------------------------------------
 Mon May 12 12:14:33 UTC 2025 - Dr. Werner Fink <werner@suse.de>

--- a/gnuplot-fr.doc.bz2
+++ b/gnuplot-fr.doc.bz2
--- a/gnuplot-wx3.diff
+++ b/gnuplot-wx3.diff
@@ -1,20 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2015-03-22 15:21:46.000000000 +0100
-
-gnuplot's wxt_gui.cpp (*not* wxWidgets) uses XInitThreads, but
-the program does not link in X11 and runs into a build error
-otherwise.
---
- gnuplot-5.2.0/src/Makefile.am |    1 +
- 1 file changed, 1 insertion(+)
-
--- gnuplot-5.2.0/src/Makefile.am
-+++ gnuplot-5.2.0/src/Makefile.am	2017-09-27 10:06:44.716255786 +0000
-@@ -101,6 +101,7 @@ $(EXTRA_gnuplot_SOURCES)
- 
- if BUILD_WXWIDGETS
- gnuplot_SOURCES += wxterminal/wxt_gui.cpp
-+gnuplot_LDADD += -lX11
- endif
- 
- if BUILD_GPCAIRO
--- a/gnuplot.changes
+++ b/gnuplot.changes
@@ -1,3 +1,113 @@
+-------------------------------------------------------------------
+Thu Jan  8 15:49:56 UTC 2026 - Jan Fooken <jan.fooken@suse.com>
+
+- Update to gnuplot 6.0.4
+  * NEW variable Inf is pre-set to floating point INFINITY
+  * NEW "sharpen" filter handles vertical edges in a step function
+  * NEW gprintf format specifiers %C and %Ci
+        %C  formats a complex value as {a, b}
+            This is the format used by the gnuplot "print" command
+        %Ci formats a complex value as a + bi
+            Both the real and imaginary parts are printed using libc format %g
+            with optional width and precision
+  * NEW Allow installation of 64bit version on Windows on ARM systems
+  * NEW mingw: optionally use the MSYS2/CLANG64 environment
+        Support for cross-compilation for Windows on ARM
+  * CHANGE update configure and headers for better compatibility with c23/gcc15
+  * CHANGE splot with pm3d fillcolor <x> generates a matching key sample
+  * CHANGE gprintf %H format is distinct from %h in utf8 context
+           %H uses dot operator between mantissa and exponent
+  * CHANGE kitty, sixel: default size to 100% width, 75% height of terminal window
+  * CHANGE partially deprecate the "sample" keyword for plot commands
+           The plot command accepts axis ranges as the first thing after "plot".
+           If present, they update the primary axis ranges x y x2 y2.
+           If a second colon is found in the range, as in [t=min:max:increment],
+           this is unambiguously a sample range rather than an axis range so
+           the "sample" keyword is not required.                          Bug 2666
+  * CHANGE do not break contour lines into 100-segment fragments
+           This fixes a bug when saved contour lines are used as polygons.
+           To maintain previous placement of contour labels, use
+           "set cntrlabl interval 100".
+  * FIX sixel: improved support for a transparent background           Bug 2828
+  * FIX kitty: support animation on a transparent background
+  * FIX webp:  support animation on a transparent background
+  * FIX backport fixes for color assignment to pm3d surfaces
+        "set pm3d implicit" + "with lines" treated the same as "with pm3d"
+        adds support for "fc background"
+        pm3d interpolate > 1 inherits rgb color assignments from the parent tile
+  * FIX fill style of colorbox should match fill style of pm3d surface
+  * FIX svg: fillstyle solid <frac> was incorrectly treated as transparent
+  * FIX transparent fill color in 3D boxes and polygons                Bug 2812
+  * FIX alpha channel colors on ARM platforms                          Bug 2812
+  * FIX resolve ambiguous syntax in "set dashtype i (n,m)"             Bug 2814
+  * FIX svg: font size changes within a text fragment could be lost    Bug 2816
+  * FIX "reset session" must terminate multiplot mode
+  * FIX determination of above/below in polar mode filledcurves        Bug 2825
+  * FIX always flush hidden3d line cache if present                    Bug 2836
+  * FIX incorrect evaluation of a**b for integer a, integer b < 0
+        in the case of "set overflow NaN" or "set overflow undefined"
+  * FIX loss of precision in some ranges for asin acos asinh acosh     Bug 2839
+- Replace Gnuplot6.pdf with gnuplot.pdf
+- Switch lualatex / texlive-luatex to generate the PDF documentation
+- Remove very old French documentation
+- Remove patches now upstream:
+  * fix4bug1241684.patch
+- Remove obsolete patches:
+  * gnuplot-wx3.diff
+
+-------------------------------------------------------------------
+Wed Jun 11 08:02:18 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch gnuplot-6.0.3-backward_compat.patch 
+
+-------------------------------------------------------------------
+Wed Jun 11 06:45:38 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Update to gnuplot 6.0.3
+  * NEW backport "contourfill {at base} {fs {no}border}"
+  * NEW backport "save changes <filename>"
+        This variant saves only the differences between the current
+        state and the state at the start of the session.
+  * NEW backport "plot <data> ... if (filter_condition)"
+        Input lines that satisfy the if condition are processed as usual.
+        Lines that fail are essentially ignored.
+  * NEW backport watchpoint label improvements from 6.1
+        Each watch target can have its own label, generated by a user function
+  * CHANGE 3D polygon objects can have per-object fill border properties.
+        The restriction that all 3D polygons share a single set of
+        properties from "set pm3d" remains true for "splot with polygons".
+  * CHANGE multiplot mousing and replot improvements back-ported from version 6.1
+  * CHANGE wxt: remove --with-wx-multithreaded configuration option
+  * CHANGE restrictions on watchpoint function target removed; any function is OK
+  * CHANGE "with hsteps" takes default width from "set boxwidth"
+  * CHANGE column(0) returns an integer (not complex) value
+  * FIX Support for combined hidden3d + pm3d depthorder back-ported from 6.1
+        This allows placing contours on a depth-sorted pm3d surface    Bug 2762
+  * FIX "with yerrorbars" error bar span should not affect OUTRANGE    Bug 2749
+  * FIX qt: opaque key caused incorrect interactive toggling           Bug 2761
+  * FIX 6.0.2 regression in "splot ... using 1:2:3:4 lc palette"       Bug 2784
+  * FIX placement of category labels along x-axis of boxplots          Bug 2789
+  * FIX qt, cairo: "set colorbox invert" produced empty colorbox
+  * FIX placement of minor tics along logscale axis with narrow range  Bug 2765
+  * FIX OK to have missing corners in an image from a sparse matrix    Bug 2791
+  * FIX error handling for various cases involving function blocks     Bug 2797
+- Remove patches now upstream
+  * fix4bug1240325.patch
+  * fix4bug1240326.patch
+  * fix4bug1240327.patch
+  * fix4bug1240328.patch
+  * fix4bug1240329.patch
+  * fix4bug1240330.patch
+
+-------------------------------------------------------------------
+Wed May 28 08:56:43 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Build with qt6 instead of qt5
+- Add _constraints file to make sure there's enough disk space
+  for building
+- Use gcc-13 when building for Leap since qt6 needs a C++17
+  compiler
+
 -------------------------------------------------------------------
 Mon May 12 12:14:33 UTC 2025 - Dr. Werner Fink <werner@suse.de>

--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnuplot
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,11 +33,16 @@ BuildRequires:  ImageMagick
 BuildRequires:  automake
 BuildRequires:  cairo-devel
 BuildRequires:  fdupes
+%if 0%{?suse_version} == 1500
+BuildRequires:  gcc13-PIE
+BuildRequires:  gcc13-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  glib2-devel
-BuildRequires:  libqt5-linguist-devel
 BuildRequires:  lua-devel
 BuildRequires:  netpbm
+BuildRequires:  qt6-linguist-devel
 %if 0%{?is_opensuse}
 BuildRequires:  openspecfun-devel
 %endif
@@ -46,11 +51,12 @@ BuildRequires:  plotutils-devel
 BuildRequires:  readline-devel
 BuildRequires:  wxGTK3-devel >= 3
 BuildRequires:  zziplib
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5PrintSupport)
-BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Core5Compat)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Network)
+BuildRequires:  pkgconfig(Qt6PrintSupport)
+BuildRequires:  pkgconfig(Qt6Svg)
 BuildRequires:  pkgconfig(caca)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gdlib)
@@ -64,8 +70,10 @@ BuildRequires:  gnuplot
 BuildRequires:  latex2html
 BuildRequires:  makeinfo
 BuildRequires:  texlive-epstopdf
+BuildRequires:  texlive-gnu-freefont
 BuildRequires:  texlive-latex
 BuildRequires:  texlive-latexconfig
+BuildRequires:  texlive-luatex
 BuildRequires:  texlive-makeindex
 BuildRequires:  texlive-pdftex
 BuildRequires:  texlive-tex
@@ -82,12 +90,12 @@ BuildRequires:  tex(nicefrac.sty)
 BuildRequires:  tex(pdftex.def)
 BuildRequires:  tex(subfigure.sty)
 BuildRequires:  tex(textgreek.sty)
+BuildRequires:  tex(unicode-math.sty)
 BuildRequires:  tex(upquote.sty)
 %endif
 URL:            https://www.gnuplot.info/
-Version:        6.0.2
+Version:        6.0.4
 Release:        0
-%global         underscore 6
 %if "%{flavor}" == ""
 Summary:        Function Plotting Utility and more
 License:        GPL-2.0-or-later AND SUSE-Gnuplot
@@ -98,30 +106,21 @@ License:        GPL-2.0-or-later AND SUSE-Gnuplot
 Group:          Documentation/Other
 %endif
 Source0:        https://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/gnuplot-%{version}.tar.gz
-Source1:        https://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/Gnuplot%{underscore}.pdf
-Source2:        gnuplot-fr.doc.bz2
-Source3:        README.whynot
-Source4:        webp_figures.gnu
+Source1:        README.whynot
+Source2:        webp_figures.gnu
 # https://mirrors.ctan.org/macros/latex209/contrib/picins/picins.sty
 # That's a build requirement, not provided by Tex Live
-Source5:        picins.sty
+Source3:        picins.sty
 # Repair broken texi(nfo) file
-Source6:        gnuplot-5.2.0-texi2info.patch
+Source4:        gnuplot-5.2.0-texi2info.patch
 Patch0:         gnuplot-4.6.0.dif
 Patch1:         gnuplot-4.4.0-x11ovf.dif
 Patch2:         gnuplot-4.6.0-fonts.diff
 Patch3:         gnuplot-doc2tex.patch
 Patch4:         gnuplot-4.6.0-demo.diff
-Patch5:         gnuplot-wx3.diff
-Patch6:         gnuplot-QtCore-PIC.dif
-Patch7:         gnuplot-PIE.patch
-Patch25:        fix4bug1240325.patch
-Patch26:        fix4bug1240326.patch
-Patch27:        fix4bug1240327.patch
-Patch28:        fix4bug1240328.patch
-Patch29:        fix4bug1240329.patch
-Patch30:        fix4bug1240330.patch
-Patch84:        fix4bug1241684.patch
+Patch5:         gnuplot-QtCore-PIC.dif
+Patch6:         gnuplot-PIE.patch
+Patch7:         gnuplot-6.0.3-backward_compat.patch
 %define _x11lib     %{_libdir}
 %define _x11data    %{_datadir}/X11
 %define _x11inc     %{_includedir}/X11
@@ -146,28 +145,21 @@ and can easily be extended to include new devices.

 %prep
 %setup -q -n %{sname}-%{version}
-bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
-test $? -eq 0 || exit 1
 cp %{_sourcedir}/picins.sty docs
 %patch -P2 -p0 -b .font
 %patch -P3 -p0 -b .overscan
 %patch -P4 -p0 -b .demo
 %patch -P0 -p1 -b .0
 %patch -P1 -p0 -b .x11ovf
-%patch -P5 -p1 -b .w3x
-%patch -P6 -p0 -b .pic
-%patch -P7 -p1 -b .pie
-%patch -P25 -p0 -b .p25
-%patch -P26 -p0 -b .p26
-%patch -P27 -p0 -b .p27
-%patch -P28 -p0 -b .p28
-%patch -P29 -p0 -b .p29
-%patch -P30 -p0 -b .p30
-%patch -P84 -p0 -b .p84
+%patch -P5 -p0 -b .pic
+%patch -P6 -p1 -b .pie
+%patch -P7 -p0 -b .multiplot

 %build
 autoreconf -fi

+    # The generation of the PDFs fails otherwise
+    export  PDFLATEX=lualatex
    export  CPPFLAGS="-I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
    export  CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{sname}/demo\\\""
    export  CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -fpic"
@@ -181,9 +173,15 @@ autoreconf -fi
    export  CFLAGS="$CFLAGS -DDIST_CONTACT='https://bugzilla.suse.com/'"
 %endif
 %endif
+%if 0%{?suse_version} == 1500
+    export CC=gcc-13
+    export CXX=g++-13
+%endif

 %if "%{flavor}" == ""
    mkdir bin
+    # Fake the existence of build dependencies only required in the doc package
+    # to make configure pass without errors
    ln -sf /bin/true bin/dvips
    ln -sf /bin/true bin/emacs
    ln -sf /bin/true bin/kpsewhich
@@ -222,21 +220,21 @@ autoreconf -fi
 	--with-metapost		\
 	--with-regis		\
        --with-amos=%{_libdir}  \
-	--with-qt=qt5
+	--with-qt=qt6

 %if "%{flavor}" == ""
-  make %{?_smp_mflags} UIC=/usr/bin/uic-qt5  MOC=/usr/bin/moc-qt5 RCC=/usr/bin/rcc-qt5 LRELEASE=/usr/bin/lrelease-qt5
+  make %{?_smp_mflags} UIC=%{_qt6_libexecdir}/uic  MOC=%{_qt6_libexecdir}/moc RCC=%{_qt6_libexecdir}/rcc LRELEASE=/usr/bin/lrelease6
 %endif

 %if "%{flavor}" == "doc"
  mv src/Makefile{,_INACESSIBLE}
  pushd docs/
-	cp -p %{S:4} webp_figures.gnu
+	cp -p %{S:2} webp_figures.gnu
 	make GNUPLOT_EXE=%{_bindir}/gnuplot srcdir=. clean
 	make GNUPLOT_EXE=%{_bindir}/gnuplot srcdir=. allterm.h allterm-ja.h
 	make GNUPLOT_EXE=%{_bindir}/gnuplot srcdir=. html pdf
 	make srcdir=. gnuplot.texi
-	patch -p0 < %{S:6}
+	patch -p0 < %{S:4}
 	make srcdir=. info
 	pushd psdoc/
 	    make srcdir=. pdf
@@ -274,6 +272,7 @@ autoreconf -fi
    rm  -vf tutorial/eg7.pdf
    rm -rvf demo/html
    install -m 0444 docs/*.info*      %{buildroot}/%{_infodir}/
+    install -m 0444 docs/gnuplot.pdf  %{buildroot}/%{_docdir}/gnuplot/
    install -m 0444 docs/html/*       %{buildroot}/%{_docdir}/gnuplot/doc/html
    install -m 0444 docs/psdoc/*.pdf  %{buildroot}/%{_docdir}/gnuplot/doc/
    install -m 0444 docs/psdoc/*.ps   %{buildroot}/%{_docdir}/gnuplot/doc/
@@ -283,9 +282,8 @@ autoreconf -fi
    install -m 0444 demo/*.*          %{buildroot}/%{_docdir}/gnuplot/demo/
    install -m 0444 README*           %{buildroot}/%{_docdir}/gnuplot/
    install -m 0444 NEWS BUGS	      %{buildroot}/%{_docdir}/gnuplot/
-    install -m 0444 %{SOURCE3}        %{buildroot}/%{_docdir}/gnuplot/
-    rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*
    install -m 0444 %{S:1}            %{buildroot}/%{_docdir}/gnuplot/
+    rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*
    %fdupes %{buildroot}/%{_docdir}
 %endif