forked from pool/gnuplot
Compare commits
12 Commits
Author | SHA256 | Date | |
---|---|---|---|
771b54c9a1 | |||
d6a210c2d7 | |||
c84631ec1a | |||
89f5bba3ad | |||
7f03dfce79 | |||
c8bffd9d8e | |||
e6f5bd53a7 | |||
a9a9b920dc | |||
7e8a3a54b8 | |||
b74974ddb2 | |||
c04c07c41c | |||
0420ffc0a0 |
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:21512aa49daafe93b6458477a57d42dd7c0bbca0952fa38ce8789d974af76aa6
|
||||
size 3954112
|
||||
oid sha256:a3f929870bbeebb4eb83fae7976947b0cb4d99faee12686813d2e4d16b2fcfe9
|
||||
size 4022910
|
||||
|
7
_constraints
Normal file
7
_constraints
Normal file
@@ -0,0 +1,7 @@
|
||||
<constraints>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">4</size>
|
||||
</disk>
|
||||
</hardware>
|
||||
</constraints>
|
57
fix4bug1241684.patch
Normal file
57
fix4bug1241684.patch
Normal file
@@ -0,0 +1,57 @@
|
||||
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);
|
||||
}
|
||||
|
@@ -115,7 +115,7 @@
|
||||
envptr = loadpath;
|
||||
--- src/show.c
|
||||
+++ src/show.c 2020-07-17 07:25:00.022670914 +0000
|
||||
@@ -1140,6 +1140,15 @@ show_version(FILE *fp)
|
||||
@@ -1138,6 +1138,15 @@ show_version(FILE *fp)
|
||||
p /* type "help seeking-assistance" */
|
||||
);
|
||||
|
||||
|
@@ -48,7 +48,7 @@
|
||||
|
||||
#define Nwidths 10
|
||||
static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
@@ -2294,6 +2301,8 @@ exec_cmd(plot_struct *plot, char *comman
|
||||
@@ -2290,6 +2297,8 @@ exec_cmd(plot_struct *plot, char *comman
|
||||
/* Save the request default font */
|
||||
c = &(buffer[strlen(buffer)-1]);
|
||||
while (*c <= ' ') *c-- = '\0';
|
||||
@@ -57,7 +57,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;
|
||||
@@ -5820,7 +5829,7 @@ XFontStruct *gpXLoadQueryFont (Display *
|
||||
@@ -5810,7 +5819,7 @@ XFontStruct *gpXLoadQueryFont (Display *
|
||||
}
|
||||
#else
|
||||
if (first_time) {
|
||||
@@ -66,7 +66,7 @@
|
||||
first_time = FALSE;
|
||||
}
|
||||
while (n_miss-- > 0)
|
||||
@@ -5972,6 +5981,18 @@ char *fontname;
|
||||
@@ -5962,6 +5971,18 @@ char *fontname;
|
||||
}
|
||||
|
||||
#ifdef USE_X11_MULTIBYTE
|
||||
|
@@ -29,16 +29,16 @@
|
||||
gihdir = @GIHDIR@
|
||||
|
||||
noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2hlp \
|
||||
@@ -111,7 +111,7 @@ wxhelp_figures wxhelp/*.html wxhelp/wgnu
|
||||
wxhelp/wgnuplot.htc wxhelp/doc2html$(EXEEXT) windows/wgnuplot.htk \
|
||||
svg_figures html/*.html html/*.svg html/*.hhc html/*.hhk \
|
||||
@@ -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)
|
||||
|
||||
@@ -271,17 +271,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
|
||||
@@ -273,17 +273,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
|
||||
doc2hlp_SOURCES = doc2hlp.c termdoc.c
|
||||
|
||||
### gnuplot interactive help format
|
||||
@@ -64,7 +64,7 @@
|
||||
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
|
||||
@@ -524,7 +524,7 @@ extern TBOOLEAN clip_lines2;
|
||||
@@ -533,7 +533,7 @@ extern TBOOLEAN clip_lines2;
|
||||
extern TBOOLEAN clip_points;
|
||||
extern TBOOLEAN clip_radial;
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
--- gnuplot-6.0.0/src/gplt_x11.c
|
||||
+++ gnuplot-6.0.0/src/gplt_x11.c 2024-01-08 09:16:58.124450437 +0000
|
||||
@@ -2518,9 +2518,12 @@ exec_cmd(plot_struct *plot, char *comman
|
||||
@@ -2514,9 +2514,12 @@ exec_cmd(plot_struct *plot, char *comman
|
||||
}
|
||||
}
|
||||
/* X11_justify_text(mode) - set text justification mode */
|
||||
@@ -93,7 +93,7 @@
|
||||
|
||||
--- gnuplot-6.0.0/src/plot.c
|
||||
+++ gnuplot-6.0.0/src/plot.c 2024-01-08 09:16:58.124450437 +0000
|
||||
@@ -296,6 +296,22 @@ main(int argc_orig, char **argv)
|
||||
@@ -299,6 +299,22 @@ main(int argc_orig, char **argv)
|
||||
rl_getc_function = getc_wrapper;
|
||||
#endif
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
|
||||
#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
|
||||
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e85a660c1a2a1808ff24f7e69981ffcbac66a45c9dcf711b65610b26ea71379a
|
||||
size 7528936
|
15
gnuplot-6.0.3-backward_compat.patch
Normal file
15
gnuplot-6.0.3-backward_compat.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
---
|
||||
src/command.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- src/command.c
|
||||
+++ src/command.c 2025-06-11 08:00:24.047462255 +0000
|
||||
@@ -2638,7 +2638,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)
|
3
gnuplot-6.0.3.tar.gz
Normal file
3
gnuplot-6.0.3.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ec52e3af8c4083d4538152b3f13db47f6d29929a3f6ecec5365c834e77f251ab
|
||||
size 7616904
|
@@ -1,3 +1,112 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Add patches
|
||||
* fix4bug1240325.patch - boo#1240325: CVE-2025-31176: segmentation fault on plot3d_points
|
||||
* fix4bug1240326.patch - boo#1240326: CVE-2025-31177: heap-buffer overflow on utf8_copy_one
|
||||
* fix4bug1240327.patch - boo#1240327: CVE-2025-31178: segmentation fault on GetAnnotateString
|
||||
* fix4bug1240328.patch - boo#1240328: CVE-2025-31179: segmentation fault on xstrftime
|
||||
* fix4bug1240329.patch - boo#1240329: CVE-2025-31180: segmentation fault on CANVAS_text
|
||||
* fix4bug1240330.patch - boo#1240330: CVE-2025-31181: segmentation fault on X11_graphics
|
||||
* fix4bug1241684.patch - boo#1241684: CVE-2025-3359: segmentation fault via IO_str_init_static_internal function
|
||||
- Add a check section and we use a dump terminal
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 18 13:09:58 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Use openspecfun only for opensuse builds
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 7 09:57:13 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Update to gnuplot 6.0.2
|
||||
* NEW backport plot style "with hsteps"
|
||||
* NEW backport plot style "splot with filledcurves" (waterfall plots)
|
||||
* NEW general binary keyword option "blank=NaN"
|
||||
- faciliates binary input to plot styles sensitive to blank lines
|
||||
* NEW polygons in splot can use pm3d coloring
|
||||
- facilitates use of triangular tessellated 3D pm3d surfaces
|
||||
* NEW - UTF-8 terminal input now works when linked against BSD editline
|
||||
./configure --with-readline=bsd
|
||||
* CHANGE backport reimplementation of local variables
|
||||
- faster function block evaluation, better-defined scope
|
||||
* CHANGE apply jitter to the horizontal spread of boxplot outliers
|
||||
* CHANGE dump $GPVAL_LAST_MULTIPLOT at the end of a "save" file
|
||||
* FIX backport reworked generation of logscale axis tic marks Bug 2372 2717
|
||||
* FIX Do not save extraneous commands to $GPVAL_LAST_MULTIPLOT Bug 2714
|
||||
* FIX svg: modify gnuplot_svg.js to work in local standalone mode Bug 2715
|
||||
* FIX "set table": honor "nosurface" keyword in splot
|
||||
* FIX "set table": honor "set format z" when z is printed from plot
|
||||
* FIX better contouring near the edge of a z-clipped surface
|
||||
* FIX x11: handle mousing of logscale axes in inactive plot window Bug 2723
|
||||
* FIX qt: handle mousing of logscale axes in inactive plot window Bug 2723
|
||||
* FIX wxt: handle mousing of logscale axes in inactive plot window Bug 2723
|
||||
* FIX wxt: release per-thread font data before entering "persist" Bug 2693
|
||||
* FIX "set tics scale" should not change other axis tick properties Bug 2724
|
||||
* FIX fill properties can be given as part of "splot with circles"
|
||||
* FIX some properties of the key title not shown by "show" or "save" Bug 2729
|
||||
* FIX points with variable color value NaN should not be drawn Bug 2737
|
||||
* FIX "set term tikz nostandalone" should suppress the latex wrapper Bug 2740
|
||||
* FIX handle unusual case of intersecting pm3d surfaces Bug 2744
|
||||
* FIX prevent use-after-free if a function block has no "return" Bug 2745
|
||||
- Port patches
|
||||
* gnuplot-4.6.0-demo.diff
|
||||
* gnuplot-4.6.0-fonts.diff
|
||||
* gnuplot-4.6.0.dif
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 3 06:04:48 UTC 2024 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
109
gnuplot.changes
109
gnuplot.changes
@@ -1,3 +1,112 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Add patches
|
||||
* fix4bug1240325.patch - boo#1240325: CVE-2025-31176: segmentation fault on plot3d_points
|
||||
* fix4bug1240326.patch - boo#1240326: CVE-2025-31177: heap-buffer overflow on utf8_copy_one
|
||||
* fix4bug1240327.patch - boo#1240327: CVE-2025-31178: segmentation fault on GetAnnotateString
|
||||
* fix4bug1240328.patch - boo#1240328: CVE-2025-31179: segmentation fault on xstrftime
|
||||
* fix4bug1240329.patch - boo#1240329: CVE-2025-31180: segmentation fault on CANVAS_text
|
||||
* fix4bug1240330.patch - boo#1240330: CVE-2025-31181: segmentation fault on X11_graphics
|
||||
* fix4bug1241684.patch - boo#1241684: CVE-2025-3359: segmentation fault via IO_str_init_static_internal function
|
||||
- Add a check section and we use a dump terminal
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 18 13:09:58 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Use openspecfun only for opensuse builds
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 7 09:57:13 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Update to gnuplot 6.0.2
|
||||
* NEW backport plot style "with hsteps"
|
||||
* NEW backport plot style "splot with filledcurves" (waterfall plots)
|
||||
* NEW general binary keyword option "blank=NaN"
|
||||
- faciliates binary input to plot styles sensitive to blank lines
|
||||
* NEW polygons in splot can use pm3d coloring
|
||||
- facilitates use of triangular tessellated 3D pm3d surfaces
|
||||
* NEW - UTF-8 terminal input now works when linked against BSD editline
|
||||
./configure --with-readline=bsd
|
||||
* CHANGE backport reimplementation of local variables
|
||||
- faster function block evaluation, better-defined scope
|
||||
* CHANGE apply jitter to the horizontal spread of boxplot outliers
|
||||
* CHANGE dump $GPVAL_LAST_MULTIPLOT at the end of a "save" file
|
||||
* FIX backport reworked generation of logscale axis tic marks Bug 2372 2717
|
||||
* FIX Do not save extraneous commands to $GPVAL_LAST_MULTIPLOT Bug 2714
|
||||
* FIX svg: modify gnuplot_svg.js to work in local standalone mode Bug 2715
|
||||
* FIX "set table": honor "nosurface" keyword in splot
|
||||
* FIX "set table": honor "set format z" when z is printed from plot
|
||||
* FIX better contouring near the edge of a z-clipped surface
|
||||
* FIX x11: handle mousing of logscale axes in inactive plot window Bug 2723
|
||||
* FIX qt: handle mousing of logscale axes in inactive plot window Bug 2723
|
||||
* FIX wxt: handle mousing of logscale axes in inactive plot window Bug 2723
|
||||
* FIX wxt: release per-thread font data before entering "persist" Bug 2693
|
||||
* FIX "set tics scale" should not change other axis tick properties Bug 2724
|
||||
* FIX fill properties can be given as part of "splot with circles"
|
||||
* FIX some properties of the key title not shown by "show" or "save" Bug 2729
|
||||
* FIX points with variable color value NaN should not be drawn Bug 2737
|
||||
* FIX "set term tikz nostandalone" should suppress the latex wrapper Bug 2740
|
||||
* FIX handle unusual case of intersecting pm3d surfaces Bug 2744
|
||||
* FIX prevent use-after-free if a function block has no "return" Bug 2745
|
||||
- Port patches
|
||||
* gnuplot-4.6.0-demo.diff
|
||||
* gnuplot-4.6.0-fonts.diff
|
||||
* gnuplot-4.6.0.dif
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 3 06:04:48 UTC 2024 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
45
gnuplot.spec
45
gnuplot.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
# spec file for package gnuplot
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -33,22 +33,30 @@ 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
|
||||
BuildRequires: pango-devel
|
||||
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)
|
||||
@@ -83,7 +91,7 @@ BuildRequires: tex(textgreek.sty)
|
||||
BuildRequires: tex(upquote.sty)
|
||||
%endif
|
||||
URL: https://www.gnuplot.info/
|
||||
Version: 6.0.1
|
||||
Version: 6.0.3
|
||||
Release: 0
|
||||
%global underscore 6
|
||||
%if "%{flavor}" == ""
|
||||
@@ -113,6 +121,8 @@ Patch4: gnuplot-4.6.0-demo.diff
|
||||
Patch5: gnuplot-wx3.diff
|
||||
Patch6: gnuplot-QtCore-PIC.dif
|
||||
Patch7: gnuplot-PIE.patch
|
||||
Patch8: gnuplot-6.0.3-backward_compat.patch
|
||||
Patch84: fix4bug1241684.patch
|
||||
%define _x11lib %{_libdir}
|
||||
%define _x11data %{_datadir}/X11
|
||||
%define _x11inc %{_includedir}/X11
|
||||
@@ -121,7 +131,7 @@ Patch7: gnuplot-PIE.patch
|
||||
%if "%{flavor}" == "doc"
|
||||
Requires: %{sname}
|
||||
Requires(post): %install_info_prereq
|
||||
Requires(preun):%install_info_prereq
|
||||
Requires(preun): %install_info_prereq
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
@@ -148,6 +158,8 @@ cp %{_sourcedir}/picins.sty docs
|
||||
%patch -P5 -p1 -b .w3x
|
||||
%patch -P6 -p0 -b .pic
|
||||
%patch -P7 -p1 -b .pie
|
||||
%patch -P8 -p0 -b .multiplot
|
||||
%patch -P84 -p0 -b .p84
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
@@ -165,6 +177,10 @@ 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
|
||||
@@ -206,10 +222,10 @@ 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"
|
||||
@@ -273,6 +289,11 @@ autoreconf -fi
|
||||
%fdupes %{buildroot}/%{_docdir}
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == ""
|
||||
%check
|
||||
GNUTERM=dumb make check
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "doc"
|
||||
%post
|
||||
%install_info --info-dir=.%{_infodir} .%{_infodir}/%{sname}.info.gz
|
||||
|
Reference in New Issue
Block a user