rpm/gnuplot
SHA256
1
0
Fork 0
forked from pool/gnuplot
Code Pull Requests Activity
af5ef76438
gnuplot/gnuplot-4.2.5.dif

352 lines
9.6 KiB
Plaintext
Raw Blame History

--- .pkgextract 1970-01-01 01:00:00.000000000 +0100
+++ .pkgextract 2009-05-09 13:32:24.000000000 +0200
@@ -0,0 +1 @@
+bzcat ../gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
--- configure.in 2009-03-15 04:39:15.000000000 +0100
+++ configure.in 2009-05-09 13:32:24.000000000 +0200
@@ -230,7 +230,7 @@
[AC_DEFINE(LINUXVGA,1,
[ Define if this is a Linux system with SuperVGA library. ])
LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
- TERMLIBS="-lvga $TERMLIBS"],
+ TERMLIBS="/usr/${ARCHLIB:=lib}/libvga.a $TERMLIBS"],
with_linux_vga=no)
fi
--- demo/poldat.dem 2003-10-28 06:35:54.000000000 +0100
+++ demo/poldat.dem 2009-05-09 13:32:24.000000000 +0200
@@ -11,7 +11,7 @@
unset polar
set title "Primitive Smith Chart"
unset key
-set xlabel "Impedance or Admittance Coordinates"
+set xlabel "Impedance or Admittance Coordinates" 12,-1
set para
set rrange [-0 : 10]
set trange [-pi : pi]
--- demo/simple.dem 2006-06-30 04:17:22.000000000 +0200
+++ 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 2006-07-12 19:21:14.000000000 +0200
+++ demo/vector.dem 2009-05-09 13:32:24.000000000 +0200
@@ -62,19 +62,19 @@
print "Now create a file with equipotential lines"
pause -1 "Hit return to continue"
-set table "equipo2.tmp"
+set table "/tmp/equipo2.tmp"
replot
unset table
reset
pause 0
-plot "equipo2.tmp" w l
+plot "/tmp/equipo2.tmp" w l
print "Now create a x/y datafile for plotting with vectors "
print "and display vectors parallel to the electrostatic field"
pause -1 "Hit return to continue"
set isosam 31,31
-set table "field2xy.tmp"
+set table "/tmp/field2xy.tmp"
splot vtot(x,y) w l
unset table
pause 0
@@ -84,8 +84,8 @@
set yr [ymin:ymax]
set isosam 31,31
set key under Left reverse
-plot "field2xy.tmp" u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \
- "equipo2.tmp" w l
+plot "/tmp/field2xy.tmp" u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \
+ "/tmp/equipo2.tmp" w l
pause -1 "Hit return to continue"
reset
--- docs/Makefile.in 2006-08-09 23:09:48.000000000 +0200
+++ docs/Makefile.in 2009-05-09 13:32:24.000000000 +0200
@@ -37,7 +37,7 @@
#
# default is what is needed for interactive gnuplot
-all: gnuplot.gih
+all: gnuplot.gih gnuplot-fr.gih gnuplot.info
# this tells GNU make not to export variables into the environment
# But other makes dont understand its significance, so it must
@@ -239,6 +239,8 @@
# emacs around to do lisp pre-processing
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
@@ -321,12 +323,16 @@
$(LINK) doc2hlp.o termdoc.o $(LIBS)
### gnuplot interactive help format
-gih: gnuplot.gih
+gih: gnuplot.gih gnuplot-fr.gih
gnuplot.gih: doc2gih $(srcdir)/gnuplot.doc
@rm -f alldoc2gih
./doc2gih $(srcdir)/gnuplot.doc gnuplot.gih
+gnuplot-fr.gih: doc2gih $(srcdir)/gnuplot-fr.doc
+ @rm -f alldoc2gih
+ ./doc2gih $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+
doc2gih: doc2gih.o termdoc.o
$(LINK) doc2gih.o termdoc.o $(LIBS)
@@ -415,6 +421,7 @@
install-gih: gnuplot.gih
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ $(INSTALL_DATA) gnuplot-fr.gih $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
install-info: gnuplot.info
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
@@ -434,6 +441,7 @@
uninstall-gih:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
uninstall-info:
$(PRE_UNINSTALL)
--- docs/gnuplot-fr.doc 2009-05-09 11:53:20.000000000 +0200
+++ docs/gnuplot-fr.doc 2009-05-09 13:32:24.000000000 +0200
@@ -436,8 +436,8 @@
#Home & same as \verb~^A~. \\
#Ctrl Home & same as \verb~^E~. \\
#Esc & same as \verb~^U~. \\
-#Help & `{\bf help}' plus Entr<74>e. \\
-#Ctrl Help & `{\bf help }'. \\
+#Help & `{\bf help}` plus Entr<74>e. \\
+#Ctrl Help & `{\bf help }`. \\
%c l .
%Touche fl<66>ch<63>e@Fonction
%_
--- src/command.c 2008-12-15 05:18:36.000000000 +0100
+++ src/command.c 2009-05-09 13:32:24.000000000 +0200
@@ -1177,14 +1177,24 @@
(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 @@
# 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 2009-01-14 19:42:02.000000000 +0100
+++ src/gplt_x11.c 2009-05-09 13:32:24.000000000 +0200
@@ -2240,8 +2240,11 @@
}
}
/* X11_justify_text(mode) - set text justification mode */
- else if (*buffer == 'J')
- sscanf(buffer, "J%4d", (int *) &plot->jmode);
+ else if (*buffer == 'J') {
+ int jmode;
+ sscanf(buffer, "J%4d", &jmode);
+ plot->jmode = jmode;
+ }
else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle);
@@ -4710,7 +4713,9 @@
*/
#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 2008-12-15 05:18:36.000000000 +0100
+++ src/plot.c 2009-05-09 13:32:24.000000000 +0200
@@ -234,6 +234,7 @@
void
drop_privilege()
{
+#ifndef SVGA_IS_SECURE
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -247,11 +248,13 @@
if (seteuid(ruid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) ruid, strerror(errno));
+#endif
}
void
take_privilege()
{
+#ifndef SVGA_IS_SECURE
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -265,6 +268,7 @@
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) euid, strerror(errno));
+#endif
}
#endif /* LINUXVGA */
@@ -290,8 +294,8 @@
int i;
#ifdef LINUXVGA
- LINUX_setup(); /* setup VGA before dropping privilege DBT 4/5/99 */
drop_privilege();
+ LINUX_setup();
#endif
/* make sure that we really have revoked root access, this might happen if
gnuplot is compiled without vga support but is installed suid by mistake */
@@ -357,6 +361,23 @@
#if defined(HAVE_LIBEDITLINE)
rl_getc_function = getc_wrapper;
#endif
+
+#ifdef __linux__
+ if (!getenv("GNUHELP")) {
+ const char* msg = setlocale(LC_MESSAGES, NULL);
+ if (msg) {
+ char hfile[64];
+ struct stat buf;
+
+ strcpy (hfile, "/usr/share/gnuplot/4.0/gnuplot-");
+ strncat(hfile, msg, 2);
+ strcat (hfile, ".gih");
+ if (stat(hfile, &buf) == 0)
+ setenv("GNUHELP", strdup(hfile), 0);
+ }
+ }
+#endif
+
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
using_history();
/* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
--- src/term.h 2006-04-29 07:30:07.000000000 +0200
+++ src/term.h 2009-05-09 13:32:24.000000000 +0200
@@ -321,9 +321,9 @@
#include "emf.trm"
/* Roland DXY800A plotter */
-/* #include "dxy.trm" */
+#include "dxy.trm"
/* QMS/EXCL laserprinter (Talaris 1590 and others) */
-/* #include "excl.trm" */
+#include "excl.trm"
/* fig graphics */
#include "fig.trm"
@@ -353,7 +353,7 @@
#include "imagen.trm"
/* Kyocera Prescribe printer */
-/* #include "kyo.trm" */
+#include "kyo.trm"
/* Frame Maker MIF 3.00 format driver */
#include "mif.trm"
@@ -389,7 +389,7 @@
#include "tkcanvas.trm"
/* Vectrix 384 printer, also Tandy colour */
-/* #include "v384.trm" */
+#include "v384.trm"
/* wire printers */
/* Epson LX-800, Star NL-10, NX-1000 and lots of others */
--- src/time.c 2008-09-02 23:12:59.000000000 +0200
+++ src/time.c 2009-05-09 13:32:24.000000000 +0200
@@ -291,11 +291,12 @@
case 's':
#if 0 /* HBB 20040213: comment this out, but keep it around for now */
{
- /* time_t when; */
- int when;
+ time_t when;
+ int iwhen;
struct tm *tmwhen;
- s = read_int(s, 10, &when);
- tmwhen = gmtime((time_t*)&when);
+ s = read_int(s, 10, &iwhen);
+ when = iwhen;
+ tmwhen = gmtime(&when);
tmwhen->tm_year += 1900;
*tm = *tmwhen;
break;
--- term/linux.trm 2006-07-21 04:35:47.000000000 +0200
+++ term/linux.trm 2009-05-09 13:32:24.000000000 +0200
@@ -80,7 +80,7 @@
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 int LINUX_text_angle __PROTO((int ang));
-TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, const char *str));
+TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, char *str));
TERM_PUBLIC void LINUX_suspend __PROTO((void));
TERM_PUBLIC void LINUX_resume __PROTO((void));
@@ -293,7 +293,7 @@
}
TERM_PUBLIC void
-LINUX_put_text(unsigned int x, unsigned int y, const char *str)
+LINUX_put_text(unsigned int x, unsigned int y, char *str)
{
int i;
switch (linux_angle) {
View Git Blame Copy Permalink