forked from pool/gnuplot
228 lines
6.7 KiB
Plaintext
228 lines
6.7 KiB
Plaintext
--- configure.in
|
||
+++ configure.in 2011-08-17 20:44:53.000000000 +0000
|
||
@@ -329,7 +329,7 @@ if test "$with_linux_vga" = yes; then
|
||
[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
|
||
|
||
--- docs/Makefile.in
|
||
+++ docs/Makefile.in 2012-04-02 14:22:57.386065105 +0000
|
||
@@ -38,7 +38,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
|
||
@@ -242,10 +242,12 @@ html: htmldocs/gnuplot.html
|
||
# requires a working latex2html, which is hard to find these days
|
||
# 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
|
||
|
||
htmldocs/gnuplot.html: $(srcdir)/gnuplot.dvi
|
||
- rm -f VERSION; ln -s ../VERSION .
|
||
+ ln -sf ../VERSION .
|
||
htlatex gnuplot
|
||
mkdir -p htmldocs
|
||
mv gnuplot.html gnuplot.css gnuplot*.png gnuplot.log htmldocs/
|
||
@@ -342,12 +344,16 @@ doc2hlp: doc2hlp.o termdoc.o
|
||
$(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)
|
||
|
||
@@ -444,6 +450,7 @@ install: install-gih install-info instal
|
||
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-pdf:
|
||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
|
||
@@ -469,6 +476,7 @@ uninstall: uninstall-gih uninstall-info
|
||
|
||
uninstall-gih:
|
||
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
|
||
+ rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
|
||
|
||
uninstall-pdf:
|
||
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.pdf
|
||
--- docs/gnuplot-fr.doc
|
||
+++ docs/gnuplot-fr.doc 2009-05-09 11:32:24.000000000 +0000
|
||
@@ -436,8 +436,8 @@ C
|
||
#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/gadgets.h
|
||
+++ src/gadgets.h 2011-08-17 20:44:53.000000000 +0000
|
||
@@ -424,7 +424,7 @@ extern TBOOLEAN clip_lines1;
|
||
extern TBOOLEAN clip_lines2;
|
||
extern TBOOLEAN clip_points;
|
||
|
||
-#define SAMPLES 100 /* default number of samples for a plot */
|
||
+#define SAMPLES 500 /* default number of samples for a plot */
|
||
extern int samples_1;
|
||
extern int samples_2;
|
||
|
||
--- src/gplt_x11.c
|
||
+++ src/gplt_x11.c 2011-08-17 20:44:53.000000000 +0000
|
||
@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman
|
||
}
|
||
}
|
||
/* 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);
|
||
--- src/plot.c
|
||
+++ src/plot.c 2011-08-17 20:44:53.000000000 +0000
|
||
@@ -214,6 +214,7 @@ static int asked_privi = 0;
|
||
void
|
||
drop_privilege()
|
||
{
|
||
+#ifndef SVGA_IS_SECURE
|
||
if (!asked_privi) {
|
||
euid = geteuid();
|
||
egid = getegid();
|
||
@@ -227,11 +228,13 @@ drop_privilege()
|
||
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();
|
||
@@ -245,6 +248,7 @@ take_privilege()
|
||
if (seteuid(euid) == -1)
|
||
(void) fprintf(stderr, "seteuid(%d): %s\n",
|
||
(int) euid, strerror(errno));
|
||
+#endif
|
||
}
|
||
|
||
#endif /* LINUXVGA */
|
||
@@ -270,8 +274,8 @@ main(int argc, char **argv)
|
||
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 */
|
||
@@ -326,6 +330,22 @@ main(int argc, char **argv)
|
||
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;
|
||
+
|
||
+ sprintf(hfile, "/usr/share/gnuplot/%s/gnuplot-", gnuplot_version);
|
||
+ 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)
|
||
/* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
|
||
* It is used to parse a 'gnuplot' specific section in '~/.inputrc'
|
||
--- src/term.h
|
||
+++ src/term.h 2011-08-17 20:44:53.000000000 +0000
|
||
@@ -272,9 +272,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"
|
||
@@ -307,7 +307,7 @@
|
||
#include "imagen.trm"
|
||
|
||
/* Kyocera Prescribe printer */
|
||
-/* #include "kyo.trm" */
|
||
+#include "kyo.trm"
|
||
|
||
/* Frame Maker MIF 3.00 format driver */
|
||
#include "mif.trm"
|
||
@@ -340,7 +340,7 @@
|
||
#include "tkcanvas.trm"
|
||
|
||
/* Vectrix 384 printer, also Tandy colour */
|
||
-/* #include "v384.trm" */
|
||
+#include "v384.trm"
|
||
|
||
#ifndef NO_BITMAP_SUPPORT
|
||
|
||
--- term/linux.trm
|
||
+++ term/linux.trm 2011-08-17 20:44:53.000000000 +0000
|
||
@@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
|
||
TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
|
||
TERM_PUBLIC void LINUX_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));
|
||
|
||
@@ -408,7 +408,7 @@ LINUX_putc(
|
||
}
|
||
|
||
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) {
|