diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index ff5907b..ee42c13 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -10,7 +10,7 @@ --- gnuplot-5.2.3/configure.ac +++ gnuplot-5.2.3/configure.ac 2018-05-07 07:12:26.984911679 +0000 -@@ -365,7 +365,7 @@ if test "$with_linux_vga" = yes; then +@@ -364,7 +364,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' @@ -65,7 +65,7 @@ alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) --- gnuplot-5.2.3/src/gadgets.h +++ gnuplot-5.2.3/src/gadgets.h 2018-05-07 07:12:26.984911679 +0000 -@@ -489,7 +489,7 @@ extern TBOOLEAN clip_lines1; +@@ -485,7 +485,7 @@ extern TBOOLEAN clip_lines1; extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; diff --git a/gnuplot-5.2.0-texi2info.patch b/gnuplot-5.2.0-texi2info.patch index ab86523..ac411e0 100644 --- a/gnuplot-5.2.0-texi2info.patch +++ b/gnuplot-5.2.0-texi2info.patch @@ -1,38 +1,6 @@ --- gnuplot.texi -+++ gnuplot.texi 2017-09-29 07:05:15.168397901 +0000 -@@ -1703,7 +1703,6 @@ third kind. See `elliptic integrals` for - @findex besj0 - - --@item - esj0(x) & int or real & $J_@{0@}$ Bessel function of $x$, in radians \\ - The `besj0(x)` function returns the J0th Bessel function of its argument. - @ref{besj0} expects its argument to be in radians. -@@ -1716,7 +1715,6 @@ The `besj0(x)` function returns the J0th - @findex besj1 - - --@item - esj1(x) & int or real & $J_@{1@}$ Bessel function of $x$, in radians \\ - The `besj1(x)` function returns the J1st Bessel function of its argument. - @ref{besj1} expects its argument to be in radians. -@@ -1729,7 +1727,6 @@ The `besj1(x)` function returns the J1st - @findex besy0 - - --@item - esy0(x) & int or real & $Y_@{0@}$ Bessel function of $x$, in radians \\ - The `besy0(x)` function returns the Y0th Bessel function of its argument. - @ref{besy0} expects its argument to be in radians. -@@ -1742,7 +1739,6 @@ The `besy0(x)` function returns the Y0th - @findex besy1 - - --@item - esy1(x) & int or real & $Y_@{1@}$ Bessel function of $x$, in radians \\ - The `besy1(x)` function returns the Y1st Bessel function of its argument. - @ref{besy1} expects its argument to be in radians. -@@ -10624,8 +10620,7 @@ but ++++ gnuplot.texi 2018-10-09 07:29:53.428331979 +0000 +@@ -10678,8 +10678,7 @@ but @end example See also @@ -42,15 +10,7 @@ @node arrow, autoscale, angles, set-show @subsection arrow -@@ -11009,7 +11004,6 @@ entries from the following table: - 4096 polar no effect - @end example - --@item - it & plot & splot \\ \hline - - -@@ -21207,13 +21201,10 @@ Syntax: +@@ -21466,13 +21465,10 @@ Syntax: @{[no]enhanced@} @end example @@ -64,7 +24,7 @@ where and set the size of the text block. The default is 79 by 24. The last newline is printed only if `feed` is enabled. -@@ -21251,7 +21242,6 @@ See also e.g. the description at +@@ -21510,7 +21506,6 @@ See also e.g. the description at @uref{https://en.wikipedia.org/wiki/ANSI_escape_code#Colors,https://en.wikipedia.org/wiki/ANSI_escape_code#Colors } @@ -72,7 +32,7 @@ Example: @example set term dumb mono size 60,15 aspect 1 -@@ -21623,8 +21613,6 @@ Preferred combinations are `medium norma +@@ -21882,8 +21877,6 @@ Preferred combinations are `medium norma With each of these drivers, a binary copy is required on a PC to print. Do not use `print`---use instead `copy file /b lpt1:`. @@ -81,7 +41,7 @@ @node excl, fig, epson_180dpi, complete_list_of_terminals @subsection excl -@@ -22423,8 +22411,6 @@ the environmental variable GNUPLOT_LUA_D +@@ -22683,8 +22676,6 @@ the environmental variable GNUPLOT_LUA_D All arguments will be provided to the selected script for further evaluation. E.g. 'set term lua tikz help' will cause the script itself to print additional help on options and choices for the script. @@ -90,7 +50,7 @@ @node mf, mp, lua, complete_list_of_terminals @subsection mf -@@ -23118,7 +23104,6 @@ terminals. It has no options." +@@ -23378,7 +23369,6 @@ terminals. It has no options." @c ?term km-tek40xx @cindex km-tek40xx @@ -98,7 +58,7 @@ @c ?commands set terminal selanar @c ?set terminal selanar @c ?set term selanar -@@ -23126,7 +23111,6 @@ terminals. It has no options." +@@ -23386,7 +23376,6 @@ terminals. It has no options." @c ?term selanar @cindex selanar @@ -106,7 +66,7 @@ @c ?commands set terminal sixel @c ?set terminal sixel @c ?set term sixel -@@ -23147,7 +23131,6 @@ For use with xterm emulation, xterm must +@@ -23407,7 +23396,6 @@ For use with xterm emulation, xterm must "--enable-sixel-graphics" and started with "-ti 340" on the command line. Menu option "sixelScrolling" should be selected. xterm/vt340 emulation limits plots to 16 simultaneous colors, but other emulators may permit more. @@ -114,7 +74,7 @@ @c ?commands set terminal bitgraph @c ?set terminal bitgraph @c ?set term bitgraph -@@ -23155,7 +23138,6 @@ limits plots to 16 simultaneous colors, +@@ -23415,7 +23403,6 @@ limits plots to 16 simultaneous colors, @c ?term bitgraph @cindex bitgraph @@ -122,7 +82,7 @@ This family of terminal drivers supports a variety of VT-like terminals. `tek40xx` supports Tektronix 4010 and others as well as most TEK emulators. `vttek` supports VT-like tek40xx terminal emulators. -@@ -23536,7 +23518,6 @@ Syntax: +@@ -23797,7 +23784,6 @@ Syntax: [dump "file"] \\ @end example @@ -130,7 +90,7 @@ @example [mode] -@@ -23556,7 +23537,6 @@ If this option is present, (i.e the dump +@@ -23817,7 +23803,6 @@ If this option is present, (i.e the dump the key KP_Delete will write the file. This action cannot and cannot be rebound. The file is written in raw ppm (P6) format. Note that this option is reset each time the `set term` command is issued. @@ -138,7 +98,7 @@ To get high resolution modes, you will probably have to modify the configuration file of libvga, usually /etc/vga/libvga.conf. Using -@@ -23762,7 +23742,6 @@ of an additional redraw after releasing +@@ -24023,7 +24008,6 @@ of an additional redraw after releasing `Line Styles...` allows customization of the line colors and styles. @@ -146,7 +106,7 @@ `Update wgnuplot.ini` saves the current window locations, window sizes, text window font, text window font size, graph window font, graph window font size, background color to the initialization file `wgnuplot.ini`. -@@ -23928,8 +23907,6 @@ This file is located in the user's appli +@@ -24189,8 +24173,6 @@ This file is located in the user's appli Line5=0 0 128 0 4 @end example @@ -155,7 +115,7 @@ @c ^

Text window options

These settings apply to the wgnuplot text-window only." -@@ -23966,7 +23943,6 @@ solid line in color mode, or a dashed li +@@ -24227,7 +24209,6 @@ solid line in color mode, or a dashed li line width is 1 pixel. If `Linestyle` is negative, it specifies the width of a SOLID line in pixels. Line1 and any linestyle used with the `points` style must be SOLID with unit width. @@ -163,7 +123,7 @@ See `graph-menu`." -@@ -24354,13 +24330,10 @@ later by `set term x11 [no]raise [no]per +@@ -24615,13 +24596,10 @@ later by `set term x11 [no]raise [no]per `-ctrlq ` closes window on ctrl-q rather than q @end example diff --git a/gnuplot-5.2.4.tar.gz b/gnuplot-5.2.4.tar.gz deleted file mode 100644 index 82afd9b..0000000 --- a/gnuplot-5.2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb -size 5292321 diff --git a/gnuplot-5.2.5.tar.gz b/gnuplot-5.2.5.tar.gz new file mode 100644 index 0000000..3d0a8be --- /dev/null +++ b/gnuplot-5.2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:039db2cce62ddcfd31a6696fe576f4224b3bc3f919e66191dfe2cdb058475caa +size 5305288 diff --git a/gnuplot-gd.patch b/gnuplot-gd.patch index fde67aa..ba4acde 100644 --- a/gnuplot-gd.patch +++ b/gnuplot-gd.patch @@ -1,13 +1,13 @@ Index: gnuplot-5.2.2/configure.ac =================================================================== --- - gnuplot-5.2.3/configure.ac | 62 ++++-------------------------------------- - gnuplot-5.2.3/src/Makefile.am | 2 - - 2 files changed, 7 insertions(+), 57 deletions(-) + gnuplot-5.2.5/configure.ac | 66 ++++++------------------------------------ + gnuplot-5.2.5/src/Makefile.am | 2 - + 2 files changed, 11 insertions(+), 57 deletions(-) ---- gnuplot-5.2.3/configure.ac -+++ gnuplot-5.2.3/configure.ac 2018-05-07 07:14:11.118955435 +0000 -@@ -578,63 +578,13 @@ AC_ARG_WITH(gd,dnl +--- gnuplot-5.2.5/configure.ac ++++ gnuplot-5.2.5/configure.ac 2018-10-09 09:38:56.700946180 +0000 +@@ -577,63 +577,17 @@ AC_ARG_WITH(gd,dnl with_gd=yes) if test "$with_gd" != no; then @@ -32,6 +32,10 @@ Index: gnuplot-5.2.2/configure.ac - AC_CHECK_LIB(gd,gdImageCreateTrueColor, - [dnl found gd library +PKG_CHECK_MODULES([GD], [gdlib], [ ++ ac_cv_lib_gd_gdImageJpeg=yes ++ ac_cv_lib_gd_gdImagePng=yes ++ ac_cv_lib_gd_gdImageGif=yes ++ ac_cv_lib_gd_gdImageGifAnimBegin=yes AC_DEFINE(HAVE_LIBGD,1,[ Define if you have gd library. ]) - AC_CHECK_HEADERS(gd.h,, - AC_MSG_WARN([please add path to gd.h to CPPFLAGS in Makefile])) @@ -77,8 +81,8 @@ Index: gnuplot-5.2.2/configure.ac fi dnl end gd ---- gnuplot-5.2.3/src/Makefile.am -+++ gnuplot-5.2.3/src/Makefile.am 2018-05-07 07:14:11.118955435 +0000 +--- gnuplot-5.2.5/src/Makefile.am ++++ gnuplot-5.2.5/src/Makefile.am 2018-10-09 09:36:58.135163622 +0000 @@ -58,7 +58,7 @@ tabulate.c tabulate.h \ template.h term_api.h term.c term.h time.c unset.c util.c util.h \ util3d.c util3d.h variable.c variable.h version.c version.h diff --git a/gnuplot.changes b/gnuplot.changes index 25c6b0c..33c2368 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Oct 9 07:40:42 UTC 2018 - Dr. Werner Fink + +- Let patch gnuplot-5.2.0-texi2info.patch apply + +------------------------------------------------------------------- +Tue Oct 9 07:10:08 UTC 2018 - Dr. Werner Fink + +- Update to gnuplot 5.2.5 + * NEW "set pm3d depthorder base" sorts pm3d quadrangles by projecting to z=0 + * NEW "set jitter vertical" displaces y coordinate rather than x coordinate + * NEW array size can be determined automatically from the initializer + * CHANGE place titles along x axis in plots with columnstacked histograms + * CHANGE equivalent slope constraint for mcs splines at both ends of the range + * CHANGE numerical arguments to "call" are stored in ARG1..ARGn as strings + * CHANGE numerical arguments to "call" are stored in ARGV[n] as complex + * CHANGE treat imaginary values plotted from a using spec as UNDEFINED (NaN) + * CHANGE allow "reset" between plots in a multiplot layout + * CHANGE Deprecate linux and vgagl terminals (to be removed in 5.3) + * CHANGE placement of axis and tic labels in 3D projections on to xz or yz plane + * CHANGE default to ./configure --without-wx-multithreading + * FIX parametric function plots did not work with logscale x (regression in 5.2.0-4) + * FIX polar mode "set trange" was assumed to use radians, now it tracks "set angle" + * FIX clip polar grid lines and ticks to x/y range limits + * FIX clipping of plot "with lines" when axes are nonlinear (regression from 5.0) + * FIX clipping of all elements in finanacebars/candlesticks/boxplots + * FIX clipping of 3D splot "with labels" + * FIX strange interaction of "noautoscale" with blank data lines + * FIX alignment of boxed text to center for eps/cairolatex + * FIX incompatibility of "pm3d depthorder" and rgb color taken from data column + * FIX aqua terminal font changes in enhanced text mode + ------------------------------------------------------------------- Mon Jun 4 07:18:27 UTC 2018 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 5085216..a09508b 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -35,6 +35,7 @@ BuildRequires: netpbm BuildRequires: pango-devel BuildRequires: readline-devel BuildRequires: pkgconfig(caca) +BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(x11) %if %qtver >= 5 BuildRequires: libqt5-linguist-devel @@ -77,10 +78,10 @@ BuildRequires: wxWidgets-devel BuildRequires: wxWidgets-devel >= 3 %endif Url: http://www.gnuplot.info/ -Version: 5.2.4 +Version: 5.2.5 Release: 0 Summary: Function Plotting Utility and more -License: SUSE-Gnuplot and GPL-2.0+ +License: SUSE-Gnuplot AND GPL-2.0-or-later Group: Productivity/Graphics/Visualization/Graph Source0: http://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/gnuplot-%{version}.tar.gz Source2: gnuplot-fr.doc.bz2 @@ -165,6 +166,13 @@ autoreconf -fi export CXXFLAGS="$CFLAGS -fno-strict-aliasing" export LDFLAGS="-L%{_x11lib} -Wl,--as-needed" export ARCHLIB=%_lib +%if 0%{?suse_version} +%if !0%{?sle_version} + export CFLAGS="$CFLAGS -DDIST_CONTACT='https://bugs.opensuse.org/'" +%else + export CFLAGS="$CFLAGS -DDIST_CONTACT='https://bugzilla.suse.com/'" +%endif +%endif for f in docs/makefile*; do test -e $f || continue mv $f $f.bak @@ -181,8 +189,9 @@ autoreconf -fi # sed -i "s;LRELEASE=lrelease;LRELEASE=lrelease-qt5;g" ./configure %configure \ - --enable-stats \ + --enable-stats \ --with-x \ + --with-x-dcop \ --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib}\ --with-x-app-defaultdir=%{_appdef}\