pool/gnuplot
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnuplot 5.0.5

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=76
This commit is contained in:
Dr. Werner Fink 2016-12-15 13:11:36 +00:00 committed by Git OBS Bridge
parent f172df7785
commit 3ec92bf9ab
11 changed files with 138 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnuplot-4.4.0-x11ovf.dif
View File

@ -1,6 +1,10 @@
--- src/gplt_x11.c.orig 2015-01-21 20:03:55.735504922 +0100 ---
+++ src/gplt_x11.c 2015-01-21 20:04:14.327506641 +0100 src/gplt_x11.c | 12 +++++++++---
@@ -951,6 +951,8 @@ 1 file changed, 9 insertions(+), 3 deletions(-)
--- src/gplt_x11.c
+++ src/gplt_x11.c 2016-12-15 12:54:24.652945585 +0000
@@ -958,6 +958,8 @@ mainloop()
nfds = cn + 1; nfds = cn + 1;
while (1) { while (1) {
@ -9,7 +13,7 @@
XFlush(dpy); /* see above */ XFlush(dpy); /* see above */
FD_ZERO(&tset); FD_ZERO(&tset);
@@ -988,7 +990,11 @@ @@ -995,7 +997,11 @@ mainloop()
process_event(&xe); process_event(&xe);
} }
} }
@ -22,7 +26,7 @@
unlink(X11_ipcpath); unlink(X11_ipcpath);
record(); record();
fclose(X11_ipc); fclose(X11_ipc);
@@ -1216,8 +1222,8 @@ @@ -1223,8 +1229,8 @@ static int read_input __PROTO((void));
static int static int
read_input() read_input()
{ {

65
gnuplot-4.6.0-demo.diff
View File

@ -1,7 +1,15 @@
diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem ---
--- ../gnuplot-5.0.0.orig/demo/fit.dem 2014-09-21 06:54:31.000000000 +0200 demo/fit.dem | 6 +++++-
+++ ./demo/fit.dem 2015-01-21 20:35:15.303678726 +0100 demo/poldat.dem | 2 +-
@@ -10,6 +10,7 @@ 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
+++ demo/fit.dem 2016-12-15 12:39:37.002761578 +0000
@@ -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."
print '' print ''
@ -9,7 +17,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem
print "We fit a straight line to the data -- only as a demo without physical meaning." print "We fit a straight line to the data -- only as a demo without physical meaning."
l(x) = y0 + m*x l(x) = y0 + m*x
@@ -29,6 +30,7 @@ @@ -29,6 +30,7 @@ set title 'data set and initial paramete
plot 'lcdemo.dat', l(x) plot 'lcdemo.dat', l(x)
pause -1 "Now start fitting... (-> return)" pause -1 "Now start fitting... (-> return)"
@ -17,7 +25,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem
fit l(x) 'lcdemo.dat' via y0, m fit l(x) 'lcdemo.dat' via y0, m
set title 'unweighted fit' set title 'unweighted fit'
plot 'lcdemo.dat', l(x) plot 'lcdemo.dat', l(x)
@@ -167,7 +169,7 @@ @@ -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' fit f(x,y) 'soundvel.dat' using 1:-2:2 via 'sound.par'
#create soundfit.par, reading from sound.par and updating values #create soundfit.par, reading from sound.par and updating values
@ -26,7 +34,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem
set title 'pseudo-3d multi-branch fit to velocity data' set title 'pseudo-3d multi-branch fit to velocity data'
plot 'soundvel.dat', vlong(x), vtrans(x) plot 'soundvel.dat', vlong(x), vtrans(x)
print '' print ''
@@ -323,6 +325,7 @@ @@ -323,6 +325,7 @@ print ' "fit3.dat" u 1:2:3:4 via a0,
pause -1 "Press enter to proceed with the next example." pause -1 "Press enter to proceed with the next example."
reset reset
@ -34,7 +42,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem
print "\n" print "\n"
print "The fit command can handle errors in the independent variable, too." 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" print "The problem shown here is Pearson's data with York's weights.\n"
@@ -428,6 +431,7 @@ @@ -428,6 +431,7 @@ print "to time."
print '' print ''
pause -1 "Done with fitting demo (-> return)" pause -1 "Done with fitting demo (-> return)"
reset reset
@ -42,10 +50,9 @@ diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem
set encoding myencoding set encoding myencoding
# release datablock # release datablock
undefine $PearsonYork undefine $PearsonYork
diff -ur ../gnuplot-5.0.0.orig/demo/poldat.dem ./demo/poldat.dem --- demo/poldat.dem
--- ../gnuplot-5.0.0.orig/demo/poldat.dem 2014-07-23 18:56:13.000000000 +0200 +++ demo/poldat.dem 2016-12-15 12:39:37.002761578 +0000
+++ ./demo/poldat.dem 2015-01-21 20:27:11.764634013 +0100 @@ -11,7 +11,7 @@ unset grid
@@ -11,7 +11,7 @@
unset polar unset polar
set title "Primitive Smith Chart" set title "Primitive Smith Chart"
unset key unset key
@ -54,9 +61,8 @@ diff -ur ../gnuplot-5.0.0.orig/demo/poldat.dem ./demo/poldat.dem
set para set para
set rrange [-0 : 10] set rrange [-0 : 10]
set trange [-pi : pi] set trange [-pi : pi]
diff -ur ../gnuplot-5.0.0.orig/demo/simple.dem ./demo/simple.dem --- demo/simple.dem
--- ../gnuplot-5.0.0.orig/demo/simple.dem 2012-11-19 18:35:09.000000000 +0100 +++ demo/simple.dem 2016-12-15 12:39:37.002761578 +0000
+++ ./demo/simple.dem 2015-01-21 20:38:52.998698856 +0100
@@ -8,14 +8,13 @@ @@ -8,14 +8,13 @@
# #
set title "Simple Plots" font ",20" set title "Simple Plots" font ",20"
@ -73,9 +79,8 @@ diff -ur ../gnuplot-5.0.0.orig/demo/simple.dem ./demo/simple.dem
plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1)) plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
diff -ur ../gnuplot-5.0.0.orig/demo/stringvar.dem ./demo/stringvar.dem --- demo/stringvar.dem
--- ../gnuplot-5.0.0.orig/demo/stringvar.dem 2014-09-09 05:35:33.000000000 +0200 +++ demo/stringvar.dem 2016-12-15 12:39:37.002761578 +0000
+++ ./demo/stringvar.dem 2015-01-21 20:27:11.765634013 +0100
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
# #
# Miscellaneous neat things you can do using the string variables code # Miscellaneous neat things you can do using the string variables code
@ -86,7 +91,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/stringvar.dem ./demo/stringvar.dem
print "" print ""
print "Exercise substring handling" print "Exercise substring handling"
print "" print ""
@@ -27,7 +28,7 @@ @@ -27,7 +28,7 @@ print "foo[1:1] eq 'A' && foo[2:2] ne 'X
unset print unset print
@ -95,7 +100,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/stringvar.dem ./demo/stringvar.dem
unset xtics unset xtics
unset ytics unset ytics
set yrange [0:1] set yrange [0:1]
@@ -36,7 +37,7 @@ @@ -36,7 +37,7 @@ plot 0
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
@ -104,7 +109,7 @@ diff -ur ../gnuplot-5.0.0.orig/demo/stringvar.dem ./demo/stringvar.dem
print "Exercise string handling functions" print "Exercise string handling functions"
print "" print ""
print "foo = ",foo print "foo = ",foo
@@ -65,7 +66,7 @@ @@ -65,7 +66,7 @@ if (strlen(foo) != 245) print "sprintf o
print "" print ""
unset print unset print
@ -113,10 +118,9 @@ diff -ur ../gnuplot-5.0.0.orig/demo/stringvar.dem ./demo/stringvar.dem
unset xtics unset xtics
unset ytics unset ytics
set yrange [0:1] set yrange [0:1]
diff -ur ../gnuplot-5.0.0.orig/src/show.c ./src/show.c --- src/show.c
--- ../gnuplot-5.0.0.orig/src/show.c 2014-11-22 05:10:50.000000000 +0100 +++ src/show.c 2016-12-15 12:39:37.006761498 +0000
+++ ./src/show.c 2015-01-21 20:27:11.767634013 +0100 @@ -1051,6 +1051,15 @@ show_version(FILE *fp)
@@ -1038,6 +1038,15 @@
p /* type "help seeking-assistance" */ p /* type "help seeking-assistance" */
); );
@ -132,10 +136,9 @@ diff -ur ../gnuplot-5.0.0.orig/src/show.c ./src/show.c
/* show version long */ /* show version long */
if (almost_equals(c_token, "l$ong")) { if (almost_equals(c_token, "l$ong")) {
diff -ur ../gnuplot-5.0.0.orig/src/variable.c ./src/variable.c --- src/variable.c
--- ../gnuplot-5.0.0.orig/src/variable.c 2013-07-03 00:19:09.000000000 +0200 +++ src/variable.c 2016-12-15 12:39:37.006761498 +0000
+++ ./src/variable.c 2015-01-21 20:27:11.767634013 +0100 @@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id
@@ -37,7 +37,10 @@
/* The Death of Global Variables - part one. */ /* The Death of Global Variables - part one. */
#include <string.h> #include <string.h>
@ -147,7 +150,7 @@ diff -ur ../gnuplot-5.0.0.orig/src/variable.c ./src/variable.c
#include "variable.h" #include "variable.h"
#include "alloc.h" #include "alloc.h"
@@ -98,6 +101,17 @@ @@ -98,6 +101,17 @@ loadpath_handler(int action, char *path)
if (!loadpath) if (!loadpath)
{ {
char *envlib = getenv("GNUPLOT_LIB"); char *envlib = getenv("GNUPLOT_LIB");
@ -165,7 +168,7 @@ diff -ur ../gnuplot-5.0.0.orig/src/variable.c ./src/variable.c
if (envlib) { if (envlib) {
int len = strlen(envlib); int len = strlen(envlib);
loadpath = gp_strdup(envlib); loadpath = gp_strdup(envlib);
@@ -106,6 +120,10 @@ @@ -106,6 +120,10 @@ loadpath_handler(int action, char *path)
/* convert all PATHSEPs to \0 */ /* convert all PATHSEPs to \0 */
PATHSEP_TO_NUL(loadpath); PATHSEP_TO_NUL(loadpath);
} /* else: NULL = empty */ } /* else: NULL = empty */

150
gnuplot-4.6.0.dif
View File

@ -1,7 +1,17 @@
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/configure.in gnuplot-5.0.1.new/configure.in ---
--- gnuplot-5.0.1.orig/configure.in 2015-05-19 01:07:16.000000000 +0200 gnuplot-5.0.5/configure.in | 2 +-
+++ gnuplot-5.0.1.new/configure.in 2015-12-01 00:49:17.507692991 +0100 gnuplot-5.0.5/docs/Makefile.am | 12 ++++++++----
@@ -369,7 +369,7 @@ gnuplot-5.0.5/docs/gnuplot-fr.doc | 4 ++--
gnuplot-5.0.5/src/gadgets.h | 2 +-
gnuplot-5.0.5/src/gplt_x11.c | 9 ++++++---
gnuplot-5.0.5/src/plot.c | 22 +++++++++++++++++++++-
gnuplot-5.0.5/src/term.h | 6 +++---
gnuplot-5.0.5/term/linux.trm | 4 ++--
8 files changed, 44 insertions(+), 17 deletions(-)
--- gnuplot-5.0.5/configure.in
+++ gnuplot-5.0.5/configure.in 2016-12-15 12:41:19.652693771 +0000
@@ -370,7 +370,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. ])
LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot' LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
@ -10,10 +20,9 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/configure.in gnuplot-5.0.1.new/confi
with_linux_vga=no) with_linux_vga=no)
fi fi
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.am gnuplot-5.0.1.new/docs/Makefile.am --- gnuplot-5.0.5/docs/Makefile.am
--- gnuplot-5.0.1.orig/docs/Makefile.am 2015-05-03 00:22:33.000000000 +0200 +++ gnuplot-5.0.5/docs/Makefile.am 2016-12-15 12:50:02.702188523 +0000
+++ gnuplot-5.0.1.new/docs/Makefile.am 2015-12-01 01:24:55.097654431 +0100 @@ -42,7 +42,7 @@
@@ -38,7 +38,7 @@
# #
# default is what is needed for interactive gnuplot # default is what is needed for interactive gnuplot
@ -22,16 +31,16 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.am gnuplot-5.0.1.new/d
gihdir = @GIHDIR@ gihdir = @GIHDIR@
noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \ noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \
@@ -86,7 +86,7 @@ @@ -96,7 +96,7 @@ gnuplot-groff.ps gnuplot.tmp VERSION gnu
checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \ gnuplot.idv gnuplot.xref gnuplot.lg gnuplot.pdf wxhelp_figures \
gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.aux \ wxhelp/*.html wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk \
wxhelp/*.html wxhelp/wgnuplot.htc windows/wgnuplot.htk gnuplot.pdf \ wxhelp/wgnuplot.htc wxhelp/doc2html$(EXEEXT) windows/wgnuplot.htk \
-gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) -windows/*.png gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
+gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih +windows/*.png gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
@@ -270,16 +270,20 @@ @@ -278,17 +278,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
doc2hlp_SOURCES = doc2hlp.c termdoc.c doc2hlp_SOURCES = doc2hlp.c termdoc.c
### gnuplot interactive help format ### gnuplot interactive help format
@ -39,73 +48,25 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.am gnuplot-5.0.1.new/d
+gih: gnuplot.gih gnuplot-fr.gih +gih: gnuplot.gih gnuplot-fr.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih $(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+gnuplot-fr.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc +gnuplot-fr.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc
+ ./doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih + $(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+ +
doc2gih_SOURCES = doc2gih.c termdoc.c doc2gih_SOURCES = doc2gih.c termdoc.c
# To include all terminals in the .gih file # To include all terminals in the .gih file
-allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc -allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
+allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc $(srcdir)/gnuplot-fr.doc +allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc $(srcdir)/gnuplot-fr.doc
./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih @echo "generate gnuplot.gih with all terminals"
+ ./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih $(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_SOURCES = doc2gih.c termdoc.c
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.in gnuplot-5.0.1.new/docs/Makefile.in --- gnuplot-5.0.5/docs/gnuplot-fr.doc
--- gnuplot-5.0.1.orig/docs/Makefile.in 2015-06-07 17:20:29.000000000 +0200 +++ gnuplot-5.0.5/docs/gnuplot-fr.doc 2016-12-15 12:41:21.712652296 +0000
+++ gnuplot-5.0.1.new/docs/Makefile.in 2015-12-01 01:24:32.578385309 +0100 @@ -436,8 +436,8 @@ C
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -406,7 +406,7 @@
top_srcdir = @top_srcdir@
# default is what is needed for interactive gnuplot
-gih_DATA = gnuplot.gih
+gih_DATA = gnuplot.gih gnuplot-fr.gih
gihdir = @GIHDIR@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/term
T = $(top_srcdir)/term/
@@ -446,7 +446,7 @@
checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.aux \
wxhelp/*.html wxhelp/wgnuplot.htc windows/wgnuplot.htk gnuplot.pdf \
-gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
+gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
BUILT_SOURCES = allterm.h
@@ -1044,14 +1044,18 @@
./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
### gnuplot interactive help format
-gih: gnuplot.gih
+gih: gnuplot.gih gnuplot-fr.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+gnuplot-fr.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc
+ ./doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+
# To include all terminals in the .gih file
-allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
+allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc $(srcdir)/gnuplot-fr.doc
./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ ./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
### wxhelp format
htb: gnuplot.htb
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/gnuplot-fr.doc gnuplot-5.0.1.new/docs/gnuplot-fr.doc
--- gnuplot-5.0.1.orig/docs/gnuplot-fr.doc 2015-12-01 00:39:35.048785014 +0100
+++ gnuplot-5.0.1.new/docs/gnuplot-fr.doc 2015-12-01 00:49:17.511692953 +0100
@@ -436,8 +436,8 @@
#Home & same as \verb~^A~. \\ #Home & same as \verb~^A~. \\
#Ctrl Home & same as \verb~^E~. \\ #Ctrl Home & same as \verb~^E~. \\
#Esc & same as \verb~^U~. \\ #Esc & same as \verb~^U~. \\
@ -116,10 +77,9 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/gnuplot-fr.doc gnuplot-5.0.1.ne
%c l . %c l .
%Touche fléchée@Fonction %Touche fléchée@Fonction
%_ %_
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/gadgets.h gnuplot-5.0.1.new/src/gadgets.h --- gnuplot-5.0.5/src/gadgets.h
--- gnuplot-5.0.1.orig/src/gadgets.h 2015-03-29 19:47:03.000000000 +0200 +++ gnuplot-5.0.5/src/gadgets.h 2016-12-15 12:41:21.712652296 +0000
+++ gnuplot-5.0.1.new/src/gadgets.h 2015-12-01 00:49:17.511692953 +0100 @@ -482,7 +482,7 @@ extern TBOOLEAN clip_lines1;
@@ -473,7 +473,7 @@
extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_lines2;
extern TBOOLEAN clip_points; extern TBOOLEAN clip_points;
@ -128,10 +88,9 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/gadgets.h gnuplot-5.0.1.new/src/
extern int samples_1; extern int samples_1;
extern int samples_2; extern int samples_2;
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/gplt_x11.c gnuplot-5.0.1.new/src/gplt_x11.c --- gnuplot-5.0.5/src/gplt_x11.c
--- gnuplot-5.0.1.orig/src/gplt_x11.c 2015-12-01 00:48:21.452198467 +0100 +++ gnuplot-5.0.5/src/gplt_x11.c 2016-12-15 12:41:21.716652216 +0000
+++ gnuplot-5.0.1.new/src/gplt_x11.c 2015-12-01 00:49:17.511692953 +0100 @@ -2524,9 +2524,12 @@ exec_cmd(plot_struct *plot, char *comman
@@ -2524,9 +2524,12 @@
} }
} }
/* X11_justify_text(mode) - set text justification mode */ /* X11_justify_text(mode) - set text justification mode */
@ -147,10 +106,9 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/gplt_x11.c gnuplot-5.0.1.new/src
else if (*buffer == 'A') else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle); sscanf(buffer + 1, "%lf", &plot->angle);
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plot.c --- gnuplot-5.0.5/src/plot.c
--- gnuplot-5.0.1.orig/src/plot.c 2014-12-31 05:32:09.000000000 +0100 +++ gnuplot-5.0.5/src/plot.c 2016-12-15 12:41:21.716652216 +0000
+++ gnuplot-5.0.1.new/src/plot.c 2015-12-01 00:49:17.511692953 +0100 @@ -216,6 +216,7 @@ static int asked_privi = 0;
@@ -216,6 +216,7 @@
void void
drop_privilege() drop_privilege()
{ {
@ -158,7 +116,7 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plo
if (!asked_privi) { if (!asked_privi) {
euid = geteuid(); euid = geteuid();
egid = getegid(); egid = getegid();
@@ -229,11 +230,13 @@ @@ -229,11 +230,13 @@ drop_privilege()
if (seteuid(ruid) == -1) if (seteuid(ruid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n", (void) fprintf(stderr, "seteuid(%d): %s\n",
(int) ruid, strerror(errno)); (int) ruid, strerror(errno));
@ -172,7 +130,7 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plo
if (!asked_privi) { if (!asked_privi) {
euid = geteuid(); euid = geteuid();
egid = getegid(); egid = getegid();
@@ -247,6 +250,7 @@ @@ -247,6 +250,7 @@ take_privilege()
if (seteuid(euid) == -1) if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n", (void) fprintf(stderr, "seteuid(%d): %s\n",
(int) euid, strerror(errno)); (int) euid, strerror(errno));
@ -180,7 +138,7 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plo
} }
#endif /* LINUXVGA */ #endif /* LINUXVGA */
@@ -273,8 +277,8 @@ @@ -273,8 +277,8 @@ main(int argc, char **argv)
int i; int i;
#ifdef LINUXVGA #ifdef LINUXVGA
@ -190,7 +148,7 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plo
#endif #endif
/* make sure that we really have revoked root access, this might happen if /* 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 */ gnuplot is compiled without vga support but is installed suid by mistake */
@@ -329,6 +333,22 @@ @@ -329,6 +333,22 @@ main(int argc, char **argv)
rl_getc_function = getc_wrapper; rl_getc_function = getc_wrapper;
#endif #endif
@ -213,10 +171,9 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plo
#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'
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/term.h gnuplot-5.0.1.new/src/term.h --- gnuplot-5.0.5/src/term.h
--- gnuplot-5.0.1.orig/src/term.h 2014-10-01 04:40:29.000000000 +0200 +++ gnuplot-5.0.5/src/term.h 2016-12-15 12:41:21.716652216 +0000
+++ gnuplot-5.0.1.new/src/term.h 2015-12-01 00:49:17.511692953 +0100 @@ -265,9 +265,9 @@
@@ -261,9 +261,9 @@
#include "emf.trm" #include "emf.trm"
/* Roland DXY800A plotter */ /* Roland DXY800A plotter */
@ -228,7 +185,7 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/term.h gnuplot-5.0.1.new/src/ter
/* fig graphics */ /* fig graphics */
#include "fig.trm" #include "fig.trm"
@@ -296,7 +296,7 @@ @@ -300,7 +300,7 @@
/* #include "imagen.trm" */ /* #include "imagen.trm" */
/* Kyocera Prescribe printer */ /* Kyocera Prescribe printer */
@ -237,10 +194,9 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/term.h gnuplot-5.0.1.new/src/ter
/* Frame Maker MIF 3.00 format driver */ /* Frame Maker MIF 3.00 format driver */
#ifdef HAVE_MIF #ifdef HAVE_MIF
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/term/linux.trm gnuplot-5.0.1.new/term/linux.trm --- gnuplot-5.0.5/term/linux.trm
--- gnuplot-5.0.1.orig/term/linux.trm 2012-01-30 20:31:01.000000000 +0100 +++ gnuplot-5.0.5/term/linux.trm 2016-12-15 12:41:21.716652216 +0000
+++ gnuplot-5.0.1.new/term/linux.trm 2015-12-01 00:49:17.511692953 +0100 @@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
@@ -195,7 +195,7 @@
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));
TERM_PUBLIC int LINUX_text_angle __PROTO((int ang)); TERM_PUBLIC int LINUX_text_angle __PROTO((int ang));
@ -249,7 +205,7 @@ diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/term/linux.trm gnuplot-5.0.1.new/ter
TERM_PUBLIC void LINUX_suspend __PROTO((void)); TERM_PUBLIC void LINUX_suspend __PROTO((void));
TERM_PUBLIC void LINUX_resume __PROTO((void)); TERM_PUBLIC void LINUX_resume __PROTO((void));
@@ -408,7 +408,7 @@ @@ -408,7 +408,7 @@ LINUX_putc(
} }
TERM_PUBLIC void TERM_PUBLIC void

24
gnuplot-5.0.0-lua-5.3.1.dif
View File

@ -1,24 +0,0 @@
---
term/lua.trm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- term/lua.trm
+++ term/lua.trm 2015-07-28 06:48:03.890643983 +0000
@@ -251,7 +251,7 @@ LUA_GP_int_error(lua_State *L) {
msg = luaL_checkstring(L, 1);
break;
case 2:
- t_num = luaL_checkint(L, 1);
+ t_num = luaL_checkinteger(L, 1);
msg = luaL_checkstring(L, 2);
break;
default:
@@ -285,7 +285,7 @@ LUA_GP_int_warn(lua_State *L) {
msg = luaL_checkstring(L, 1);
break;
case 2:
- t_num = luaL_checkint(L, 1);
+ t_num = luaL_checkinteger(L, 1);
msg = luaL_checkstring(L, 2);
break;
default:

24
gnuplot-5.0.1-fix-latex-docs.diff
View File

@ -1,24 +0,0 @@
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.am gnuplot-5.0.1.new/docs/Makefile.am
--- gnuplot-5.0.1.orig/docs/Makefile.am 2015-05-03 00:22:33.000000000 +0200
+++ gnuplot-5.0.1.new/docs/Makefile.am 2015-12-01 01:24:55.097654431 +0100
@@ -172,7 +172,7 @@
rm -f figures
pdffigures.tex: figures
- @if [ -z pdffigures.tex ] ; then \
+ @if [ ! -f pdffigures.tex ] ; then \
echo "\usepackage{graphicx}" > pdffigures.tex ; \
echo "\usepackage{picins}" >> pdffigures.tex ; \
fi
diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.in gnuplot-5.0.1.new/docs/Makefile.in
--- gnuplot-5.0.1.orig/docs/Makefile.in 2015-06-07 17:20:29.000000000 +0200
+++ gnuplot-5.0.1.new/docs/Makefile.in 2015-12-01 01:24:32.578385309 +0100
@@ -952,7 +952,7 @@
rm -f figures
pdffigures.tex: figures
- @if [ -z pdffigures.tex ] ; then \
+ @if [ ! -f pdffigures.tex ] ; then \
echo "\usepackage{graphicx}" > pdffigures.tex ; \
echo "\usepackage{picins}" >> pdffigures.tex ; \
fi

3
gnuplot-5.0.1.tar.gz
View File

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

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

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

4
gnuplot-QtCore-PIC.dif
View File

@ -5,8 +5,8 @@ Since QtCore is build with -reduce-relocations a -fPIC is required
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
--- src/Makefile.am --- src/Makefile.am
+++ src/Makefile.am 2015-05-21 08:09:36.882019332 +0000 +++ src/Makefile.am 2016-12-15 12:55:44.739344919 +0000
@@ -158,6 +158,9 @@ clean-local: clean-qt-extra clean-demo @@ -161,6 +161,9 @@ clean-local: clean-qt-extra clean-demo
gnuplot_SOURCES += qtterminal/qt_term.cpp gnuplot_SOURCES += qtterminal/qt_term.cpp

10
gnuplot-wx3.diff
View File

@ -5,14 +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 the program does not link in X11 and runs into a build error
otherwise. otherwise.
--- ---
src/Makefile.am | 1 + gnuplot-5.0.5/src/Makefile.am | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
Index: gnuplot-5.0.0/src/Makefile.am --- gnuplot-5.0.5/src/Makefile.am
=================================================================== +++ gnuplot-5.0.5/src/Makefile.am 2016-12-15 12:55:09.016058783 +0000
--- gnuplot-5.0.0.orig/src/Makefile.am @@ -91,6 +91,7 @@ $(EXTRA_gnuplot_SOURCES)
+++ gnuplot-5.0.0/src/Makefile.am
@@ -93,6 +93,7 @@ $(EXTRA_gnuplot_SOURCES)
if BUILD_WXWIDGETS if BUILD_WXWIDGETS
gnuplot_SOURCES += wxterminal/wxt_gui.cpp gnuplot_SOURCES += wxterminal/wxt_gui.cpp

31
gnuplot.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Thu Dec 15 13:08:46 UTC 2016 - werner@suse.de
- Update to 5.0.5
* NEW allow filename completion for system commands and pipes (backport from 5.1)
* NEW option to plot with labels {rotate variable}
* NEW command "set minussign"
* NEW stats command "name" option now accepts "columnheader" or "columnheader(N)"
* NEW command option "set colorbox invert"
* CHANGE qt terminal force selection of outline font rather than bitmap font
* CHANGE post terminal simplex/duplex output depends on PostScript level setting
* CHANGE improved autoscaling of plot "with boxes"
* CHANGE qt terminal sets TERM_POLYGON_PIXELS to avoid aliasing artifacts
* CHANGE all stats and fit commands skip header records if "autotitle columnhead"
* FIX Do not confuse EOF with 8-bit character 0x177 (E.g. in Cyrillic encodings).
* FIX use blank line rather than 'u' flag in "set table" output of smoothed data
* FIX order dependence of "fillcolor" keyword in plot commands
* FIX svg - better vertical justification of rotated text
* FIX wxt - file export widget correctly handles inactive plots
* FIX qt - preserve leading and trailing whitespace in enhanced text strings
* FIX various bugs affecting matrix data plotted "with image"
- Remove the patches now upstream
gnuplot-5.0.0-lua-5.3.1.dif
gnuplot-5.0.1-fix-latex-docs.diff
- Port patches to current version
gnuplot-4.4.0-x11ovf.dif
gnuplot-4.6.0-demo.diff
gnuplot-4.6.0.dif
gnuplot-QtCore-PIC.dif
gnuplot-wx3.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 26 17:31:55 UTC 2016 - werner@suse.de Tue Jul 26 17:31:55 UTC 2016 - werner@suse.de

11
gnuplot.spec
View File

@ -83,13 +83,12 @@ BuildRequires: wxWidgets-devel >= 3
BuildRequires: xorg-x11 BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
Url: http://www.gnuplot.info/ Url: http://www.gnuplot.info/
Version: 5.0.1 Version: 5.0.5
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+
Group: Productivity/Graphics/Visualization/Graph Group: Productivity/Graphics/Visualization/Graph
# http://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.1/gnuplot-5.0.1.tar.gz/download Source0: http://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/gnuplot-%{version}.tar.gz
Source0: gnuplot-%{version}.tar.gz
Source2: gnuplot-fr.doc.bz2 Source2: gnuplot-fr.doc.bz2
Source3: README.whynot Source3: README.whynot
# According to the gnuplot 5.0.0 release notes, the emacs .el should now be # According to the gnuplot 5.0.0 release notes, the emacs .el should now be
@ -106,10 +105,6 @@ Patch2: gnuplot-4.6.0-fonts.diff
Patch4: gnuplot-4.6.0-demo.diff Patch4: gnuplot-4.6.0-demo.diff
Patch5: gnuplot-wx3.diff Patch5: gnuplot-wx3.diff
Patch6: gnuplot-QtCore-PIC.dif Patch6: gnuplot-QtCore-PIC.dif
# PATCH-FIX-SUSE -- make it build with lua-5.3.1
Patch7: gnuplot-5.0.0-lua-5.3.1.dif
# PATCH-FIX-UPSTREAM -- fix building latex docs
Patch8: gnuplot-5.0.1-fix-latex-docs.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6" %if "%_exec_prefix" == "/usr/X11R6"
@ -160,8 +155,6 @@ cp %{_sourcedir}/picins.sty docs
%patch1 -p0 -b .x11ovf %patch1 -p0 -b .x11ovf
%patch5 -p1 -b .w3x %patch5 -p1 -b .w3x
%patch6 -p0 -b .pic %patch6 -p0 -b .pic
%patch7 -p0 -b .l531
%patch8 -p1 -b .latex
%build %build
autoreconf -fi autoreconf -fi