From e855513e211f58cf49a9226adeb03ac54cee8cf58cc4dedeb1d16f20b19af7b7 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 17 Jul 2020 08:10:21 +0000 Subject: [PATCH] Update to gnuplot-5.4.0 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=115 --- gnuplot-4.4.0-x11ovf.dif | 8 ++-- gnuplot-4.6.0-demo.diff | 30 ++++++------- gnuplot-4.6.0-fonts.diff | 30 ++++--------- gnuplot-4.6.0.dif | 89 ++++++++++++--------------------------- gnuplot-5.2.8.tar.gz | 3 -- gnuplot-5.4.0.tar.gz | 3 ++ gnuplot-QtCore-PIC.dif | 2 +- gnuplot-QtIndexedList.dif | 47 --------------------- gnuplot-gd.patch | 20 ++++----- gnuplot-wx3.diff | 2 +- gnuplot.changes | 73 ++++++++++++++++++++++++++++++++ gnuplot.spec | 8 ++-- 12 files changed, 147 insertions(+), 168 deletions(-) delete mode 100644 gnuplot-5.2.8.tar.gz create mode 100644 gnuplot-5.4.0.tar.gz delete mode 100644 gnuplot-QtIndexedList.dif diff --git a/gnuplot-4.4.0-x11ovf.dif b/gnuplot-4.4.0-x11ovf.dif index 247772e..6236338 100644 --- a/gnuplot-4.4.0-x11ovf.dif +++ b/gnuplot-4.4.0-x11ovf.dif @@ -3,8 +3,8 @@ 1 file changed, 9 insertions(+), 3 deletions(-) --- src/gplt_x11.c -+++ src/gplt_x11.c 2018-05-07 07:13:13.080045710 +0000 -@@ -958,6 +958,8 @@ mainloop() ++++ src/gplt_x11.c 2020-07-17 07:29:52.061621215 +0000 +@@ -954,6 +954,8 @@ mainloop() nfds = cn + 1; while (1) { @@ -13,7 +13,7 @@ XFlush(dpy); /* see above */ FD_ZERO(&tset); -@@ -995,7 +997,11 @@ mainloop() +@@ -991,7 +993,11 @@ mainloop() process_event(&xe); } } @@ -26,7 +26,7 @@ unlink(X11_ipcpath); record(); fclose(X11_ipc); -@@ -1227,8 +1233,8 @@ static int read_input __PROTO((void)); +@@ -1223,8 +1229,8 @@ static int read_input(void); static int read_input() { diff --git a/gnuplot-4.6.0-demo.diff b/gnuplot-4.6.0-demo.diff index 5d67543..0ee9e04 100644 --- a/gnuplot-4.6.0-demo.diff +++ b/gnuplot-4.6.0-demo.diff @@ -7,8 +7,8 @@ 5 files changed, 34 insertions(+), 4 deletions(-) --- demo/fit.dem -+++ demo/fit.dem 2018-05-07 07:11:51.433579608 +0000 -@@ -10,6 +10,7 @@ set dummy x, y ++++ demo/fit.dem 2020-07-17 07:25:00.022670914 +0000 +@@ -6,6 +6,7 @@ set dummy x, y print "Some examples how data fitting using nonlinear least squares fit can be done." print '' @@ -16,7 +16,7 @@ print "We fit a straight line to the data -- only as a demo without physical meaning." l(x) = y0 + m*x -@@ -29,6 +30,7 @@ set title 'data set and initial paramete +@@ -25,6 +26,7 @@ set title 'data set and initial paramete plot 'lcdemo.dat', l(x) pause -1 "Now start fitting... (-> return)" @@ -24,7 +24,7 @@ fit l(x) 'lcdemo.dat' via y0, m set title 'unweighted fit' plot 'lcdemo.dat', l(x) -@@ -324,6 +326,7 @@ print ' "fit3.dat" u 1:2:3:4 via a0, +@@ -320,6 +322,7 @@ print ' "fit3.dat" u 1:2:3:4 via a0, pause -1 "Press enter to proceed with the next example." reset @@ -32,7 +32,7 @@ print "\n" print "The fit command can handle errors in the independent variable, too." print "The problem shown here is Pearson's data with York's weights.\n" -@@ -429,6 +432,7 @@ print "to time." +@@ -425,6 +428,7 @@ print "to time." print '' pause -1 "Done with fitting demo (-> return)" reset @@ -41,8 +41,8 @@ # release datablock undefine $PearsonYork --- demo/poldat.dem -+++ demo/poldat.dem 2018-05-07 07:11:51.433579608 +0000 -@@ -11,7 +11,7 @@ unset grid ++++ demo/poldat.dem 2020-07-17 07:25:00.022670914 +0000 +@@ -7,7 +7,7 @@ unset grid unset polar set title "Primitive Smith Chart" unset key @@ -52,8 +52,8 @@ set rrange [-0 : 10] set trange [-pi : pi] --- demo/simple.dem -+++ demo/simple.dem 2018-05-07 07:11:51.433579608 +0000 -@@ -8,14 +8,13 @@ ++++ demo/simple.dem 2020-07-17 07:25:00.022670914 +0000 +@@ -5,14 +5,13 @@ # set title "Simple Plots" font ",20" set key left box @@ -70,8 +70,8 @@ pause -1 "Hit return to continue" --- src/show.c -+++ src/show.c 2018-05-07 07:11:51.437579533 +0000 -@@ -1078,6 +1078,15 @@ show_version(FILE *fp) ++++ src/show.c 2020-07-17 07:25:00.022670914 +0000 +@@ -1076,6 +1076,15 @@ show_version(FILE *fp) p /* type "help seeking-assistance" */ ); @@ -88,8 +88,8 @@ /* show version long */ if (almost_equals(c_token, "l$ong")) { --- src/variable.c -+++ src/variable.c 2018-05-07 07:11:51.437579533 +0000 -@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id ++++ src/variable.c 2020-07-17 07:25:00.022670914 +0000 +@@ -33,7 +33,10 @@ /* The Death of Global Variables - part one. */ #include @@ -101,7 +101,7 @@ #include "variable.h" #include "alloc.h" -@@ -98,6 +101,17 @@ loadpath_handler(int action, char *path) +@@ -94,6 +97,17 @@ loadpath_handler(int action, char *path) if (!loadpath) { char *envlib = getenv("GNUPLOT_LIB"); @@ -119,7 +119,7 @@ if (envlib) { int len = strlen(envlib); loadpath = gp_strdup(envlib); -@@ -106,6 +120,10 @@ loadpath_handler(int action, char *path) +@@ -102,6 +116,10 @@ loadpath_handler(int action, char *path) /* convert all PATHSEPs to \0 */ PATHSEP_TO_NUL(loadpath); } /* else: NULL = empty */ diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index 1d86fc4..36bea90 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -1,10 +1,9 @@ --- src/gplt_x11.c | 33 +++++++++++++++++++++++++++------ - src/variable.c | 2 ++ - 2 files changed, 29 insertions(+), 6 deletions(-) + 1 file changed, 27 insertions(+), 6 deletions(-) --- src/gplt_x11.c -+++ src/gplt_x11.c 2018-05-07 07:11:03.618477998 +0000 ++++ src/gplt_x11.c 2020-07-17 07:20:04.523781257 +0000 @@ -99,15 +99,16 @@ * patches by Masahito Yamaga */ @@ -38,8 +37,8 @@ #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ -@@ -523,8 +530,8 @@ static char *gpFallbackFont __PROTO((voi - static int gpXGetFontascent __PROTO((XFontStruct *cfont)); +@@ -521,8 +528,8 @@ static char *gpFallbackFont(void); + static int gpXGetFontascent(XFontStruct *cfont); enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ -static char default_font[196] = { '\0' }; @@ -49,16 +48,16 @@ #define Nwidths 10 static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -@@ -2289,6 +2296,8 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2285,6 +2292,8 @@ exec_cmd(plot_struct *plot, char *comman /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; + if (strlen(&buffer[2]) == 0) -+ break; - strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); ++ break; + strncpy(default_font, &buffer[2], sizeof(default_font)-1); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); break; -@@ -5772,7 +5781,7 @@ XFontStruct *gpXLoadQueryFont (Display * +@@ -5739,7 +5748,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { @@ -67,7 +66,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5927,6 +5936,18 @@ char *fontname; +@@ -5892,6 +5901,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE @@ -86,14 +85,3 @@ if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { if (multibyte_fonts_usable) { usemultibyte = 1; ---- src/variable.c -+++ src/variable.c 2018-05-07 07:11:03.622477923 +0000 -@@ -280,6 +280,8 @@ static const struct path_table fontpath_ - { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, - #endif - /* Linux paths */ -+ { "/usr/share/fonts/Type1" }, -+ { "/usr/share/fonts/truetype" }, - { "/usr/X11R6/lib/X11/fonts/Type1" }, - { "/usr/X11R6/lib/X11/fonts/truetype" }, - /* HP-UX */ diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 30b6ef8..e4a38ab 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -1,26 +1,13 @@ --- - gnuplot-5.2.3/configure.ac | 2 +- - gnuplot-5.2.3/docs/Makefile.am | 12 ++++++++---- - gnuplot-5.2.3/src/gadgets.h | 2 +- - gnuplot-5.2.3/src/gplt_x11.c | 9 ++++++--- - gnuplot-5.2.3/src/plot.c | 22 +++++++++++++++++++++- - gnuplot-5.2.3/src/term.h | 6 +++--- - gnuplot-5.2.3/term/linux.trm | 4 ++-- - 7 files changed, 42 insertions(+), 15 deletions(-) + gnuplot-5.4.0/docs/Makefile.am | 12 ++++++++---- + gnuplot-5.4.0/src/gadgets.h | 2 +- + gnuplot-5.4.0/src/gplt_x11.c | 9 ++++++--- + gnuplot-5.4.0/src/plot.c | 22 +++++++++++++++++++++- + gnuplot-5.4.0/src/term.h | 6 +++--- + 5 files changed, 39 insertions(+), 12 deletions(-) ---- gnuplot-5.2.3/configure.ac -+++ gnuplot-5.2.3/configure.ac 2018-05-07 07:12:26.984911679 +0000 -@@ -364,7 +364,7 @@ if test "$with_linux_vga" = yes; then - [AC_DEFINE(LINUXVGA,1, - [ Define if this is a Linux system with SuperVGA library. ]) - LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot' -- TERMLIBS="-lvga $TERMLIBS"], -+ TERMLIBS="/usr/${ARCHLIB:=lib}/libvga.a $TERMLIBS"], - with_linux_vga=no) - fi - ---- gnuplot-5.2.3/docs/Makefile.am -+++ gnuplot-5.2.3/docs/Makefile.am 2018-05-07 07:12:26.984911679 +0000 +--- gnuplot-5.4.0/docs/Makefile.am ++++ gnuplot-5.4.0/docs/Makefile.am 2020-07-17 07:25:36.834034450 +0000 @@ -42,7 +42,7 @@ # @@ -30,7 +17,7 @@ gihdir = @GIHDIR@ noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \ -@@ -97,7 +97,7 @@ gnuplot-groff.ps gnuplot.tmp VERSION gnu +@@ -101,7 +101,7 @@ gnuplot-groff.ps gnuplot.tmp VERSION gnu gnuplot.idv gnuplot.xref gnuplot.lg gnuplot.pdf wxhelp_figures \ wxhelp/*.html wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk \ wxhelp/wgnuplot.htc wxhelp/doc2html$(EXEEXT) windows/wgnuplot.htk \ @@ -39,7 +26,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST) -@@ -261,17 +261,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/ +@@ -265,17 +265,21 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/ doc2hlp_SOURCES = doc2hlp.c termdoc.c ### gnuplot interactive help format @@ -63,20 +50,20 @@ alldoc2gih_SOURCES = doc2gih.c termdoc.c alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) ---- gnuplot-5.2.3/src/gadgets.h -+++ gnuplot-5.2.3/src/gadgets.h 2018-05-07 07:12:26.984911679 +0000 -@@ -486,7 +486,7 @@ extern TBOOLEAN clip_lines1; - extern TBOOLEAN clip_lines2; +--- gnuplot-5.4.0/src/gadgets.h ++++ gnuplot-5.4.0/src/gadgets.h 2020-07-17 07:27:48.183763305 +0000 +@@ -512,7 +512,7 @@ extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; + extern TBOOLEAN clip_radial; -#define SAMPLES 100 /* default number of samples for a plot */ +#define SAMPLES 500 /* default number of samples for a plot */ extern int samples_1; extern int samples_2; ---- gnuplot-5.2.3/src/gplt_x11.c -+++ gnuplot-5.2.3/src/gplt_x11.c 2018-05-07 07:12:26.988911605 +0000 -@@ -2524,9 +2524,12 @@ exec_cmd(plot_struct *plot, char *comman +--- gnuplot-5.4.0/src/gplt_x11.c ++++ gnuplot-5.4.0/src/gplt_x11.c 2020-07-17 07:25:36.834034450 +0000 +@@ -2508,9 +2508,12 @@ exec_cmd(plot_struct *plot, char *comman } } /* X11_justify_text(mode) - set text justification mode */ @@ -92,9 +79,9 @@ else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); ---- gnuplot-5.2.3/src/plot.c -+++ gnuplot-5.2.3/src/plot.c 2018-05-07 07:12:26.988911605 +0000 -@@ -217,6 +217,7 @@ static int asked_privi = 0; +--- gnuplot-5.4.0/src/plot.c ++++ gnuplot-5.4.0/src/plot.c 2020-07-17 07:28:52.762646614 +0000 +@@ -214,6 +214,7 @@ static int asked_privi = 0; void drop_privilege() { @@ -102,7 +89,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -230,11 +231,13 @@ drop_privilege() +@@ -227,11 +228,13 @@ drop_privilege() if (seteuid(ruid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) ruid, strerror(errno)); @@ -116,7 +103,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -248,6 +251,7 @@ take_privilege() +@@ -245,6 +248,7 @@ take_privilege() if (seteuid(euid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) euid, strerror(errno)); @@ -124,17 +111,17 @@ } #endif /* LINUXVGA */ -@@ -274,8 +278,8 @@ main(int argc, char **argv) - int i; +@@ -280,8 +284,8 @@ main(int argc_orig, char **argv) + argc = argc_orig; #ifdef LINUXVGA - LINUX_setup(); /* setup VGA before dropping privilege DBT 4/5/99 */ drop_privilege(); -+ LINUX_setup(); ++ LINUX_setup(); /* setup VGA before dropping privilege DBT 4/5/99 */ #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 */ -@@ -339,6 +343,22 @@ main(int argc, char **argv) +@@ -359,6 +363,22 @@ main(int argc_orig, char **argv) rl_getc_function = getc_wrapper; #endif @@ -157,8 +144,8 @@ #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE) /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name. * It is used to parse a 'gnuplot' specific section in '~/.inputrc' ---- gnuplot-5.2.3/src/term.h -+++ gnuplot-5.2.3/src/term.h 2018-05-07 07:12:26.988911605 +0000 +--- gnuplot-5.4.0/src/term.h ++++ gnuplot-5.4.0/src/term.h 2020-07-17 07:25:36.838034380 +0000 @@ -242,9 +242,9 @@ #include "emf.trm" @@ -180,23 +167,3 @@ /* Frame Maker MIF 3.00 format driver */ #ifdef HAVE_MIF ---- gnuplot-5.2.3/term/linux.trm -+++ gnuplot-5.2.3/term/linux.trm 2018-05-07 07:12:26.988911605 +0000 -@@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( - TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y)); - TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y)); - TERM_PUBLIC int LINUX_text_angle __PROTO((int ang)); --TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, const char *str)); -+TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, char *str)); - TERM_PUBLIC void LINUX_suspend __PROTO((void)); - TERM_PUBLIC void LINUX_resume __PROTO((void)); - -@@ -408,7 +408,7 @@ LINUX_putc( - } - - TERM_PUBLIC void --LINUX_put_text(unsigned int x, unsigned int y, const char *str) -+LINUX_put_text(unsigned int x, unsigned int y, char *str) - { - int i; - switch (linux_angle) { diff --git a/gnuplot-5.2.8.tar.gz b/gnuplot-5.2.8.tar.gz deleted file mode 100644 index f954e98..0000000 --- a/gnuplot-5.2.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37 -size 5340677 diff --git a/gnuplot-5.4.0.tar.gz b/gnuplot-5.4.0.tar.gz new file mode 100644 index 0000000..b240bbd --- /dev/null +++ b/gnuplot-5.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47 +size 5622595 diff --git a/gnuplot-QtCore-PIC.dif b/gnuplot-QtCore-PIC.dif index e83c628..0d6c320 100644 --- a/gnuplot-QtCore-PIC.dif +++ b/gnuplot-QtCore-PIC.dif @@ -6,7 +6,7 @@ Since QtCore is build with -reduce-relocations a -fPIC is required --- src/Makefile.am +++ src/Makefile.am 2017-09-27 10:07:07.767840550 +0000 -@@ -163,6 +163,9 @@ clean-local: clean-qt-extra clean-demo +@@ -168,6 +168,9 @@ clean-local: clean-qt-extra clean-demo gnuplot_SOURCES += qtterminal/qt_term.cpp diff --git a/gnuplot-QtIndexedList.dif b/gnuplot-QtIndexedList.dif deleted file mode 100644 index 25f5933..0000000 --- a/gnuplot-QtIndexedList.dif +++ /dev/null @@ -1,47 +0,0 @@ -From a0f2b0f820c9eb734029984887e7bab5fb0b9aea Mon Sep 17 00:00:00 2001 -From: Werner Fink -Date: Sat, 20 Jun 2020 10:02:40 -0700 -Subject: [PATCH] qt: Suppress error messages "QList index out of range" - -In three places gnuplot_qt was appending an element to an existing -list by insertiong using an index greater than the current list size. -This works but starting with Qt 5.15 an error message is given. -Replace with append() or insert(list_size, ...) -Bug #2280 ---- - src/qtterminal/QtGnuplotScene.cpp | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git src/qtterminal/QtGnuplotScene.cpp src/qtterminal/QtGnuplotScene.cpp -index f98151b63..a72e6aa8f 100644 ---- src/qtterminal/QtGnuplotScene.cpp -+++ src/qtterminal/QtGnuplotScene.cpp -@@ -167,9 +167,7 @@ void QtGnuplotScene::flushCurrentPointsItem() - void QtGnuplotScene::update_key_box(const QRectF rect) - { - if (m_currentPlotNumber > m_key_boxes.count()) { -- // DEBUG Feb 2018 should no longer trigger -- // because m_key_box insertion is done in layer code for GEAfterPlot -- m_key_boxes.insert(m_currentPlotNumber, QtGnuplotKeybox(rect)); -+ m_key_boxes.insert(m_currentPlotNumber-1, QtGnuplotKeybox(rect)); - } else if (m_key_boxes[m_currentPlotNumber-1].isEmpty()) { - // Retain the visible/hidden flag when re-initializing the Keybox - bool tmp = m_key_boxes[m_currentPlotNumber-1].ishidden(); -@@ -515,12 +513,12 @@ void QtGnuplotScene::processEvent(QtGnuplotEventType type, QDataStream& in) - if (0 < m_currentPlotNumber && m_currentPlotNumber <= m_key_boxes.count()) - newgroup->setVisible( !(m_key_boxes[m_currentPlotNumber-1].ishidden()) ); - // Store it in an ordered list so we can toggle it by index -- m_plot_group.insert(m_currentPlotNumber, newgroup); -+ m_plot_group.insert(m_currentPlotNumber-1, newgroup); - } - - if (m_currentPlotNumber >= m_key_boxes.count()) { - QRectF empty( QPointF(0,0), QPointF(0,0)); -- m_key_boxes.insert(m_currentPlotNumber, empty); -+ m_key_boxes.append(empty); - m_key_boxes[m_currentPlotNumber-1].resetStatus(); - } - --- -2.26.2 - diff --git a/gnuplot-gd.patch b/gnuplot-gd.patch index ba4acde..1f9d909 100644 --- a/gnuplot-gd.patch +++ b/gnuplot-gd.patch @@ -1,13 +1,13 @@ Index: gnuplot-5.2.2/configure.ac =================================================================== --- - gnuplot-5.2.5/configure.ac | 66 ++++++------------------------------------ - gnuplot-5.2.5/src/Makefile.am | 2 - + gnuplot-5.4.0/configure.ac | 66 ++++++------------------------------------ + gnuplot-5.4.0/src/Makefile.am | 2 - 2 files changed, 11 insertions(+), 57 deletions(-) ---- gnuplot-5.2.5/configure.ac -+++ gnuplot-5.2.5/configure.ac 2018-10-09 09:38:56.700946180 +0000 -@@ -577,63 +577,17 @@ AC_ARG_WITH(gd,dnl +--- gnuplot-5.4.0/configure.ac ++++ gnuplot-5.4.0/configure.ac 2020-07-17 07:31:14.828189953 +0000 +@@ -535,63 +535,17 @@ AC_ARG_WITH(gd,dnl with_gd=yes) if test "$with_gd" != no; then @@ -81,11 +81,11 @@ Index: gnuplot-5.2.2/configure.ac fi dnl end gd ---- gnuplot-5.2.5/src/Makefile.am -+++ gnuplot-5.2.5/src/Makefile.am 2018-10-09 09:36:58.135163622 +0000 -@@ -58,7 +58,7 @@ tabulate.c tabulate.h \ - template.h term_api.h term.c term.h time.c unset.c util.c util.h \ - util3d.c util3d.h variable.c variable.h version.c version.h +--- gnuplot-5.4.0/src/Makefile.am ++++ gnuplot-5.4.0/src/Makefile.am 2020-07-17 07:32:16.391125309 +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 -gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) +gnuplot_LDADD = $(GD_LIBS) $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) diff --git a/gnuplot-wx3.diff b/gnuplot-wx3.diff index 38507fc..7bbe2f9 100644 --- a/gnuplot-wx3.diff +++ b/gnuplot-wx3.diff @@ -10,7 +10,7 @@ otherwise. --- gnuplot-5.2.0/src/Makefile.am +++ gnuplot-5.2.0/src/Makefile.am 2017-09-27 10:06:44.716255786 +0000 -@@ -93,6 +93,7 @@ $(EXTRA_gnuplot_SOURCES) +@@ -95,6 +95,7 @@ $(EXTRA_gnuplot_SOURCES) if BUILD_WXWIDGETS gnuplot_SOURCES += wxterminal/wxt_gui.cpp diff --git a/gnuplot.changes b/gnuplot.changes index c96dd36..2d088e1 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Fri Jul 17 07:36:14 UTC 2020 - Dr. Werner Fink + +- Update to gnuplot 5.4 + * NEW support for 64-bit integer arithmetic + * NEW support for voxel grids + * NEW plot ... with table if + * NEW "set walls" command to show xy xz and yz planes in 3D plots + * NEW "set clip radial" for line segments in polar mode plots + * NEW "splot ... with isosurface" + * NEW "splot ... with circles" + * NEW "splot ... with boxes" + * NEW "plot ... with arrows" + * NEW "plot ... with polygons" + * NEW "set view projection {xz|yz}" + * NEW "set datafile columnheaders" + * NEW per-plot fillcolor and fillstyle for pm3d surfaces + * NEW allow separate color column with dgrid3d surfaces (but not color splines) + * NEW string function trim(" padded string ") removes leading and trailing whitespace + * NEW unicode escape sequences \U+hhhh + * NEW order N Bessel functions of 1st and 2nd kind (besjn besyn) + * NEW modified Bessel functions I0 (besi0) and I1 (besi1) + * NEW modified Bessel function of order n (besin) + * NEW "set object polygon depthsort" as an alternative to front/back/behind + * NEW "set pixmap" object-like bitmap images from png/gif/jpeg input files + * NEW overflow avoidance extends range of arguments handled by complex division + * NEW largely extended pcl5 terminal supports PCL5e/PCL5c printers + * NEW revised pstricks and texdraw LaTeX terminals + * NEW extended dospc terminal (DOS32/OpenWatcom) + * NEW extended svga terminal using the (M)GRX library (DOS32/DJGPP) + * NEW heavily revised fig terminal + * NEW LaTeX terminal pict2e uses the LaTeX2e pict2e environment + * NEW Left-click on hypertext label will copy text to clipboard (wxt qt) + * NEW smooth option "zsort" controls order that points are plotting in + * NEW multiple textbox styles + * NEW Time/date input recognizes format %p to handle am/pm field + * EXPERIMENTAL "set mouse mouseformat function " + * EXPERIMENTAL load $DATABLOCK + * CHANGE revised syntax for plot style "with parallelaxes" + * CHANGE deprecate command "reread" + * CHANGE remove deprecated command "update" + * CHANGE remove deprecated option "thru" + * CHANGE special case optimization of nonlinear code to speed up logscale + * CHANGE windows terminal can print using Direct2D + * CHANGE windows terminal supports color fonts (Direct2D) + * CHANGE arrow head size can be decoupled from arrow size + * CHANGE apply trange to sampling on pseudofile '+' + * CHANGE move tgif terminal to "legacy" status; build only if configured + * CHANGE imaginary values from the using spec of a 2D plot are treated as NaN + * CHANGE remove compile option EXTENDED_COLOR_SPECS used only by vgagl.trm + * CHANGE remove linux and vgagl terminals + * CHANGE remove undocumented EXPERIMENTAL option for pm3d filled contours + * CHANGE print to datablock expands embedded \n into a separate block entry + * CHANGE boxplot outliers affect autoscaling only if they are enabled + * CHANGE remove latex, emtex, eepic, and tpic terminals from default build + * CHANGE pm3d quadrangles are by default clipped smoothly to zrange + * CHANGE `set offset` is ignored when the axis range is not autoscaled + * FIX allow mixed use of in-key plot titles and manually placed titles + * FIX open/close path for polygons + * FIX several stability issues of the caca terminal + * FIX gd terminals: rendering of white lines with lw > 1 + * FIX do not reapply "set offset" on refresh or scrolling event + * FIX for negative relative time format with leading element zero +- Port patch to 5.4.0 + * gnuplot-4.4.0-x11ovf.dif + * gnuplot-4.6.0-demo.diff + * gnuplot-4.6.0-fonts.diff + * gnuplot-4.6.0.dif + * gnuplot-QtCore-PIC.dif + * gnuplot-gd.patch + * gnuplot-wx3.diff +- Remove now obsolete patch gnuplot-QtIndexedList.dif + ------------------------------------------------------------------- Mon Jun 22 07:49:19 UTC 2020 - Werner Fink diff --git a/gnuplot.spec b/gnuplot.spec index ba7cb7c..1a70cfe 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -70,12 +70,12 @@ BuildRequires: tex(pdftex.def) BuildRequires: tex(subfigure.sty) %endif URL: http://www.gnuplot.info/ -Version: 5.2.8 +Version: 5.4.0 Release: 0 %if "%{flavor}" == "" Summary: Function Plotting Utility and more License: SUSE-Gnuplot AND GPL-2.0-or-later -Group: Productivity/Graphics/Visualization/Graph +Group: Documentation/Other %else Summary: Documentation of GNUplot License: SUSE-Gnuplot AND GPL-2.0-or-later @@ -96,7 +96,6 @@ Patch4: gnuplot-4.6.0-demo.diff Patch5: gnuplot-wx3.diff Patch6: gnuplot-QtCore-PIC.dif Patch7: gnuplot-gd.patch -Patch8: gnuplot-QtIndexedList.dif %define _x11lib %{_libdir} %define _x11data %{_datadir}/X11 %define _libx11 %{_exec_prefix}/lib/X11 @@ -131,7 +130,6 @@ cp %{_sourcedir}/picins.sty docs %patch5 -p1 -b .w3x %patch6 -p0 -b .pic %patch7 -p1 -b .gd -%patch8 -p0 -b .qtlist %build autoreconf -fi @@ -208,7 +206,7 @@ autoreconf -fi %if "%{flavor}" == "" make DESTDIR=%{buildroot} appdefaultdir=%{_appdef} install mkdir -p %{buildroot}/%{_mandir}/ja/man1 - mv %{buildroot}/%{_mandir}/man1/gnuplot-ja.1 %{buildroot}/%{_mandir}/ja/man1/gnuplot.1 + install -m 0644 man/gnuplot-ja_JP.UTF-8 %{buildroot}/%{_mandir}/ja/man1/gnuplot.1 %endif %if "%{flavor}" == "doc"