PR#7: WIP update to upstream 5.4.1 - rpms/gnuplot

rpms / gnuplot

#7 WIP update to upstream 5.4.1

Closed 2 years ago by orion. Opened 3 years ago by pcahyna.

rpms/ pcahyna/gnuplot rebase-5.4.1 into rawhide

Rebuild with wxWidgets GTK3 version

Pavel Cahyna • 3 years ago

93430ae

Update to 5.4.1

Pavel Cahyna • 3 years ago

c481ab6

gnuplot-5.2.4-no-lena.patch

file modified

+30 -18

		`@@ -1,11 +1,17 @@`
		`diff -up gnuplot-5.2.4/demo/circles.dem.nolena gnuplot-5.2.4/demo/circles.dem`
		`--- gnuplot-5.2.4/demo/circles.dem.nolena 2017-12-22 18:32:30.000000000 +0100`
		`+++ gnuplot-5.2.4/demo/circles.dem 2018-08-08 10:14:21.308379527 +0200`
		`- @@ -98,21 +98,6 @@ pause -1 "Hit return to continue"`
		`+ @@ -61,32 +61,16 @@`
		`+ plot 'optimize.dat' with circles lc rgb "blue" fs transparent solid 0.15 noborder,\`
		`+ 'optimize.dat' u 1:2 with linespoints lw 2 lc rgb "black"`
		`+`
		`+ pause -1 "Hit return to continue"`
		`+`

		`reset`
		`set size ratio -1`
		`-set title "Lena's key points"`
		`+ -unset xlabel`
		`-unset xtics`
		`-unset ytics`
		`-unset key`
		`@@ -23,6 +29,12 @@`
		`set title "Delaunay triangulation of Hemisphere points, some empty circles in red"`
		`unset key`

		`+ plot 'empty-circles.dat' with circles lw 2 lc rgb "red", \`
		`+ 'delaunay-edges.dat' with lines lc rgb "forest-green", \`
		`+ 'hemisphr.dat' u (100$1):(100$2) with points pt 7 lc rgb "black"`
		`+`
		`+ pause -1 "Hit return to continue"`
		`+`
		`diff -up gnuplot-5.2.4/demo/Makefile.am.nolena gnuplot-5.2.4/demo/Makefile.am`
		`--- gnuplot-5.2.4/demo/Makefile.am.nolena 2017-12-23 07:29:12.000000000 +0100`
		`+++ gnuplot-5.2.4/demo/Makefile.am 2018-08-08 10:18:08.787797877 +0200`
		`@@ -34,20 +46,20 @@`
		`+EXTRA_DIST = Makefile.am.in scatter2.bin sine.bin \`
		`using.bin gnuplot.cfg world.cor 1.dat 2.dat 3.dat arrowstyle.dat \`
		`asciimat.dat battery.dat big_peak.dat candlesticks.dat cities.dat \`
		`- clip14in.dat ctg-y2.dat delaunay-edges.dat ellipses.dat empty-circles.dat \`
		`- @@ -107,7 +107,7 @@ textrotate.dem tics.dem timedat.dem tran`
		`- ttics.dem using.dem utf8.dem varcolor.dem vector.dem violinplot.dem \`
		`- volatile.dem world2.dem world.dem zerror.dem demo.edf density.fnc \`
		`- hexa.fnc line.fnc reflect.fnc gen-random.inc stat.inc GM1_sugar.pdb \`
		`- -bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par start.par \`
		`- +bldg.png GM1_bonds.r3d blutux.rgb sound.par sound2.par start.par \`
		`- gnuplot.rot gnu-valley random-points gpdemos.tcl html`
		`+ clip14in.dat ctg-y2.dat delaunay-edges.dat dodecahedron.dat ellipses.dat \`
		`+ @@ -114,7 +114,7 @@ textrotate.dem tics.dem timedat.dem tran`
		`+ violinplot.dem volatile.dem voxel.dem vplot.dem walls.dem world2.dem \`
		`+ world.dem zerror.dem demo.edf density.fnc hexa.fnc line.fnc reflect.fnc \`
		`+ gen-random.inc stat.inc GM1_sugar.pdb aries.png bldg.png gradient.png \`
		`+ -icon64x64.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par \`
		`+ +icon64x64.png GM1_bonds.r3d blutux.rgb sound.par sound2.par \`
		`+ start.par gnuplot.rot gnu-valley random-points gpdemos.tcl html`
		`##m4-files-end`

		`diff -up gnuplot-5.2.4/demo/Makefile.in.nolena gnuplot-5.2.4/demo/Makefile.in`
		`--- gnuplot-5.2.4/demo/Makefile.in.nolena 2018-06-01 03:51:13.000000000 +0200`
		`+++ gnuplot-5.2.4/demo/Makefile.in 2018-08-08 10:18:14.455683660 +0200`
		`- @@ -330,7 +330,7 @@ SUBDIRS = $(PLUGIN_DIR)`
		`+ @@ -340,7 +340,7 @@ SUBDIRS = $(PLUGIN_DIR)`
		`DIST_SUBDIRS = plugin`
		`DEMO = all.dem`
		`GNUPLOT = gnuplot`
		`@@ -55,14 +67,14 @@`
		`+EXTRA_DIST = Makefile.am.in scatter2.bin sine.bin \`
		`using.bin gnuplot.cfg world.cor 1.dat 2.dat 3.dat arrowstyle.dat \`
		`asciimat.dat battery.dat big_peak.dat candlesticks.dat cities.dat \`
		`- clip14in.dat ctg-y2.dat delaunay-edges.dat ellipses.dat empty-circles.dat \`
		`- @@ -369,7 +369,7 @@ textrotate.dem tics.dem timedat.dem tran`
		`- ttics.dem using.dem utf8.dem varcolor.dem vector.dem violinplot.dem \`
		`- volatile.dem world2.dem world.dem zerror.dem demo.edf density.fnc \`
		`- hexa.fnc line.fnc reflect.fnc gen-random.inc stat.inc GM1_sugar.pdb \`
		`- -bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par start.par \`
		`- +bldg.png GM1_bonds.r3d blutux.rgb sound.par sound2.par start.par \`
		`- gnuplot.rot gnu-valley random-points gpdemos.tcl html`
		`+ clip14in.dat ctg-y2.dat delaunay-edges.dat dodecahedron.dat ellipses.dat \`
		`+ @@ -386,7 +386,7 @@ textrotate.dem tics.dem timedat.dem tran`
		`+ violinplot.dem volatile.dem voxel.dem vplot.dem walls.dem world2.dem \`
		`+ world.dem zerror.dem demo.edf density.fnc hexa.fnc line.fnc reflect.fnc \`
		`+ gen-random.inc stat.inc GM1_sugar.pdb aries.png bldg.png gradient.png \`
		`+ -icon64x64.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par \`
		`+ +icon64x64.png GM1_bonds.r3d blutux.rgb sound.par sound2.par \`
		`+ start.par gnuplot.rot gnu-valley random-points gpdemos.tcl html`

		`@BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin`
		`diff -up gnuplot-5.2.4/demo/rgbalpha.dem.nolena gnuplot-5.2.4/demo/rgbalpha.dem`

gnuplot.spec

file modified

+19 -20

		`@@ -1,6 +1,6 @@`
		`%global major 5`
		`- %global minor 2`
		`- %global patchlevel 8`
		`+ %global minor 4`
		`+ %global patchlevel 1`

		`%global x11_app_defaults_dir %{_datadir}/X11/app-defaults`

		`@@ -29,7 +29,6 @@`
		`Source0: %{name}-%{version}-clean.tar.gz`
		`Source1: gnuplot-init.el`

		`- Patch0: gnuplot-4.2.0-refers_to.patch`
		`Patch1: gnuplot-4.2.0-fonts.patch`
		`# resolves: #812225`
		`# submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558973&group_id=2055&atid=302055`
		`@@ -61,7 +60,7 @@`
		`BuildRequires: libcerf-devel >= 1.11`
		`%endif`
		`%if %{with wx}`
		`- BuildRequires: compat-wxGTK3-gtk2-devel`
		`+ BuildRequires: wxGTK3-devel`
		`%endif`
		`BuildRequires: make`

		`@@ -168,7 +167,6 @@`

		`%prep`
		`%setup -q`
		`- %patch0 -p1 -b .refto`
		`%patch1 -p1 -b .font`
		`%patch3 -p1 -b .plot-sigsegv`
		`%patch4 -p1 -b .isinglethread`
		`@@ -178,8 +176,6 @@`
		`%patch8 -p1 -b .cmd-opts`
		`%patch9 -p1 -b .config`
		`sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c`
		`- iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux`
		`- mv ChangeLog.aux ChangeLog`
		`chmod 644 src/getcolor.h`
		`chmod 644 demo/html/webify.pl`
		`chmod 644 demo/html/webify_svg.pl`
		`@@ -221,13 +217,16 @@`


		`# Docs don't build properly out of tree`
		`- %configure %{configure_opts} --with-tutorial`
		`+ %configure %{configure_opts}`
		`+ # tutorial is not part of 5.4 - considered horribly obsolete`
		`+ # --with-tutorial`
		`ln -s ../minimal/src/gnuplot src/`
		`make -C docs html info`
		`export GNUPLOT_PS_DIR=../../term/PostScript`
		`make -C docs/psdoc ps_symbols.ps ps_fontfile_doc.pdf`
		`rm -rf docs/htmldocs/images.idx`
		`- make -C tutorial`
		`+ # not part of 5.4 - horribly obsolete`
		`+ #make -C tutorial`

		`%install`
		`%if %{with wx}`
		`@@ -248,6 +247,8 @@`
		`# install info`
		`make -C docs install-info DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'`

		`+ install -p -m 644 -D man/gnuplot-ja_JP.UTF-8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/gnuplot.1`
		`+`
		`# install emacs files`
		`#install -d ${RPM_BUILD_ROOT}/%{_emacs_sitestartdir}/`
		`#install -p -m 644 %SOURCE1 ${RPM_BUILD_ROOT}/%{_emacs_sitestartdir}/gnuplot-init.el`
		`@@ -263,8 +264,6 @@`
		`mv $RPM_BUILD_ROOT%{_datadir}/gnuplot/%{major}.%{minor}/app-defaults/Gnuplot $RPM_BUILD_ROOT%{x11_app_defaults_dir}/Gnuplot`
		`rm -rf $RPM_BUILD_ROOT%{_libdir}/`

		`- mkdir -p $RPM_BUILD_ROOT/%{_mandir}/ja/man1`
		`- mv $RPM_BUILD_ROOT%{_mandir}/man1/gnuplot-ja.1 $RPM_BUILD_ROOT/%{_mandir}/ja/man1/`
		`ln -s gnuplot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/gnuplot-qt.1`
		`%if %{with wx}`
		`ln -s gnuplot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/gnuplot-wx.1`
		`@@ -306,18 +305,18 @@`

		`%files`
		`%ghost %attr(0755,-,-) %{_bindir}/gnuplot`
		`- %doc ChangeLog Copyright`
		`+ %doc Copyright`
		`%{_bindir}/gnuplot-qt`
		`%{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_qt`
		`%{_datadir}/gnuplot/%{major}.%{minor}/qt/`

		`%files doc`
		`- %doc ChangeLog Copyright`
		`- %doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi docs/psdoc/ps_file.doc demo`
		`- %doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs tutorial/eg7.eps`
		`+ %doc Copyright`
		`+ %doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps docs/psdoc/ps_file.doc demo`
		`+ %doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs`

		`%files common`
		`- %doc BUGS ChangeLog Copyright NEWS README`
		`+ %doc BUGS Copyright NEWS README`
		`%{_mandir}/man1/gnuplot.1.gz`
		`%{_mandir}/man1/gnuplot-qt.1.gz`
		`%dir %{_datadir}/gnuplot`
		`@@ -337,18 +336,18 @@`
		`%{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11`
		`%{x11_app_defaults_dir}/Gnuplot`
		`%{_infodir}/gnuplot.info.*`
		`- %{_mandir}/ja/man1/gnuplot-ja.1.gz`
		`+ %{_mandir}/ja/man1/gnuplot.1.gz`

		`%files minimal`
		`%ghost %attr(0755,-,-) %{_bindir}/gnuplot`
		`- %doc ChangeLog Copyright`
		`+ %doc Copyright`
		`%{_bindir}/gnuplot-minimal`

		`%if %{with wx}`
		`%files wx`
		`%ghost %attr(0755,-,-) %{_bindir}/gnuplot`
		`%{_mandir}/man1/gnuplot-wx.1.gz`
		`- %doc ChangeLog Copyright`
		`+ %doc Copyright`
		`%{_bindir}/gnuplot-wx`
		`%endif`

		`@@ -365,7 +364,7 @@`
		`#%{_emacs_sitelispdir}/*.el`

		`%files latex`
		`- %doc ChangeLog Copyright`
		`+ %doc Copyright`
		`%{_datadir}/texlive/texmf-dist/tex/latex/gnuplot/`

		`%changelog`

pcahyna commented 3 years ago

Includes #4 Rebuild with wxWidgets GTK3 version, as the regression that was originally present is fixed in the new version, so the PR can be merged.

Unfortunately, the s390x build segfaults:

GNUPLOT_LIB=../demo ../src/gnuplot -e "winhelp=1;" ./plotstyles.gnu
line 0: warning: iconv failed to convert degree sign
"./plotstyles.gnu" line 36: warning: iconv failed to convert degree sign
vfill from + :
    radius 0.9 gives a brick of 9 voxels on x, 9 voxels on y, 3 voxels on z
    number of points input:          55
    number of voxels modified:     5886
make: *** [Makefile:1197: wxhelp_figures] Segmentation fault (core dumped)
make: Leaving directory '/builddir/build/BUILD/gnuplot-5.4.1/docs'

-- possible LP64 + big endian problem?

pcahyna commented 3 years ago

Copr build for now https://copr.fedorainfracloud.org/coprs/pcahyna/gnuplot-updates/build/2116301/