Hello community, here is the log from the commit of package gnuplot for openSUSE:Factory checked in at 2012-04-12 09:24:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuplot (Old) and /work/SRC/openSUSE:Factory/.gnuplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuplot", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2012-02-16 10:05:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot.changes 2012-04-12 09:24:54.000000000 +0200 @@ -1,0 +2,34 @@ +Wed Apr 4 12:13:24 UTC 2012 - [email protected] + +- Use new bcond_without h3d_gridbox to switch back to h3d-quadtree + if h3d-gridbox will be disabled on the commandline of rpmbuild + +------------------------------------------------------------------- +Mon Apr 2 15:37:32 UTC 2012 - [email protected] + +- Avoid to stumble on bug in QtCore.pc on older distributions + +------------------------------------------------------------------- +Mon Apr 2 14:38:11 UTC 2012 - [email protected] + +- Refresh patches to see in which C function each change is in +- Reenable bitmap terminals + +------------------------------------------------------------------- +Thu Mar 15 11:43:23 UTC 2012 - [email protected] + +- Update to gnuplot 4.6.0 + * New syntax supporting multi-line blocks of code delimited by curly braces + if (<cond>) { ... } else { ... } + do for [<iteration-spec>] { ... } + while (<cond>) { ... } + * Time formats can handle fractional seconds to microsecond precision. + * User-definable linetypes that can be used to establish a locally + preferred default sequence of colors or dash/thickness/point styles. + * Statistical summary of the data to be plotted (new command "stats") + * New terminal drivers: qt context epscairo cairolatex + * The version for Windows received major improvements + (GUI, help, native terminal and wxt, installer) + * Improved support for UTF-8, SJIS and other multi-byte encodings + +------------------------------------------------------------------- Old: ---- gnuplot-4.2.5-fix-format-errors.dif gnuplot-4.4.0-demo.dif gnuplot-4.4.0-fonts.dif gnuplot-4.4.1.dif gnuplot-4.4.4.tar.bz2 gnuplot-lua.diff New: ---- gnuplot-4.6.0-demo.diff gnuplot-4.6.0-fix-format-errors.diff gnuplot-4.6.0-fonts.diff gnuplot-4.6.0.dif gnuplot-4.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuplot.spec ++++++ --- /var/tmp/diff_new_pack.J4hUSm/_old 2012-04-12 09:24:56.000000000 +0200 +++ /var/tmp/diff_new_pack.J4hUSm/_new 2012-04-12 09:24:56.000000000 +0200 @@ -16,7 +16,10 @@ # +%bcond_without h3d_gridbox + Name: gnuplot +BuildRequires: ImageMagick BuildRequires: automake BuildRequires: cairo-devel BuildRequires: emacs-nox @@ -24,12 +27,16 @@ BuildRequires: gcc-c++ BuildRequires: gd-devel BuildRequires: gtk2-devel -BuildRequires: latex2html BuildRequires: libjpeg-devel +BuildRequires: libqt4-devel >= 4.5 BuildRequires: netpbm BuildRequires: pango-devel BuildRequires: readline-devel +%if %suse_version <= 1140 +BuildRequires: zziplib +%endif BuildRequires: texlive-latex +BuildRequires: texlive-tex4ht BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel %if %suse_version > 1130 @@ -49,20 +56,20 @@ BuildRequires: plotutils %endif Url: http://www.gnuplot.info/ -Version: 4.4.4 +Version: 4.6.0 Release: 0 Summary: GNUplot a Function Plotting Utility License: SUSE-Gnuplot and GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph -Source0: gnuplot-%{version}.tar.bz2 +# http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz +Source0: gnuplot-%{version}.tar.gz Source2: gnuplot-fr.doc.bz2 Source3: README.whynot -Patch0: gnuplot-4.4.1.dif +Patch0: gnuplot-4.6.0.dif Patch1: gnuplot-4.4.0-x11ovf.dif -Patch2: gnuplot-4.4.0-fonts.dif -Patch4: gnuplot-4.4.0-demo.dif -Patch6: gnuplot-4.2.5-fix-format-errors.dif -Patch7: gnuplot-lua.diff +Patch2: gnuplot-4.6.0-fonts.diff +Patch4: gnuplot-4.6.0-demo.diff +Patch6: gnuplot-4.6.0-fix-format-errors.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -112,12 +119,11 @@ %setup -q -n gnuplot-%{version} bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc test $? -eq 0 || exit 1 -%patch -P 1 -p 0 -b .x11ovf -%patch -P 2 -p 0 -b .font -%patch -P 4 -p 0 -%patch -P 6 -p 0 -%patch -P 7 -p 0 -%patch -P 0 -p 0 +%patch1 -p 0 -b .x11ovf +%patch2 -p 0 -b .font +%patch4 -p 0 -b .demo +%patch6 -p 0 -b .formaterrors +%patch0 -p 0 -b .0 %build SECSVGA="-DSVGA_IS_SECURE=1" @@ -146,17 +152,29 @@ --with-readline=gnu \ --enable-history-file \ --with-linux-vga \ - --with-gif=png \ + --with-bitmap-terminals \ --with-freetype=%{_libdir}\ --enable-x11-mbfonts \ +%if ! %{with h3d_gridbox} --enable-h3d-quadtree \ + --disable-h3d-gridbox \ +%else + --disable-h3d-quadtree \ + --enable-h3d-gridbox \ +%endif + --enable-backwards-compatibility\ --with-zlib \ --with-gd \ --enable-thin-splines \ --without-row-help \ --with-kpsexpand \ - --with-plot=%{_libdir} + --with-plot=%{_libdir} \ + --enable-qt +%if %suse_version <= 1140 + make %{?jobs:-j%jobs} RCC=/usr/bin/rcc LRELEASE=/usr/bin/lrelease +%else make %{?jobs:-j%jobs} +%endif pushd docs/ make srcdir=. clean all html pdf gpcard.ps pushd psdoc/ ++++++ gnuplot-4.6.0-demo.diff ++++++ --- demo/ellipse.dem +++ demo/ellipse.dem 2012-03-15 11:05:54.000000000 +0000 @@ -9,6 +9,7 @@ if ((GPVAL_VERSION == 4.3 || GPVAL_VERSI print "This copy of gnuplot was built without support for placing ellipses\n" ; \ exit ; +random="`mktemp /tmp/random.XXXXXX` unset key set xrange [-8:8] @@ -27,7 +28,7 @@ set object 1 ellipse center 1.5,1.0 size set obj 2 ellipse center 1.5, 1 size 6, 12 angle 20 front fs empty bo 3 A = pi/9. -plot 'random.tmp' using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots +plot random using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots pause -1 "Hit return to continue" --- demo/fit.dem +++ demo/fit.dem 2012-03-15 11:05:54.000000000 +0000 @@ -5,9 +5,11 @@ print "Some examples how data fitting using nonlinear least squares fit" print "can be done." print "" +logfile = "`mktemp /tmp/fit.log.XXXXXX`" pause -1 "first plotting the pure data set (-> return)" reset +set fit logfile logfile set title 'data for first fit demo' set xlabel "Temperature T [deg Cels.]" set ylabel "Density [g/cm3]" @@ -162,7 +164,7 @@ pause -1 "(-> return)" # Must provide an error estimate for a 3d fit. Use constant 1 fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via 'sound.par' #create soundfit.par, reading from sound.par and updating values -update 'sound.par' 'soundfit.par' +update 'sound.par' "`mktemp /tmp/soundfit.par.XXXXXX`" print "" pause -1 "(-> return)" set title 'pseudo-3d multi-branch fit to velocity data' @@ -251,6 +253,7 @@ print "" pause -1 "Hit return to continue" reset +set fit logfile logfile set xlabel 'x' set ylabel 'y' set zlabel 'z' @@ -340,3 +343,4 @@ print "from time to time!" print "" pause -1 "Done with fitting demo (-> return)" reset +set fit logfile logfile --- demo/poldat.dem +++ demo/poldat.dem 2012-03-15 11:05:54.000000000 +0000 @@ -11,7 +11,7 @@ unset grid unset polar set title "Primitive Smith Chart" unset key -set xlabel "Impedance or Admittance Coordinates" +set xlabel "Impedance or Admittance Coordinates" offset 12,-1 set para set rrange [-0 : 10] set trange [-pi : pi] --- demo/random.dem +++ demo/random.dem 2012-03-15 11:08:49.000000000 +0000 @@ -46,7 +46,8 @@ print "this case is zero, i.e. a circle. print "" nsamp = 50 # Generate N random data points. -set print "random.tmp" +random="`mktemp /tmp/random.XXXXXX`" +set print random do for [i=1:nsamp] { print sprintf("%8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0))) } @@ -73,7 +74,7 @@ set vrange [-3:3] set ticslevel 0 set isosamples 30 splot u,v,( 1/(2*pi) * exp(-0.5 * (u**2 + v**2)) ) with line lc rgb "black", \ - "random.tmp" using 1:2:(-0.2) with points pointtype 7 lc rgb "black" + random using 1:2:(-0.2) with points pointtype 7 lc rgb "black" pause -1 "Hit return to continue" unset contour unset parametric @@ -96,7 +97,7 @@ xlow = -3.0 xhigh = 3.0 scale = (binwidth/(xhigh-xlow)) # Generate N random data points. -set print "random.tmp" +set print random do for [i=1:nsamp] { print sprintf("%8.5g %8.5g", invnorm(rand(0)), (1.0*scale/nsamp)) } @@ -110,7 +111,7 @@ set grid set xrange [-3:3] set yrange [0:0.45] bin(x) = (1.0/scale)*floor(x*scale) -plot "random.tmp" using (bin($1)):2 smooth frequency with steps \ +plot random using (bin($1)):2 smooth frequency with steps \ title "scaled bin frequency", \ normal(x,0,1) with lines title "Gaussian p.d.f." pause -1 "Hit return to continue" @@ -126,7 +127,7 @@ print "" reset nsamp = 3000 # Generate N random data points. -set print "random.tmp" +set print random do for [i=1:nsamp] { print sprintf("%8.5g %8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)), invnorm(rand(0))) } @@ -150,7 +151,7 @@ set zzeroaxis lt -1 set view 68, 28, 1.4, 0.9 tstring(n) = sprintf("Gaussian 3D cloud of %d random samples\n", n) set title tstring(nsamp) offset graph 0.15, graph -0.33 -splot "random.tmp" every :::::0 with dots +splot random every :::::0 with dots if (!oneplot) pause -1 "Hit return to continue" unset parametric @@ -170,7 +171,7 @@ scale = (binwidth/(xhigh-xlow)) set xrange [0:xhigh] set yrange [0:0.65] bin(x) = (1.0/scale)*floor(x*scale) -plot "random.tmp" using (bin(sqrt($1**2+$2**2+$3**2))):(1.0*scale/nsamp) every :::::0 smooth frequency with steps \ +plot random using (bin(sqrt($1**2+$2**2+$3**2))):(1.0*scale/nsamp) every :::::0 smooth frequency with steps \ title "scaled bin frequency", \ maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f." # --- demo/simple.dem +++ demo/simple.dem 2012-03-15 11:05:54.000000000 +0000 @@ -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/stringvar.dem +++ demo/stringvar.dem 2012-03-15 11:05:54.000000000 +0000 @@ -1,7 +1,8 @@ # # Miscellaneous neat things you can do using the string variables code # -set print "stringvar.tmp" +stringvar="`mktemp /tmp/stringvar.XXXXXX`" +set print stringvar print "" print "Exercise substring handling" print "" @@ -24,7 +25,7 @@ print "(foo.foo)[2:2]= ",(foo.foo)[2:2] print "" unset print -set label 1 system("cat stringvar.tmp") at graph 0.1, graph 0.9 +set label 1 system(sprintf("cat %s", stringvar)) at graph 0.1, graph 0.9 unset xtics unset ytics set yrange [0:1] @@ -33,7 +34,7 @@ plot 0 pause -1 "Hit return to continue" -set print "stringvar.tmp" +set print stringvar print "Exercise string handling functions" print "" print "foo = ",foo @@ -62,7 +63,7 @@ if (strlen(foo) != 245) print "sprintf o print "" unset print -set label 1 system("cat stringvar.tmp") at graph 0.1, graph 0.9 +set label 1 system(sprintf("cat %s", stringvar)) at graph 0.1, graph 0.9 unset xtics unset ytics set yrange [0:1] --- demo/vector.dem +++ demo/vector.dem 2012-03-15 11:05:54.000000000 +0000 @@ -62,19 +62,21 @@ splot vtot(x,y) w l print "Now create a file with equipotential lines" pause -1 "Hit return to continue" -set table "equipo2.tmp" +equipo2="`mktemp /tmp/equipo2.XXXXXX`" +set table equipo2 replot unset table reset pause 0 -plot "equipo2.tmp" w l +plot equipo2 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" +field2xy="`mktemp /tmp/field2xy.XXXXXX`" +set table field2xy splot vtot(x,y) w l unset table pause 0 @@ -84,8 +86,8 @@ set xr [xmin:xmax] 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 field2xy u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \ + equipo2 w l pause -1 "Hit return to continue" reset --- src/show.c +++ src/show.c 2012-03-15 11:05:54.000000000 +0000 @@ -1074,6 +1074,15 @@ show_version(FILE *fp) p /* type "help seeking-assistance" */ ); +#ifdef GNUPLOT_LIB_DEFAULT + { + struct stat st; + if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { + fprintf(fp, "%s\n%s\tType `load \"all.dem\"` to display a large number of examples.", p, p); + fprintf(fp, "\n%s\tThey are located at %s/*\n%s\n", p, GNUPLOT_LIB_DEFAULT, p); + } + } +#endif /* show version long */ if (almost_equals(c_token, "l$ong")) { --- src/variable.c +++ src/variable.c 2012-03-15 11:05:54.000000000 +0000 @@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id /* The Death of Global Variables - part one. */ #include <string.h> - +#include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "variable.h" #include "alloc.h" @@ -98,6 +101,17 @@ loadpath_handler(int action, char *path) if (!loadpath) { char *envlib = getenv("GNUPLOT_LIB"); +#ifdef GNUPLOT_LIB_DEFAULT + char *defenvlib = (char*)0; + struct stat st; + if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { + if (envlib) { + if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) + envlib = defenvlib; + } else + envlib = GNUPLOT_LIB_DEFAULT; + } +#endif /* GNUPLOT_LIB_DEFAULT */ if (envlib) { int len = strlen(envlib); loadpath = gp_strdup(envlib); @@ -106,6 +120,10 @@ loadpath_handler(int action, char *path) /* convert all PATHSEPs to \0 */ PATHSEP_TO_NUL(loadpath); } /* else: NULL = empty */ +#ifdef GNUPLOT_LIB_DEFAULT + if (defenvlib) + free(defenvlib); +#endif /* GNUPLOT_LIB_DEFAULT */ } /* else: already initialised; int_warn (?) */ /* point to env portion of loadpath */ envptr = loadpath; ++++++ gnuplot-4.6.0-fix-format-errors.diff ++++++ --- src/gplt_x11.c +++ src/gplt_x11.c 2012-03-15 11:17:24.000000000 +0000 @@ -2912,22 +2912,22 @@ exec_cmd(plot_struct *plot, char *comman case PseudoColor: fprintf(stderr, ERROR_NOTICE("PseudoColor")); - fprintf(stderr, display_error_text_after); + fprintf(stderr, "%s", display_error_text_after); break; case GrayScale: fprintf(stderr, ERROR_NOTICE("GrayScale")); - fprintf(stderr, display_error_text_after); + fprintf(stderr, "%s", display_error_text_after); break; case StaticColor: fprintf(stderr, ERROR_NOTICE("StaticColor")); - fprintf(stderr, display_error_text_after); + fprintf(stderr, "%s", display_error_text_after); break; case StaticGray: fprintf(stderr, ERROR_NOTICE("StaticGray")); - fprintf(stderr, display_error_text_after); + fprintf(stderr, "%s", display_error_text_after); break; case DirectColor: ++++++ gnuplot-4.6.0-fonts.diff ++++++ --- src/gplt_x11.c +++ src/gplt_x11.c 2012-03-15 11:10:53.000000000 +0000 @@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id * patches by Masahito Yamaga <[email protected]> */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include <string.h> #include <X11/Xos.h> #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> #include <X11/Xatom.h> #include <X11/keysym.h> -#ifdef USE_X11_MULTIBYTE -# include <X11/Xlocale.h> -#endif #include <assert.h> #include "syscfg.h" @@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id #include "gplt_x11.h" #include "version.h" +#ifdef USE_X11_MULTIBYTE +# include <locale.h> +# include <langinfo.h> +# include <X11/Xlocale.h> +#endif + #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ @@ -482,7 +489,7 @@ static double mouse_to_axis __PROTO((int static char *FallbackFont = "fixed"; #ifdef USE_X11_MULTIBYTE static char *FallbackFontMB = - "mbfont:*-medium-r-normal--14-*;*-medium-r-normal--16-*"; + "mbfont:*-medium-r-normal--14-*,*-medium-r-normal--16-*"; # define FontSetSep ';' static int usemultibyte = 0; static int multibyte_fonts_usable=1; @@ -499,8 +506,8 @@ static char *gpFallbackFont __PROTO((voi static int gpXGetFontascent __PROTO((XFontStruct *cfont)); enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ -static char default_font[64] = { '\0' }; -static char default_encoding[16] = { '\0' }; +static char default_font[256] = { '\0' }; +static char default_encoding[64] = { '\0' }; #define Nwidths 10 static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -2116,6 +2123,8 @@ exec_cmd(plot_struct *plot, char *comman /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; + if (strlen(&buffer[2]) == 0) + break; strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); break; @@ -5395,7 +5404,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { - fprintf(stderr,"gnuplot_x11: Some character sets not available\n"); + FPRINTF(("gnuplot_x11: Some character sets not available\n")); first_time = FALSE; } while (n_miss-- > 0) @@ -5490,6 +5499,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE + if ((!fontname || !(*fontname)) && multibyte_fonts_usable) { + const char * codeset = nl_langinfo(CODESET); + if (strcasestr(codeset, "UTF-8")) { + const char* utf8 = "mbfont:-*-sazanami*mincho-medium-r-normal--16-* \ +-*-mincho-medium-r-normal--16-*,-*-verdana-medium-r-normal--16-* \ +-*-dejavu*sans-medium-r-normal--16-*,-*-medium-r-normal--16-*"; + strncpy(default_font, utf8, strlen(utf8)+1); + } + } +#endif + +#ifdef USE_X11_MULTIBYTE if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { if (multibyte_fonts_usable) { usemultibyte = 1; --- src/variable.c +++ src/variable.c 2012-03-15 11:10:53.000000000 +0000 @@ -282,6 +282,8 @@ static const struct path_table fontpath_ { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, #endif /* Linux paths */ + { "/usr/share/fonts/Type1" }, + { "/usr/share/fonts/truetype" }, { "/usr/X11R6/lib/X11/fonts/Type1" }, { "/usr/X11R6/lib/X11/fonts/truetype" }, /* HP-UX */ ++++++ gnuplot-4.2.5-fix-format-errors.dif -> gnuplot-4.6.0.dif ++++++ --- /work/SRC/openSUSE:Factory/gnuplot/gnuplot-4.2.5-fix-format-errors.dif 2011-09-23 02:01:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot-4.6.0.dif 2012-04-12 09:24:54.000000000 +0200 @@ -1,40 +1,227 @@ +--- 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�e. \\ +-#Ctrl Help & `{\bf help }'. \\ ++#Help & `{\bf help}` plus Entr�e. \\ ++#Ctrl Help & `{\bf help }`. \\ + %c l . + %Touche fl�ch�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 2009-05-09 13:50:34.000000000 +0200 -@@ -2903,22 +2903,22 @@ exec_cmd(plot_struct *plot, char *comman ++++ 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( + } - case PseudoColor: - fprintf(stderr, ERROR_NOTICE("PseudoColor")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case GrayScale: - fprintf(stderr, ERROR_NOTICE("GrayScale")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case StaticColor: - fprintf(stderr, ERROR_NOTICE("StaticColor")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case StaticGray: - fprintf(stderr, ERROR_NOTICE("StaticGray")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case DirectColor: ---- term/post.trm -+++ term/post.trm 2009-05-09 13:50:34.000000000 +0200 -@@ -1748,7 +1748,7 @@ gnudict begin\ngsave\n\ - (ps_params->psformat == PSTERM_EPS ? 0.5 : 1.0)/PS_SC); - if (ps_params->psformat == PSTERM_LANDSCAPE) - fprintf(gppsfile,"90 rotate\n0 %d translate\n", -(int)(term->ymax)); -- fprintf(gppsfile, psg1); -+ fprintf(gppsfile, "%s", psg1); - if (ps_common_uses_fonts) - fprintf(gppsfile, "(%s) findfont %d scalefont setfont\n", - ps_params->font, (t->v_char)); + 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) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
