diff --git a/gnuplot-4.4.0-x11ovf.dif b/gnuplot-4.4.0-x11ovf.dif index b6c837a..7637a7b 100644 --- a/gnuplot-4.4.0-x11ovf.dif +++ b/gnuplot-4.4.0-x11ovf.dif @@ -3,8 +3,8 @@ 1 file changed, 9 insertions(+), 3 deletions(-) --- src/gplt_x11.c -+++ src/gplt_x11.c 2017-09-27 10:05:59.165076157 +0000 -@@ -960,6 +960,8 @@ mainloop() ++++ src/gplt_x11.c 2018-05-07 07:13:13.080045710 +0000 +@@ -956,6 +956,8 @@ mainloop() nfds = cn + 1; while (1) { @@ -13,7 +13,7 @@ XFlush(dpy); /* see above */ FD_ZERO(&tset); -@@ -997,7 +999,11 @@ mainloop() +@@ -993,7 +995,11 @@ mainloop() process_event(&xe); } } @@ -26,7 +26,7 @@ unlink(X11_ipcpath); record(); fclose(X11_ipc); -@@ -1229,8 +1235,8 @@ static int read_input __PROTO((void)); +@@ -1225,8 +1231,8 @@ static int read_input __PROTO((void)); static int read_input() { diff --git a/gnuplot-4.6.0-demo.diff b/gnuplot-4.6.0-demo.diff index 28b8075..0138872 100644 --- a/gnuplot-4.6.0-demo.diff +++ b/gnuplot-4.6.0-demo.diff @@ -7,7 +7,7 @@ 5 files changed, 34 insertions(+), 4 deletions(-) --- demo/fit.dem -+++ demo/fit.dem 2017-09-27 09:55:05.976971898 +0000 ++++ demo/fit.dem 2018-05-07 07:11:51.433579608 +0000 @@ -10,6 +10,7 @@ set dummy x, y print "Some examples how data fitting using nonlinear least squares fit can be done." @@ -41,7 +41,7 @@ # release datablock undefine $PearsonYork --- demo/poldat.dem -+++ demo/poldat.dem 2017-09-27 09:55:05.976971898 +0000 ++++ demo/poldat.dem 2018-05-07 07:11:51.433579608 +0000 @@ -11,7 +11,7 @@ unset grid unset polar set title "Primitive Smith Chart" @@ -52,7 +52,7 @@ set rrange [-0 : 10] set trange [-pi : pi] --- demo/simple.dem -+++ demo/simple.dem 2017-09-27 09:55:05.976971898 +0000 ++++ demo/simple.dem 2018-05-07 07:11:51.433579608 +0000 @@ -8,14 +8,13 @@ # set title "Simple Plots" font ",20" @@ -70,8 +70,8 @@ pause -1 "Hit return to continue" --- src/show.c -+++ src/show.c 2017-09-27 09:55:05.980971825 +0000 -@@ -1076,6 +1076,15 @@ show_version(FILE *fp) ++++ src/show.c 2018-05-07 07:11:51.437579533 +0000 +@@ -1082,6 +1082,15 @@ show_version(FILE *fp) p /* type "help seeking-assistance" */ ); @@ -88,7 +88,7 @@ /* show version long */ if (almost_equals(c_token, "l$ong")) { --- src/variable.c -+++ src/variable.c 2017-09-27 09:55:05.980971825 +0000 ++++ src/variable.c 2018-05-07 07:11:51.437579533 +0000 @@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id /* The Death of Global Variables - part one. */ diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index 4e92f15..52bf769 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -4,8 +4,8 @@ 2 files changed, 29 insertions(+), 6 deletions(-) --- src/gplt_x11.c -+++ src/gplt_x11.c 2017-09-27 09:54:43.805379677 +0000 -@@ -103,15 +103,16 @@ static char *RCSid() { return RCSid("$Id ++++ src/gplt_x11.c 2018-05-07 07:11:03.618477998 +0000 +@@ -99,15 +99,16 @@ * patches by Masahito Yamaga */ @@ -25,7 +25,7 @@ #include /* for XkbKeycodeToKeysym */ #include -@@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id +@@ -118,6 +119,12 @@ #include "gplt_x11.h" #include "version.h" @@ -38,7 +38,7 @@ #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ -@@ -525,8 +532,8 @@ static char *gpFallbackFont __PROTO((voi +@@ -521,8 +528,8 @@ static char *gpFallbackFont __PROTO((voi static int gpXGetFontascent __PROTO((XFontStruct *cfont)); enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ @@ -49,7 +49,7 @@ #define Nwidths 10 static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -@@ -2291,6 +2298,8 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2287,6 +2294,8 @@ exec_cmd(plot_struct *plot, char *comman /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; @@ -58,7 +58,7 @@ strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); break; -@@ -5774,7 +5783,7 @@ XFontStruct *gpXLoadQueryFont (Display * +@@ -5770,7 +5779,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { @@ -67,7 +67,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5929,6 +5938,18 @@ char *fontname; +@@ -5925,6 +5934,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE @@ -87,7 +87,7 @@ if (multibyte_fonts_usable) { usemultibyte = 1; --- src/variable.c -+++ src/variable.c 2017-09-27 09:54:43.805379677 +0000 ++++ 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 diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 016ee92..ff5907b 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -1,18 +1,15 @@ --- - gnuplot-5.2.0/configure.ac | 2 +- - gnuplot-5.2.0/docs/Makefile.am | 12 ++++++++---- - gnuplot-5.2.0/docs/gnuplot-fr.doc | 4 ++-- - gnuplot-5.2.0/src/gadgets.h | 2 +- - gnuplot-5.2.0/src/gplt_x11.c | 9 ++++++--- - gnuplot-5.2.0/src/plot.c | 22 +++++++++++++++++++++- - gnuplot-5.2.0/src/term.h | 6 +++--- - gnuplot-5.2.0/term/linux.trm | 4 ++-- - 8 files changed, 44 insertions(+), 17 deletions(-) + gnuplot-5.2.3/configure.ac | 2 +- + gnuplot-5.2.3/docs/Makefile.am | 12 ++++++++---- + gnuplot-5.2.3/src/gadgets.h | 2 +- + gnuplot-5.2.3/src/gplt_x11.c | 9 ++++++--- + gnuplot-5.2.3/src/plot.c | 22 +++++++++++++++++++++- + gnuplot-5.2.3/src/term.h | 6 +++--- + gnuplot-5.2.3/term/linux.trm | 4 ++-- + 7 files changed, 42 insertions(+), 15 deletions(-) -Index: gnuplot-5.2.2/configure.ac -=================================================================== ---- gnuplot-5.2.2.orig/configure.ac -+++ gnuplot-5.2.2/configure.ac +--- gnuplot-5.2.3/configure.ac ++++ gnuplot-5.2.3/configure.ac 2018-05-07 07:12:26.984911679 +0000 @@ -365,7 +365,7 @@ if test "$with_linux_vga" = yes; then [AC_DEFINE(LINUXVGA,1, [ Define if this is a Linux system with SuperVGA library. ]) @@ -22,10 +19,8 @@ Index: gnuplot-5.2.2/configure.ac with_linux_vga=no) fi -Index: gnuplot-5.2.2/docs/Makefile.am -=================================================================== ---- gnuplot-5.2.2.orig/docs/Makefile.am -+++ gnuplot-5.2.2/docs/Makefile.am +--- gnuplot-5.2.3/docs/Makefile.am ++++ gnuplot-5.2.3/docs/Makefile.am 2018-05-07 07:12:26.984911679 +0000 @@ -42,7 +42,7 @@ # @@ -68,10 +63,8 @@ Index: gnuplot-5.2.2/docs/Makefile.am alldoc2gih_SOURCES = doc2gih.c termdoc.c alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) -Index: gnuplot-5.2.2/src/gadgets.h -=================================================================== ---- gnuplot-5.2.2.orig/src/gadgets.h -+++ gnuplot-5.2.2/src/gadgets.h +--- gnuplot-5.2.3/src/gadgets.h ++++ gnuplot-5.2.3/src/gadgets.h 2018-05-07 07:12:26.984911679 +0000 @@ -489,7 +489,7 @@ extern TBOOLEAN clip_lines1; extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; @@ -81,11 +74,9 @@ Index: gnuplot-5.2.2/src/gadgets.h extern int samples_1; extern int samples_2; -Index: gnuplot-5.2.2/src/gplt_x11.c -=================================================================== ---- gnuplot-5.2.2.orig/src/gplt_x11.c -+++ gnuplot-5.2.2/src/gplt_x11.c -@@ -2526,9 +2526,12 @@ exec_cmd(plot_struct *plot, char *comman +--- gnuplot-5.2.3/src/gplt_x11.c ++++ gnuplot-5.2.3/src/gplt_x11.c 2018-05-07 07:12:26.988911605 +0000 +@@ -2522,9 +2522,12 @@ exec_cmd(plot_struct *plot, char *comman } } /* X11_justify_text(mode) - set text justification mode */ @@ -101,10 +92,8 @@ Index: gnuplot-5.2.2/src/gplt_x11.c else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); -Index: gnuplot-5.2.2/src/plot.c -=================================================================== ---- gnuplot-5.2.2.orig/src/plot.c -+++ gnuplot-5.2.2/src/plot.c +--- gnuplot-5.2.3/src/plot.c ++++ gnuplot-5.2.3/src/plot.c 2018-05-07 07:12:26.988911605 +0000 @@ -219,6 +219,7 @@ static int asked_privi = 0; void drop_privilege() @@ -168,10 +157,8 @@ Index: gnuplot-5.2.2/src/plot.c #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE) /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name. * It is used to parse a 'gnuplot' specific section in '~/.inputrc' -Index: gnuplot-5.2.2/src/term.h -=================================================================== ---- gnuplot-5.2.2.orig/src/term.h -+++ gnuplot-5.2.2/src/term.h +--- gnuplot-5.2.3/src/term.h ++++ gnuplot-5.2.3/src/term.h 2018-05-07 07:12:26.988911605 +0000 @@ -242,9 +242,9 @@ #include "emf.trm" @@ -193,10 +180,8 @@ Index: gnuplot-5.2.2/src/term.h /* Frame Maker MIF 3.00 format driver */ #ifdef HAVE_MIF -Index: gnuplot-5.2.2/term/linux.trm -=================================================================== ---- gnuplot-5.2.2.orig/term/linux.trm -+++ gnuplot-5.2.2/term/linux.trm +--- gnuplot-5.2.3/term/linux.trm ++++ gnuplot-5.2.3/term/linux.trm 2018-05-07 07:12:26.988911605 +0000 @@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y)); TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y)); diff --git a/gnuplot-5.2.2.tar.gz b/gnuplot-5.2.2.tar.gz deleted file mode 100644 index 75ab67a..0000000 --- a/gnuplot-5.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1 -size 5282973 diff --git a/gnuplot-5.2.3.tar.gz b/gnuplot-5.2.3.tar.gz new file mode 100644 index 0000000..14d8583 --- /dev/null +++ b/gnuplot-5.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feb58c9358d9d129e00507f3b34d4b13c4caea3f004325c587f8caafe5dbe724 +size 5289416 diff --git a/gnuplot-gd.patch b/gnuplot-gd.patch index 3da8a7d..fde67aa 100644 --- a/gnuplot-gd.patch +++ b/gnuplot-gd.patch @@ -1,8 +1,13 @@ Index: gnuplot-5.2.2/configure.ac =================================================================== ---- gnuplot-5.2.2.orig/configure.ac -+++ gnuplot-5.2.2/configure.ac -@@ -570,63 +570,13 @@ AC_ARG_WITH(gd,dnl +--- + gnuplot-5.2.3/configure.ac | 62 ++++-------------------------------------- + gnuplot-5.2.3/src/Makefile.am | 2 - + 2 files changed, 7 insertions(+), 57 deletions(-) + +--- gnuplot-5.2.3/configure.ac ++++ gnuplot-5.2.3/configure.ac 2018-05-07 07:14:11.118955435 +0000 +@@ -578,63 +578,13 @@ AC_ARG_WITH(gd,dnl with_gd=yes) if test "$with_gd" != no; then @@ -72,10 +77,8 @@ Index: gnuplot-5.2.2/configure.ac fi dnl end gd -Index: gnuplot-5.2.2/src/Makefile.am -=================================================================== ---- gnuplot-5.2.2.orig/src/Makefile.am -+++ gnuplot-5.2.2/src/Makefile.am +--- gnuplot-5.2.3/src/Makefile.am ++++ gnuplot-5.2.3/src/Makefile.am 2018-05-07 07:14:11.118955435 +0000 @@ -58,7 +58,7 @@ tabulate.c tabulate.h \ template.h term_api.h term.c term.h time.c unset.c util.c util.h \ util3d.c util3d.h variable.c variable.h version.c version.h diff --git a/gnuplot.changes b/gnuplot.changes index ac01b63..6ff27da 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon May 7 07:15:14 UTC 2018 - werner@suse.de + +- Update to gnuplot 5.2.3 + * NEW "set grid {no}vertical" adds grid lines in the xz and xz planes + * NEW "set cntrparam {firstlinetype N} {{un}sorted}" + * CHANGE drop non-working support for YIQ color space + * CHANGE expand \n characters when printing into a datablock + * CHANGE allow contour plots to opt out of hidden3d processing + * CHANGE special-case code to speed up handling of logscale axes + * CHANGE do not write GPFUN_* variables to "save" output file + * CHANGE default to density 100 for "set fs solid", 50 for "set fs transparent" + * FIX potential buffer overflow in gprintf formats containing %% + * FIX immediate response to ctrl-Z when libreadline is used for input + * FIX warning messages inside a bracketed clause could trigger early exit + * FIX tweak logscale tic range limits and minor tic generation intervals + * FIX stats FOO using 'namedcolumn' name columnhead + * FIX clipping of INRANGE->UNDEFINED line segments + * FIX use of logscale y axis in "set view map" or "set pm3d map" modes + * FIX placement of colorbox in "set view map" mode + * FIX autoscaled axis range of logscale axes in "set view map" mode + * FIX polar mode "with yerrorbars" error bars are radial, not vertical + * FIX clipping of circles whose center is offscreen to the left or bottom + * FIX snap to x=zero for function plot sampling does not apply to logscale x + * FIX canvas terminal: apply both color and alpha channel to points and lines + * FIX svg terminal: apply current color to dots + * FIX qt terminal: include "notitle" plots in accounting for toggle operations + * FIX svg terminal: point plot empty title produced spurious mousing directive + * FIX tikz terminal: failed to recognize dashtype 1 + ------------------------------------------------------------------- Thu Feb 15 10:30:48 UTC 2018 - werner@suse.de @@ -17,7 +47,7 @@ Mon Feb 12 18:26:08 UTC 2018 - crrodriguez@opensuse.org ------------------------------------------------------------------- Thu Nov 16 07:52:31 UTC 2017 - werner@suse.de -- Update to gnuplot 5.2.2 +- Update to gnuplot 5.2.2 * NEW splot ... with lines title at {beg|end} * FIX allow mixed use of in-key plot titles and manually placed titles * FIX prevent runaway iterations of the form plot for [i=start:*] ... diff --git a/gnuplot.spec b/gnuplot.spec index d425ab2..7629673 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -77,7 +77,7 @@ BuildRequires: wxWidgets-devel BuildRequires: wxWidgets-devel >= 3 %endif Url: http://www.gnuplot.info/ -Version: 5.2.2 +Version: 5.2.3 Release: 0 Summary: Function Plotting Utility and more License: SUSE-Gnuplot and GPL-2.0+ @@ -154,6 +154,7 @@ cp %{_sourcedir}/picins.sty docs %patch5 -p1 -b .w3x %patch6 -p0 -b .pic %patch7 -p1 -b .gd + %build autoreconf -fi