rpms/gnuplot
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 5.4.3

Browse Source
This commit is contained in:
Orion Poplawski 2022-01-07 21:22:05 -07:00
parent 0151a6b28d
commit 6eb09f85e0
5 changed files with 35 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/gnuplot-5.2.4-clean.tar.gz
/gnuplot-5.2.8-clean.tar.gz
/gnuplot-5.4.2-clean.tar.gz
/gnuplot-5.4.3-clean.tar.gz

52
gnuplot-5.4.2-no-lena.patch → gnuplot-5.4.3-no-lena.patch
View File

@ -1,6 +1,6 @@
diff -up gnuplot-5.4.2/demo/circles.dem.nolena gnuplot-5.4.2/demo/circles.dem
--- gnuplot-5.4.2/demo/circles.dem.nolena 2021-08-03 21:18:34.337717507 -0600
+++ gnuplot-5.4.2/demo/circles.dem 2021-08-03 21:20:36.298806964 -0600
diff -up gnuplot-5.4.3/demo/circles.dem.nolena gnuplot-5.4.3/demo/circles.dem
--- gnuplot-5.4.3/demo/circles.dem.nolena 2020-10-13 15:14:48.000000000 -0600
+++ gnuplot-5.4.3/demo/circles.dem 2022-01-07 20:46:33.978684483 -0700
@@ -66,22 +66,6 @@ pause -1 "Hit return to continue"
reset
@ -24,9 +24,9 @@ diff -up gnuplot-5.4.2/demo/circles.dem.nolena gnuplot-5.4.2/demo/circles.dem
set title "Delaunay triangulation of Hemisphere points, some empty circles in red"
unset key
diff -up gnuplot-5.4.2/demo/Makefile.am.nolena gnuplot-5.4.2/demo/Makefile.am
--- gnuplot-5.4.2/demo/Makefile.am.nolena 2021-08-03 21:18:34.338717516 -0600
+++ gnuplot-5.4.2/demo/Makefile.am 2021-08-03 21:19:37.044277654 -0600
diff -up gnuplot-5.4.3/demo/Makefile.am.nolena gnuplot-5.4.3/demo/Makefile.am
--- gnuplot-5.4.3/demo/Makefile.am.nolena 2022-01-02 19:19:33.000000000 -0700
+++ gnuplot-5.4.3/demo/Makefile.am 2022-01-07 20:47:13.536024223 -0700
@@ -68,7 +68,7 @@ epslatex:
dvips epslatex
@ -36,18 +36,18 @@ diff -up gnuplot-5.4.2/demo/Makefile.am.nolena gnuplot-5.4.2/demo/Makefile.am
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 dodecahedron.dat ellipses.dat \
@@ -115,7 +115,7 @@ ttics.dem unicode.dem using.dem utf8.dem
violinplot.dem volatile.dem voxel.dem vplot.dem walls.dem week_date.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 \
+gradient.png icon64x64.png GM1_bonds.r3d blutux.rgb sound.par \
sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl html
@@ -116,7 +116,7 @@ utf8.dem varcolor.dem vector.dem violinp
vplot.dem walls.dem week_date.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 start.par gnuplot.rot gnu-valley \
+blutux.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
random-points gpdemos.tcl html
##m4-files-end
diff -up gnuplot-5.4.2/demo/Makefile.in.nolena gnuplot-5.4.2/demo/Makefile.in
--- gnuplot-5.4.2/demo/Makefile.in.nolena 2021-08-03 21:18:34.340717534 -0600
+++ gnuplot-5.4.2/demo/Makefile.in 2021-08-03 21:20:03.262511857 -0600
diff -up gnuplot-5.4.3/demo/Makefile.in.nolena gnuplot-5.4.3/demo/Makefile.in
--- gnuplot-5.4.3/demo/Makefile.in.nolena 2022-01-02 19:19:34.000000000 -0700
+++ gnuplot-5.4.3/demo/Makefile.in 2022-01-07 20:47:34.991208498 -0700
@@ -340,7 +340,7 @@ SUBDIRS = $(PLUGIN_DIR)
DIST_SUBDIRS = plugin
DEMO = all.dem
@ -57,18 +57,18 @@ diff -up gnuplot-5.4.2/demo/Makefile.in.nolena gnuplot-5.4.2/demo/Makefile.in
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 dodecahedron.dat ellipses.dat \
@@ -387,7 +387,7 @@ ttics.dem unicode.dem using.dem utf8.dem
violinplot.dem volatile.dem voxel.dem vplot.dem walls.dem week_date.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 \
+gradient.png icon64x64.png GM1_bonds.r3d blutux.rgb sound.par \
sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl html
@@ -388,7 +388,7 @@ utf8.dem varcolor.dem vector.dem violinp
vplot.dem walls.dem week_date.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 start.par gnuplot.rot gnu-valley \
+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.4.2/demo/rgbalpha.dem.nolena gnuplot-5.4.2/demo/rgbalpha.dem
--- gnuplot-5.4.2/demo/rgbalpha.dem.nolena 2017-12-22 10:32:30.000000000 -0700
+++ gnuplot-5.4.2/demo/rgbalpha.dem 2021-08-03 21:18:34.341717543 -0600
diff -up gnuplot-5.4.3/demo/rgbalpha.dem.nolena gnuplot-5.4.3/demo/rgbalpha.dem
--- gnuplot-5.4.3/demo/rgbalpha.dem.nolena 2017-12-22 10:32:30.000000000 -0700
+++ gnuplot-5.4.3/demo/rgbalpha.dem 2022-01-07 20:46:33.979684492 -0700
@@ -18,8 +18,8 @@ set yrange [ 0. : 128. ]
# Alpha = linear gradient on x

39
gnuplot-signed-char.patch
View File

@ -1,39 +0,0 @@
From 10995e7043211c793d545e7b2cc95acb4760e479 Mon Sep 17 00:00:00 2001
From: Ethan A Merritt <merritt@u.washington.edu>
Date: Sun, 17 Oct 2021 14:28:41 -0700
Subject: [PATCH] arm and s390 need "signed char"
The default is unsigned, which breaks array bound checks in the
vplot.c isosurface code.
Bugs #2467 #2450
---
src/marching_cubes.h | 2 +-
src/qt_table.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/marching_cubes.h b/src/marching_cubes.h
index 4f7264f93..4f1a5a872 100644
--- a/src/marching_cubes.h
+++ b/src/marching_cubes.h
@@ -58,7 +58,7 @@ static const short cube_edge_flags[256]=
First official public domain release
Version 3.00 dated 8-6-94
*/
-static char triangle_table[256][13]=
+static signed char triangle_table[256][13]=
{
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
{ 8, 3, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
diff --git a/src/qt_table.h b/src/qt_table.h
index 9e4ebf8e8..747ef8ec1 100644
--- a/src/qt_table.h
+++ b/src/qt_table.h
@@ -10,7 +10,7 @@
* collapsed them into quadrangles.
* So there is room for improvement in this table.
*/
-static char qt_table[256][13] =
+static signed char qt_table[256][13] =
{
{ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
{ 8, 3, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},

14
gnuplot.spec
View File

@ -1,6 +1,6 @@
%global major 5
%global minor 4
%global patchlevel 2
%global patchlevel 3
%global x11_app_defaults_dir %{_datadir}/X11/app-defaults
@ -10,7 +10,7 @@
%bcond_with wx
%endif
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 9
%if 0%{?fedora} || 0%{?rhel} >= 9
%bcond_without libcerf
%else
%bcond_with libcerf
@ -35,12 +35,10 @@ Patch1: gnuplot-4.2.0-fonts.patch
Patch3: gnuplot-4.6.1-plot-sigsegv.patch
Patch4: gnuplot-4.6.4-singlethread.patch
Patch5: gnuplot-5.0.0-lua_checkint.patch
Patch6: gnuplot-5.4.2-no-lena.patch
Patch6: gnuplot-5.4.3-no-lena.patch
Patch7: gnuplot-5.2.2-doc.patch
Patch8: gnuplot-5.2.8-cmd-opts.patch
Patch9: gnuplot-config.patch
# Upstream patch to fix s390x build failure
Patch20: gnuplot-signed-char.patch
Requires: %{name}-common = %{version}-%{release}
Requires: dejavu-sans-fonts
@ -177,7 +175,6 @@ plotting tool.
%patch7 -p1 -b .doc
%patch8 -p1 -b .cmd-opts
%patch9 -p1 -b .config
%patch20 -p1 -b .signed-char
sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
chmod 644 src/getcolor.h
chmod 644 demo/html/webify.pl
@ -364,7 +361,10 @@ fi
%{_datadir}/texlive/texmf-dist/tex/latex/gnuplot/
%changelog
* Tue Aug 03 2021 Orion Poplawski <orion@nwra.com> - 5.4.2-1
* Sat Jan 08 2022 Orion Poplawski <orion@nwra.com> - 5.4.3-1
- Update to 5.4.3
* Wed Oct 27 2021 Orion Poplawski <orion@nwra.com> - 5.4.2-1
- Update to 5.4.2
* Thu Aug 05 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 5.2.8-11

2
sources
View File

@ -1 +1 @@
SHA512 (gnuplot-5.4.2-clean.tar.gz) = c0c095c761787e57e22e97b14287604cc2cb13e0c820d9c05450f4cfc4e7126eab818f6dc4eca48ff15dd53cb5586f52df911c18dcd8cc7083255c5196d035a9
SHA512 (gnuplot-5.4.3-clean.tar.gz) = 04a494d9ee6681318611b5dbc15934e5b82b717c95aae15458632917d3ea2fcd4e1e59c307c8908c1551f3fc6f40b5301ef7b93a30df523833d0840365fa2f28