SHA256
1
0
forked from pool/gnuplot

Update to gnuplot gnuplot-5.4.7

OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=149
This commit is contained in:
Dr. Werner Fink 2023-05-22 07:21:56 +00:00 committed by Git OBS Bridge
parent 2c4b838c4b
commit 69c4a5531b
7 changed files with 56 additions and 59 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3ac52deec8794fb8817b836ceb83b84f4a8e2b190c314efe9e76c72dec45ee0
size 2211429
oid sha256:9ff12ff93cbd23a70c7aed3bd948e1bdeb8a80e8fd86a5835c2340f6011d21ae
size 2230285

View File

@ -1,51 +0,0 @@
From 7f7eb181d5be89425d1a9baae0eb49d9f5420590 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <Andreas.Stieger@gmx.de>
Date: Tue, 27 Sep 2022 20:25:34 +0200
Subject: [PATCH] Convert all calls of egrep/fgrep to grep -E / grep -F,
respectively
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1203093 https://sourceforge.net/p/gnuplot/gnuplot-main/merge-requests/22/
Avoids warnings with GNU grep 3.8 and prepares for ultimate removal
---
config/makefile.cyg | 2 +-
docs/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/makefile.cyg b/config/makefile.cyg
index e6e3bc59f..eb6b5bcad 100644
--- a/config/makefile.cyg
+++ b/config/makefile.cyg
@@ -357,7 +357,7 @@ ifdef SORT_TERMINALS
# sort alphabetically all terminals (note: req. GNU sort, not from MS)
allterm.h: $(CORETERM)
@echo "Building allterm.h"
- @for e in `egrep "^[ ]*START_HELP" $(CORETERM) |\
+ @for e in `grep -E "^[ ]*START_HELP" $(CORETERM) |\
$(GNUSORT) -f -t':' -k2` ; do \
f=`echo $$e |cut -d\: -f1` ; s=`echo $$e | cut -d\: -f2` ;\
sed -n "/^[ ]*$$s/,/^[ ]*END_HELP/p" $$f ; \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f94eea28b..2e867d0db 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -121,7 +121,7 @@ LUA_HELP =
endif
allterm.h: $(CORETERM) $(LUA_HELP)
- $(AM_V_GEN) for e in `egrep "^[ ]*START_HELP" $(CORETERM) |\
+ $(AM_V_GEN) for e in `grep -E "^[ ]*START_HELP" $(CORETERM) |\
LC_ALL=C sort -f -t':' -k2` ; do \
f=`echo $$e |cut -d\: -f1` ; s=`echo $$e | cut -d\: -f2` ;\
sed -n "/^[ ]*$$s/,/^[ ]*END_HELP/p" $$f ; \
@@ -333,7 +333,7 @@ install-info: gnuplot.info
$(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
$(AM_V_at) $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info
$(AM_V_at) if (install-info --version && \
- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+ install-info --version | grep -F -i -v debian) >/dev/null 2>&1; then \
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || : ;\
else : ; fi
--
2.37.3

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419
size 5655661

3
gnuplot-5.4.7.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:318a1501c9e659f39cf05ee5268335671bddc6c20eae06851f262fde27c2e739
size 5683635

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon May 22 07:19:52 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update to gnuplot 5.4.7
* FIX pseudofiles '+','++' must ignore "set datafile columnheader" Bug #2585
* FIX data from an array must ignore "set datafile columnheader" Bug #2585
* FIX various problems with unbounded plot iteration Bug #2589
* FIX allow plot ... smooth acsplines with filledcurves Bug #2592
* FIX "plot title at {end|beginning}" belongs in KEYSAMPLE layer
* FIX handle empty string in last field of csv file
* FIX Handle nonlinear axes during contour generation Bug #2593
* FIX yerrorbars key sample should match bars in the plot Bug #2598
* FIX "plot with table" must skip all smoothing operations Bug #2610
* FIX cairolatex/epslatex: prevent doubled text in opaque textboxes
* FIX wxt: versions prior to 3.0 do not support XDG Bug #2587
* FIX wxt: fontscale and fontsize handling was inconsistent Bug #2373
* FIX tikz epslatex cairolatex: updated to work with TeXLive2023 Bug #2613
* FIX correctly report cardinality of an empty array is zero Bug #2616
* FIX ignore datafile separator when plotting from an array
* FIX combination of pm3d options "at b" or "at t" with "depthorder"
* FIX combination of 'autotitle columnhead' and 'using col("key")' Bug #2620
* FIX do not complain if XDG files are not found because no $HOME Bug #2623
* FIX windows terminal: arrow length corrected for aspect ratio Bug #2565
- Delete patch gnuplot-5.4.4-grep.patch now upstream
-------------------------------------------------------------------
Sun Feb 12 15:07:08 UTC 2023 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon May 22 07:19:52 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update to gnuplot 5.4.7
* FIX pseudofiles '+','++' must ignore "set datafile columnheader" Bug #2585
* FIX data from an array must ignore "set datafile columnheader" Bug #2585
* FIX various problems with unbounded plot iteration Bug #2589
* FIX allow plot ... smooth acsplines with filledcurves Bug #2592
* FIX "plot title at {end|beginning}" belongs in KEYSAMPLE layer
* FIX handle empty string in last field of csv file
* FIX Handle nonlinear axes during contour generation Bug #2593
* FIX yerrorbars key sample should match bars in the plot Bug #2598
* FIX "plot with table" must skip all smoothing operations Bug #2610
* FIX cairolatex/epslatex: prevent doubled text in opaque textboxes
* FIX wxt: versions prior to 3.0 do not support XDG Bug #2587
* FIX wxt: fontscale and fontsize handling was inconsistent Bug #2373
* FIX tikz epslatex cairolatex: updated to work with TeXLive2023 Bug #2613
* FIX correctly report cardinality of an empty array is zero Bug #2616
* FIX ignore datafile separator when plotting from an array
* FIX combination of pm3d options "at b" or "at t" with "depthorder"
* FIX combination of 'autotitle columnhead' and 'using col("key")' Bug #2620
* FIX do not complain if XDG files are not found because no $HOME Bug #2623
* FIX windows terminal: arrow length corrected for aspect ratio Bug #2565
- Delete patch gnuplot-5.4.4-grep.patch now upstream
-------------------------------------------------------------------
Sun Feb 12 15:07:08 UTC 2023 - Dr. Werner Fink <werner@suse.de>

View File

@ -78,7 +78,7 @@ BuildRequires: tex(subfigure.sty)
BuildRequires: tex(textgreek.sty)
%endif
URL: https://www.gnuplot.info/
Version: 5.4.6
Version: 5.4.7
Release: 0
%global underscore 5_4
%if "%{flavor}" == ""
@ -107,7 +107,6 @@ Patch5: gnuplot-wx3.diff
Patch6: gnuplot-QtCore-PIC.dif
Patch7: gnuplot-gd.patch
Patch8: gnuplot-PIE.patch
Patch9: gnuplot-5.4.4-grep.patch
%define _x11lib %{_libdir}
%define _x11data %{_datadir}/X11
%define _libx11 %{_exec_prefix}/lib/X11
@ -143,7 +142,6 @@ cp %{_sourcedir}/picins.sty docs
%patch6 -p0 -b .pic
%patch7 -p1 -b .gd
%patch8 -p1 -b .pie
%patch9 -p1 -b .grep
%build
autoreconf -fi