From ef98346a314f69e7ebf72f1a0a3a6e8d949f5c5db14dc2e0e6182d8bbf6ddda4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 12 Feb 2023 15:09:15 +0000 Subject: [PATCH] Update to gnuplot 5.4.6 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=146 --- Gnuplot_5_4.pdf | 4 ++-- gnuplot-4.6.0-demo.diff | 2 +- gnuplot-4.6.0-fonts.diff | 2 +- gnuplot-4.6.0.dif | 14 +++++++------- gnuplot-5.4.4-grep.patch | 4 ++-- gnuplot-5.4.5.tar.gz | 3 --- gnuplot-5.4.6.tar.gz | 3 +++ gnuplot-PIE.patch | 2 +- gnuplot-gd.patch | 2 +- gnuplot.changes | 30 ++++++++++++++++++++++++++++++ gnuplot.spec | 4 ++-- 11 files changed, 50 insertions(+), 20 deletions(-) delete mode 100644 gnuplot-5.4.5.tar.gz create mode 100644 gnuplot-5.4.6.tar.gz diff --git a/Gnuplot_5_4.pdf b/Gnuplot_5_4.pdf index 58cf291..237895d 100644 --- a/Gnuplot_5_4.pdf +++ b/Gnuplot_5_4.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdd4cc2b85b5c7f75f8488020c9b85b9cca070227aff9a3792f30c85ccb31284 -size 2209518 +oid sha256:c3ac52deec8794fb8817b836ceb83b84f4a8e2b190c314efe9e76c72dec45ee0 +size 2211429 diff --git a/gnuplot-4.6.0-demo.diff b/gnuplot-4.6.0-demo.diff index 0ee9e04..076fbdd 100644 --- a/gnuplot-4.6.0-demo.diff +++ b/gnuplot-4.6.0-demo.diff @@ -71,7 +71,7 @@ --- src/show.c +++ src/show.c 2020-07-17 07:25:00.022670914 +0000 -@@ -1076,6 +1076,15 @@ show_version(FILE *fp) +@@ -1077,6 +1077,15 @@ show_version(FILE *fp) p /* type "help seeking-assistance" */ ); diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index c60fe87..8dc64ea 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -66,7 +66,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5897,6 +5906,18 @@ char *fontname; +@@ -5896,6 +5905,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 2c2560e..8e54110 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -26,7 +26,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST) -@@ -265,17 +265,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/ +@@ -262,17 +262,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/ doc2hlp_SOURCES = doc2hlp.c termdoc.c ### gnuplot interactive help format @@ -52,7 +52,7 @@ alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) --- gnuplot-5.4.0/src/gadgets.h +++ gnuplot-5.4.0/src/gadgets.h 2020-07-17 07:27:48.183763305 +0000 -@@ -515,7 +515,7 @@ extern TBOOLEAN clip_lines2; +@@ -522,7 +522,7 @@ extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; extern TBOOLEAN clip_radial; @@ -81,7 +81,7 @@ --- gnuplot-5.4.0/src/plot.c +++ gnuplot-5.4.0/src/plot.c 2020-07-17 07:28:52.762646614 +0000 -@@ -205,6 +205,7 @@ static int asked_privi = 0; +@@ -206,6 +206,7 @@ static int asked_privi = 0; void drop_privilege() { @@ -89,7 +89,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -218,11 +219,13 @@ drop_privilege() +@@ -219,11 +220,13 @@ drop_privilege() if (seteuid(ruid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) ruid, strerror(errno)); @@ -103,7 +103,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -236,6 +239,7 @@ take_privilege() +@@ -237,6 +240,7 @@ take_privilege() if (seteuid(euid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) euid, strerror(errno)); @@ -111,7 +111,7 @@ } #endif /* LINUXVGA */ -@@ -271,8 +275,8 @@ main(int argc_orig, char **argv) +@@ -272,8 +276,8 @@ main(int argc_orig, char **argv) argc = argc_orig; #ifdef LINUXVGA @@ -121,7 +121,7 @@ #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,22 @@ main(int argc_orig, char **argv) +@@ -346,6 +350,22 @@ main(int argc_orig, char **argv) rl_getc_function = getc_wrapper; #endif diff --git a/gnuplot-5.4.4-grep.patch b/gnuplot-5.4.4-grep.patch index 77c9106..6fa9a44 100644 --- a/gnuplot-5.4.4-grep.patch +++ b/gnuplot-5.4.4-grep.patch @@ -28,7 +28,7 @@ diff --git a/docs/Makefile.am b/docs/Makefile.am index f94eea28b..2e867d0db 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am -@@ -135,7 +135,7 @@ LUA_HELP = +@@ -121,7 +121,7 @@ LUA_HELP = endif allterm.h: $(CORETERM) $(LUA_HELP) @@ -37,7 +37,7 @@ index f94eea28b..2e867d0db 100644 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 ; \ -@@ -386,7 +386,7 @@ install-info: gnuplot.info +@@ -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 && \ diff --git a/gnuplot-5.4.5.tar.gz b/gnuplot-5.4.5.tar.gz deleted file mode 100644 index b21155c..0000000 --- a/gnuplot-5.4.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 -size 5643171 diff --git a/gnuplot-5.4.6.tar.gz b/gnuplot-5.4.6.tar.gz new file mode 100644 index 0000000..bf3e82e --- /dev/null +++ b/gnuplot-5.4.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 +size 5655661 diff --git a/gnuplot-PIE.patch b/gnuplot-PIE.patch index 553b7cc..742abfb 100644 --- a/gnuplot-PIE.patch +++ b/gnuplot-PIE.patch @@ -3,7 +3,7 @@ Index: gnuplot-5.4.1/src/Makefile.am --- gnuplot-5.4.1.orig/src/Makefile.am +++ gnuplot-5.4.1/src/Makefile.am @@ -61,6 +61,7 @@ util3d.c util3d.h variable.c variable.h - voxelgrid.c voxelgrid.h vplot.c vplot.h marching_cubes.h + voxelgrid.c voxelgrid.h vplot.c vplot.h marching_cubes.h xdg.c xdg.h gnuplot_LDADD = $(GD_LIBS) $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) +gnuplot_LDFLAGS = -pie diff --git a/gnuplot-gd.patch b/gnuplot-gd.patch index 0569caa..ff65b78 100644 --- a/gnuplot-gd.patch +++ b/gnuplot-gd.patch @@ -95,7 +95,7 @@ Index: gnuplot-5.2.2/configure.ac +++ gnuplot-5.4.3/src/Makefile.am 2022-01-10 08:51:05.936921975 +0000 @@ -60,7 +60,7 @@ term_api.h term.c term.h time.c unset.c util3d.c util3d.h variable.c variable.h version.c version.h \ - voxelgrid.c voxelgrid.h vplot.c vplot.h marching_cubes.h + voxelgrid.c voxelgrid.h vplot.c vplot.h marching_cubes.h xdg.c xdg.h -gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) +gnuplot_LDADD = $(GD_LIBS) $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) diff --git a/gnuplot.changes b/gnuplot.changes index 592b284..b197a81 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sun Feb 12 15:07:08 UTC 2023 - Dr. Werner Fink + +- Update to gnuplot 5.4.6 + * NEW set key {columns } + set key {keywidth } + * NEW XDG support + startup file: $XDG_CONFIG_HOME/gnuplot/gnuplotrc + history file: $XDG_STATE_HOME/gnuplot_history + wxt configuration: $XDG_CONFIG_HOME/gnuplot/gnuplot-wxt.conf + * CHANGE remove "alldoc" build target + * CHANGE plot with polygons fillstyle empty really does mean empty + * FIX windows: various problems mixing piped input and stdin Bug #2491 + * FIX x11: bad interactions of lt nodraw, bgnd and dash pattern Bug #2572 + * FIX wxt: export-to-file widget should preserve line properties + * FIX svg: set initial default fill to "none" + * FIX png: back-compatibility with very old versions of gdlib Bug #2579 + * FIX variable pointtype, pointsize in plot style yerrorlines + * FIX border color for polygons with variable fillcolor + * FIX definition followed by iteration in a plot command Bug #2580 + * FIX parametric plot with filledcurves y1= Bug #1797 +- Port patches + * Gnuplot_5_4.pdf + * gnuplot-4.6.0-demo.diff + * gnuplot-4.6.0-fonts.diff + * gnuplot-4.6.0.dif + * gnuplot-5.4.4-grep.patch + * gnuplot-PIE.patch + * gnuplot-gd.patch + ------------------------------------------------------------------- Sat Dec 17 19:33:27 UTC 2022 - Dirk Müller diff --git a/gnuplot.spec b/gnuplot.spec index 5e97b4c..0b26f3e 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -78,7 +78,7 @@ BuildRequires: tex(subfigure.sty) BuildRequires: tex(textgreek.sty) %endif URL: https://www.gnuplot.info/ -Version: 5.4.5 +Version: 5.4.6 Release: 0 %global underscore 5_4 %if "%{flavor}" == ""