Hello community,
here is the log from the commit of package gnuplot for openSUSE:Factory
checked in at Wed Apr 7 21:19:13 CEST 2010.
--------
--- gnuplot/gnuplot.changes 2010-03-05 11:44:18.000000000 +0100
+++ gnuplot/gnuplot.changes 2010-04-07 12:29:26.000000000 +0200
@@ -1,0 +2,63 @@
+Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de
+
+- Update to gnuplot 4.4.0
+ * NEW linetype property 'pointinterval'
+ * NEW gnuplot.exe is a full-featured console mode gnuplot executable for Windows
+ * NEW plot style "with circles"
+ * NEW object types circle, ellipse, and polygon
+ * NEW options front and back to "set colorbox"
+ * NEW x11 can plot into a window opened and managed by an external application
+ * NEW gd terminal can use fonts through fontconfig (libgd version > 2.0.35)
+ * NEW optional 3 columns of data to generate histogram errorbars
+ * NEW 'volatile' data, including inline data, can be replotted without rereading
+ * NEW 'refresh' command replots without rereading data if possible
+ * NEW rgbimage style now works in 2D and 3D for all terminals that support RGB
+ * NEW plot style rgbalpha
+ * NEW transparent fill styles
+ * NEW iteration within a plot command; e.g. plot for [i=1:10] foo(i)
+ * NEW iteration within set/unset commands
+ * NEW operators '=' and ',' in expression syntax
+ * NEW terminal lua generates commands for interpretation by external lua script
+ * NEW terminal tikz uses a lua script to generate output for latex TikZ package
+ * NEW terminal canvas for HTML 5 canvas element
+ * NEW terminal pdfcairo based on cairo and pango
+ * NEW terminal pngcairo based on cairo and pango
+ * NEW terminal dpu414 - Seiko DPU-414 thermal printer
+ * NEW error status variables GPVAL_ERRNO and GPVAL_ERRMSG
+ * NEW variables GPVAL_LAST_PLOT, GPVAL_{S}PLOT, GPVAL_MULTIPLOT
+ * NEW variables GPVAL_VIEW_{MAP|ROT_X|ROT_Z|SCALE|ZSCALE}, GPVAL_TERMINALS
+ * NEW variables GPVAL_PWD
+ * NEW per-plot export of information needed for external mousing scripts
+ * NEW support for dashed linetypes in additional terminals
+ * NEW the 'bind' command accepts non-keyboard triggers, e.g. 'close'
+ * NEW commands 'show bind' and 'reset bind'
+ * NEW individual plots can be omitted from autoscaling of axis ranges
+ * NEW more smoothing options: new kernels (for dgrid3d) and 'smooth cumulative'
+ * NEW command 'evaluate' executes commands from a string variable
+ * NEW z-axis tic labels can be colored by Z value
+ * NEW command 'set view equal {xy|xyz}' forces axes in a 3D plot to the same scale
+ * NEW 'set pm3d interpolate m,n' supports also non-positive m,n as nbs of points
+ * FIX domain restrictions on ibeta()
+ * FIX color assignment of contour lines when "set increment user" is in effect
+ * FIX remove the limit of 64 characters read as string data from a data file
+ * FIX remainder of command line is not lost after a "load" command
+ * FIX more complete support for locale internationalization, UTF-8 encoding
+ * FIX various font-handling problems in postscript terminal driver
+ * FIX avoid infinite loop on resizing x11 plot window under ion, fluxbox
+ * FIX handle addition plot styles in mode 'set table'
+ * FIX purge tick labels read from a datafile at the end of each plot
+ * FIX 2nd colour in the colour box for negative palette in postscript
+ * FIX interpolatation for pm3d surfaces given by both z and colour coordinates
+ * FIX 'set datafile binary format=...' was documented, but not implemented
+ * FIX enhanced text mode treatment of UTF-8 characters
+ * FIX emf terminal enhanced text mode now accepted by Windows programs
+ * CHANGE A number that begins with a . must continue with a digit
+ * CHANGE syntax of 'set datafile binary' array= and record= options
+ * CHANGE 'reset' does not affect locale, encoding, decimalsign settings
+ * CHANGE 'set key textcolor rgb variable' will use plot colors for key entries
+ * CHANGE Remove obsolete IRIS4D terminal type
+ * CHANGE Remove obsolete atari terminal types (atariaes atarivdi multitos)
+ * CHANGE Use empty/solid fill for candlesticks rather than empty/striped
+ * CHANGE 'l' and 'L' hotkeys toggle colorbar logscale iff mouse is in colorbar
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnuplot-4.2.5-demo.dif
gnuplot-4.2.5-fonts.dif
gnuplot-4.2.5-gcc45.dif
gnuplot-4.2.5-utf8.dif
gnuplot-4.2.5-wxt.dif
gnuplot-4.2.5-x11ovf.dif
gnuplot-4.2.5.dif
gnuplot-4.2.6.tar.bz2
New:
----
gnuplot-4.4.0-demo.dif
gnuplot-4.4.0-fonts.dif
gnuplot-4.4.0-wxt.dif
gnuplot-4.4.0-x11ovf.dif
gnuplot-4.4.0.dif
gnuplot-4.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuplot.spec ++++++
--- /var/tmp/diff_new_pack.8QcJoV/_old 2010-04-07 21:15:41.000000000 +0200
+++ /var/tmp/diff_new_pack.8QcJoV/_new 2010-04-07 21:15:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnuplot (Version 4.2.6)
+# spec file for package gnuplot (Version 4.4.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,12 @@
Name: gnuplot
-BuildRequires: cairo-devel emacs-nox freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel netpbm pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11 xorg-x11-devel
+BuildRequires: cairo-devel emacs-nox freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel netpbm pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11 xorg-x11-devel
+%if 0%{?suse_version} > 1120
+BuildRequires: libpng14-devel lua-devel
+%else
+BuildRequires: libpng-devel
+%endif
%if 0%{?suse_version} > 1110
BuildRequires: plotutils-devel
%else
@@ -29,21 +34,18 @@
License: BSD3c(or similar)
Group: Productivity/Graphics/Visualization/Graph
AutoReqProv: on
-PreReq: %install_info_prereq
-Version: 4.2.6
-Release: 2
+Version: 4.4.0
+Release: 1
Summary: GNUplot a Function Plotting Utility
Source0: gnuplot-%{version}.tar.bz2
Source2: gnuplot-fr.doc.bz2
Source3: README.whynot
-Patch0: gnuplot-4.2.5.dif
-Patch1: gnuplot-4.2.5-x11ovf.dif
-Patch2: gnuplot-4.2.5-fonts.dif
-Patch3: gnuplot-4.2.5-wxt.dif
-Patch4: gnuplot-4.2.5-demo.dif
-Patch5: gnuplot-4.2.5-utf8.dif
+Patch0: gnuplot-4.4.0.dif
+Patch1: gnuplot-4.4.0-x11ovf.dif
+Patch2: gnuplot-4.4.0-fonts.dif
+Patch3: gnuplot-4.4.0-wxt.dif
+Patch4: gnuplot-4.4.0-demo.dif
Patch6: gnuplot-4.2.5-fix-format-errors.dif
-Patch7: gnuplot-4.2.5-gcc45.dif
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"
@@ -71,7 +73,8 @@
Summary: Documentation of GNUplot
Group: Productivity/Graphics/Visualization/Graph
Requires: %{name}
-PreReq: %install_info_prereq
+Requires(post): %install_info_prereq
+Requires(postun): %install_info_prereq
%description doc
GNUplot documentation files including the man and info pages. GNUplot
@@ -87,21 +90,19 @@
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
-%patch -P 3 -p 0
+%patch -P 2 -p 0 -b .font
+#%patch -P 3 -p 0
%patch -P 4 -p 0
-%patch -P 5 -p 0
%patch -P 6 -p 0
%patch -P 0 -p 0
-%patch -P 7 -p 1
%build
SECSVGA="-DSVGA_IS_SECURE=1"
export CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
export CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\""
- export CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA}"
+ export CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA} -D_GNU_SOURCE"
export CXXFLAGS="$CFLAGS -fno-strict-aliasing"
- export LDFLAGS="-L%{_x11lib}"
+ export LDFLAGS="-L%{_x11lib} -Wl,--as-needed"
export ARCHLIB=%_lib
for f in docs/makefile*; do
test -e $f || continue
@@ -171,8 +172,8 @@
install -m 0444 demo/* %{buildroot}/%{_docdir}/gnuplot/demo/
install -m 0444 README* %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 Copyright %{buildroot}/%{_docdir}/gnuplot/
- install -m 0444 FAQ TODO VERSION %{buildroot}/%{_docdir}/gnuplot/
- install -m 0444 NEWS VERSION BUGS %{buildroot}/%{_docdir}/gnuplot/
+ install -m 0444 TODO VERSION %{buildroot}/%{_docdir}/gnuplot/
+ install -m 0444 NEWS BUGS %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 %{SOURCE3} %{buildroot}/%{_docdir}/gnuplot/
rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*
rm -f %{buildroot}/%{_datadir}/emacs/site-lisp/info-look.*
++++++ gnuplot-4.2.5-demo.dif -> gnuplot-4.4.0-demo.dif ++++++
--- gnuplot/gnuplot-4.2.5-demo.dif 2009-06-15 15:14:40.000000000 +0200
+++ gnuplot/gnuplot-4.4.0-demo.dif 2010-04-07 12:29:24.000000000 +0200
@@ -1,14 +1,37 @@
+--- demo/ellipse.dem
++++ demo/ellipse.dem 2010-04-06 16:00:28.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 2009-06-15 14:13:03.358008816 +0200
-@@ -5,6 +5,7 @@
++++ demo/fit.dem 2010-04-07 07:33:39.097446751 +0000
+@@ -5,9 +5,11 @@
print "Some examples how data fitting using nonlinear least squares fit"
print "can be done."
print ""
-+set fit logfile "`mktemp /tmp/fit.log.XXXXXX`"
++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'
-@@ -125,7 +126,7 @@ plot 'soundvel.dat', vlong(x), vtrans(x)
+ 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
@@ -17,19 +40,32 @@
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 2009-05-09 13:32:24.000000000 +0200
-@@ -11,7 +11,7 @@
++++ demo/poldat.dem 2010-04-07 07:40:04.016079881 +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" 12,-1
++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 2009-06-15 14:28:57.277902957 +0200
++++ demo/random.dem 2009-06-15 12:28:57.000000000 +0000
@@ -53,7 +53,8 @@ set parametric
# non-pressing plot-command feature addition may address this issue.
set samples nsamp
@@ -94,17 +130,24 @@
title "scaled bin frequency", \
maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f."
#
-@@ -202,7 +203,7 @@ set format xy "%.0f"
- set title 'Example of range-limited axes and tics'
-
- 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
+--- demo/simple.dem
++++ demo/simple.dem 2009-05-09 11:32:24.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 2009-06-15 14:46:14.406401438 +0200
++++ demo/stringvar.dem 2009-06-15 12:46:14.000000000 +0000
@@ -1,7 +1,8 @@
#
# Miscellaneous neat things you can do using the string variables code
@@ -142,24 +185,8 @@
unset xtics
unset ytics
set yrange [0:1]
---- demo/simple.dem
-+++ demo/simple.dem 2009-05-09 13:32:24.000000000 +0200
-@@ -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/vector.dem
-+++ demo/vector.dem 2009-06-15 14:24:23.430401839 +0200
++++ demo/vector.dem 2009-06-15 12:24:23.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"
@@ -197,8 +224,17 @@
reset
--- src/variable.c
-+++ src/variable.c 2009-06-15 14:01:38.998402587 +0200
-@@ -94,6 +94,14 @@ loadpath_handler(int action, char *path)
++++ src/variable.c 2009-06-15 12:01:39.000000000 +0000
+@@ -37,7 +37,7 @@ static char *RCSid() { return RCSid("$Id
+ /* The Death of Global Variables - part one. */
+
+ #include
+-
++#include
+ #include "variable.h"
+
+ #include "alloc.h"
+@@ -95,6 +95,14 @@ loadpath_handler(int action, char *path)
if (!loadpath)
{
char *envlib = getenv("GNUPLOT_LIB");
@@ -213,7 +249,7 @@
if (envlib) {
int len = strlen(envlib);
loadpath = gp_strdup(envlib);
-@@ -102,6 +110,10 @@ loadpath_handler(int action, char *path)
+@@ -103,6 +111,10 @@ loadpath_handler(int action, char *path)
/* convert all PATHSEPs to \0 */
PATHSEP_TO_NUL(loadpath);
} /* else: NULL = empty */
++++++ gnuplot-4.2.5-fonts.dif -> gnuplot-4.4.0-fonts.dif ++++++
--- gnuplot/gnuplot-4.2.5-fonts.dif 2009-06-15 15:14:35.000000000 +0200
+++ gnuplot/gnuplot-4.4.0-fonts.dif 2010-04-07 12:29:25.000000000 +0200
@@ -1,6 +1,6 @@
--- src/gplt_x11.c
-+++ src/gplt_x11.c 2008-03-14 15:26:16.000000000 +0100
-@@ -104,6 +104,10 @@ static char *RCSid() { return RCSid("$Id
++++ src/gplt_x11.c 2010-04-06 16:31:39.655185838 +0000
+@@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id
* patches by Masahito Yamaga
*/
@@ -8,19 +8,32 @@
+#define _GNU_SOURCE
+#endif
+#include
- #include "syscfg.h"
- #include "stdfn.h"
- #include "gp_types.h"
-@@ -133,6 +137,8 @@ Error. Incompatible options.
+ #include
+ #include
+ #include
+ #include
#include
#include
- #ifdef USE_X11_MULTIBYTE
+-#ifdef USE_X11_MULTIBYTE
+-# include
+-#endif
+
+ #include "syscfg.h"
+ #include "stdfn.h"
+@@ -120,6 +121,12 @@ static char *RCSid() { return RCSid("$Id
+ #include "term_api.h"
+ #include "gplt_x11.h"
+
++#ifdef USE_X11_MULTIBYTE
+# include
+# include
- # include
- #endif
-
-@@ -474,7 +480,7 @@ static double mouse_to_axis __PROTO((int
++# include
++#endif
++
+ #ifdef EXPORT_SELECTION
+ # undef EXPORT_SELECTION
+ #endif /* EXPORT SELECTION */
+@@ -490,7 +497,7 @@ static double mouse_to_axis __PROTO((int
static char *FallbackFont = "fixed";
#ifdef USE_X11_MULTIBYTE
static char *FallbackFontMB =
@@ -29,7 +42,7 @@
# define FontSetSep ';'
static int usemultibyte = 0;
static int multibyte_fonts_usable=1;
-@@ -491,8 +497,8 @@ static char *gpFallbackFont __PROTO((voi
+@@ -507,8 +514,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' */
@@ -40,7 +53,7 @@
#define Nwidths 10
static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-@@ -2116,6 +2122,8 @@ exec_cmd(plot_struct *plot, char *comman
+@@ -2117,6 +2124,8 @@ exec_cmd(plot_struct *plot, char *comman
/* Save the request default font */
c = &(buffer[strlen(buffer)-1]);
while (*c <= ' ') *c-- = '\0';
@@ -49,7 +62,7 @@
strncpy(default_font, &buffer[2], strlen(&buffer[2])+1);
FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
break;
-@@ -5326,7 +5334,7 @@ XFontStruct *gpXLoadQueryFont (Display *
+@@ -5480,7 +5489,7 @@ XFontStruct *gpXLoadQueryFont (Display *
}
#else
if (first_time) {
@@ -58,7 +71,7 @@
first_time = FALSE;
}
while (n_miss-- > 0)
-@@ -5419,6 +5427,18 @@ char *fontname;
+@@ -5573,6 +5582,18 @@ char *fontname;
}
#ifdef USE_X11_MULTIBYTE
@@ -78,8 +91,8 @@
if (multibyte_fonts_usable) {
usemultibyte = 1;
--- src/variable.c
-+++ src/variable.c 2009-06-15 13:55:04.902957631 +0200
-@@ -263,6 +263,8 @@ static const struct path_table fontpath_
++++ src/variable.c 2009-06-15 11:55:05.000000000 +0000
+@@ -276,6 +276,8 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif
/* Linux paths */
++++++ gnuplot-4.2.5-wxt.dif -> gnuplot-4.4.0-wxt.dif ++++++
--- gnuplot/gnuplot-4.2.5-wxt.dif 2009-06-15 15:14:38.000000000 +0200
+++ gnuplot/gnuplot-4.4.0-wxt.dif 2010-04-07 12:29:25.000000000 +0200
@@ -1,6 +1,6 @@
--- src/plot.c
-+++ src/plot.c 2007-04-24 12:21:32.000000000 +0200
-@@ -610,6 +610,8 @@ main(int argc, char **argv)
++++ src/plot.c 2007-04-24 10:21:32.000000000 +0000
+@@ -573,6 +573,8 @@ main(int argc, char **argv)
#endif /* GNUPLOT_HISTORY */
fprintf(stderr, "\nTerminal type set to '%s'\n", term->name);
@@ -10,18 +10,19 @@
} else {
/* come back here from int_error() */
--- src/term.c
-+++ src/term.c 2007-04-24 12:21:51.000000000 +0200
-@@ -1561,6 +1561,8 @@ change_term(const char *origname, int le
- }
++++ src/term.c 2010-04-06 16:12:36.696331404 +0000
+@@ -1646,6 +1646,9 @@ change_term(const char *origname, int le
if (interactive)
- fprintf(stderr, "Terminal type set to '%s'\n", term->name);
+ fprintf(stderr, "Terminal type set to '%s'\n", term->name);
+
+ if (interactive && !strncmp("wxt", term->name, 3))
+ fprintf(stderr, "Warning: terminal 'wxt' is experimental\n");
-
++
/* Invalidate any terminal-specific structures that may be active */
invalidate_palette();
-@@ -1626,11 +1628,6 @@ init_terminal()
- term_name = "sun";
+
+@@ -1710,11 +1713,6 @@ init_terminal()
+ term_name = "sun";
#endif /* SUN */
-#ifdef WXWIDGETS
@@ -31,9 +32,9 @@
-
#ifdef _Windows
/* let the wxWidgets terminal be the default when available */
- if (term_name == (char *) NULL)
-@@ -1666,6 +1663,11 @@ init_terminal()
- term_name = "x11";
+ if (term_name == (char *) NULL)
+@@ -1750,6 +1748,11 @@ init_terminal()
+ term_name = "x11";
#endif /* x11 */
+#ifdef WXWIDGETS
@@ -42,5 +43,5 @@
+#endif
+
#ifdef AMIGA
- term_name = "amiga";
+ term_name = "amiga";
#endif
++++++ gnuplot-4.2.5-x11ovf.dif -> gnuplot-4.4.0-x11ovf.dif ++++++
--- gnuplot/gnuplot-4.2.5-x11ovf.dif 2009-06-15 15:14:32.000000000 +0200
+++ gnuplot/gnuplot-4.4.0-x11ovf.dif 2010-04-07 12:29:25.000000000 +0200
@@ -1,6 +1,6 @@
--- src/gplt_x11.c
-+++ src/gplt_x11.c 2009-06-15 13:17:19.021900688 +0200
-@@ -901,6 +901,8 @@ mainloop()
++++ src/gplt_x11.c 2010-04-06 15:49:17.446925544 +0000
+@@ -912,6 +912,8 @@ mainloop()
nfds = cn + 1;
while (1) {
@@ -9,7 +9,7 @@
XFlush(dpy); /* see above */
FD_ZERO(&tset);
-@@ -938,7 +940,11 @@ mainloop()
+@@ -949,7 +951,11 @@ mainloop()
process_event(&xe);
}
}
@@ -22,14 +22,14 @@
unlink(X11_ipcpath);
record();
fclose(X11_ipc);
-@@ -1176,8 +1182,8 @@ static int read_input __PROTO((void));
+@@ -1172,8 +1178,8 @@ static int read_input __PROTO((void));
static int
read_input()
{
-- static int rdbuf_size = 10 * Nbuf;
-- static char rdbuf[10 * Nbuf];
-+ const int rdbuf_size = 10 * Nbuf;
-+ static char rdbuf[rdbuf_size+1];
+- static int rdbuf_size = 10 * X11_COMMAND_BUFFER_LENGTH;
+- static char rdbuf[10 * X11_COMMAND_BUFFER_LENGTH];
++ const int rdbuf_size = 10 * X11_COMMAND_BUFFER_LENGTH;
++ static char rdbuf[(10 * X11_COMMAND_BUFFER_LENGTH)+1];
static int total_chars;
static int rdbuf_offset;
static int buf_offset;
++++++ gnuplot-4.2.5-demo.dif -> gnuplot-4.4.0.dif ++++++
--- gnuplot/gnuplot-4.2.5-demo.dif 2009-06-15 15:14:40.000000000 +0200
+++ gnuplot/gnuplot-4.4.0.dif 2010-04-07 12:29:25.000000000 +0200
@@ -1,226 +1,231 @@
---- demo/fit.dem
-+++ demo/fit.dem 2009-06-15 14:13:03.358008816 +0200
-@@ -5,6 +5,7 @@
- print "Some examples how data fitting using nonlinear least squares fit"
- print "can be done."
- print ""
-+set fit logfile "`mktemp /tmp/fit.log.XXXXXX`"
- pause -1 "first plotting the pure data set (-> return)"
-
- set title 'data for first fit demo'
-@@ -125,7 +126,7 @@ plot 'soundvel.dat', vlong(x), vtrans(x)
- # 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'
---- demo/poldat.dem
-+++ demo/poldat.dem 2009-05-09 13:32:24.000000000 +0200
-@@ -11,7 +11,7 @@
- unset polar
- set title "Primitive Smith Chart"
- unset key
--set xlabel "Impedance or Admittance Coordinates"
-+set xlabel "Impedance or Admittance Coordinates" 12,-1
- set para
- set rrange [-0 : 10]
- set trange [-pi : pi]
---- demo/random.dem
-+++ demo/random.dem 2009-06-15 14:28:57.277902957 +0200
-@@ -53,7 +53,8 @@ set parametric
- # non-pressing plot-command feature addition may address this issue.
- set samples nsamp
- set format "%8.5g"
--set table "random.tmp"
-+random="`mktemp /tmp/random.XXXXXX`"
-+set table random
- plot invnorm(rand(0)),invnorm(rand(0))
- unset table
- unset format
-@@ -75,7 +76,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
-
-@@ -101,7 +102,7 @@ scale = (binwidth/(xhigh-xlow))
- set parametric
- set samples nsamp
- set format "%8.5g"
--set table "random.tmp"
-+set table random
- plot invnorm(rand(0)),(1.0*scale/nsamp)
- unset table
- unset format
-@@ -115,7 +116,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"
-@@ -136,7 +137,7 @@ set parametric
- set samples nsamp
- set isosamples 2,2 # Smallest possible
- set format "%8.5g"
--set table "random.tmp"
-+set table random
- splot invnorm(rand(0)),invnorm(rand(0)),invnorm(rand(0))
- unset table
- unset format
-@@ -158,7 +159,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
-@@ -178,7 +179,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."
+--- 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 @@
#
-@@ -202,7 +203,7 @@ set format xy "%.0f"
- set title 'Example of range-limited axes and tics'
- 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/stringvar.dem
-+++ demo/stringvar.dem 2009-06-15 14:46:14.406401438 +0200
-@@ -1,7 +1,8 @@
+ # 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
#
- # 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/simple.dem
-+++ demo/simple.dem 2009-05-09 13:32:24.000000000 +0200
-@@ -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/vector.dem
-+++ demo/vector.dem 2009-06-15 14:24:23.430401839 +0200
-@@ -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/variable.c
-+++ src/variable.c 2009-06-15 14:01:38.998402587 +0200
-@@ -94,6 +94,14 @@ loadpath_handler(int action, char *path)
- if (!loadpath)
- {
- char *envlib = getenv("GNUPLOT_LIB");
-+#ifdef GNUPLOT_LIB_DEFAULT
-+ char *defenvlib = (char*)0;
-+ 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);
-@@ -102,6 +110,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;
+ 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�e. \\
+-#Ctrl Help & `{\bf help }'. \\
++#Help & `{\bf help}` plus Entr�e. \\
++#Ctrl Help & `{\bf help }`. \\
+ %c l .
+ %Touche fl�ch�e@Fonction
+ %_
+--- 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 2009-05-09 11:32:24.000000000 +0000
+@@ -222,6 +222,7 @@ static int asked_privi = 0;
+ void
+ drop_privilege()
+ {
++#ifndef SVGA_IS_SECURE
+ if (!asked_privi) {
+ euid = geteuid();
+ egid = getegid();
+@@ -235,11 +236,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();
+@@ -253,6 +256,7 @@ take_privilege()
+ if (seteuid(euid) == -1)
+ (void) fprintf(stderr, "seteuid(%d): %s\n",
+ (int) euid, strerror(errno));
++#endif
+ }
+
+ #endif /* LINUXVGA */
+@@ -278,8 +282,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 */
+@@ -345,6 +349,23 @@ main(int argc, char **argv)
+ #if defined(HAVE_LIBEDITLINE)
+ 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 */
+--- src/time.c
++++ src/time.c 2009-05-09 11:32:24.000000000 +0000
+@@ -291,11 +291,12 @@ gstrptime(char *s, char *fmt, struct tm
+ case 's':
+ #if 0 /* HBB 20040213: comment this out, but keep it around for now */
+ {
+- /* time_t when; */
+- int when;
++ time_t when;
++ int iwhen;
+ struct tm *tmwhen;
+- s = read_int(s, 10, &when);
+- tmwhen = gmtime((time_t*)&when);
++ s = read_int(s, 10, &iwhen);
++ when = iwhen;
++ tmwhen = gmtime(&when);
+ tmwhen->tm_year += 1900;
+ *tm = *tmwhen;
+ break;
+--- 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) {
++++++ gnuplot-4.2.6.tar.bz2 -> gnuplot-4.4.0.tar.bz2 ++++++
++++ 184273 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org