diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index 251700c..c60fe87 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -48,7 +48,7 @@ #define Nwidths 10 static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -@@ -2285,6 +2292,8 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2289,6 +2296,8 @@ exec_cmd(plot_struct *plot, char *comman /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; @@ -57,7 +57,7 @@ strncpy(default_font, &buffer[2], sizeof(default_font)-1); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); break; -@@ -5740,7 +5749,7 @@ XFontStruct *gpXLoadQueryFont (Display * +@@ -5744,7 +5753,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { @@ -66,7 +66,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5893,6 +5902,18 @@ char *fontname; +@@ -5897,6 +5906,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 893868f..2c2560e 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -63,7 +63,7 @@ --- gnuplot-5.4.0/src/gplt_x11.c +++ gnuplot-5.4.0/src/gplt_x11.c 2020-07-17 07:25:36.834034450 +0000 -@@ -2509,9 +2509,12 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2513,9 +2513,12 @@ exec_cmd(plot_struct *plot, char *comman } } /* X11_justify_text(mode) - set text justification mode */ diff --git a/gnuplot-5.4.3.tar.gz b/gnuplot-5.4.3.tar.gz deleted file mode 100644 index b20dfe9..0000000 --- a/gnuplot-5.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 -size 5656008 diff --git a/gnuplot-5.4.4.tar.gz b/gnuplot-5.4.4.tar.gz new file mode 100644 index 0000000..27cc89d --- /dev/null +++ b/gnuplot-5.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:372300b7867f5b3538b25fc5d0ac7734af6e3fe0d202b6db926e4369913f0902 +size 5639573 diff --git a/gnuplot-gd.patch b/gnuplot-gd.patch index a487001..0569caa 100644 --- a/gnuplot-gd.patch +++ b/gnuplot-gd.patch @@ -16,7 +16,7 @@ Index: gnuplot-5.2.2/configure.ac - # 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 +- if test $pkg_failed = no && test -n "$GDLIB_CONFIG"; then - # If pkg-config did succeed and we have gdlib-config then the later takes - # priority - libgd_CFLAGS=`$GDLIB_CONFIG --cflags` diff --git a/gnuplot.changes b/gnuplot.changes index 5a07bd1..e8cace1 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Jul 19 08:15:29 UTC 2022 - Dr. Werner Fink + +- Update to gnuplot 5.4.4 + * NEW plots can use arrow styles that specify "lc rgb variable" + * CHANGE make page layout of "set view map; splot" more like that of "plot" + - honor "set rmargin" and "set tmargin" Bug #2484 + - display x2label and y2label Bug #2484 + - revised placement of color box Bug #2484 + - reconcile linked axis data and tic ranges Bug #2483 + - apply "set key invert" to splot Bug #2381 + * CHANGE cairo terminals: increase internal oversampling factor Bugs #2499 #2369 + * CHANGE fig: restore terminal option "pointsmax " Bug #2509 + * CHANGE always add a space between items in a "print" command Bug #2488 + * CHANGE consistent ordering of input columns for "plot ... ps var pt var" Bug #2524 + * CHANGE gnuplot -c script.gp A B -C ... will pass A B -C ... without interpretation + * CHANGE stricter error checks when promoting string to numeric value Bug #2527 + * CHANGE report GPVAL_TERM_XMIN and friends as floating point values + * FIX handle combination of axis properties logscale + autoscale + reverse Bug #2347 + * FIX mis-handled arguments at start-up of "gnuplot -c script arg1 ..." Bug #2493 + * FIX windows: redirected output of printf() Bug #2490 + * FIX allow variable point style and point type in plot "with yerrorbars" + * FIX plots "with labels point pt variable" were off-by-one in choosing point type + * FIX contour "with labels" from binary data + * FIX x/y fractional coordinate mouse readout for nonlinear axes Bug #2526 + * FIX Support combination of "set surface explicit; set hidden3d" Bug #2521 +- Use https +- Port patches + * gnuplot-4.6.0-fonts.diff + * gnuplot-4.6.0.dif + * gnuplot-gd.patch + ------------------------------------------------------------------- Sun Jun 19 17:31:46 UTC 2022 - Stefan Brüns diff --git a/gnuplot.spec b/gnuplot.spec index c2bda03..86a4235 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -77,8 +77,8 @@ BuildRequires: tex(pdftex.def) BuildRequires: tex(subfigure.sty) BuildRequires: tex(textgreek.sty) %endif -URL: http://www.gnuplot.info/ -Version: 5.4.3 +URL: https://www.gnuplot.info/ +Version: 5.4.4 Release: 0 %global underscore 5_4 %if "%{flavor}" == "" @@ -90,11 +90,11 @@ Summary: Documentation of GNUplot License: GPL-2.0-or-later AND SUSE-Gnuplot Group: Documentation/Other %endif -Source0: http://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/gnuplot-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/Gnuplot_%{underscore}.pdf +Source0: https://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/gnuplot-%{version}.tar.gz +Source1: https://downloads.sourceforge.net/project/gnuplot/gnuplot/%{version}/Gnuplot_%{underscore}.pdf Source2: gnuplot-fr.doc.bz2 Source3: README.whynot -# http://mirrors.ctan.org/macros/latex209/contrib/picins/picins.sty +# https://mirrors.ctan.org/macros/latex209/contrib/picins/picins.sty # That's a build requirement, not provided by Tex Live Source5: picins.sty # Repair broken texi(nfo) file