SHA256
1
0
forked from pool/gnuplot
gnuplot/gnuplot-4.4.1.dif
Dr. Werner Fink b54a7a3338 Accepting request 94492 from home:burnus:branches:Publishing
The package might regress on SLE_10 as cairo >= 1.2 is needed and
only cairo 1.0.2 is available. (Maybe it is no regresion - and
cairo didn't work before, either.)

The build currently fails on SLE_10 with some TeX/epstopdf error,
on SLE_11/i586 with a texlive-2007/2010 conflict, on SLE_11/x86-64
with a tex.fmt error, and on oS 11.4 and oS11.3/i586, it cannot
resolve libzzip which is needed by texlive. I think those are all
problems related to an incomplete texlive*rpm build in "Publishing".

- Update to gnuplot 4.4.4
  * NEW boxxyerrors plot style now allows variable color
  * NEW splot with pm3d now allows variable rgb color
  * NEW "nonuniform matrix" indicates ascii data with explicit x, y
  * CHANGE columnhead(N) is a string-valued function, not a keyword
  * CHANGE Demarcate plots in svg output using <g id="Plot_#"><title>...
  * CHANGE xticlabels() works for binary data files as well as ascii
  * CHANGE "set key maxrows" now applies to 3D plots as well as 2D
  * CHANGE rewrite installation path rules for TeX files
  * FIX wxt terminal should now work on at least some flavors of OSX
  * FIX incorrect space allowed for outside left key box
  * FIX buffer overflow from enhanced text timefmt tic labels
  * FIX correction for offset in epochs when reading in time format "%s"
  * FIX discontinuity in defined palette limited by maxcolors
  * FIX initialization of svg pattern-fill definitions
  * FIX positioning of histogram bars when some data entries are missing
  * FIX emf terminal can handle UTF-8 encoding
  * FIX User-specified axis tick labels override auto labels in 3D
    just as in 2D
  * FIX `plot with labels` failed to skip labels with UNDEFINED coords
  * FIX NaN (not a number) implementation for Windows build
  * FIX work-around for poor scaling in pdfcairo pattern fill
  * FIX segfault if mismatch between palette sizes of successive terminals

OBS-URL: https://build.opensuse.org/request/show/94492
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=23
2011-11-30 17:17:21 +00:00

223 lines
6.4 KiB
Plaintext
Raw Blame History

--- configure.in
+++ configure.in 2009-05-09 11:32:24.000000000 +0000
@@ -264,7 +264,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 2009-05-09 11:32:24.000000000 +0000
@@ -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
@@ -245,6 +245,8 @@ html: htmldocs/gnuplot.html
#
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
@@ -337,12 +339,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)
@@ -431,6 +437,7 @@ install: install-gih install-info
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)
@@ -450,6 +457,7 @@ uninstall: uninstall-gih uninstall-info
uninstall-gih:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
uninstall-info:
$(PRE_UNINSTALL)
--- 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 2010-05-10 10:57:45.850924766 +0000
@@ -389,7 +389,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 2009-05-09 11:32:24.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 2010-09-14 17:08:15.836458107 +0200
@@ -220,6 +220,7 @@ static int asked_privi = 0;
void
drop_privilege()
{
+#ifndef SVGA_IS_SECURE
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -233,11 +234,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();
@@ -251,6 +254,7 @@ take_privilege()
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) euid, strerror(errno));
+#endif
}
#endif /* LINUXVGA */
@@ -276,8 +280,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 */
@@ -344,6 +348,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;
+
+ 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
+++ src/term.h 2009-05-09 11:32:24.000000000 +0000
@@ -309,9 +309,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"
@@ -341,7 +341,7 @@
#include "imagen.trm"
/* Kyocera Prescribe printer */
-/* #include "kyo.trm" */
+#include "kyo.trm"
/* Frame Maker MIF 3.00 format driver */
#include "mif.trm"
@@ -377,7 +377,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 */
--- term/linux.trm
+++ term/linux.trm 2009-05-09 11:32:24.000000000 +0000
@@ -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_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 @@ 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) {