diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 3a71661..893868f 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -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 -@@ -514,7 +514,7 @@ extern TBOOLEAN clip_lines2; +@@ -515,7 +515,7 @@ extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; extern TBOOLEAN clip_radial; diff --git a/gnuplot-5.4.2.tar.gz b/gnuplot-5.4.2.tar.gz deleted file mode 100644 index a684dfe..0000000 --- a/gnuplot-5.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba -size 5640202 diff --git a/gnuplot-5.4.3.tar.gz b/gnuplot-5.4.3.tar.gz new file mode 100644 index 0000000..b20dfe9 --- /dev/null +++ b/gnuplot-5.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 +size 5656008 diff --git a/gnuplot-gd.patch b/gnuplot-gd.patch index c197347..a487001 100644 --- a/gnuplot-gd.patch +++ b/gnuplot-gd.patch @@ -1,37 +1,47 @@ Index: gnuplot-5.2.2/configure.ac =================================================================== --- - gnuplot-5.4.0/configure.ac | 66 ++++++------------------------------------ - gnuplot-5.4.0/src/Makefile.am | 2 - - 2 files changed, 11 insertions(+), 57 deletions(-) + gnuplot-5.4.3/configure.ac | 76 +++++------------------------------------- + gnuplot-5.4.3/src/Makefile.am | 2 - + 2 files changed, 11 insertions(+), 67 deletions(-) ---- gnuplot-5.4.0/configure.ac -+++ gnuplot-5.4.0/configure.ac 2020-07-17 07:31:14.828189953 +0000 -@@ -534,63 +534,17 @@ AC_ARG_WITH(gd,dnl +--- gnuplot-5.4.3/configure.ac ++++ gnuplot-5.4.3/configure.ac 2022-01-10 09:30:11.836241429 +0000 +@@ -526,73 +526,17 @@ AC_ARG_WITH(gd,dnl if test "$with_gd" != no; then PKG_CHECK_MODULES_NOFAIL(libgd, [gdlib]) - AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config]) +- +- # If pkg-config did return libgd configuration then +- # libgd_{CFLAGS,LDFLAGS,LIBS} is set +- # If gdlib-config executable is found then GDLIB_CONFIG is set - if test $pkg_failed == no && test -n "$GDLIB_CONFIG"; then -- libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags` +- # If pkg-config did succeed and we have gdlib-config then the later takes +- # priority +- libgd_CFLAGS=`$GDLIB_CONFIG --cflags` - libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags` - libgd_LIBS=`$GDLIB_CONFIG --libs` - elif test -d "$with_gd"; then -- libgd_CPPFLAGS="-I$with_gd/include" +- # pkg-config did NOT succeed, we do NOT have gdlib-config but user +- # specified --with-gd= +- libgd_CFLAGS="-I$with_gd/include" - libgd_LDFLAGS="-L$with_gd/lib" - libgd_LIBS="-ljpeg -lpng -lfreetype -lz" - fi - +- # Verify that libgd works, but backup the previous compilation variables to +- # be able to revert in the case that libgd is not functional - _cppflags="$CPPFLAGS" - _ldflags="$LDFLAGS" - _libs="$LIBS" -- CPPFLAGS="$CPPFLAGS $libgd_CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $libgd_CFLAGS" - LDFLAGS="$LDFLAGS $libgd_LDFLAGS" - LIBS="$LIBS $libgd_LIBS" - - AC_CHECK_LIB(gd,gdImageCreateTrueColor, - [dnl found gd library -+PKG_CHECK_MODULES([GD], [gdlib], [ ++ PKG_CHECK_MODULES([GD], [gdlib], [ + ac_cv_lib_gd_gdImageJpeg=yes + ac_cv_lib_gd_gdImagePng=yes + ac_cv_lib_gd_gdImageGif=yes @@ -81,8 +91,8 @@ Index: gnuplot-5.2.2/configure.ac fi dnl end gd ---- gnuplot-5.4.0/src/Makefile.am -+++ gnuplot-5.4.0/src/Makefile.am 2020-07-17 07:32:16.391125309 +0000 +--- gnuplot-5.4.3/src/Makefile.am ++++ 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 diff --git a/gnuplot.changes b/gnuplot.changes index 90dd8b8..7fd02a1 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jan 10 09:31:15 UTC 2022 - Dr. Werner Fink + +- Update to gnuplot 5.4.3 + * NEW "set pm3d border retrace" will use quadrangle color for the border + * NEW "nogrid" flag for plots to opt out of dgrid3d processing + * NEW option "above|below y=" for "plot with fillsteps" + * NEW "set style histogram nokeyseparators" suppress blank key entries Bug #2473 + * CHANGE always allow palette color for non-plot elements of 2D plot + * FIX contours were incorrectly allocated space in the key even if "notitle" + * FIX evaluation of unary minus in front of ternary operator Bug #2468 + * FIX arm and s390 require "signed char" Bugs #2467 #2450 + * FIX range errors if "smooth csplines" applied with x-axis reversed Bug #2465 + * FIX handle various corner cases found by fuzzing + * FIX textcolor should accept "linetype N" Bug #2459 + * FIX Windows: handling of Window messages for piped input Bugs #2204 #2412 + * FIX aquaterm: auto-configuration use of Frameworks Bug #2419 + * FIX qt: pm3d quadrangle borders for transparent surfaces + * FIX png/gif: gdlib auto-configuration issues + * FIX dumb: limit enhanced text markup to single-line vertical displacement +- Port patches + * gnuplot-4.6.0.dif + * gnuplot-gd.patch + ------------------------------------------------------------------- Mon Jun 7 05:53:01 UTC 2021 - Dr. Werner Fink diff --git a/gnuplot.spec b/gnuplot.spec index fd6ac4e..b5f5684 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -79,7 +79,7 @@ BuildRequires: tex(subfigure.sty) BuildRequires: tex(textgreek.sty) %endif URL: http://www.gnuplot.info/ -Version: 5.4.2 +Version: 5.4.3 Release: 0 %global underscore 5_4 %if "%{flavor}" == ""