forked from pool/gnuplot
011db28dee
Update to gnuplot 5.0.0 OBS-URL: https://build.opensuse.org/request/show/282275 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=59
261 lines
9.1 KiB
Plaintext
261 lines
9.1 KiB
Plaintext
diff -upr ../gnuplot-5.0.0.orig/configure.in ./configure.in
|
||
--- ../gnuplot-5.0.0.orig/configure.in 2014-12-06 07:23:29.000000000 +0100
|
||
+++ ./configure.in 2015-01-21 19:43:16.398390320 +0100
|
||
@@ -369,7 +369,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
|
||
|
||
diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.am ./docs/Makefile.am
|
||
--- ../gnuplot-5.0.0.orig/docs/Makefile.am 2014-10-01 04:36:59.000000000 +0200
|
||
+++ ./docs/Makefile.am 2015-01-21 19:43:16.399390320 +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 @@ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf g
|
||
checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
|
||
gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.* \
|
||
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)
|
||
|
||
@@ -268,16 +268,20 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
|
||
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 -upr ../gnuplot-5.0.0.orig/docs/Makefile.in ./docs/Makefile.in
|
||
--- ../gnuplot-5.0.0.orig/docs/Makefile.in 2015-01-01 20:27:52.000000000 +0100
|
||
+++ ./docs/Makefile.in 2015-01-21 19:43:16.400390321 +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_builddir = @top_builddir@
|
||
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 @@ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf g
|
||
checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
|
||
gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.* \
|
||
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
|
||
@@ -1042,14 +1042,18 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
|
||
./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 -upr ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc
|
||
--- ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc 2015-01-21 19:31:33.000000000 +0100
|
||
+++ ./docs/gnuplot-fr.doc 2015-01-21 19:59:22.858479689 +0100
|
||
@@ -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
|
||
%_
|
||
diff -upr ../gnuplot-5.0.0.orig/src/gadgets.h ./src/gadgets.h
|
||
--- ../gnuplot-5.0.0.orig/src/gadgets.h 2014-07-14 19:06:00.000000000 +0200
|
||
+++ ./src/gadgets.h 2015-01-21 19:44:18.308396045 +0100
|
||
@@ -470,7 +470,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;
|
||
|
||
diff -upr ../gnuplot-5.0.0.orig/src/gplt_x11.c ./src/gplt_x11.c
|
||
--- ../gnuplot-5.0.0.orig/src/gplt_x11.c 2014-12-15 05:24:07.000000000 +0100
|
||
+++ ./src/gplt_x11.c 2015-01-21 19:55:05.112455855 +0100
|
||
@@ -2515,9 +2515,12 @@ exec_cmd(plot_struct *plot, char *comman
|
||
}
|
||
}
|
||
/* 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 -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
|
||
--- ../gnuplot-5.0.0.orig/src/plot.c 2014-12-31 05:32:09.000000000 +0100
|
||
+++ ./src/plot.c 2015-01-21 19:49:19.917423935 +0100
|
||
@@ -216,6 +216,7 @@ static int asked_privi = 0;
|
||
void
|
||
drop_privilege()
|
||
{
|
||
+#ifndef SVGA_IS_SECURE
|
||
if (!asked_privi) {
|
||
euid = geteuid();
|
||
egid = getegid();
|
||
@@ -229,11 +230,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();
|
||
@@ -247,6 +250,7 @@ take_privilege()
|
||
if (seteuid(euid) == -1)
|
||
(void) fprintf(stderr, "seteuid(%d): %s\n",
|
||
(int) euid, strerror(errno));
|
||
+#endif
|
||
}
|
||
|
||
#endif /* LINUXVGA */
|
||
@@ -273,8 +277,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 */
|
||
@@ -329,6 +333,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'
|
||
diff -upr ../gnuplot-5.0.0.orig/src/term.h ./src/term.h
|
||
--- ../gnuplot-5.0.0.orig/src/term.h 2014-10-01 04:40:29.000000000 +0200
|
||
+++ ./src/term.h 2015-01-21 19:49:50.522426765 +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 -upr ../gnuplot-5.0.0.orig/term/linux.trm ./term/linux.trm
|
||
--- ../gnuplot-5.0.0.orig/term/linux.trm 2012-01-30 20:31:01.000000000 +0100
|
||
+++ ./term/linux.trm 2015-01-21 19:50:41.692431497 +0100
|
||
@@ -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) {
|