rpm/gnuplot
SHA256
1
0
Fork 0
forked from pool/gnuplot
Code Pull Requests Activity

Update to gnuplot-5.2.3

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=92
This commit is contained in:
Dr. Werner Fink 2018-05-07 07:16:41 +00:00 committed by Git OBS Bridge
parent c163dbf0c6
commit 55103c8556
9 changed files with 87 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnuplot-4.4.0-x11ovf.dif
View File

@ -3,8 +3,8 @@
1 file changed, 9 insertions(+), 3 deletions(-) 1 file changed, 9 insertions(+), 3 deletions(-)
--- src/gplt_x11.c --- src/gplt_x11.c
+++ src/gplt_x11.c 2017-09-27 10:05:59.165076157 +0000 +++ src/gplt_x11.c 2018-05-07 07:13:13.080045710 +0000
@@ -960,6 +960,8 @@ mainloop() @@ -956,6 +956,8 @@ mainloop()
nfds = cn + 1; nfds = cn + 1;
while (1) { while (1) {
@ -13,7 +13,7 @@
XFlush(dpy); /* see above */ XFlush(dpy); /* see above */
FD_ZERO(&tset); FD_ZERO(&tset);
@@ -997,7 +999,11 @@ mainloop() @@ -993,7 +995,11 @@ mainloop()
process_event(&xe); process_event(&xe);
} }
} }
@ -26,7 +26,7 @@
unlink(X11_ipcpath); unlink(X11_ipcpath);
record(); record();
fclose(X11_ipc); 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 static int
read_input() read_input()
{ {

12
gnuplot-4.6.0-demo.diff
View File

@ -7,7 +7,7 @@
5 files changed, 34 insertions(+), 4 deletions(-) 5 files changed, 34 insertions(+), 4 deletions(-)
--- demo/fit.dem --- 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 @@ -10,6 +10,7 @@ set dummy x, y
print "Some examples how data fitting using nonlinear least squares fit can be done." print "Some examples how data fitting using nonlinear least squares fit can be done."
@ -41,7 +41,7 @@
# release datablock # release datablock
undefine $PearsonYork undefine $PearsonYork
--- demo/poldat.dem --- 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 @@ -11,7 +11,7 @@ unset grid
unset polar unset polar
set title "Primitive Smith Chart" set title "Primitive Smith Chart"
@ -52,7 +52,7 @@
set rrange [-0 : 10] set rrange [-0 : 10]
set trange [-pi : pi] set trange [-pi : pi]
--- demo/simple.dem --- 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 @@ @@ -8,14 +8,13 @@
# #
set title "Simple Plots" font ",20" set title "Simple Plots" font ",20"
@ -70,8 +70,8 @@
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
--- src/show.c --- src/show.c
+++ src/show.c 2017-09-27 09:55:05.980971825 +0000 +++ src/show.c 2018-05-07 07:11:51.437579533 +0000
@@ -1076,6 +1076,15 @@ show_version(FILE *fp) @@ -1082,6 +1082,15 @@ show_version(FILE *fp)
p /* type "help seeking-assistance" */ p /* type "help seeking-assistance" */
); );
@ -88,7 +88,7 @@
/* show version long */ /* show version long */
if (almost_equals(c_token, "l$ong")) { if (almost_equals(c_token, "l$ong")) {
--- src/variable.c --- 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 @@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id
/* The Death of Global Variables - part one. */ /* The Death of Global Variables - part one. */

16
gnuplot-4.6.0-fonts.diff
View File

@ -4,8 +4,8 @@
2 files changed, 29 insertions(+), 6 deletions(-) 2 files changed, 29 insertions(+), 6 deletions(-)
--- src/gplt_x11.c --- src/gplt_x11.c
+++ src/gplt_x11.c 2017-09-27 09:54:43.805379677 +0000 +++ src/gplt_x11.c 2018-05-07 07:11:03.618477998 +0000
@@ -103,15 +103,16 @@ static char *RCSid() { return RCSid("$Id @@ -99,15 +99,16 @@
* patches by Masahito Yamaga <ma@yama-ga.com> * patches by Masahito Yamaga <ma@yama-ga.com>
*/ */
@ -25,7 +25,7 @@
#include <X11/XKBlib.h> /* for XkbKeycodeToKeysym */ #include <X11/XKBlib.h> /* for XkbKeycodeToKeysym */
#include <assert.h> #include <assert.h>
@@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id @@ -118,6 +119,12 @@
#include "gplt_x11.h" #include "gplt_x11.h"
#include "version.h" #include "version.h"
@ -38,7 +38,7 @@
#ifdef EXPORT_SELECTION #ifdef EXPORT_SELECTION
# undef EXPORT_SELECTION # undef EXPORT_SELECTION
#endif /* 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)); static int gpXGetFontascent __PROTO((XFontStruct *cfont));
enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */
@ -49,7 +49,7 @@
#define Nwidths 10 #define Nwidths 10
static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; 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 */ /* Save the request default font */
c = &(buffer[strlen(buffer)-1]); c = &(buffer[strlen(buffer)-1]);
while (*c <= ' ') *c-- = '\0'; while (*c <= ' ') *c-- = '\0';
@ -58,7 +58,7 @@
strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); strncpy(default_font, &buffer[2], strlen(&buffer[2])+1);
FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
break; break;
@@ -5774,7 +5783,7 @@ XFontStruct *gpXLoadQueryFont (Display * @@ -5770,7 +5779,7 @@ XFontStruct *gpXLoadQueryFont (Display *
} }
#else #else
if (first_time) { if (first_time) {
@ -67,7 +67,7 @@
first_time = FALSE; first_time = FALSE;
} }
while (n_miss-- > 0) while (n_miss-- > 0)
@@ -5929,6 +5938,18 @@ char *fontname; @@ -5925,6 +5934,18 @@ char *fontname;
} }
#ifdef USE_X11_MULTIBYTE #ifdef USE_X11_MULTIBYTE
@ -87,7 +87,7 @@
if (multibyte_fonts_usable) { if (multibyte_fonts_usable) {
usemultibyte = 1; usemultibyte = 1;
--- src/variable.c --- 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_ @@ -280,6 +280,8 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif #endif

61
gnuplot-4.6.0.dif
View File

@ -1,18 +1,15 @@
--- ---
gnuplot-5.2.0/configure.ac | 2 +- gnuplot-5.2.3/configure.ac | 2 +-
gnuplot-5.2.0/docs/Makefile.am | 12 ++++++++---- gnuplot-5.2.3/docs/Makefile.am | 12 ++++++++----
gnuplot-5.2.0/docs/gnuplot-fr.doc | 4 ++-- gnuplot-5.2.3/src/gadgets.h | 2 +-
gnuplot-5.2.0/src/gadgets.h | 2 +- gnuplot-5.2.3/src/gplt_x11.c | 9 ++++++---
gnuplot-5.2.0/src/gplt_x11.c | 9 ++++++--- gnuplot-5.2.3/src/plot.c | 22 +++++++++++++++++++++-
gnuplot-5.2.0/src/plot.c | 22 +++++++++++++++++++++- gnuplot-5.2.3/src/term.h | 6 +++---
gnuplot-5.2.0/src/term.h | 6 +++--- gnuplot-5.2.3/term/linux.trm | 4 ++--
gnuplot-5.2.0/term/linux.trm | 4 ++-- 7 files changed, 42 insertions(+), 15 deletions(-)
8 files changed, 44 insertions(+), 17 deletions(-)
Index: 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
--- gnuplot-5.2.2.orig/configure.ac
+++ gnuplot-5.2.2/configure.ac
@@ -365,7 +365,7 @@ if test "$with_linux_vga" = yes; then @@ -365,7 +365,7 @@ if test "$with_linux_vga" = yes; then
[AC_DEFINE(LINUXVGA,1, [AC_DEFINE(LINUXVGA,1,
[ Define if this is a Linux system with SuperVGA library. ]) [ 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) with_linux_vga=no)
fi fi
Index: 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
--- gnuplot-5.2.2.orig/docs/Makefile.am
+++ gnuplot-5.2.2/docs/Makefile.am
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
# #
@ -68,10 +63,8 @@ Index: gnuplot-5.2.2/docs/Makefile.am
alldoc2gih_SOURCES = doc2gih.c termdoc.c alldoc2gih_SOURCES = doc2gih.c termdoc.c
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
Index: 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
--- gnuplot-5.2.2.orig/src/gadgets.h
+++ gnuplot-5.2.2/src/gadgets.h
@@ -489,7 +489,7 @@ extern TBOOLEAN clip_lines1; @@ -489,7 +489,7 @@ extern TBOOLEAN clip_lines1;
extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_lines2;
extern TBOOLEAN clip_points; extern TBOOLEAN clip_points;
@ -81,11 +74,9 @@ Index: gnuplot-5.2.2/src/gadgets.h
extern int samples_1; extern int samples_1;
extern int samples_2; extern int samples_2;
Index: gnuplot-5.2.2/src/gplt_x11.c --- gnuplot-5.2.3/src/gplt_x11.c
=================================================================== +++ gnuplot-5.2.3/src/gplt_x11.c 2018-05-07 07:12:26.988911605 +0000
--- gnuplot-5.2.2.orig/src/gplt_x11.c @@ -2522,9 +2522,12 @@ exec_cmd(plot_struct *plot, char *comman
+++ gnuplot-5.2.2/src/gplt_x11.c
@@ -2526,9 +2526,12 @@ exec_cmd(plot_struct *plot, char *comman
} }
} }
/* X11_justify_text(mode) - set text justification mode */ /* 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') else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle); sscanf(buffer + 1, "%lf", &plot->angle);
Index: 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
--- gnuplot-5.2.2.orig/src/plot.c
+++ gnuplot-5.2.2/src/plot.c
@@ -219,6 +219,7 @@ static int asked_privi = 0; @@ -219,6 +219,7 @@ static int asked_privi = 0;
void void
drop_privilege() drop_privilege()
@ -168,10 +157,8 @@ Index: gnuplot-5.2.2/src/plot.c
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE) #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
/* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name. /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
* It is used to parse a 'gnuplot' specific section in '~/.inputrc' * It is used to parse a 'gnuplot' specific section in '~/.inputrc'
Index: 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
--- gnuplot-5.2.2.orig/src/term.h
+++ gnuplot-5.2.2/src/term.h
@@ -242,9 +242,9 @@ @@ -242,9 +242,9 @@
#include "emf.trm" #include "emf.trm"
@ -193,10 +180,8 @@ Index: gnuplot-5.2.2/src/term.h
/* Frame Maker MIF 3.00 format driver */ /* Frame Maker MIF 3.00 format driver */
#ifdef HAVE_MIF #ifdef HAVE_MIF
Index: 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
--- gnuplot-5.2.2.orig/term/linux.trm
+++ gnuplot-5.2.2/term/linux.trm
@@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( @@ -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_move __PROTO((unsigned int x, unsigned int y));
TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y)); TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));

3
gnuplot-5.2.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1
size 5282973

3
gnuplot-5.2.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:feb58c9358d9d129e00507f3b34d4b13c4caea3f004325c587f8caafe5dbe724
size 5289416

17
gnuplot-gd.patch
View File

@ -1,8 +1,13 @@
Index: gnuplot-5.2.2/configure.ac 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 | 62 ++++--------------------------------------
@@ -570,63 +570,13 @@ AC_ARG_WITH(gd,dnl 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) with_gd=yes)
if test "$with_gd" != no; then if test "$with_gd" != no; then
@ -72,10 +77,8 @@ Index: gnuplot-5.2.2/configure.ac
fi fi
dnl end gd dnl end gd
Index: 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
--- gnuplot-5.2.2.orig/src/Makefile.am
+++ gnuplot-5.2.2/src/Makefile.am
@@ -58,7 +58,7 @@ tabulate.c tabulate.h \ @@ -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 \ 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 util3d.c util3d.h variable.c variable.h version.c version.h

30
gnuplot.changes
View File

@ -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 Thu Feb 15 10:30:48 UTC 2018 - werner@suse.de

3
gnuplot.spec
View File

@ -77,7 +77,7 @@ BuildRequires: wxWidgets-devel
BuildRequires: wxWidgets-devel >= 3 BuildRequires: wxWidgets-devel >= 3
%endif %endif
Url: http://www.gnuplot.info/ Url: http://www.gnuplot.info/
Version: 5.2.2 Version: 5.2.3
Release: 0 Release: 0
Summary: Function Plotting Utility and more Summary: Function Plotting Utility and more
License: SUSE-Gnuplot and GPL-2.0+ License: SUSE-Gnuplot and GPL-2.0+
@ -154,6 +154,7 @@ cp %{_sourcedir}/picins.sty docs
%patch5 -p1 -b .w3x %patch5 -p1 -b .w3x
%patch6 -p0 -b .pic %patch6 -p0 -b .pic
%patch7 -p1 -b .gd %patch7 -p1 -b .gd
%build %build
autoreconf -fi autoreconf -fi