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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=7
This commit is contained in:
Dr. Werner Fink 2010-04-07 10:29:27 +00:00 committed by Git OBS Bridge
parent 4aa0b2dd03
commit d58a3ec06e
11 changed files with 233 additions and 4486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnuplot-4.2.5-gcc45.dif
View File

@ -1,13 +0,0 @@
Index: gnuplot-4.2.6/src/gplt_x11.c
===================================================================
--- gnuplot-4.2.6.orig/src/gplt_x11.c 2010-03-04 10:45:10.000000000 +0100
+++ gnuplot-4.2.6/src/gplt_x11.c 2010-03-04 11:59:35.000000000 +0100
@@ -1189,7 +1189,7 @@ static int
read_input()
{
const int rdbuf_size = 10 * Nbuf;
- static char rdbuf[rdbuf_size+1];
+ static char rdbuf[10*Nbuf+1];
static int total_chars;
static int rdbuf_offset;
static int buf_offset;

4297
gnuplot-4.2.5-utf8.dif
View File

File diff suppressed because it is too large Load Diff

3
gnuplot-4.2.6.tar.bz2
View File

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

106
gnuplot-4.2.5-demo.dif → gnuplot-4.4.0-demo.dif
View File

@ -1,14 +1,37 @@
--- demo/ellipse.dem
+++ demo/ellipse.dem 2010-04-06 16:00:28.000000000 +0000
@@ -9,6 +9,7 @@ if ((GPVAL_VERSION == 4.3 || GPVAL_VERSI
print "This copy of gnuplot was built without support for placing ellipses\n" ; \
exit ;
+random="`mktemp /tmp/random.XXXXXX`
unset key
set xrange [-8:8]
@@ -27,7 +28,7 @@ set object 1 ellipse center 1.5,1.0 size
set obj 2 ellipse center 1.5, 1 size 6, 12 angle 20 front fs empty bo 3
A = pi/9.
-plot 'random.tmp' using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots
+plot random using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots
pause -1 "Hit return to continue"
--- demo/fit.dem --- demo/fit.dem
+++ demo/fit.dem 2009-06-15 14:13:03.358008816 +0200 +++ demo/fit.dem 2010-04-07 07:33:39.097446751 +0000
@@ -5,6 +5,7 @@ @@ -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."
print "" print ""
+set fit logfile "`mktemp /tmp/fit.log.XXXXXX`" +logfile = "`mktemp /tmp/fit.log.XXXXXX`"
pause -1 "first plotting the pure data set (-> return)" pause -1 "first plotting the pure data set (-> return)"
reset
+set fit logfile logfile
set title 'data for first fit demo' set title 'data for first fit demo'
@@ -125,7 +126,7 @@ plot 'soundvel.dat', vlong(x), vtrans(x) set xlabel "Temperature T [deg Cels.]"
set ylabel "Density [g/cm3]"
@@ -162,7 +164,7 @@ pause -1 "(-> return)"
# 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
@ -17,19 +40,32 @@
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 ""
pause -1 "Hit return to continue"
reset
+set fit logfile logfile
set xlabel 'x'
set ylabel 'y'
set zlabel 'z'
@@ -340,3 +343,4 @@ print "from time to time!"
print ""
pause -1 "Done with fitting demo (-> return)"
reset
+set fit logfile logfile
--- demo/poldat.dem --- demo/poldat.dem
+++ demo/poldat.dem 2009-05-09 13:32:24.000000000 +0200 +++ demo/poldat.dem 2010-04-07 07:40:04.016079881 +0000
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ unset grid
unset polar unset polar
set title "Primitive Smith Chart" set title "Primitive Smith Chart"
unset key unset key
-set xlabel "Impedance or Admittance Coordinates" -set xlabel "Impedance or Admittance Coordinates"
+set xlabel "Impedance or Admittance Coordinates" 12,-1 +set xlabel "Impedance or Admittance Coordinates" offset 12,-1
set para set para
set rrange [-0 : 10] set rrange [-0 : 10]
set trange [-pi : pi] set trange [-pi : pi]
--- demo/random.dem --- demo/random.dem
+++ demo/random.dem 2009-06-15 14:28:57.277902957 +0200 +++ demo/random.dem 2009-06-15 12:28:57.000000000 +0000
@@ -53,7 +53,8 @@ set parametric @@ -53,7 +53,8 @@ set parametric
# non-pressing plot-command feature addition may address this issue. # non-pressing plot-command feature addition may address this issue.
set samples nsamp set samples nsamp
@ -94,17 +130,24 @@
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."
# #
@@ -202,7 +203,7 @@ set format xy "%.0f" --- demo/simple.dem
set title 'Example of range-limited axes and tics' +++ demo/simple.dem 2009-05-09 11:32:24.000000000 +0000
@@ -7,12 +7,11 @@
A = pi/9. # gnuplot> load 'simple.dem'
-plot 'random.tmp' using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots #
+plot random using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots set key left box
-set samples 50
+set samples 400
plot [-10:10] sin(x),atan(x),cos(atan(x))
pause -1 "Hit return to continue"
set key right nobox
-set samples 100
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 --- demo/stringvar.dem
+++ demo/stringvar.dem 2009-06-15 14:46:14.406401438 +0200 +++ demo/stringvar.dem 2009-06-15 12:46:14.000000000 +0000
@@ -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
@ -142,24 +185,8 @@
unset xtics unset xtics
unset ytics unset ytics
set yrange [0:1] set yrange [0:1]
--- demo/simple.dem
+++ demo/simple.dem 2009-05-09 13:32:24.000000000 +0200
@@ -7,12 +7,11 @@
# gnuplot> load 'simple.dem'
#
set key left box
-set samples 50
+set samples 400
plot [-10:10] sin(x),atan(x),cos(atan(x))
pause -1 "Hit return to continue"
set key right nobox
-set samples 100
plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
pause -1 "Hit return to continue"
--- demo/vector.dem --- demo/vector.dem
+++ demo/vector.dem 2009-06-15 14:24:23.430401839 +0200 +++ demo/vector.dem 2009-06-15 12:24:23.000000000 +0000
@@ -62,19 +62,21 @@ splot vtot(x,y) w l @@ -62,19 +62,21 @@ splot vtot(x,y) w l
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"
@ -197,8 +224,17 @@
reset reset
--- src/variable.c --- src/variable.c
+++ src/variable.c 2009-06-15 14:01:38.998402587 +0200 +++ src/variable.c 2009-06-15 12:01:39.000000000 +0000
@@ -94,6 +94,14 @@ loadpath_handler(int action, char *path) @@ -37,7 +37,7 @@ static char *RCSid() { return RCSid("$Id
/* The Death of Global Variables - part one. */
#include <string.h>
-
+#include <stdio.h>
#include "variable.h"
#include "alloc.h"
@@ -95,6 +95,14 @@ loadpath_handler(int action, char *path)
if (!loadpath) if (!loadpath)
{ {
char *envlib = getenv("GNUPLOT_LIB"); char *envlib = getenv("GNUPLOT_LIB");
@ -213,7 +249,7 @@
if (envlib) { if (envlib) {
int len = strlen(envlib); int len = strlen(envlib);
loadpath = gp_strdup(envlib); loadpath = gp_strdup(envlib);
@@ -102,6 +110,10 @@ loadpath_handler(int action, char *path) @@ -103,6 +111,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 */

47
gnuplot-4.2.5-fonts.dif → gnuplot-4.4.0-fonts.dif
View File

@ -1,6 +1,6 @@
--- src/gplt_x11.c --- src/gplt_x11.c
+++ src/gplt_x11.c 2008-03-14 15:26:16.000000000 +0100 +++ src/gplt_x11.c 2010-04-06 16:31:39.655185838 +0000
@@ -104,6 +104,10 @@ static char *RCSid() { return RCSid("$Id @@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id
* patches by Masahito Yamaga <ma@yama-ga.com> * patches by Masahito Yamaga <ma@yama-ga.com>
*/ */
@ -8,19 +8,32 @@
+#define _GNU_SOURCE +#define _GNU_SOURCE
+#endif +#endif
+#include <string.h> +#include <string.h>
#include "syscfg.h" #include <X11/Xos.h>
#include "stdfn.h" #include <X11/Xlib.h>
#include "gp_types.h" #include <X11/Xresource.h>
@@ -133,6 +137,8 @@ Error. Incompatible options. #include <X11/Xutil.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#ifdef USE_X11_MULTIBYTE -#ifdef USE_X11_MULTIBYTE
-# include <X11/Xlocale.h>
-#endif
#include "syscfg.h"
#include "stdfn.h"
@@ -120,6 +121,12 @@ static char *RCSid() { return RCSid("$Id
#include "term_api.h"
#include "gplt_x11.h"
+#ifdef USE_X11_MULTIBYTE
+# include <locale.h> +# include <locale.h>
+# include <langinfo.h> +# include <langinfo.h>
# include <X11/Xlocale.h> +# include <X11/Xlocale.h>
#endif +#endif
+
@@ -474,7 +480,7 @@ static double mouse_to_axis __PROTO((int #ifdef EXPORT_SELECTION
# undef EXPORT_SELECTION
#endif /* EXPORT SELECTION */
@@ -490,7 +497,7 @@ static double mouse_to_axis __PROTO((int
static char *FallbackFont = "fixed"; static char *FallbackFont = "fixed";
#ifdef USE_X11_MULTIBYTE #ifdef USE_X11_MULTIBYTE
static char *FallbackFontMB = static char *FallbackFontMB =
@ -29,7 +42,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;
@@ -491,8 +497,8 @@ static char *gpFallbackFont __PROTO((voi @@ -507,8 +514,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' */
@ -40,7 +53,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 };
@@ -2116,6 +2122,8 @@ exec_cmd(plot_struct *plot, char *comman @@ -2117,6 +2124,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';
@ -49,7 +62,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;
@@ -5326,7 +5334,7 @@ XFontStruct *gpXLoadQueryFont (Display * @@ -5480,7 +5489,7 @@ XFontStruct *gpXLoadQueryFont (Display *
} }
#else #else
if (first_time) { if (first_time) {
@ -58,7 +71,7 @@
first_time = FALSE; first_time = FALSE;
} }
while (n_miss-- > 0) while (n_miss-- > 0)
@@ -5419,6 +5427,18 @@ char *fontname; @@ -5573,6 +5582,18 @@ char *fontname;
} }
#ifdef USE_X11_MULTIBYTE #ifdef USE_X11_MULTIBYTE
@ -78,8 +91,8 @@
if (multibyte_fonts_usable) { if (multibyte_fonts_usable) {
usemultibyte = 1; usemultibyte = 1;
--- src/variable.c --- src/variable.c
+++ src/variable.c 2009-06-15 13:55:04.902957631 +0200 +++ src/variable.c 2009-06-15 11:55:05.000000000 +0000
@@ -263,6 +263,8 @@ static const struct path_table fontpath_ @@ -276,6 +276,8 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif #endif
/* Linux paths */ /* Linux paths */

27
gnuplot-4.2.5-wxt.dif → gnuplot-4.4.0-wxt.dif
View File

@ -1,6 +1,6 @@
--- src/plot.c --- src/plot.c
+++ src/plot.c 2007-04-24 12:21:32.000000000 +0200 +++ src/plot.c 2007-04-24 10:21:32.000000000 +0000
@@ -610,6 +610,8 @@ main(int argc, char **argv) @@ -573,6 +573,8 @@ main(int argc, char **argv)
#endif /* GNUPLOT_HISTORY */ #endif /* GNUPLOT_HISTORY */
fprintf(stderr, "\nTerminal type set to '%s'\n", term->name); fprintf(stderr, "\nTerminal type set to '%s'\n", term->name);
@ -10,18 +10,19 @@
} else { } else {
/* come back here from int_error() */ /* come back here from int_error() */
--- src/term.c --- src/term.c
+++ src/term.c 2007-04-24 12:21:51.000000000 +0200 +++ src/term.c 2010-04-06 16:12:36.696331404 +0000
@@ -1561,6 +1561,8 @@ change_term(const char *origname, int le @@ -1646,6 +1646,9 @@ change_term(const char *origname, int le
}
if (interactive) if (interactive)
fprintf(stderr, "Terminal type set to '%s'\n", term->name); fprintf(stderr, "Terminal type set to '%s'\n", term->name);
+ if (interactive && !strncmp("wxt", term->name, 3)) + if (interactive && !strncmp("wxt", term->name, 3))
+ fprintf(stderr, "Warning: terminal 'wxt' is experimental\n"); + fprintf(stderr, "Warning: terminal 'wxt' is experimental\n");
+
/* Invalidate any terminal-specific structures that may be active */ /* Invalidate any terminal-specific structures that may be active */
invalidate_palette(); invalidate_palette();
@@ -1626,11 +1628,6 @@ init_terminal()
term_name = "sun"; @@ -1710,11 +1713,6 @@ init_terminal()
term_name = "sun";
#endif /* SUN */ #endif /* SUN */
-#ifdef WXWIDGETS -#ifdef WXWIDGETS
@ -31,9 +32,9 @@
- -
#ifdef _Windows #ifdef _Windows
/* let the wxWidgets terminal be the default when available */ /* let the wxWidgets terminal be the default when available */
if (term_name == (char *) NULL) if (term_name == (char *) NULL)
@@ -1666,6 +1663,11 @@ init_terminal() @@ -1750,6 +1748,11 @@ init_terminal()
term_name = "x11"; term_name = "x11";
#endif /* x11 */ #endif /* x11 */
+#ifdef WXWIDGETS +#ifdef WXWIDGETS
@ -42,5 +43,5 @@
+#endif +#endif
+ +
#ifdef AMIGA #ifdef AMIGA
term_name = "amiga"; term_name = "amiga";
#endif #endif

16
gnuplot-4.2.5-x11ovf.dif → gnuplot-4.4.0-x11ovf.dif
View File

@ -1,6 +1,6 @@
--- src/gplt_x11.c --- src/gplt_x11.c
+++ src/gplt_x11.c 2009-06-15 13:17:19.021900688 +0200 +++ src/gplt_x11.c 2010-04-06 15:49:17.446925544 +0000
@@ -901,6 +901,8 @@ mainloop() @@ -912,6 +912,8 @@ mainloop()
nfds = cn + 1; nfds = cn + 1;
while (1) { while (1) {
@ -9,7 +9,7 @@
XFlush(dpy); /* see above */ XFlush(dpy); /* see above */
FD_ZERO(&tset); FD_ZERO(&tset);
@@ -938,7 +940,11 @@ mainloop() @@ -949,7 +951,11 @@ mainloop()
process_event(&xe); process_event(&xe);
} }
} }
@ -22,14 +22,14 @@
unlink(X11_ipcpath); unlink(X11_ipcpath);
record(); record();
fclose(X11_ipc); fclose(X11_ipc);
@@ -1176,8 +1182,8 @@ static int read_input __PROTO((void)); @@ -1172,8 +1178,8 @@ static int read_input __PROTO((void));
static int static int
read_input() read_input()
{ {
- static int rdbuf_size = 10 * Nbuf; - static int rdbuf_size = 10 * X11_COMMAND_BUFFER_LENGTH;
- static char rdbuf[10 * Nbuf]; - static char rdbuf[10 * X11_COMMAND_BUFFER_LENGTH];
+ const int rdbuf_size = 10 * Nbuf; + const int rdbuf_size = 10 * X11_COMMAND_BUFFER_LENGTH;
+ static char rdbuf[rdbuf_size+1]; + static char rdbuf[(10 * X11_COMMAND_BUFFER_LENGTH)+1];
static int total_chars; static int total_chars;
static int rdbuf_offset; static int rdbuf_offset;
static int buf_offset; static int buf_offset;

103
gnuplot-4.2.5.dif → gnuplot-4.4.0.dif
View File

@ -1,10 +1,6 @@
--- .pkgextract
+++ .pkgextract 2009-05-09 13:32:24.000000000 +0200
@@ -0,0 +1 @@
+bzcat ../gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
--- configure.in --- configure.in
+++ configure.in 2009-05-09 13:32:24.000000000 +0200 +++ configure.in 2009-05-09 11:32:24.000000000 +0000
@@ -230,7 +230,7 @@ if test "$with_linux_vga" = yes; then @@ -264,7 +264,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'
@ -14,7 +10,7 @@
fi fi
--- docs/Makefile.in --- docs/Makefile.in
+++ docs/Makefile.in 2009-05-09 13:32:24.000000000 +0200 +++ docs/Makefile.in 2009-05-09 11:32:24.000000000 +0000
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
# #
@ -24,8 +20,8 @@
# 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
@@ -239,6 +239,8 @@ html: htmldocs/gnuplot.html @@ -245,6 +245,8 @@ html: htmldocs/gnuplot.html
# emacs around to do lisp pre-processing #
htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
mkdir -p htmldocs mkdir -p htmldocs
+ ln -sf ../../VERSION htmldocs/ + ln -sf ../../VERSION htmldocs/
@ -33,7 +29,7 @@
latex2html -dir htmldocs -local_icons gnuplot latex2html -dir htmldocs -local_icons gnuplot
### PDF documentation ### PDF documentation
@@ -321,12 +323,16 @@ doc2hlp: doc2hlp.o termdoc.o @@ -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
@ -51,7 +47,7 @@
doc2gih: doc2gih.o termdoc.o doc2gih: doc2gih.o termdoc.o
$(LINK) doc2gih.o termdoc.o $(LIBS) $(LINK) doc2gih.o termdoc.o $(LIBS)
@@ -415,6 +421,7 @@ install: install-gih install-info @@ -431,6 +437,7 @@ install: install-gih install-info
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
@ -59,7 +55,7 @@
install-info: gnuplot.info install-info: gnuplot.info
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
@@ -434,6 +441,7 @@ uninstall: uninstall-gih uninstall-info @@ -450,6 +457,7 @@ uninstall: uninstall-gih uninstall-info
uninstall-gih: uninstall-gih:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
@ -68,7 +64,7 @@
uninstall-info: uninstall-info:
$(PRE_UNINSTALL) $(PRE_UNINSTALL)
--- docs/gnuplot-fr.doc --- docs/gnuplot-fr.doc
+++ docs/gnuplot-fr.doc 2009-05-09 13:32:24.000000000 +0200 +++ docs/gnuplot-fr.doc 2009-05-09 11:32:24.000000000 +0000
@@ -436,8 +436,8 @@ C @@ -436,8 +436,8 @@ C
#Home & same as \verb~^A~. \\ #Home & same as \verb~^A~. \\
#Ctrl Home & same as \verb~^E~. \\ #Ctrl Home & same as \verb~^E~. \\
@ -80,52 +76,9 @@
%c l . %c l .
%Touche fléchée@Fonction %Touche fléchée@Fonction
%_ %_
--- src/command.c
+++ src/command.c 2009-05-09 13:32:24.000000000 +0200
@@ -1177,14 +1177,24 @@ pause_command()
(void) fgets(buf, strlen(buf), stdin);
}
} else if (strcmp(term->name, "atari") == 0) {
- char *line = readline("");
+ char *line;
+#if 0
+ if (term->waitforinput)
+ term->waitforinput();
+#endif
+ line = readline("");
if (line)
free(line);
} else
(void) fgets(buf, strlen(buf), stdin);
#elif defined(ATARI)
if (strcmp(term->name, "atari") == 0) {
- char *line = readline("");
+ char *line;
+#if 0
+ if (term->waitforinput)
+ term->waitforinput();
+#endif
+ line = readline("");
if (line)
free(line);
} else
@@ -2696,6 +2706,13 @@ read_line(const char *prompt)
# endif /* no READLINE */
do {
+# if 0
+# ifdef USE_MOUSE
+ /* wait for input from graphic device, mainly x11 */
+ if (term->waitforinput)
+ term->waitforinput();
+# endif
+# endif
/* grab some input */
# if defined(READLINE) || defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
if (((interactive)
--- src/gplt_x11.c --- src/gplt_x11.c
+++ src/gplt_x11.c 2009-05-09 13:32:24.000000000 +0200 +++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000
@@ -2254,8 +2254,11 @@ exec_cmd(plot_struct *plot, char *comman @@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman
} }
} }
/* X11_justify_text(mode) - set text justification mode */ /* X11_justify_text(mode) - set text justification mode */
@ -139,19 +92,9 @@
else if (*buffer == 'A') else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle); sscanf(buffer + 1, "%lf", &plot->angle);
@@ -4724,7 +4727,9 @@ process_event(XEvent *event)
*/
#define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
+#ifndef AppDefDir
#define AppDefDir "/usr/lib/X11/app-defaults"
+#endif
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 64
#endif
--- src/plot.c --- src/plot.c
+++ src/plot.c 2009-05-09 13:32:24.000000000 +0200 +++ src/plot.c 2009-05-09 11:32:24.000000000 +0000
@@ -234,6 +234,7 @@ static int asked_privi = 0; @@ -222,6 +222,7 @@ static int asked_privi = 0;
void void
drop_privilege() drop_privilege()
{ {
@ -159,7 +102,7 @@
if (!asked_privi) { if (!asked_privi) {
euid = geteuid(); euid = geteuid();
egid = getegid(); egid = getegid();
@@ -247,11 +248,13 @@ drop_privilege() @@ -235,11 +236,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));
@ -173,7 +116,7 @@
if (!asked_privi) { if (!asked_privi) {
euid = geteuid(); euid = geteuid();
egid = getegid(); egid = getegid();
@@ -265,6 +268,7 @@ take_privilege() @@ -253,6 +256,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));
@ -181,7 +124,7 @@
} }
#endif /* LINUXVGA */ #endif /* LINUXVGA */
@@ -290,8 +294,8 @@ main(int argc, char **argv) @@ -278,8 +282,8 @@ main(int argc, char **argv)
int i; int i;
#ifdef LINUXVGA #ifdef LINUXVGA
@ -191,7 +134,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 */
@@ -357,6 +361,23 @@ main(int argc, char **argv) @@ -345,6 +349,23 @@ main(int argc, char **argv)
#if defined(HAVE_LIBEDITLINE) #if defined(HAVE_LIBEDITLINE)
rl_getc_function = getc_wrapper; rl_getc_function = getc_wrapper;
#endif #endif
@ -216,8 +159,8 @@
using_history(); 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 --- src/term.h
+++ src/term.h 2009-05-09 13:32:24.000000000 +0200 +++ src/term.h 2009-05-09 11:32:24.000000000 +0000
@@ -321,9 +321,9 @@ @@ -309,9 +309,9 @@
#include "emf.trm" #include "emf.trm"
/* Roland DXY800A plotter */ /* Roland DXY800A plotter */
@ -229,7 +172,7 @@
/* fig graphics */ /* fig graphics */
#include "fig.trm" #include "fig.trm"
@@ -353,7 +353,7 @@ @@ -341,7 +341,7 @@
#include "imagen.trm" #include "imagen.trm"
/* Kyocera Prescribe printer */ /* Kyocera Prescribe printer */
@ -238,7 +181,7 @@
/* Frame Maker MIF 3.00 format driver */ /* Frame Maker MIF 3.00 format driver */
#include "mif.trm" #include "mif.trm"
@@ -389,7 +389,7 @@ @@ -377,7 +377,7 @@
#include "tkcanvas.trm" #include "tkcanvas.trm"
/* Vectrix 384 printer, also Tandy colour */ /* Vectrix 384 printer, also Tandy colour */
@ -248,7 +191,7 @@
/* wire printers */ /* wire printers */
/* Epson LX-800, Star NL-10, NX-1000 and lots of others */ /* Epson LX-800, Star NL-10, NX-1000 and lots of others */
--- src/time.c --- src/time.c
+++ src/time.c 2009-05-09 13:32:24.000000000 +0200 +++ src/time.c 2009-05-09 11:32:24.000000000 +0000
@@ -291,11 +291,12 @@ gstrptime(char *s, char *fmt, struct tm @@ -291,11 +291,12 @@ gstrptime(char *s, char *fmt, struct tm
case 's': case 's':
#if 0 /* HBB 20040213: comment this out, but keep it around for now */ #if 0 /* HBB 20040213: comment this out, but keep it around for now */
@ -267,7 +210,7 @@
*tm = *tmwhen; *tm = *tmwhen;
break; break;
--- term/linux.trm --- term/linux.trm
+++ term/linux.trm 2009-05-09 13:32:24.000000000 +0200 +++ term/linux.trm 2009-05-09 11:32:24.000000000 +0000
@@ -80,7 +80,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( @@ -80,7 +80,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-4.4.0.tar.bz2 Normal file
View File

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

63
gnuplot.changes
View File

@ -1,3 +1,66 @@
-------------------------------------------------------------------
Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de
- Update to gnuplot 4.4.0
* NEW linetype property 'pointinterval'
* NEW gnuplot.exe is a full-featured console mode gnuplot executable for Windows
* NEW plot style "with circles"
* NEW object types circle, ellipse, and polygon
* NEW options front and back to "set colorbox"
* NEW x11 can plot into a window opened and managed by an external application
* NEW gd terminal can use fonts through fontconfig (libgd version > 2.0.35)
* NEW optional 3 columns of data to generate histogram errorbars
* NEW 'volatile' data, including inline data, can be replotted without rereading
* NEW 'refresh' command replots without rereading data if possible
* NEW rgbimage style now works in 2D and 3D for all terminals that support RGB
* NEW plot style rgbalpha
* NEW transparent fill styles
* NEW iteration within a plot command; e.g. plot for [i=1:10] foo(i)
* NEW iteration within set/unset commands
* NEW operators '=' and ',' in expression syntax
* NEW terminal lua generates commands for interpretation by external lua script
* NEW terminal tikz uses a lua script to generate output for latex TikZ package
* NEW terminal canvas for HTML 5 canvas element
* NEW terminal pdfcairo based on cairo and pango
* NEW terminal pngcairo based on cairo and pango
* NEW terminal dpu414 - Seiko DPU-414 thermal printer
* NEW error status variables GPVAL_ERRNO and GPVAL_ERRMSG
* NEW variables GPVAL_LAST_PLOT, GPVAL_{S}PLOT, GPVAL_MULTIPLOT
* NEW variables GPVAL_VIEW_{MAP|ROT_X|ROT_Z|SCALE|ZSCALE}, GPVAL_TERMINALS
* NEW variables GPVAL_PWD
* NEW per-plot export of information needed for external mousing scripts
* NEW support for dashed linetypes in additional terminals
* NEW the 'bind' command accepts non-keyboard triggers, e.g. 'close'
* NEW commands 'show bind' and 'reset bind'
* NEW individual plots can be omitted from autoscaling of axis ranges
* NEW more smoothing options: new kernels (for dgrid3d) and 'smooth cumulative'
* NEW command 'evaluate' executes commands from a string variable
* NEW z-axis tic labels can be colored by Z value
* NEW command 'set view equal {xy|xyz}' forces axes in a 3D plot to the same scale
* NEW 'set pm3d interpolate m,n' supports also non-positive m,n as nbs of points
* FIX domain restrictions on ibeta()
* FIX color assignment of contour lines when "set increment user" is in effect
* FIX remove the limit of 64 characters read as string data from a data file
* FIX remainder of command line is not lost after a "load" command
* FIX more complete support for locale internationalization, UTF-8 encoding
* FIX various font-handling problems in postscript terminal driver
* FIX avoid infinite loop on resizing x11 plot window under ion, fluxbox
* FIX handle addition plot styles in mode 'set table'
* FIX purge tick labels read from a datafile at the end of each plot
* FIX 2nd colour in the colour box for negative palette in postscript
* FIX interpolatation for pm3d surfaces given by both z and colour coordinates
* FIX 'set datafile binary format=...' was documented, but not implemented
* FIX enhanced text mode treatment of UTF-8 characters
* FIX emf terminal enhanced text mode now accepted by Windows programs
* CHANGE A number that begins with a . must continue with a digit
* CHANGE syntax of 'set datafile binary' array= and record= options
* CHANGE 'reset' does not affect locale, encoding, decimalsign settings
* CHANGE 'set key textcolor rgb variable' will use plot colors for key entries
* CHANGE Remove obsolete IRIS4D terminal type
* CHANGE Remove obsolete atari terminal types (atariaes atarivdi multitos)
* CHANGE Use empty/solid fill for candlesticks rather than empty/striped
* CHANGE 'l' and 'L' hotkeys toggle colorbar logscale iff mouse is in colorbar
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 4 11:48:39 UTC 2010 - coolo@novell.com Thu Mar 4 11:48:39 UTC 2010 - coolo@novell.com

41
gnuplot.spec
View File

@ -19,7 +19,12 @@
Name: gnuplot Name: gnuplot
BuildRequires: cairo-devel emacs-nox freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel netpbm pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11 xorg-x11-devel BuildRequires: cairo-devel emacs-nox freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel netpbm pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11 xorg-x11-devel
%if 0%{?suse_version} > 1120
BuildRequires: libpng14-devel lua-devel
%else
BuildRequires: libpng-devel
%endif
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: plotutils-devel BuildRequires: plotutils-devel
%else %else
@ -29,21 +34,18 @@ Url: http://www.gnuplot.info/
License: BSD3c(or similar) License: BSD3c(or similar)
Group: Productivity/Graphics/Visualization/Graph Group: Productivity/Graphics/Visualization/Graph
AutoReqProv: on AutoReqProv: on
PreReq: %install_info_prereq Version: 4.4.0
Version: 4.2.6 Release: 1
Release: 2
Summary: GNUplot a Function Plotting Utility Summary: GNUplot a Function Plotting Utility
Source0: gnuplot-%{version}.tar.bz2 Source0: gnuplot-%{version}.tar.bz2
Source2: gnuplot-fr.doc.bz2 Source2: gnuplot-fr.doc.bz2
Source3: README.whynot Source3: README.whynot
Patch0: gnuplot-4.2.5.dif Patch0: gnuplot-4.4.0.dif
Patch1: gnuplot-4.2.5-x11ovf.dif Patch1: gnuplot-4.4.0-x11ovf.dif
Patch2: gnuplot-4.2.5-fonts.dif Patch2: gnuplot-4.4.0-fonts.dif
Patch3: gnuplot-4.2.5-wxt.dif Patch3: gnuplot-4.4.0-wxt.dif
Patch4: gnuplot-4.2.5-demo.dif Patch4: gnuplot-4.4.0-demo.dif
Patch5: gnuplot-4.2.5-utf8.dif
Patch6: gnuplot-4.2.5-fix-format-errors.dif Patch6: gnuplot-4.2.5-fix-format-errors.dif
Patch7: gnuplot-4.2.5-gcc45.dif
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"
@ -71,7 +73,8 @@ License: BSD3c(or similar)
Summary: Documentation of GNUplot Summary: Documentation of GNUplot
Group: Productivity/Graphics/Visualization/Graph Group: Productivity/Graphics/Visualization/Graph
Requires: %{name} Requires: %{name}
PreReq: %install_info_prereq Requires(post): %install_info_prereq
Requires(postun): %install_info_prereq
%description doc %description doc
GNUplot documentation files including the man and info pages. GNUplot GNUplot documentation files including the man and info pages. GNUplot
@ -87,21 +90,19 @@ and can easily be extended to include new devices.
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 %patch -P 1 -p 0 -b .x11ovf
%patch -P 2 -p 0 %patch -P 2 -p 0 -b .font
%patch -P 3 -p 0 #%patch -P 3 -p 0
%patch -P 4 -p 0 %patch -P 4 -p 0
%patch -P 5 -p 0
%patch -P 6 -p 0 %patch -P 6 -p 0
%patch -P 0 -p 0 %patch -P 0 -p 0
%patch -P 7 -p 1
%build %build
SECSVGA="-DSVGA_IS_SECURE=1" SECSVGA="-DSVGA_IS_SECURE=1"
export CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\"" export CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
export CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\"" export CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\""
export CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA}" export CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA} -D_GNU_SOURCE"
export CXXFLAGS="$CFLAGS -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -fno-strict-aliasing"
export LDFLAGS="-L%{_x11lib}" export LDFLAGS="-L%{_x11lib} -Wl,--as-needed"
export ARCHLIB=%_lib export ARCHLIB=%_lib
for f in docs/makefile*; do for f in docs/makefile*; do
test -e $f || continue test -e $f || continue
@ -171,8 +172,8 @@ test $? -eq 0 || exit 1
install -m 0444 demo/* %{buildroot}/%{_docdir}/gnuplot/demo/ install -m 0444 demo/* %{buildroot}/%{_docdir}/gnuplot/demo/
install -m 0444 README* %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 README* %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 Copyright %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 Copyright %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 FAQ TODO VERSION %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 TODO VERSION %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 NEWS VERSION BUGS %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 NEWS BUGS %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 %{SOURCE3} %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 %{SOURCE3} %{buildroot}/%{_docdir}/gnuplot/
rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile* rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*
rm -f %{buildroot}/%{_datadir}/emacs/site-lisp/info-look.* rm -f %{buildroot}/%{_datadir}/emacs/site-lisp/info-look.*