diff --git a/gnuplot-4.4.0-x11ovf.dif b/gnuplot-4.4.0-x11ovf.dif index c6ad17b..b6c837a 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-08-16 07:04:07.631337117 +0000 -@@ -957,6 +957,8 @@ mainloop() ++++ src/gplt_x11.c 2017-09-27 10:05:59.165076157 +0000 +@@ -960,6 +960,8 @@ mainloop() nfds = cn + 1; while (1) { @@ -13,7 +13,7 @@ XFlush(dpy); /* see above */ FD_ZERO(&tset); -@@ -994,7 +996,11 @@ mainloop() +@@ -997,7 +999,11 @@ mainloop() process_event(&xe); } } @@ -26,7 +26,7 @@ unlink(X11_ipcpath); record(); fclose(X11_ipc); -@@ -1226,8 +1232,8 @@ static int read_input __PROTO((void)); +@@ -1229,8 +1235,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 a74cc6f..28b8075 100644 --- a/gnuplot-4.6.0-demo.diff +++ b/gnuplot-4.6.0-demo.diff @@ -1,14 +1,13 @@ --- - demo/fit.dem | 6 +++++- - demo/poldat.dem | 2 +- - demo/simple.dem | 3 +-- - demo/stringvar.dem | 9 +++++---- - src/show.c | 9 +++++++++ - src/variable.c | 20 +++++++++++++++++++- - 6 files changed, 40 insertions(+), 9 deletions(-) + demo/fit.dem | 4 ++++ + demo/poldat.dem | 2 +- + demo/simple.dem | 3 +-- + src/show.c | 9 +++++++++ + src/variable.c | 20 +++++++++++++++++++- + 5 files changed, 34 insertions(+), 4 deletions(-) --- demo/fit.dem -+++ demo/fit.dem 2017-08-16 07:02:41.572923104 +0000 ++++ demo/fit.dem 2017-09-27 09:55:05.976971898 +0000 @@ -10,6 +10,7 @@ set dummy x, y print "Some examples how data fitting using nonlinear least squares fit can be done." @@ -25,16 +24,7 @@ fit l(x) 'lcdemo.dat' via y0, m set title 'unweighted fit' plot 'lcdemo.dat', l(x) -@@ -167,7 +169,7 @@ pause -1 "Press enter to start the fit." - - fit f(x,y) 'soundvel.dat' using 1:-2:2 via 'sound.par' - #create soundfit.par, reading from sound.par and updating values --update 'sound.par' 'soundfit.par' -+update 'sound.par' "`mktemp /tmp/soundfit.par.XXXXXX`" - set title 'pseudo-3d multi-branch fit to velocity data' - plot 'soundvel.dat', vlong(x), vtrans(x) - print '' -@@ -323,6 +325,7 @@ print ' "fit3.dat" u 1:2:3:4 via a0, +@@ -324,6 +326,7 @@ print ' "fit3.dat" u 1:2:3:4 via a0, pause -1 "Press enter to proceed with the next example." reset @@ -42,7 +32,7 @@ print "\n" print "The fit command can handle errors in the independent variable, too." print "The problem shown here is Pearson's data with York's weights.\n" -@@ -428,6 +431,7 @@ print "to time." +@@ -429,6 +432,7 @@ print "to time." print '' pause -1 "Done with fitting demo (-> return)" reset @@ -51,7 +41,7 @@ # release datablock undefine $PearsonYork --- demo/poldat.dem -+++ demo/poldat.dem 2017-08-16 07:02:41.572923104 +0000 ++++ demo/poldat.dem 2017-09-27 09:55:05.976971898 +0000 @@ -11,7 +11,7 @@ unset grid unset polar set title "Primitive Smith Chart" @@ -62,7 +52,7 @@ set rrange [-0 : 10] set trange [-pi : pi] --- demo/simple.dem -+++ demo/simple.dem 2017-08-16 07:02:41.572923104 +0000 ++++ demo/simple.dem 2017-09-27 09:55:05.976971898 +0000 @@ -8,14 +8,13 @@ # set title "Simple Plots" font ",20" @@ -79,48 +69,9 @@ plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1)) pause -1 "Hit return to continue" ---- demo/stringvar.dem -+++ demo/stringvar.dem 2017-08-16 07:02:41.572923104 +0000 -@@ -1,7 +1,8 @@ - # - # Miscellaneous neat things you can do using the string variables code - # --set print "stringvar.tmp" -+stringvar="`mktemp /tmp/stringvar.XXXXXX`" -+set print stringvar - print "" - print "Exercise substring handling" - print "" -@@ -27,7 +28,7 @@ print "foo[1:1] eq 'A' && foo[2:2] ne 'X - - unset print - --set label 1 system("cat stringvar.tmp") at graph 0.1, graph 0.9 -+set label 1 system(sprintf("cat %s", stringvar)) at graph 0.1, graph 0.9 - unset xtics - unset ytics - set yrange [0:1] -@@ -36,7 +37,7 @@ plot 0 - pause -1 "Hit return to continue" - - --set print "stringvar.tmp" -+set print stringvar - print "Exercise string handling functions" - print "" - print "foo = ",foo -@@ -65,7 +66,7 @@ if (strlen(foo) != 245) print "sprintf o - print "" - - unset print --set label 1 system("cat stringvar.tmp") at graph 0.1, graph 0.9 -+set label 1 system(sprintf("cat %s", stringvar)) at graph 0.1, graph 0.9 - unset xtics - unset ytics - set yrange [0:1] --- src/show.c -+++ src/show.c 2017-08-16 07:02:41.576923031 +0000 -@@ -1056,6 +1056,15 @@ show_version(FILE *fp) ++++ src/show.c 2017-09-27 09:55:05.980971825 +0000 +@@ -1076,6 +1076,15 @@ show_version(FILE *fp) p /* type "help seeking-assistance" */ ); @@ -137,7 +88,7 @@ /* show version long */ if (almost_equals(c_token, "l$ong")) { --- src/variable.c -+++ src/variable.c 2017-08-16 07:02:41.576923031 +0000 ++++ src/variable.c 2017-09-27 09:55:05.980971825 +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 119c323..4e92f15 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -4,7 +4,7 @@ 2 files changed, 29 insertions(+), 6 deletions(-) --- src/gplt_x11.c -+++ src/gplt_x11.c 2017-08-16 07:02:00.645677412 +0000 ++++ src/gplt_x11.c 2017-09-27 09:54:43.805379677 +0000 @@ -103,15 +103,16 @@ static char *RCSid() { return RCSid("$Id * patches by Masahito Yamaga */ @@ -38,7 +38,7 @@ #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ -@@ -522,8 +529,8 @@ static char *gpFallbackFont __PROTO((voi +@@ -525,8 +532,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 }; -@@ -2288,6 +2295,8 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2291,6 +2298,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; -@@ -5751,7 +5760,7 @@ XFontStruct *gpXLoadQueryFont (Display * +@@ -5774,7 +5783,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { @@ -67,7 +67,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5906,6 +5915,18 @@ char *fontname; +@@ -5929,6 +5938,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE @@ -87,8 +87,8 @@ if (multibyte_fonts_usable) { usemultibyte = 1; --- src/variable.c -+++ src/variable.c 2017-08-16 07:02:00.645677412 +0000 -@@ -282,6 +282,8 @@ static const struct path_table fontpath_ ++++ src/variable.c 2017-09-27 09:54:43.805379677 +0000 +@@ -280,6 +280,8 @@ static const struct path_table fontpath_ { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, #endif /* Linux paths */ diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 766772e..a630d6a 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -1,17 +1,17 @@ --- - gnuplot-5.0.7/configure.in | 2 +- - gnuplot-5.0.7/docs/Makefile.am | 12 ++++++++---- - gnuplot-5.0.7/docs/gnuplot-fr.doc | 4 ++-- - gnuplot-5.0.7/src/gadgets.h | 2 +- - gnuplot-5.0.7/src/gplt_x11.c | 9 ++++++--- - gnuplot-5.0.7/src/plot.c | 22 +++++++++++++++++++++- - gnuplot-5.0.7/src/term.h | 6 +++--- - gnuplot-5.0.7/term/linux.trm | 4 ++-- + 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.0.7/configure.in -+++ gnuplot-5.0.7/configure.in 2017-08-16 07:03:41.655815809 +0000 -@@ -370,7 +370,7 @@ if test "$with_linux_vga" = yes; then +--- gnuplot-5.2.0/configure.ac ++++ gnuplot-5.2.0/configure.ac 2017-09-27 10:04:22.506816233 +0000 +@@ -363,7 +363,7 @@ if test "$with_linux_vga" = yes; then [AC_DEFINE(LINUXVGA,1, [ Define if this is a Linux system with SuperVGA library. ]) LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot' @@ -20,8 +20,8 @@ with_linux_vga=no) fi ---- gnuplot-5.0.7/docs/Makefile.am -+++ gnuplot-5.0.7/docs/Makefile.am 2017-08-16 07:03:41.655815809 +0000 +--- gnuplot-5.2.0/docs/Makefile.am ++++ gnuplot-5.2.0/docs/Makefile.am 2017-09-27 10:05:25.857675880 +0000 @@ -42,7 +42,7 @@ # @@ -30,8 +30,8 @@ +gih_DATA = gnuplot.gih gnuplot-fr.gih gihdir = @GIHDIR@ - noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \ -@@ -96,7 +96,7 @@ gnuplot-groff.ps gnuplot.tmp VERSION gnu + noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \ +@@ -97,7 +97,7 @@ gnuplot-groff.ps gnuplot.tmp VERSION gnu gnuplot.idv gnuplot.xref gnuplot.lg gnuplot.pdf wxhelp_figures \ wxhelp/*.html wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk \ wxhelp/wgnuplot.htc wxhelp/doc2html$(EXEEXT) windows/wgnuplot.htk \ @@ -40,7 +40,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST) -@@ -278,17 +278,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/ +@@ -261,17 +261,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/ doc2hlp_SOURCES = doc2hlp.c termdoc.c ### gnuplot interactive help format @@ -64,8 +64,8 @@ alldoc2gih_SOURCES = doc2gih.c termdoc.c alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) ---- gnuplot-5.0.7/docs/gnuplot-fr.doc -+++ gnuplot-5.0.7/docs/gnuplot-fr.doc 2017-08-16 07:03:41.655815809 +0000 +--- gnuplot-5.2.0/docs/gnuplot-fr.doc ++++ gnuplot-5.2.0/docs/gnuplot-fr.doc 2017-09-27 10:04:22.510816162 +0000 @@ -436,8 +436,8 @@ C #Home & same as \verb~^A~. \\ #Ctrl Home & same as \verb~^E~. \\ @@ -77,9 +77,9 @@ %c l . %Touche fléchée@Fonction %_ ---- gnuplot-5.0.7/src/gadgets.h -+++ gnuplot-5.0.7/src/gadgets.h 2017-08-16 07:03:41.655815809 +0000 -@@ -482,7 +482,7 @@ extern TBOOLEAN clip_lines1; +--- gnuplot-5.2.0/src/gadgets.h ++++ gnuplot-5.2.0/src/gadgets.h 2017-09-27 10:04:22.510816162 +0000 +@@ -489,7 +489,7 @@ extern TBOOLEAN clip_lines1; extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; @@ -88,9 +88,9 @@ extern int samples_1; extern int samples_2; ---- gnuplot-5.0.7/src/gplt_x11.c -+++ gnuplot-5.0.7/src/gplt_x11.c 2017-08-16 07:03:41.655815809 +0000 -@@ -2525,9 +2525,12 @@ exec_cmd(plot_struct *plot, char *comman +--- gnuplot-5.2.0/src/gplt_x11.c ++++ gnuplot-5.2.0/src/gplt_x11.c 2017-09-27 10:04:22.510816162 +0000 +@@ -2526,9 +2526,12 @@ exec_cmd(plot_struct *plot, char *comman } } /* X11_justify_text(mode) - set text justification mode */ @@ -106,9 +106,9 @@ else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); ---- gnuplot-5.0.7/src/plot.c -+++ gnuplot-5.0.7/src/plot.c 2017-08-16 07:03:41.655815809 +0000 -@@ -218,6 +218,7 @@ static int asked_privi = 0; +--- gnuplot-5.2.0/src/plot.c ++++ gnuplot-5.2.0/src/plot.c 2017-09-27 10:04:22.510816162 +0000 +@@ -219,6 +219,7 @@ static int asked_privi = 0; void drop_privilege() { @@ -116,7 +116,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -231,11 +232,13 @@ drop_privilege() +@@ -232,11 +233,13 @@ drop_privilege() if (seteuid(ruid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) ruid, strerror(errno)); @@ -130,7 +130,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -249,6 +252,7 @@ take_privilege() +@@ -250,6 +253,7 @@ take_privilege() if (seteuid(euid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) euid, strerror(errno)); @@ -138,7 +138,7 @@ } #endif /* LINUXVGA */ -@@ -275,8 +279,8 @@ main(int argc, char **argv) +@@ -276,8 +280,8 @@ main(int argc, char **argv) int i; #ifdef LINUXVGA @@ -148,7 +148,7 @@ #endif /* make sure that we really have revoked root access, this might happen if gnuplot is compiled without vga support but is installed suid by mistake */ -@@ -334,6 +338,22 @@ main(int argc, char **argv) +@@ -338,6 +342,22 @@ main(int argc, char **argv) rl_getc_function = getc_wrapper; #endif @@ -171,9 +171,9 @@ #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' ---- gnuplot-5.0.7/src/term.h -+++ gnuplot-5.0.7/src/term.h 2017-08-16 07:03:41.655815809 +0000 -@@ -265,9 +265,9 @@ +--- gnuplot-5.2.0/src/term.h ++++ gnuplot-5.2.0/src/term.h 2017-09-27 10:04:22.514816090 +0000 +@@ -242,9 +242,9 @@ #include "emf.trm" /* Roland DXY800A plotter */ @@ -185,7 +185,7 @@ /* fig graphics */ #include "fig.trm" -@@ -300,7 +300,7 @@ +@@ -277,7 +277,7 @@ /* #include "imagen.trm" */ /* Kyocera Prescribe printer */ @@ -194,8 +194,8 @@ /* Frame Maker MIF 3.00 format driver */ #ifdef HAVE_MIF ---- gnuplot-5.0.7/term/linux.trm -+++ gnuplot-5.0.7/term/linux.trm 2017-08-16 07:03:41.655815809 +0000 +--- gnuplot-5.2.0/term/linux.trm ++++ gnuplot-5.2.0/term/linux.trm 2017-09-27 10:04:22.514816090 +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.0.7.tar.gz b/gnuplot-5.0.7.tar.gz deleted file mode 100644 index b980343..0000000 --- a/gnuplot-5.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ad760ff013b4a9cf29853fa9b50c50030a33cd8fb86220a23abb466655136fc -size 5100186 diff --git a/gnuplot-5.2.0-texi2info.patch b/gnuplot-5.2.0-texi2info.patch new file mode 100644 index 0000000..ab86523 --- /dev/null +++ b/gnuplot-5.2.0-texi2info.patch @@ -0,0 +1,179 @@ +--- gnuplot.texi ++++ gnuplot.texi 2017-09-29 07:05:15.168397901 +0000 +@@ -1703,7 +1703,6 @@ third kind. See `elliptic integrals` for + @findex besj0 + + +-@item + esj0(x) & int or real & $J_@{0@}$ Bessel function of $x$, in radians \\ + The `besj0(x)` function returns the J0th Bessel function of its argument. + @ref{besj0} expects its argument to be in radians. +@@ -1716,7 +1715,6 @@ The `besj0(x)` function returns the J0th + @findex besj1 + + +-@item + esj1(x) & int or real & $J_@{1@}$ Bessel function of $x$, in radians \\ + The `besj1(x)` function returns the J1st Bessel function of its argument. + @ref{besj1} expects its argument to be in radians. +@@ -1729,7 +1727,6 @@ The `besj1(x)` function returns the J1st + @findex besy0 + + +-@item + esy0(x) & int or real & $Y_@{0@}$ Bessel function of $x$, in radians \\ + The `besy0(x)` function returns the Y0th Bessel function of its argument. + @ref{besy0} expects its argument to be in radians. +@@ -1742,7 +1739,6 @@ The `besy0(x)` function returns the Y0th + @findex besy1 + + +-@item + esy1(x) & int or real & $Y_@{1@}$ Bessel function of $x$, in radians \\ + The `besy1(x)` function returns the Y1st Bessel function of its argument. + @ref{besy1} expects its argument to be in radians. +@@ -10624,8 +10620,7 @@ but + @end example + + See also +-@uref{http://www.gnuplot.info/demo/poldat.html,poldat.dem: polar plot using @ref{angles} demo. +-} ++@uref{http://www.gnuplot.info/demo/poldat.html,poldat.dem}: polar plot using @ref{angles} demo. + + @node arrow, autoscale, angles, set-show + @subsection arrow +@@ -11009,7 +11004,6 @@ entries from the following table: + 4096 polar no effect + @end example + +-@item + it & plot & splot \\ \hline + + +@@ -21207,13 +21201,10 @@ Syntax: + @{[no]enhanced@} + @end example + +-@end itemizeif + @example + @{mono|ansi|ansi256|ansirgb@} + @end example + +-@end itemizeif +- + where and set the size of the text block. The default is + 79 by 24. The last newline is printed only if `feed` is enabled. + +@@ -21251,7 +21242,6 @@ See also e.g. the description at + @uref{https://en.wikipedia.org/wiki/ANSI_escape_code#Colors,https://en.wikipedia.org/wiki/ANSI_escape_code#Colors + } + +-@end itemizeif + Example: + @example + set term dumb mono size 60,15 aspect 1 +@@ -21623,8 +21613,6 @@ Preferred combinations are `medium norma + + With each of these drivers, a binary copy is required on a PC to print. + Do not use `print`---use instead `copy file /b lpt1:`. +-@end itemizeif +- + + @node excl, fig, epson_180dpi, complete_list_of_terminals + @subsection excl +@@ -22423,8 +22411,6 @@ the environmental variable GNUPLOT_LUA_D + All arguments will be provided to the selected script for further + evaluation. E.g. 'set term lua tikz help' will cause the script itself + to print additional help on options and choices for the script. +-@end itemizeif +- + + @node mf, mp, lua, complete_list_of_terminals + @subsection mf +@@ -23118,7 +23104,6 @@ terminals. It has no options." + @c ?term km-tek40xx + @cindex km-tek40xx + +-@end itemizeif + @c ?commands set terminal selanar + @c ?set terminal selanar + @c ?set term selanar +@@ -23126,7 +23111,6 @@ terminals. It has no options." + @c ?term selanar + @cindex selanar + +-@end itemizeif + @c ?commands set terminal sixel + @c ?set terminal sixel + @c ?set term sixel +@@ -23147,7 +23131,6 @@ For use with xterm emulation, xterm must + "--enable-sixel-graphics" and started with "-ti 340" on the command line. + Menu option "sixelScrolling" should be selected. xterm/vt340 emulation + limits plots to 16 simultaneous colors, but other emulators may permit more. +-@end itemizeif + @c ?commands set terminal bitgraph + @c ?set terminal bitgraph + @c ?set term bitgraph +@@ -23155,7 +23138,6 @@ limits plots to 16 simultaneous colors, + @c ?term bitgraph + @cindex bitgraph + +-@end itemizeif + This family of terminal drivers supports a variety of VT-like terminals. + `tek40xx` supports Tektronix 4010 and others as well as most TEK emulators. + `vttek` supports VT-like tek40xx terminal emulators. +@@ -23536,7 +23518,6 @@ Syntax: + [dump "file"] \\ + @end example + +-@end itemizeif + @example + [mode] + +@@ -23556,7 +23537,6 @@ If this option is present, (i.e the dump + the key KP_Delete will write the file. This action cannot and cannot be + rebound. The file is written in raw ppm (P6) format. Note that this option + is reset each time the `set term` command is issued. +-@end itemizeif + + To get high resolution modes, you will probably have to modify the + configuration file of libvga, usually /etc/vga/libvga.conf. Using +@@ -23762,7 +23742,6 @@ of an additional redraw after releasing + + `Line Styles...` allows customization of the line colors and styles. + +-@end itemizeif + `Update wgnuplot.ini` saves the current window locations, window sizes, text + window font, text window font size, graph window font, graph window font + size, background color to the initialization file `wgnuplot.ini`. +@@ -23928,8 +23907,6 @@ This file is located in the user's appli + Line5=0 0 128 0 4 + @end example + +-@end itemizeif +- + @c ^

Text window options

+ + These settings apply to the wgnuplot text-window only." +@@ -23966,7 +23943,6 @@ solid line in color mode, or a dashed li + line width is 1 pixel. If `Linestyle` is negative, it specifies the width of + a SOLID line in pixels. Line1 and any linestyle used with the `points` style + must be SOLID with unit width. +-@end itemizeif + + See `graph-menu`." + +@@ -24354,13 +24330,10 @@ later by `set term x11 [no]raise [no]per + `-ctrlq ` closes window on ctrl-q rather than q + @end example + +-@end itemizeif + @example + `-persist` plot windows survive after main gnuplot program exits + @end example + +-@end itemizeif +- + @cindex X resources + + The options are shown above in their command-line syntax. When entered as diff --git a/gnuplot-5.2.0.tar.gz b/gnuplot-5.2.0.tar.gz new file mode 100644 index 0000000..fc7be0b --- /dev/null +++ b/gnuplot-5.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dfe6425a1a6b9349b1fb42dae46b2e52833b13e807a78a613024d6a99541e43 +size 5265808 diff --git a/gnuplot-QtCore-PIC.dif b/gnuplot-QtCore-PIC.dif index 21221a5..e83c628 100644 --- a/gnuplot-QtCore-PIC.dif +++ b/gnuplot-QtCore-PIC.dif @@ -5,8 +5,8 @@ Since QtCore is build with -reduce-relocations a -fPIC is required 1 file changed, 3 insertions(+) --- src/Makefile.am -+++ src/Makefile.am 2016-12-15 12:55:44.739344919 +0000 -@@ -161,6 +161,9 @@ clean-local: clean-qt-extra clean-demo ++++ src/Makefile.am 2017-09-27 10:07:07.767840550 +0000 +@@ -163,6 +163,9 @@ clean-local: clean-qt-extra clean-demo gnuplot_SOURCES += qtterminal/qt_term.cpp diff --git a/gnuplot-wx3.diff b/gnuplot-wx3.diff index fc87f6e..38507fc 100644 --- a/gnuplot-wx3.diff +++ b/gnuplot-wx3.diff @@ -5,12 +5,12 @@ 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.0.5/src/Makefile.am | 1 + + gnuplot-5.2.0/src/Makefile.am | 1 + 1 file changed, 1 insertion(+) ---- gnuplot-5.0.5/src/Makefile.am -+++ gnuplot-5.0.5/src/Makefile.am 2016-12-15 12:55:09.016058783 +0000 -@@ -91,6 +91,7 @@ $(EXTRA_gnuplot_SOURCES) +--- gnuplot-5.2.0/src/Makefile.am ++++ gnuplot-5.2.0/src/Makefile.am 2017-09-27 10:06:44.716255786 +0000 +@@ -93,6 +93,7 @@ $(EXTRA_gnuplot_SOURCES) if BUILD_WXWIDGETS gnuplot_SOURCES += wxterminal/wxt_gui.cpp diff --git a/gnuplot.changes b/gnuplot.changes index 55678d9..50bd304 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,119 @@ +------------------------------------------------------------------- +Fri Sep 29 07:55:11 UTC 2017 - werner@suse.de + +- Add patch gnuplot-5.2.0-texi2info.patch as source to be avble + to patch the resulting gnuplot.texi +- Modify patches + * gnuplot-4.4.0-x11ovf.dif + * gnuplot-4.6.0-demo.diff + * gnuplot-4.6.0-fonts.diff + * gnuplot-4.6.0.dif + * gnuplot-QtCore-PIC.dif + * gnuplot-wx3.diff + +------------------------------------------------------------------- +Wed Sep 27 13:47:57 UTC 2017 - werner@suse.de + +- Update to gnuplot 5.2.0 + * NEW user-defined dashtypes in metapost terminal +* NEW datablock contents may be accessed as an indexed array of strings + * CHANGE allow explicit sample interval for u and v using pseudofile '++' + * CHANGE decouple cbrange from color components in "with rgbimage" + * FIX reconcile aspect ratio flags from "set view map" and "set view equal xy" + * FIX "set key fixed" should be ignored in the case of "set view map" + * FIX GPVAL_* variables were not being updated in "set table" mode + * FIX evaluation of nested iteration containing an empty range + * FIX bug in variant time_spec formats %tH %tM (undesired wrapping) + * NEW "plot with table" can handle string-valued output columns + * CHANGE add caca terminal documentation to the user manual + * CHANGE revised output of "test" command + * CHANGE use Mingw-w64 and MSVC popen rather than built-in "fake" popen + * FIX copy environmental variable GNUTERM to internal variable on entry + * FIX more consistent handling of plot 'with table' + * FIX incorrect, possibly empty, command string was saved for previous fit + * FIX ignore non-numeric values of potential dummy params used by "fit" + * FIX autoscaling during refresh of volatile data plots "with vectors" + * FIX terminal initialization must be done before executing ~/.gnuplot + * FIX do not use LaTeX formatting in tabular output + * FIX polar border should not be clipped to rectangular border + * FIX raxis was truncated at R=0 if the axis direction was inverted + * FIX sanity check to catch "plot '+' binary" + * FIX sanity check for NULL format passed to gprintf + * FIX sanity check inverse mapping function of set link and set nonlinear + * FIX sanity check for empty image data structure + * FIX segfault from corruption of timestamp text + * FIX several unitialized variables (see Bug 1933) + * FIX dumb term: linetype character distinction was lost if not in color mode + * CHANGE svg terminal option "fontscale" replaces obsolete "fsize" + * NEW plot styles + * NEW splot ... using :::: with zerrorfill + * NEW "set jitter" allows creation of bee swarm plots + * NEW data filter "bins" sorts input into equal width bins on x + * NEW "with points" and "with linespoints" accept `pointtype variable` + * NEW hidden3d now treats 'image' and 'rgbimage' as occluding rectangles + * NEW "smooth fnormal" normalized frequency + * NEW polar mode improvements and extensions + * NEW "set [m]ttics" places labels around perimeter of polar grid + * NEW "set rlabel" places a label above the r axis + * NEW "set rrange [90:0]" plots in celestial horizontal coordinates + * NEW "set border polar" uses border linetype for perimeter of polar plot + * NEW "set theta " orientation of polar coordinate theta + * NEW label, arrow, and object positions may be given in polar coordinates + * NEW nonlinear coordinate systems + * NEW "set nonlinear via f(axis) inverse g(axis)" + * NEW "set log" re-implemented as special case of "set nonlinear" + * NEW data type array[size] + * NEW commands and command options + * NEW "break" exits from iteration loop + * NEW "continue" begins next iteration immediately + * NEW "toggle { | "plottitle" | all}" + * NEW "set pm3d lighting" specifies lighting model with specular highlighting + * NEW "set table OUTFILE {append}" + * NEW "set minussign" and "set micro" (first appeared in 5.0.5) + * NEW "set view azimuth " controls azimuth of the z axis in 3D plots + * NEW "save fit " replaces deprecated command "update" + * NEW terminals and terminal options + * NEW terminal domterm (supports in-line SVG in DomTerm terminal emulator) + * NEW terminal sixelgd (sixel terminal graphics using gdlib) + * NEW svg 'standalone' embeds images rather than including by reference + * NEW windows terminal supports saving graph as bitmap + * NEW windows graph windows can be docked to the wgnuplot text window + * NEW windows terminal Direct2D driver rather than GDI/GDI+ where possible + * NEW wxt supports saving graph as EMF on Windows + * NEW wxt supports printing on Windows + * NEW dumb suports ANSI colors and filled polygons + * NEW Optional sampling interval in range specifiers for pseudofiles '+' '++' + * NEW gnuplot on Windows + * converts Unicode (BMP) input to current `set encoding`, including UTF-8 + * is system DPI aware + * NEW textbox style supports fillcolor and bordercolor + * CHANGE point style associated with "plot with labels" is shown in the key + * CHANGE Revise placement of axis labels in 3D plots + * CHANGE Timestamp is now placed relative to page rather than plot boundary + * CHANGE Track font/enhanced for key title separately from the key entries + * CHANGE order of margins in `set margins , , , ` + * CHANGE Store and reuse x,y dimensions from the time image data is read in + * CHANGE Some STATS_* variables are of type integer rather than real (complex) + * CHANGE ^R starts a backward search when using the built-in readline + * CHANGE Only update axis->data_min/max if the point being stored is INRANGE + * CHANGE auto-generation of minitics on logscale axis has changed + * CHANGE revised printing dialogs on Windows + * CHANGE preserve whitespace following opening { in enhanced text strings + * CHANGE windows terminal provides better oversampling + * CHANGE New default "set key fixed" prevents 3D key box from rotating with plot + * CHANGE Deprecate pdf terminal requiring non-free library PDFlib + * CHANGE windows terminal also uses GDI+ for printing and copy-to-clipboard + * CHANGE raxis/polar grid can coexist with cartesian axes + * CHANGE evaluation of norm(x) or x**y returns 0 on floating underflow + * CHANGE support for space-in-x11-raises-KDE3-konsole is now a configure option + * CHANGE don't use loadpath to choose output directory for "save" + * CHANGE GNUTERM may contain terminal options in addition to bare terminal name + * CHANGE remove legacy terminals corel and dxf from default build + * FIX cairo.trm - reset terminal font after printing an enhanced text string + * FIX autoscaling of data with "smooth cnorm" + * FIX Built-in readline handles S-JIS encoding + * FIX Output to printer on Windows via special file "PRN" + ------------------------------------------------------------------- Wed Aug 16 07:09:12 UTC 2017 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 1cac2d5..d76306b 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -83,7 +83,7 @@ BuildRequires: wxWidgets-devel >= 3 BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel Url: http://www.gnuplot.info/ -Version: 5.0.7 +Version: 5.2.0 Release: 0 Summary: Function Plotting Utility and more License: SUSE-Gnuplot and GPL-2.0+ @@ -99,6 +99,8 @@ Source4: gnuplot-el.tar.bz2 # http://mirrors.ctan.org/macros/latex209/contrib/picins/picins.sty # That's a build requirement, not provided by Tex Live Source5: picins.sty +# Repair broken texi(nfo) file +Source6: 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 @@ -214,20 +216,23 @@ autoreconf -fi %endif pushd docs/ - make srcdir=. clean all html pdf gpcard.ps info + make srcdir=. clean all html pdf + make srcdir=. gnuplot.texi + patch -p0 < %{S:6} + make srcdir=. info pushd psdoc/ - make srcdir=. clean pdf + make srcdir=. pdf popd - popd - pushd tutorial/ + popd + pushd tutorial/ make srcdir=. clean pdf - popd - pushd lisp/ + popd + pushd lisp/ for el_file in gnuplot.el gnuplot-gui.el; do emacs -batch -q -no-site-file -l "dot.el" -f batch-byte-compile \ "$el_file" done - popd + popd %install rm -rf %{buildroot} @@ -246,7 +251,6 @@ autoreconf -fi rm -rvf demo/html install -m 0444 docs/*.info* %{buildroot}/%{_infodir}/ install -m 0444 docs/*.pdf %{buildroot}/%{_docdir}/gnuplot/doc/ - install -m 0444 docs/gpcard.ps %{buildroot}/%{_docdir}/gnuplot/doc/ install -m 0444 docs/htmldocs/* %{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/