From ffb691cfda283d5eaa4a31fc5450d9cbacf760e8d370a6b6c73f0efb8b839354 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 1 Apr 2013 18:27:45 +0000 Subject: [PATCH] Accepting request 161937 from home:burnus:branches:Publishing Update to 4.6.2 OBS-URL: https://build.opensuse.org/request/show/161937 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=49 --- gnuplot-4.6.0-fonts.diff | 27 ++++++++++-------- gnuplot-4.6.0.dif | 61 ++++++++++++++++++++-------------------- gnuplot-4.6.1.tar.gz | 3 -- gnuplot-4.6.2.tar.gz | 3 ++ gnuplot.changes | 13 +++++++++ gnuplot.spec | 10 ++++--- 6 files changed, 68 insertions(+), 49 deletions(-) delete mode 100644 gnuplot-4.6.1.tar.gz create mode 100644 gnuplot-4.6.2.tar.gz diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index 636ed29..9d7d76e 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -1,6 +1,7 @@ ---- ../gnuplot-4.6.1.orig/src/gplt_x11.c 2012-05-07 18:53:08.000000000 +0200 -+++ src/gplt_x11.c 2012-11-06 10:37:22.000000000 +0100 -@@ -104,15 +104,16 @@ +diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c +--- ../gnuplot-4.6.2.orig/src/gplt_x11.c 2013-03-31 23:35:15.000000000 +0200 ++++ ./src/gplt_x11.c 2013-03-31 23:35:57.000000000 +0200 +@@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id * patches by Masahito Yamaga */ @@ -20,7 +21,7 @@ #include #include "syscfg.h" -@@ -122,6 +123,12 @@ +@@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id #include "gplt_x11.h" #include "version.h" @@ -33,7 +34,7 @@ #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ -@@ -482,7 +489,7 @@ +@@ -482,7 +489,7 @@ static double mouse_to_axis __PROTO((int static char *FallbackFont = "fixed"; #ifdef USE_X11_MULTIBYTE static char *FallbackFontMB = @@ -42,7 +43,7 @@ # define FontSetSep ';' static int usemultibyte = 0; static int multibyte_fonts_usable=1; -@@ -499,8 +506,8 @@ +@@ -499,8 +506,8 @@ static char *gpFallbackFont __PROTO((voi static int gpXGetFontascent __PROTO((XFontStruct *cfont)); enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ @@ -53,7 +54,7 @@ #define Nwidths 10 static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -@@ -2110,6 +2117,8 @@ +@@ -2116,6 +2123,8 @@ exec_cmd(plot_struct *plot, char *comman /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; @@ -62,7 +63,7 @@ strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); break; -@@ -5389,7 +5398,7 @@ +@@ -5397,7 +5406,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { @@ -71,7 +72,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5484,6 +5493,18 @@ +@@ -5492,6 +5501,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE @@ -90,9 +91,11 @@ if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { if (multibyte_fonts_usable) { usemultibyte = 1; ---- ../gnuplot-4.6.1.orig/src/variable.c 2011-12-28 23:00:37.000000000 +0100 -+++ src/variable.c 2012-11-06 10:37:22.000000000 +0100 -@@ -282,6 +282,8 @@ +Nur in ./src: gplt_x11.c.orig. +diff -upr ../gnuplot-4.6.2.orig/src/variable.c ./src/variable.c +--- ../gnuplot-4.6.2.orig/src/variable.c 2013-03-31 23:35:15.000000000 +0200 ++++ ./src/variable.c 2013-03-31 23:35:57.000000000 +0200 +@@ -282,6 +282,8 @@ static const struct path_table fontpath_ { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, #endif /* Linux paths */ diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index a95afb5..e1470f7 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -1,6 +1,6 @@ -diff -upr ../gnuplot-4.6.1.orig/configure.in ./configure.in ---- ../gnuplot-4.6.1.orig/configure.in 2012-09-12 00:38:33.000000000 +0200 -+++ ./configure.in 2012-11-06 10:39:47.000000000 +0100 +diff -upr ../gnuplot-4.6.2.orig/configure.in ./configure.in +--- ../gnuplot-4.6.2.orig/configure.in 2013-03-31 23:12:33.000000000 +0200 ++++ ./configure.in 2013-03-31 23:15:44.000000000 +0200 @@ -332,7 +332,7 @@ if test "$with_linux_vga" = yes; then [AC_DEFINE(LINUXVGA,1, [ Define if this is a Linux system with SuperVGA library. ]) @@ -10,9 +10,9 @@ diff -upr ../gnuplot-4.6.1.orig/configure.in ./configure.in with_linux_vga=no) fi -diff -upr ../gnuplot-4.6.1.orig/docs/Makefile.in ./docs/Makefile.in ---- ../gnuplot-4.6.1.orig/docs/Makefile.in 2012-09-22 23:48:02.000000000 +0200 -+++ ./docs/Makefile.in 2012-11-06 10:40:08.000000000 +0100 +diff -upr ../gnuplot-4.6.2.orig/docs/Makefile.in ./docs/Makefile.in +--- ../gnuplot-4.6.2.orig/docs/Makefile.in 2013-03-31 23:12:33.000000000 +0200 ++++ ./docs/Makefile.in 2013-03-31 23:15:44.000000000 +0200 @@ -38,7 +38,7 @@ # @@ -70,9 +70,10 @@ diff -upr ../gnuplot-4.6.1.orig/docs/Makefile.in ./docs/Makefile.in uninstall-pdf: rm -f $(DESTDIR)$(GIHDIR)/gnuplot.pdf ---- ../gnuplot-4.6.1.orig/docs/gnuplot-fr.doc 2012-11-06 12:28:29.000000000 +0100 -+++ docs/gnuplot-fr.doc 2012-11-06 12:31:37.000000000 +0100 -@@ -436,8 +436,8 @@ +diff -upr ../gnuplot-4.6.2.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc +--- ../gnuplot-4.6.2.orig/docs/gnuplot-fr.doc 2013-03-31 23:12:33.000000000 +0200 ++++ ./docs/gnuplot-fr.doc 2013-03-31 23:15:44.000000000 +0200 +@@ -436,8 +436,8 @@ C #Home & same as \verb~^A~. \\ #Ctrl Home & same as \verb~^E~. \\ #Esc & same as \verb~^U~. \\ @@ -83,9 +84,9 @@ diff -upr ../gnuplot-4.6.1.orig/docs/Makefile.in ./docs/Makefile.in %c l . %Touche fléchée@Fonction %_ -diff -upr ../gnuplot-4.6.1.orig/src/gadgets.h ./src/gadgets.h ---- ../gnuplot-4.6.1.orig/src/gadgets.h 2011-10-10 23:17:04.000000000 +0200 -+++ ./src/gadgets.h 2012-11-06 10:40:22.000000000 +0100 +diff -upr ../gnuplot-4.6.2.orig/src/gadgets.h ./src/gadgets.h +--- ../gnuplot-4.6.2.orig/src/gadgets.h 2013-03-31 23:12:33.000000000 +0200 ++++ ./src/gadgets.h 2013-03-31 23:15:44.000000000 +0200 @@ -424,7 +424,7 @@ extern TBOOLEAN clip_lines1; extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; @@ -95,9 +96,9 @@ diff -upr ../gnuplot-4.6.1.orig/src/gadgets.h ./src/gadgets.h extern int samples_1; extern int samples_2; -diff -upr ../gnuplot-4.6.1.orig/src/gplt_x11.c ./src/gplt_x11.c ---- ../gnuplot-4.6.1.orig/src/gplt_x11.c 2012-05-07 18:53:08.000000000 +0200 -+++ ./src/gplt_x11.c 2012-11-06 10:40:32.000000000 +0100 +diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c +--- ../gnuplot-4.6.2.orig/src/gplt_x11.c 2013-03-31 23:12:33.000000000 +0200 ++++ ./src/gplt_x11.c 2013-03-31 23:15:44.000000000 +0200 @@ -2241,8 +2241,11 @@ exec_cmd(plot_struct *plot, char *comman } } @@ -112,10 +113,10 @@ diff -upr ../gnuplot-4.6.1.orig/src/gplt_x11.c ./src/gplt_x11.c else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); -diff -upr ../gnuplot-4.6.1.orig/src/plot.c ./src/plot.c ---- ../gnuplot-4.6.1.orig/src/plot.c 2012-05-07 07:25:47.000000000 +0200 -+++ ./src/plot.c 2012-11-06 10:40:46.000000000 +0100 -@@ -214,6 +214,7 @@ static int asked_privi = 0; +diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c +--- ../gnuplot-4.6.2.orig/src/plot.c 2013-03-31 23:12:33.000000000 +0200 ++++ ./src/plot.c 2013-03-31 23:15:44.000000000 +0200 +@@ -215,6 +215,7 @@ static int asked_privi = 0; void drop_privilege() { @@ -123,7 +124,7 @@ diff -upr ../gnuplot-4.6.1.orig/src/plot.c ./src/plot.c if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -227,11 +228,13 @@ drop_privilege() +@@ -228,11 +229,13 @@ drop_privilege() if (seteuid(ruid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) ruid, strerror(errno)); @@ -137,7 +138,7 @@ diff -upr ../gnuplot-4.6.1.orig/src/plot.c ./src/plot.c if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -245,6 +248,7 @@ take_privilege() +@@ -246,6 +249,7 @@ take_privilege() if (seteuid(euid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) euid, strerror(errno)); @@ -145,7 +146,7 @@ diff -upr ../gnuplot-4.6.1.orig/src/plot.c ./src/plot.c } #endif /* LINUXVGA */ -@@ -270,8 +274,8 @@ main(int argc, char **argv) +@@ -271,8 +275,8 @@ main(int argc, char **argv) int i; #ifdef LINUXVGA @@ -155,7 +156,7 @@ diff -upr ../gnuplot-4.6.1.orig/src/plot.c ./src/plot.c #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 */ -@@ -326,6 +330,22 @@ main(int argc, char **argv) +@@ -327,6 +331,22 @@ main(int argc, char **argv) rl_getc_function = getc_wrapper; #endif @@ -177,10 +178,10 @@ diff -upr ../gnuplot-4.6.1.orig/src/plot.c ./src/plot.c + #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' -diff -upr ../gnuplot-4.6.1.orig/src/term.h ./src/term.h ---- ../gnuplot-4.6.1.orig/src/term.h 2011-11-06 10:31:00.000000000 +0100 -+++ ./src/term.h 2012-11-06 10:40:46.000000000 +0100 + * It is used to parse a 'gnuplot' specific section in '~/.inputrc' +diff -upr ../gnuplot-4.6.2.orig/src/term.h ./src/term.h +--- ../gnuplot-4.6.2.orig/src/term.h 2013-03-31 23:12:33.000000000 +0200 ++++ ./src/term.h 2013-03-31 23:15:44.000000000 +0200 @@ -272,9 +272,9 @@ #include "emf.trm" @@ -211,9 +212,9 @@ diff -upr ../gnuplot-4.6.1.orig/src/term.h ./src/term.h #ifndef NO_BITMAP_SUPPORT -diff -upr ../gnuplot-4.6.1.orig/term/linux.trm ./term/linux.trm ---- ../gnuplot-4.6.1.orig/term/linux.trm 2012-01-30 20:35:14.000000000 +0100 -+++ ./term/linux.trm 2012-11-06 10:40:53.000000000 +0100 +diff -upr ../gnuplot-4.6.2.orig/term/linux.trm ./term/linux.trm +--- ../gnuplot-4.6.2.orig/term/linux.trm 2013-03-31 23:12:33.000000000 +0200 ++++ ./term/linux.trm 2013-03-31 23:15:44.000000000 +0200 @@ -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)); diff --git a/gnuplot-4.6.1.tar.gz b/gnuplot-4.6.1.tar.gz deleted file mode 100644 index 9ccbcda..0000000 --- a/gnuplot-4.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 -size 4959670 diff --git a/gnuplot-4.6.2.tar.gz b/gnuplot-4.6.2.tar.gz new file mode 100644 index 0000000..b3dcaa7 --- /dev/null +++ b/gnuplot-4.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:978b01bbd288c4c5f6d6572cae3aa8bc73b429629ef4400f71856bb5d2251818 +size 4969701 diff --git a/gnuplot.changes b/gnuplot.changes index 39c4e7c..4bad4b5 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Mar 31 21:06:21 UTC 2013 - burnus@net-b.de + +- Update to 4.6.2 + * Bug fixes + * Allow the "bind" command to attach a user command to + mouse button 1 + * hidden3d can handle occlusion by pm3d surfaces + * -d option from command line skips ~/.gnuplot + initialization file + * plot '<&N' plots from file descriptor N opened during + shell invocation + ------------------------------------------------------------------- Tue Nov 6 09:19:06 UTC 2012 - burnus@net-b.de diff --git a/gnuplot.spec b/gnuplot.spec index 0a24303..4f76c93 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # # spec file for package gnuplot # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,8 +37,10 @@ BuildRequires: zziplib %endif BuildRequires: texlive-latex BuildRequires: texlive-tex4ht -%if %suse_version > 1220 +%if %suse_version >= 1220 BuildRequires: makeinfo +%endif +%if %suse_version > 1220 BuildRequires: texlive-dvips BuildRequires: texlive-epstopdf BuildRequires: texlive-tex @@ -62,12 +64,12 @@ BuildRequires: plotutils-devel BuildRequires: plotutils %endif Url: http://www.gnuplot.info/ -Version: 4.6.1 +Version: 4.6.2 Release: 0 Summary: GNUplot a Function Plotting Utility License: SUSE-Gnuplot and GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph -# http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz +# http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.2/gnuplot-4.6.2.tar.gz Source0: gnuplot-%{version}.tar.gz Source2: gnuplot-fr.doc.bz2 Source3: README.whynot