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

Accepting request 110070 from home:NicoK:branches:Publishing

Browse Source 
update to 4.6.0 (2nd try)
sorry, changes from bnc746299 were lost since I re-used my 4.5.0 patch instead of creating a clean 4.6.0 one - integrated them now (don't have time for a clean patch right now but if there was no other change, this should be fine);
what about french help messages? - I didn't change anything there. If something needs to be fixed there, then this was either an issue before or is a bug of 4.6.0

OBS-URL: https://build.opensuse.org/request/show/110070
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=31
This commit is contained in:
Dr. Werner Fink 2012-04-02 14:02:56 +00:00 committed by Git OBS Bridge
parent 0735330a38
commit c28f2a38b4
9 changed files with 180 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnuplot-4.4.4.tar.bz2
View File

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

109
gnuplot-4.4.1.dif → gnuplot-4.5.0.dif
View File

@ -1,6 +1,7 @@
--- configure.in diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/configure.in gnuplot-cvs.dif/configure.in
+++ configure.in 2009-05-09 11:32:24.000000000 +0000 --- gnuplot-cvs/configure.in 2011-08-17 22:31:26.652066109 +0200
@@ -264,7 +264,7 @@ if test "$with_linux_vga" = yes; then +++ gnuplot-cvs.dif/configure.in 2011-08-17 22:44:53.104586854 +0200
@@ -322,7 +322,7 @@
[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'
@ -9,9 +10,10 @@
with_linux_vga=no) with_linux_vga=no)
fi fi
--- docs/Makefile.in diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/docs/Makefile.in gnuplot-cvs.dif/docs/Makefile.in
+++ docs/Makefile.in 2009-05-09 11:32:24.000000000 +0000 --- gnuplot-cvs/docs/Makefile.in 2011-08-17 22:31:27.473061565 +0200
@@ -37,7 +37,7 @@ +++ gnuplot-cvs.dif/docs/Makefile.in 2011-08-17 22:44:53.104586854 +0200
@@ -38,7 +38,7 @@
# #
# default is what is needed for interactive gnuplot # default is what is needed for interactive gnuplot
@ -20,16 +22,7 @@
# this tells GNU make not to export variables into the environment # this tells GNU make not to export variables into the environment
# But other makes dont understand its significance, so it must # But other makes dont understand its significance, so it must
@@ -245,6 +245,8 @@ html: htmldocs/gnuplot.html @@ -343,12 +343,16 @@
#
htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
mkdir -p htmldocs
+ ln -sf ../../VERSION htmldocs/
+ ln -sf ../toc_entr.sty htmldocs/
latex2html -dir htmldocs -local_icons gnuplot
### PDF documentation
@@ -337,12 +339,16 @@ doc2hlp: doc2hlp.o termdoc.o
$(LINK) doc2hlp.o termdoc.o $(LIBS) $(LINK) doc2hlp.o termdoc.o $(LIBS)
### gnuplot interactive help format ### gnuplot interactive help format
@ -47,38 +40,26 @@
doc2gih: doc2gih.o termdoc.o doc2gih: doc2gih.o termdoc.o
$(LINK) doc2gih.o termdoc.o $(LIBS) $(LINK) doc2gih.o termdoc.o $(LIBS)
@@ -431,6 +437,7 @@ install: install-gih install-info @@ -445,6 +449,7 @@
install-gih: gnuplot.gih install-gih: gnuplot.gih
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih $(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ $(INSTALL_DATA) gnuplot-fr.gih $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih + $(INSTALL_DATA) gnuplot-fr.gih $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
install-info: gnuplot.info install-pdf:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
@@ -450,6 +457,7 @@ uninstall: uninstall-gih uninstall-info @@ -470,6 +475,7 @@
uninstall-gih: uninstall-gih:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih + rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
uninstall-info: uninstall-pdf:
$(PRE_UNINSTALL) rm -f $(DESTDIR)$(GIHDIR)/gnuplot.pdf
--- docs/gnuplot-fr.doc diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/gadgets.h gnuplot-cvs.dif/src/gadgets.h
+++ docs/gnuplot-fr.doc 2009-05-09 11:32:24.000000000 +0000 --- gnuplot-cvs/src/gadgets.h 2011-08-17 22:31:29.955047825 +0200
@@ -436,8 +436,8 @@ C +++ gnuplot-cvs.dif/src/gadgets.h 2011-08-17 22:44:53.111586814 +0200
#Home & same as \verb~^A~. \\ @@ -414,7 +414,7 @@
#Ctrl Home & same as \verb~^E~. \\
#Esc & same as \verb~^U~. \\
-#Help & `{\bf help}' plus Entrée. \\
-#Ctrl Help & `{\bf help }'. \\
+#Help & `{\bf help}` plus Entrée. \\
+#Ctrl Help & `{\bf help }`. \\
%c l .
%Touche fléchée@Fonction
%_
--- src/gadgets.h
+++ src/gadgets.h 2010-05-10 10:57:45.850924766 +0000
@@ -389,7 +389,7 @@ extern TBOOLEAN clip_lines1;
extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_lines2;
extern TBOOLEAN clip_points; extern TBOOLEAN clip_points;
@ -87,9 +68,10 @@
extern int samples_1; extern int samples_1;
extern int samples_2; extern int samples_2;
--- src/gplt_x11.c diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/gplt_x11.c gnuplot-cvs.dif/src/gplt_x11.c
+++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000 --- gnuplot-cvs/src/gplt_x11.c 2011-08-17 22:31:30.011047518 +0200
@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman +++ gnuplot-cvs.dif/src/gplt_x11.c 2011-08-17 22:44:53.113586802 +0200
@@ -2237,8 +2237,11 @@
} }
} }
/* X11_justify_text(mode) - set text justification mode */ /* X11_justify_text(mode) - set text justification mode */
@ -103,9 +85,10 @@
else if (*buffer == 'A') else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle); sscanf(buffer + 1, "%lf", &plot->angle);
--- src/plot.c diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/plot.c
+++ src/plot.c 2010-09-14 17:08:15.836458107 +0200 --- gnuplot-cvs/src/plot.c 2011-08-17 22:31:30.649043986 +0200
@@ -220,6 +220,7 @@ static int asked_privi = 0; +++ gnuplot-cvs.dif/src/plot.c 2011-08-17 22:44:53.114586796 +0200
@@ -213,6 +213,7 @@
void void
drop_privilege() drop_privilege()
{ {
@ -113,7 +96,7 @@
if (!asked_privi) { if (!asked_privi) {
euid = geteuid(); euid = geteuid();
egid = getegid(); egid = getegid();
@@ -233,11 +234,13 @@ drop_privilege() @@ -226,11 +227,13 @@
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));
@ -127,7 +110,7 @@
if (!asked_privi) { if (!asked_privi) {
euid = geteuid(); euid = geteuid();
egid = getegid(); egid = getegid();
@@ -251,6 +254,7 @@ take_privilege() @@ -244,6 +247,7 @@
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));
@ -135,7 +118,7 @@
} }
#endif /* LINUXVGA */ #endif /* LINUXVGA */
@@ -276,8 +280,8 @@ main(int argc, char **argv) @@ -269,8 +273,8 @@
int i; int i;
#ifdef LINUXVGA #ifdef LINUXVGA
@ -145,7 +128,7 @@
#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 */
@@ -344,6 +348,22 @@ main(int argc, char **argv) @@ -331,6 +335,22 @@
rl_getc_function = getc_wrapper; rl_getc_function = getc_wrapper;
#endif #endif
@ -155,22 +138,23 @@
+ if (msg) { + if (msg) {
+ char hfile[64]; + char hfile[64];
+ struct stat buf; + struct stat buf;
+ +
+ sprintf(hfile, "/usr/share/gnuplot/%s/gnuplot-", gnuplot_version); + sprintf(hfile, "/usr/share/gnuplot/%s/gnuplot-", gnuplot_version);
+ strncat(hfile, msg, 2); + strncat(hfile, msg, 2);
+ strcat (hfile, ".gih"); + strcat (hfile, ".gih");
+ if (stat(hfile, &buf) == 0) + if (stat(hfile, &buf) == 0)
+ setenv("GNUHELP", strdup(hfile), 0); + setenv("GNUHELP", strdup(hfile), 0);
+ } + }
+ } + }
+#endif +#endif
+ +
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE) #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
using_history();
/* 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.
--- src/term.h * It is used to parse a 'gnuplot' specific section in '~/.inputrc'
+++ src/term.h 2009-05-09 11:32:24.000000000 +0000 diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/term.h gnuplot-cvs.dif/src/term.h
@@ -309,9 +309,9 @@ --- gnuplot-cvs/src/term.h 2011-08-17 22:31:31.431039658 +0200
+++ gnuplot-cvs.dif/src/term.h 2011-08-17 22:44:53.115586790 +0200
@@ -277,9 +277,9 @@
#include "emf.trm" #include "emf.trm"
/* Roland DXY800A plotter */ /* Roland DXY800A plotter */
@ -182,7 +166,7 @@
/* fig graphics */ /* fig graphics */
#include "fig.trm" #include "fig.trm"
@@ -341,7 +341,7 @@ @@ -312,7 +312,7 @@
#include "imagen.trm" #include "imagen.trm"
/* Kyocera Prescribe printer */ /* Kyocera Prescribe printer */
@ -191,18 +175,19 @@
/* Frame Maker MIF 3.00 format driver */ /* Frame Maker MIF 3.00 format driver */
#include "mif.trm" #include "mif.trm"
@@ -377,7 +377,7 @@ @@ -345,7 +345,7 @@
#include "tkcanvas.trm" #include "tkcanvas.trm"
/* Vectrix 384 printer, also Tandy colour */ /* Vectrix 384 printer, also Tandy colour */
-/* #include "v384.trm" */ -/* #include "v384.trm" */
+#include "v384.trm" +#include "v384.trm"
/* wire printers */ #ifndef NO_BITMAP_SUPPORT
/* Epson LX-800, Star NL-10, NX-1000 and lots of others */
--- term/linux.trm diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/term/linux.trm gnuplot-cvs.dif/term/linux.trm
+++ term/linux.trm 2009-05-09 11:32:24.000000000 +0000 --- gnuplot-cvs/term/linux.trm 2011-08-17 22:31:33.287029383 +0200
@@ -80,7 +80,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( +++ gnuplot-cvs.dif/term/linux.trm 2011-08-17 22:44:53.116586784 +0200
@@ -80,7 +80,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));
@ -211,7 +196,7 @@
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));
@@ -293,7 +293,7 @@ LINUX_putc( @@ -293,7 +293,7 @@
} }
TERM_PUBLIC void TERM_PUBLIC void

141
gnuplot-4.4.0-demo.dif → gnuplot-4.6.0-demo.diff
View File

@ -1,6 +1,7 @@
--- demo/ellipse.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-4.6.0.demo/demo/ellipse.dem
+++ demo/ellipse.dem 2010-04-06 16:00:28.000000000 +0000 --- gnuplot-4.6.0/demo/ellipse.dem 2008-08-19 20:48:20.000000000 +0200
@@ -9,6 +9,7 @@ if ((GPVAL_VERSION == 4.3 || GPVAL_VERSI +++ gnuplot-4.6.0.demo/demo/ellipse.dem 2012-03-15 12:05:53.781781358 +0100
@@ -9,6 +9,7 @@
print "This copy of gnuplot was built without support for placing ellipses\n" ; \ print "This copy of gnuplot was built without support for placing ellipses\n" ; \
exit ; exit ;
@ -8,7 +9,7 @@
unset key unset key
set xrange [-8:8] set xrange [-8:8]
@@ -27,7 +28,7 @@ set object 1 ellipse center 1.5,1.0 size @@ -27,7 +28,7 @@
set obj 2 ellipse center 1.5, 1 size 6, 12 angle 20 front fs empty bo 3 set obj 2 ellipse center 1.5, 1 size 6, 12 angle 20 front fs empty bo 3
A = pi/9. A = pi/9.
@ -17,8 +18,9 @@
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
--- demo/fit.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.0.demo/demo/fit.dem
+++ demo/fit.dem 2010-04-07 07:33:39.097446751 +0000 --- gnuplot-4.6.0/demo/fit.dem 2009-10-31 06:24:18.000000000 +0100
+++ gnuplot-4.6.0.demo/demo/fit.dem 2012-03-15 12:05:53.781781358 +0100
@@ -5,9 +5,11 @@ @@ -5,9 +5,11 @@
print "Some examples how data fitting using nonlinear least squares fit" print "Some examples how data fitting using nonlinear least squares fit"
print "can be done." print "can be done."
@ -31,7 +33,7 @@
set title 'data for first fit demo' set title 'data for first fit demo'
set xlabel "Temperature T [deg Cels.]" set xlabel "Temperature T [deg Cels.]"
set ylabel "Density [g/cm3]" set ylabel "Density [g/cm3]"
@@ -162,7 +164,7 @@ pause -1 "(-> return)" @@ -162,7 +164,7 @@
# Must provide an error estimate for a 3d fit. Use constant 1 # Must provide an error estimate for a 3d fit. Use constant 1
fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via 'sound.par' fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via 'sound.par'
#create soundfit.par, reading from sound.par and updating values #create soundfit.par, reading from sound.par and updating values
@ -40,7 +42,7 @@
print "" print ""
pause -1 "(-> return)" pause -1 "(-> return)"
set title 'pseudo-3d multi-branch fit to velocity data' set title 'pseudo-3d multi-branch fit to velocity data'
@@ -251,6 +253,7 @@ print "" @@ -251,6 +253,7 @@
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
reset reset
@ -48,14 +50,15 @@
set xlabel 'x' set xlabel 'x'
set ylabel 'y' set ylabel 'y'
set zlabel 'z' set zlabel 'z'
@@ -340,3 +343,4 @@ print "from time to time!" @@ -340,3 +343,4 @@
print "" print ""
pause -1 "Done with fitting demo (-> return)" pause -1 "Done with fitting demo (-> return)"
reset reset
+set fit logfile logfile +set fit logfile logfile
--- demo/poldat.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/poldat.dem gnuplot-4.6.0.demo/demo/poldat.dem
+++ demo/poldat.dem 2010-04-07 07:40:04.016079881 +0000 --- gnuplot-4.6.0/demo/poldat.dem 2010-11-19 00:59:58.000000000 +0100
@@ -11,7 +11,7 @@ unset grid +++ gnuplot-4.6.0.demo/demo/poldat.dem 2012-03-15 12:05:53.782781367 +0100
@@ -11,7 +11,7 @@
unset polar unset polar
set title "Primitive Smith Chart" set title "Primitive Smith Chart"
unset key unset key
@ -64,19 +67,20 @@
set para set para
set rrange [-0 : 10] set rrange [-0 : 10]
set trange [-pi : pi] set trange [-pi : pi]
--- demo/random.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4.6.0.demo/demo/random.dem
+++ demo/random.dem 2009-06-15 12:28:57.000000000 +0000 --- gnuplot-4.6.0/demo/random.dem 2011-12-28 23:00:37.000000000 +0100
@@ -53,7 +53,8 @@ set parametric +++ gnuplot-4.6.0.demo/demo/random.dem 2012-03-15 12:08:48.975459282 +0100
# non-pressing plot-command feature addition may address this issue. @@ -46,7 +46,8 @@
set samples nsamp print ""
set format "%8.5g" nsamp = 50
-set table "random.tmp" # Generate N random data points.
-set print "random.tmp"
+random="`mktemp /tmp/random.XXXXXX`" +random="`mktemp /tmp/random.XXXXXX`"
+set table random +set print random
plot invnorm(rand(0)),invnorm(rand(0)) do for [i=1:nsamp] {
unset table print sprintf("%8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)))
unset format }
@@ -75,7 +76,7 @@ set vrange [-3:3] @@ -73,7 +74,7 @@
set ticslevel 0 set ticslevel 0
set isosamples 30 set isosamples 30
splot u,v,( 1/(2*pi) * exp(-0.5 * (u**2 + v**2)) ) with line lc rgb "black", \ splot u,v,( 1/(2*pi) * exp(-0.5 * (u**2 + v**2)) ) with line lc rgb "black", \
@ -84,17 +88,17 @@
+ random using 1:2:(-0.2) with points pointtype 7 lc rgb "black" + random using 1:2:(-0.2) with points pointtype 7 lc rgb "black"
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
unset contour unset contour
unset parametric
@@ -101,7 +102,7 @@ scale = (binwidth/(xhigh-xlow)) @@ -96,7 +97,7 @@
set parametric xhigh = 3.0
set samples nsamp scale = (binwidth/(xhigh-xlow))
set format "%8.5g" # Generate N random data points.
-set table "random.tmp" -set print "random.tmp"
+set table random +set print random
plot invnorm(rand(0)),(1.0*scale/nsamp) do for [i=1:nsamp] {
unset table print sprintf("%8.5g %8.5g", invnorm(rand(0)), (1.0*scale/nsamp))
unset format }
@@ -115,7 +116,7 @@ set grid @@ -110,7 +111,7 @@
set xrange [-3:3] set xrange [-3:3]
set yrange [0:0.45] set yrange [0:0.45]
bin(x) = (1.0/scale)*floor(x*scale) bin(x) = (1.0/scale)*floor(x*scale)
@ -103,16 +107,16 @@
title "scaled bin frequency", \ title "scaled bin frequency", \
normal(x,0,1) with lines title "Gaussian p.d.f." normal(x,0,1) with lines title "Gaussian p.d.f."
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
@@ -136,7 +137,7 @@ set parametric @@ -126,7 +127,7 @@
set samples nsamp reset
set isosamples 2,2 # Smallest possible nsamp = 3000
set format "%8.5g" # Generate N random data points.
-set table "random.tmp" -set print "random.tmp"
+set table random +set print random
splot invnorm(rand(0)),invnorm(rand(0)),invnorm(rand(0)) do for [i=1:nsamp] {
unset table print sprintf("%8.5g %8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)), invnorm(rand(0)))
unset format }
@@ -158,7 +159,7 @@ set zzeroaxis lt -1 @@ -150,7 +151,7 @@
set view 68, 28, 1.4, 0.9 set view 68, 28, 1.4, 0.9
tstring(n) = sprintf("Gaussian 3D cloud of %d random samples\n", n) tstring(n) = sprintf("Gaussian 3D cloud of %d random samples\n", n)
set title tstring(nsamp) offset graph 0.15, graph -0.33 set title tstring(nsamp) offset graph 0.15, graph -0.33
@ -121,7 +125,7 @@
if (!oneplot) pause -1 "Hit return to continue" if (!oneplot) pause -1 "Hit return to continue"
unset parametric unset parametric
@@ -178,7 +179,7 @@ scale = (binwidth/(xhigh-xlow)) @@ -170,7 +171,7 @@
set xrange [0:xhigh] set xrange [0:xhigh]
set yrange [0:0.65] set yrange [0:0.65]
bin(x) = (1.0/scale)*floor(x*scale) bin(x) = (1.0/scale)*floor(x*scale)
@ -130,8 +134,9 @@
title "scaled bin frequency", \ title "scaled bin frequency", \
maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f." maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f."
# #
--- demo/simple.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/simple.dem gnuplot-4.6.0.demo/demo/simple.dem
+++ demo/simple.dem 2009-05-09 11:32:24.000000000 +0000 --- gnuplot-4.6.0/demo/simple.dem 2011-08-19 23:01:41.000000000 +0200
+++ gnuplot-4.6.0.demo/demo/simple.dem 2012-03-15 12:05:53.782781367 +0100
@@ -7,12 +7,11 @@ @@ -7,12 +7,11 @@
# gnuplot> load 'simple.dem' # gnuplot> load 'simple.dem'
# #
@ -146,8 +151,9 @@
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"
--- demo/stringvar.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplot-4.6.0.demo/demo/stringvar.dem
+++ demo/stringvar.dem 2009-06-15 12:46:14.000000000 +0000 --- gnuplot-4.6.0/demo/stringvar.dem 2007-03-30 07:18:46.000000000 +0200
+++ gnuplot-4.6.0.demo/demo/stringvar.dem 2012-03-15 12:05:53.782781367 +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
@ -158,7 +164,7 @@
print "" print ""
print "Exercise substring handling" print "Exercise substring handling"
print "" print ""
@@ -24,7 +25,7 @@ print "(foo.foo)[2:2]= ",(foo.foo)[2:2] @@ -24,7 +25,7 @@
print "" print ""
unset print unset print
@ -167,7 +173,7 @@
unset xtics unset xtics
unset ytics unset ytics
set yrange [0:1] set yrange [0:1]
@@ -33,7 +34,7 @@ plot 0 @@ -33,7 +34,7 @@
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
@ -176,7 +182,7 @@
print "Exercise string handling functions" print "Exercise string handling functions"
print "" print ""
print "foo = ",foo print "foo = ",foo
@@ -62,7 +63,7 @@ if (strlen(foo) != 245) print "sprintf o @@ -62,7 +63,7 @@
print "" print ""
unset print unset print
@ -185,9 +191,10 @@
unset xtics unset xtics
unset ytics unset ytics
set yrange [0:1] set yrange [0:1]
--- demo/vector.dem diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4.6.0.demo/demo/vector.dem
+++ demo/vector.dem 2009-06-15 12:24:23.000000000 +0000 --- gnuplot-4.6.0/demo/vector.dem 2009-10-31 06:24:18.000000000 +0100
@@ -62,19 +62,21 @@ splot vtot(x,y) w l +++ gnuplot-4.6.0.demo/demo/vector.dem 2012-03-15 12:05:53.782781367 +0100
@@ -62,19 +62,21 @@
print "Now create a file with equipotential lines" print "Now create a file with equipotential lines"
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
@ -212,7 +219,7 @@
splot vtot(x,y) w l splot vtot(x,y) w l
unset table unset table
pause 0 pause 0
@@ -84,8 +86,8 @@ set xr [xmin:xmax] @@ -84,8 +86,8 @@
set yr [ymin:ymax] set yr [ymin:ymax]
set isosam 31,31 set isosam 31,31
set key under Left reverse set key under Left reverse
@ -223,10 +230,11 @@
pause -1 "Hit return to continue" pause -1 "Hit return to continue"
reset reset
--- src/show.c diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/show.c gnuplot-4.6.0.demo/src/show.c
+++ src/show.c 2010-05-19 21:19:16.000000000 +0200 --- gnuplot-4.6.0/src/show.c 2012-03-02 21:00:04.000000000 +0100
@@ -1054,6 +1054,15 @@ +++ gnuplot-4.6.0.demo/src/show.c 2012-03-15 12:05:53.783781376 +0100
p /* hit 'h' */ @@ -1074,6 +1074,15 @@
p /* type "help seeking-assistance" */
); );
+#ifdef GNUPLOT_LIB_DEFAULT +#ifdef GNUPLOT_LIB_DEFAULT
@ -241,9 +249,10 @@
/* show version long */ /* show version long */
if (almost_equals(c_token, "l$ong")) { if (almost_equals(c_token, "l$ong")) {
--- src/variable.c diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.6.0.demo/src/variable.c
+++ src/variable.c 2009-06-15 12:01:39.000000000 +0000 --- gnuplot-4.6.0/src/variable.c 2011-12-28 23:00:37.000000000 +0100
@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id +++ gnuplot-4.6.0.demo/src/variable.c 2012-03-15 12:05:53.783781376 +0100
@@ -37,7 +37,10 @@
/* The Death of Global Variables - part one. */ /* The Death of Global Variables - part one. */
#include <string.h> #include <string.h>
@ -255,7 +264,7 @@
#include "variable.h" #include "variable.h"
#include "alloc.h" #include "alloc.h"
@@ -95,6 +98,17 @@ loadpath_handler(int action, char *path) @@ -98,6 +101,17 @@
if (!loadpath) if (!loadpath)
{ {
char *envlib = getenv("GNUPLOT_LIB"); char *envlib = getenv("GNUPLOT_LIB");
@ -273,7 +282,7 @@
if (envlib) { if (envlib) {
int len = strlen(envlib); int len = strlen(envlib);
loadpath = gp_strdup(envlib); loadpath = gp_strdup(envlib);
@@ -103,6 +117,10 @@ loadpath_handler(int action, char *path) @@ -106,6 +120,10 @@
/* convert all PATHSEPs to \0 */ /* convert all PATHSEPs to \0 */
PATHSEP_TO_NUL(loadpath); PATHSEP_TO_NUL(loadpath);
} /* else: NULL = empty */ } /* else: NULL = empty */

18
gnuplot-4.2.5-fix-format-errors.dif → gnuplot-4.6.0-fix-format-errors.dif
View File

@ -1,6 +1,7 @@
--- src/gplt_x11.c diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.6.0.formaterrors/src/gplt_x11.c
+++ src/gplt_x11.c 2009-05-09 13:50:34.000000000 +0200 --- gnuplot-4.6.0/src/gplt_x11.c 2011-12-28 23:00:37.000000000 +0100
@@ -2903,22 +2903,22 @@ exec_cmd(plot_struct *plot, char *comman +++ gnuplot-4.6.0.formaterrors/src/gplt_x11.c 2012-03-15 12:17:24.311767033 +0100
@@ -2897,22 +2897,22 @@
case PseudoColor: case PseudoColor:
fprintf(stderr, ERROR_NOTICE("PseudoColor")); fprintf(stderr, ERROR_NOTICE("PseudoColor"));
@ -27,14 +28,3 @@
break; break;
case DirectColor: case DirectColor:
--- term/post.trm
+++ term/post.trm 2009-05-09 13:50:34.000000000 +0200
@@ -1748,7 +1748,7 @@ gnudict begin\ngsave\n\
(ps_params->psformat == PSTERM_EPS ? 0.5 : 1.0)/PS_SC);
if (ps_params->psformat == PSTERM_LANDSCAPE)
fprintf(gppsfile,"90 rotate\n0 %d translate\n", -(int)(term->ymax));
- fprintf(gppsfile, psg1);
+ fprintf(gppsfile, "%s", psg1);
if (ps_common_uses_fonts)
fprintf(gppsfile, "(%s) findfont %d scalefont setfont\n",
ps_params->font, (t->v_char));

30
gnuplot-4.4.0-fonts.dif → gnuplot-4.6.0-fonts.diff
View File

@ -1,6 +1,7 @@
--- src/gplt_x11.c diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.6.0.fonts2/src/gplt_x11.c
+++ src/gplt_x11.c 2010-04-06 16:31:39.655185838 +0000 --- gnuplot-4.6.0/src/gplt_x11.c 2011-12-28 23:00:37.000000000 +0100
@@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id +++ gnuplot-4.6.0.fonts2/src/gplt_x11.c 2012-03-15 12:10:52.600531888 +0100
@@ -104,15 +104,16 @@
* patches by Masahito Yamaga <ma@yama-ga.com> * patches by Masahito Yamaga <ma@yama-ga.com>
*/ */
@ -18,11 +19,11 @@
-# include <X11/Xlocale.h> -# include <X11/Xlocale.h>
-#endif -#endif
#include <assert.h>
#include "syscfg.h" #include "syscfg.h"
#include "stdfn.h" @@ -122,6 +123,12 @@
@@ -120,6 +121,12 @@ static char *RCSid() { return RCSid("$Id
#include "term_api.h"
#include "gplt_x11.h" #include "gplt_x11.h"
#include "version.h"
+#ifdef USE_X11_MULTIBYTE +#ifdef USE_X11_MULTIBYTE
+# include <locale.h> +# include <locale.h>
@ -33,7 +34,7 @@
#ifdef EXPORT_SELECTION #ifdef EXPORT_SELECTION
# undef EXPORT_SELECTION # undef EXPORT_SELECTION
#endif /* EXPORT SELECTION */ #endif /* EXPORT SELECTION */
@@ -490,7 +497,7 @@ static double mouse_to_axis __PROTO((int @@ -482,7 +489,7 @@
static char *FallbackFont = "fixed"; static char *FallbackFont = "fixed";
#ifdef USE_X11_MULTIBYTE #ifdef USE_X11_MULTIBYTE
static char *FallbackFontMB = static char *FallbackFontMB =
@ -42,7 +43,7 @@
# define FontSetSep ';' # define FontSetSep ';'
static int usemultibyte = 0; static int usemultibyte = 0;
static int multibyte_fonts_usable=1; static int multibyte_fonts_usable=1;
@@ -507,8 +514,8 @@ static char *gpFallbackFont __PROTO((voi @@ -499,8 +506,8 @@
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' */
@ -53,7 +54,7 @@
#define Nwidths 10 #define Nwidths 10
static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -2117,6 +2124,8 @@ exec_cmd(plot_struct *plot, char *comman @@ -2110,6 +2117,8 @@
/* 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';
@ -62,7 +63,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;
@@ -5480,7 +5489,7 @@ XFontStruct *gpXLoadQueryFont (Display * @@ -5389,7 +5398,7 @@
} }
#else #else
if (first_time) { if (first_time) {
@ -71,7 +72,7 @@
first_time = FALSE; first_time = FALSE;
} }
while (n_miss-- > 0) while (n_miss-- > 0)
@@ -5573,6 +5582,18 @@ char *fontname; @@ -5484,6 +5493,18 @@
} }
#ifdef USE_X11_MULTIBYTE #ifdef USE_X11_MULTIBYTE
@ -90,9 +91,10 @@
if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { if (fontname && strncmp(fontname, "mbfont:", 7) == 0) {
if (multibyte_fonts_usable) { if (multibyte_fonts_usable) {
usemultibyte = 1; usemultibyte = 1;
--- src/variable.c diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.6.0.fonts2/src/variable.c
+++ src/variable.c 2009-06-15 11:55:05.000000000 +0000 --- gnuplot-4.6.0/src/variable.c 2011-12-28 23:00:37.000000000 +0100
@@ -276,6 +276,8 @@ static const struct path_table fontpath_ +++ gnuplot-4.6.0.fonts2/src/variable.c 2012-03-15 12:10:52.600531888 +0100
@@ -282,6 +282,8 @@
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif #endif
/* Linux paths */ /* Linux paths */

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

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

108
gnuplot-lua.diff
View File

@ -1,108 +0,0 @@
Support lua 5.2, based on Rev. 1.17.2.1 from the
gnuplot branch-4-6-stable.
Cf. http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/term/lua.trm?view=log
--- term/lua.trm.orig 2012-02-09 20:16:56.000000000 +0100
+++ term/lua.trm 2012-02-09 20:17:07.000000000 +0100
@@ -113,6 +113,41 @@
*/
static char last_error_msg[MAX_LINE_LEN+1] = "";
+#if LUA_VERSION_NUM > 501
+/*
+ * two helper functions to ease transitioning to lua 5.2
+ */
+
+/*
+ * same as lua_getfield(L, LUA_GLOBALINDEXS, f) in lua 5.1
+ */
+static void LUA_getfield_global(lua_State *L, const char *f)
+{
+ lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS);
+ lua_getfield(L, -1, f);
+ lua_replace(L, -2);
+}
+/*
+ * approximately the same as luaL_register(L, libname, l) in lua 5.1
+ */
+static void LUA_register(lua_State *L, const char *libname, const luaL_Reg *l)
+{
+ if (!libname)
+ luaL_setfuncs(L, l, 0);
+ else {
+ LUA_getfield_global(L, "package");
+ lua_getfield(L, -1, "loaded");
+ lua_newtable(L);
+ luaL_setfuncs(L, l, 0);
+ lua_pushvalue(L, -1);
+ lua_setglobal(L, libname);
+ lua_setfield(L, -2, libname);
+ lua_pop(L, 2);
+ lua_getglobal(L, libname);
+ }
+}
+#endif /* LUA_VERSION_NUM > 501 */
+
/*
* Handle Lua functions
*/
@@ -378,8 +413,11 @@
return(1);
}
-
+#if LUA_VERSION_NUM > 500
+static const luaL_Reg gp_methods[] = {
+#else
static const luaL_reg gp_methods[] = {
+#endif
{"write", LUA_GP_write},
{"int_error", LUA_GP_int_error},
{"int_warn", LUA_GP_int_warn},
@@ -395,7 +433,11 @@
static void
LUA_register_gp_fnc ()
{
+#if LUA_VERSION_NUM > 501
+ LUA_register(L, LUA_GP_FNC, gp_methods);
+#else
luaL_register(L, LUA_GP_FNC, gp_methods);
+#endif
}
@@ -524,7 +566,11 @@
*/
if (L)
lua_close(L);
+#if LUA_VERSION_NUM > 500
+ L = luaL_newstate();
+#else
L = lua_open();
+#endif
luaL_openlibs(L); /* Load Lua libraries */
luaopen_debug(L);
@@ -571,14 +617,22 @@
sf = lua_gettop(L);
/* lua_settop(L, 0);*/ /* clear stack */
+#if LUA_VERSION_NUM > 501
+ LUA_getfield_global(L, "debug");
+#else
lua_getfield(L, LUA_GLOBALSINDEX, "debug");
+#endif
lua_getfield(L, -1, "traceback");
lua_remove(L, -2); /* rm debug */
tb = lua_gettop(L); /* store "traceback" */
/* create table `term' */
lua_newtable(L);
lua_setglobal(L, "term");
+#if LUA_VERSION_NUM > 501
+ LUA_getfield_global(L, "term");
+#else
lua_getfield(L, LUA_GLOBALSINDEX, "term");
+#endif
luaterm = lua_gettop(L); /* store `term' */
/* register gp functions */

17
gnuplot.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Mar 15 11:43:23 UTC 2012 - kruber@zib.de
- Update to gnuplot 4.6.0
* New syntax supporting multi-line blocks of code delimited by curly braces
if (<cond>) { ... } else { ... }
do for [<iteration-spec>] { ... }
while (<cond>) { ... }
* Time formats can handle fractional seconds to microsecond precision.
* User-definable linetypes that can be used to establish a locally
preferred default sequence of colors or dash/thickness/point styles.
* Statistical summary of the data to be plotted (new command "stats")
* New terminal drivers: qt context epscairo cairolatex
* The version for Windows received major improvements
(GUI, help, native terminal and wxt, installer)
* Improved support for UTF-8, SJIS and other multi-byte encodings
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 13 15:03:20 UTC 2012 - burnus@net-b.de Wed Feb 13 15:03:20 UTC 2012 - burnus@net-b.de

33
gnuplot.spec
View File

@ -24,11 +24,14 @@ BuildRequires: freetype2-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gd-devel BuildRequires: gd-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: latex2html
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libqt4-devel >= 4.5
BuildRequires: netpbm BuildRequires: netpbm
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: texlive-tex4ht
#BuildRequires: latex2html
BuildRequires: ImageMagick
BuildRequires: texlive-latex BuildRequires: texlive-latex
BuildRequires: xorg-x11 BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
@ -49,20 +52,20 @@ BuildRequires: plotutils-devel
BuildRequires: plotutils BuildRequires: plotutils
%endif %endif
Url: http://www.gnuplot.info/ Url: http://www.gnuplot.info/
Version: 4.4.4 Version: 4.6.0
Release: 0 Release: 0
Summary: GNUplot a Function Plotting Utility Summary: GNUplot a Function Plotting Utility
License: SUSE-Gnuplot and GPL-2.0+ License: SUSE-Gnuplot and GPL-2.0+
Group: Productivity/Graphics/Visualization/Graph Group: Productivity/Graphics/Visualization/Graph
Source0: gnuplot-%{version}.tar.bz2 #Source0: http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz
Source0: gnuplot-%{version}.tar.gz
Source2: gnuplot-fr.doc.bz2 Source2: gnuplot-fr.doc.bz2
Source3: README.whynot Source3: README.whynot
Patch0: gnuplot-4.4.1.dif Patch0: gnuplot-4.5.0.dif
Patch1: gnuplot-4.4.0-x11ovf.dif Patch1: gnuplot-4.4.0-x11ovf.dif
Patch2: gnuplot-4.4.0-fonts.dif Patch2: gnuplot-4.6.0-fonts.diff
Patch4: gnuplot-4.4.0-demo.dif Patch4: gnuplot-4.6.0-demo.diff
Patch6: gnuplot-4.2.5-fix-format-errors.dif Patch6: gnuplot-4.6.0-fix-format-errors.dif
Patch7: gnuplot-lua.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"
@ -112,12 +115,11 @@ and can easily be extended to include new devices.
%setup -q -n gnuplot-%{version} %setup -q -n gnuplot-%{version}
bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
%patch -P 1 -p 0 -b .x11ovf %patch1 -p 0 -b .x11ovf
%patch -P 2 -p 0 -b .font %patch2 -p 1 -b .font
%patch -P 4 -p 0 %patch4 -p 1 -b .demo
%patch -P 6 -p 0 %patch6 -p 1 -b .formaterrors
%patch -P 7 -p 0 %patch0 -p 1
%patch -P 0 -p 0
%build %build
SECSVGA="-DSVGA_IS_SECURE=1" SECSVGA="-DSVGA_IS_SECURE=1"
@ -155,7 +157,8 @@ test $? -eq 0 || exit 1
--enable-thin-splines \ --enable-thin-splines \
--without-row-help \ --without-row-help \
--with-kpsexpand \ --with-kpsexpand \
--with-plot=%{_libdir} --with-plot=%{_libdir} \
--enable-qt
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
pushd docs/ pushd docs/
make srcdir=. clean all html pdf gpcard.ps make srcdir=. clean all html pdf gpcard.ps