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

261 lines
9.0 KiB
Plaintext
Raw Blame History

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.1.new/configure.in 2015-12-01 00:49:17.507692991 +0100
@@ -369,7 +369,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
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
@@ -38,7 +38,7 @@
#
# default is what is needed for interactive gnuplot
-gih_DATA = gnuplot.gih
+gih_DATA = gnuplot.gih gnuplot-fr.gih
gihdir = @GIHDIR@
noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \
@@ -86,7 +86,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)
@@ -270,16 +270,20 @@
doc2hlp_SOURCES = doc2hlp.c termdoc.c
### 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
+
doc2gih_SOURCES = doc2gih.c termdoc.c
# 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
alldoc2gih_SOURCES = doc2gih.c termdoc.c
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.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
@@ -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~. \\
#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
%_
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.1.orig/src/gadgets.h 2015-03-29 19:47:03.000000000 +0200
+++ gnuplot-5.0.1.new/src/gadgets.h 2015-12-01 00:49:17.511692953 +0100
@@ -473,7 +473,7 @@
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;
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.1.orig/src/gplt_x11.c 2015-12-01 00:48:21.452198467 +0100
+++ gnuplot-5.0.1.new/src/gplt_x11.c 2015-12-01 00:49:17.511692953 +0100
@@ -2524,9 +2524,12 @@
}
}
/* X11_justify_text(mode) - set text justification mode */
- else if (*buffer == 'J')
- sscanf(buffer, "J%d", (int *) &plot->jmode);
-
+ else if (*buffer == 'J') {
+ int jmode;
+ sscanf(buffer, "J%d", &jmode);
+ plot->jmode = jmode;
+ }
+
else if (*buffer == 'A')
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.1.orig/src/plot.c 2014-12-31 05:32:09.000000000 +0100
+++ gnuplot-5.0.1.new/src/plot.c 2015-12-01 00:49:17.511692953 +0100
@@ -216,6 +216,7 @@
void
drop_privilege()
{
+#ifndef SVGA_IS_SECURE
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -229,11 +230,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();
@@ -247,6 +250,7 @@
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) euid, strerror(errno));
+#endif
}
#endif /* LINUXVGA */
@@ -273,8 +277,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 */
@@ -329,6 +333,22 @@
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'
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.1.orig/src/term.h 2014-10-01 04:40:29.000000000 +0200
+++ gnuplot-5.0.1.new/src/term.h 2015-12-01 00:49:17.511692953 +0100
@@ -261,9 +261,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"
@@ -296,7 +296,7 @@
/* #include "imagen.trm" */
/* Kyocera Prescribe printer */
-/* #include "kyo.trm" */
+#include "kyo.trm"
/* Frame Maker MIF 3.00 format driver */
#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.1.orig/term/linux.trm 2012-01-30 20:31:01.000000000 +0100
+++ gnuplot-5.0.1.new/term/linux.trm 2015-12-01 00:49:17.511692953 +0100
@@ -195,7 +195,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));
@@ -408,7 +408,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