diff --git a/gnuplot-4.4.0-x11ovf.dif b/gnuplot-4.4.0-x11ovf.dif index 6d0f653..b633efa 100644 --- a/gnuplot-4.4.0-x11ovf.dif +++ b/gnuplot-4.4.0-x11ovf.dif @@ -1,6 +1,6 @@ ---- src/gplt_x11.c -+++ src/gplt_x11.c 2010-04-06 15:49:17.446925544 +0000 -@@ -912,6 +912,8 @@ mainloop() +--- src/gplt_x11.c.orig 2012-05-07 18:53:08.000000000 +0200 ++++ src/gplt_x11.c 2012-11-06 10:24:58.000000000 +0100 +@@ -900,6 +900,8 @@ nfds = cn + 1; while (1) { @@ -9,7 +9,7 @@ XFlush(dpy); /* see above */ FD_ZERO(&tset); -@@ -949,7 +951,11 @@ mainloop() +@@ -937,7 +939,11 @@ process_event(&xe); } } @@ -22,7 +22,7 @@ unlink(X11_ipcpath); record(); fclose(X11_ipc); -@@ -1172,8 +1178,8 @@ static int read_input __PROTO((void)); +@@ -1160,8 +1166,8 @@ static int read_input() { diff --git a/gnuplot-4.6.0-backtick.diff b/gnuplot-4.6.0-backtick.diff index 2bd579e..3415ed3 100644 --- a/gnuplot-4.6.0-backtick.diff +++ b/gnuplot-4.6.0-backtick.diff @@ -1,23 +1,20 @@ ---- lisp/gnuplot.el -+++ lisp/gnuplot.el 2012-07-02 14:46:33.000000000 +0000 -@@ -342,16 +342,16 @@ - (if (fboundp 'defface) +--- ../gnuplot-4.6.1.orig/lisp/gnuplot.el 2012-09-18 23:33:37.000000000 +0200 ++++ lisp/gnuplot.el 2012-11-06 11:19:15.000000000 +0100 +@@ -343,15 +343,15 @@ nil (defmacro defface (var values doc &rest args) -- (` (progn + `(progn - (defvar (, var) (quote (, var))) -+ `(progn + (defvar ,var (quote ,var)) ;; To make colors for your faces you need to set your .Xdefaults ;; or set them up ahead of time in your .emacs file. - (make-face (, var)) -- )))) + (make-face ,var) -+ ))) + ))) (if (fboundp 'defcustom) nil (defmacro defcustom (var value doc &rest args) -- (` (defvar (, var) (, value) (, doc))))))) +- `(defvar (, var) (, value) (, doc)))))) + `(defvar ,var ,value ,doc))))) ;; (eval-and-compile diff --git a/gnuplot-4.6.0-fix-format-errors.diff b/gnuplot-4.6.0-fix-format-errors.diff deleted file mode 100644 index a957c14..0000000 --- a/gnuplot-4.6.0-fix-format-errors.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- src/gplt_x11.c -+++ src/gplt_x11.c 2012-03-15 11:17:24.000000000 +0000 -@@ -2912,22 +2912,22 @@ exec_cmd(plot_struct *plot, char *comman - - case PseudoColor: - fprintf(stderr, ERROR_NOTICE("PseudoColor")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case GrayScale: - fprintf(stderr, ERROR_NOTICE("GrayScale")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case StaticColor: - fprintf(stderr, ERROR_NOTICE("StaticColor")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case StaticGray: - fprintf(stderr, ERROR_NOTICE("StaticGray")); -- fprintf(stderr, display_error_text_after); -+ fprintf(stderr, "%s", display_error_text_after); - break; - - case DirectColor: diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index d142c8e..636ed29 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -1,6 +1,6 @@ ---- src/gplt_x11.c -+++ src/gplt_x11.c 2012-03-15 11:10:53.000000000 +0000 -@@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id +--- ../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 @@ * patches by Masahito Yamaga */ @@ -20,7 +20,7 @@ #include #include "syscfg.h" -@@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id +@@ -122,6 +123,12 @@ #include "gplt_x11.h" #include "version.h" @@ -33,7 +33,7 @@ #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ -@@ -482,7 +489,7 @@ static double mouse_to_axis __PROTO((int +@@ -482,7 +489,7 @@ static char *FallbackFont = "fixed"; #ifdef USE_X11_MULTIBYTE static char *FallbackFontMB = @@ -42,7 +42,7 @@ # define FontSetSep ';' static int usemultibyte = 0; static int multibyte_fonts_usable=1; -@@ -499,8 +506,8 @@ static char *gpFallbackFont __PROTO((voi +@@ -499,8 +506,8 @@ static int gpXGetFontascent __PROTO((XFontStruct *cfont)); enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ @@ -53,7 +53,7 @@ #define Nwidths 10 static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -@@ -2116,6 +2123,8 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2110,6 +2117,8 @@ /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; @@ -62,7 +62,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; -@@ -5395,7 +5404,7 @@ XFontStruct *gpXLoadQueryFont (Display * +@@ -5389,7 +5398,7 @@ } #else if (first_time) { @@ -71,7 +71,7 @@ first_time = FALSE; } while (n_miss-- > 0) -@@ -5490,6 +5499,18 @@ char *fontname; +@@ -5484,6 +5493,18 @@ } #ifdef USE_X11_MULTIBYTE @@ -90,9 +90,9 @@ if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { if (multibyte_fonts_usable) { usemultibyte = 1; ---- src/variable.c -+++ src/variable.c 2012-03-15 11:10:53.000000000 +0000 -@@ -282,6 +282,8 @@ static const struct path_table fontpath_ +--- ../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 @@ { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, #endif /* Linux paths */ diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index c7064ac..a95afb5 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -1,6 +1,7 @@ ---- configure.in -+++ configure.in 2011-08-17 20:44:53.000000000 +0000 -@@ -328,7 +328,7 @@ if test "$with_linux_vga" = yes; then +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 +@@ -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. ]) LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot' @@ -9,8 +10,9 @@ with_linux_vga=no) fi ---- docs/Makefile.in -+++ docs/Makefile.in 2012-04-02 14:22:57.386065105 +0000 +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 @@ -38,7 +38,7 @@ # @@ -20,7 +22,7 @@ # this tells GNU make not to export variables into the environment # But other makes dont understand its significance, so it must -@@ -242,10 +242,12 @@ html: htmldocs/gnuplot.html +@@ -243,10 +243,12 @@ html: htmldocs/gnuplot.html # requires a working latex2html, which is hard to find these days # htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex # mkdir -p htmldocs @@ -34,7 +36,7 @@ htlatex gnuplot mkdir -p htmldocs mv gnuplot.html gnuplot.css gnuplot*.png gnuplot.log htmldocs/ -@@ -342,12 +344,16 @@ doc2hlp: doc2hlp.o termdoc.o +@@ -348,12 +350,16 @@ doc2hlp: doc2hlp.o termdoc.o $(LINK) doc2hlp.o termdoc.o $(LIBS) ### gnuplot interactive help format @@ -52,7 +54,7 @@ doc2gih: doc2gih.o termdoc.o $(LINK) doc2gih.o termdoc.o $(LIBS) -@@ -444,6 +450,7 @@ install: install-gih install-info instal +@@ -454,6 +460,7 @@ install: install-gih install-info instal install-gih: gnuplot.gih $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR) $(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih @@ -60,7 +62,7 @@ install-pdf: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR) -@@ -469,6 +476,7 @@ uninstall: uninstall-gih uninstall-info +@@ -483,6 +490,7 @@ uninstall: uninstall-gih uninstall-info uninstall-gih: rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih @@ -68,9 +70,9 @@ uninstall-pdf: rm -f $(DESTDIR)$(GIHDIR)/gnuplot.pdf ---- docs/gnuplot-fr.doc -+++ docs/gnuplot-fr.doc 2009-05-09 11:32:24.000000000 +0000 -@@ -436,8 +436,8 @@ C +--- ../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 @@ #Home & same as \verb~^A~. \\ #Ctrl Home & same as \verb~^E~. \\ #Esc & same as \verb~^U~. \\ @@ -81,8 +83,9 @@ %c l . %Touche fléchée@Fonction %_ ---- src/gadgets.h -+++ src/gadgets.h 2011-08-17 20:44:53.000000000 +0000 +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 @@ -424,7 +424,7 @@ extern TBOOLEAN clip_lines1; extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; @@ -92,9 +95,10 @@ extern int samples_1; extern int samples_2; ---- src/gplt_x11.c -+++ src/gplt_x11.c 2011-08-17 20:44:53.000000000 +0000 -@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman +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 +@@ -2241,8 +2241,11 @@ exec_cmd(plot_struct *plot, char *comman } } /* X11_justify_text(mode) - set text justification mode */ @@ -108,8 +112,9 @@ else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); ---- src/plot.c -+++ src/plot.c 2011-08-17 20:44:53.000000000 +0000 +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; void drop_privilege() @@ -173,8 +178,9 @@ #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' ---- src/term.h -+++ src/term.h 2011-08-17 20:44:53.000000000 +0000 +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 @@ -272,9 +272,9 @@ #include "emf.trm" @@ -205,8 +211,9 @@ #ifndef NO_BITMAP_SUPPORT ---- term/linux.trm -+++ term/linux.trm 2011-08-17 20:44:53.000000000 +0000 +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 @@ -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.0.tar.gz b/gnuplot-4.6.0.tar.gz deleted file mode 100644 index 036ef5e..0000000 --- a/gnuplot-4.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be -size 5017694 diff --git a/gnuplot-4.6.1.tar.gz b/gnuplot-4.6.1.tar.gz new file mode 100644 index 0000000..9ccbcda --- /dev/null +++ b/gnuplot-4.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 +size 4959670 diff --git a/gnuplot-automake.diff b/gnuplot-automake.diff deleted file mode 100644 index d2cbb75..0000000 --- a/gnuplot-automake.diff +++ /dev/null @@ -1,61 +0,0 @@ -From: Jan Engelhardt -Date: 2012-05-30 17:27:56.732814252 +0200 - -Rip out obsolete constructs. - ---- - Makefile.am | 1 - - configure.in | 3 +-- - src/Makefile.am | 3 +-- - 3 files changed, 2 insertions(+), 5 deletions(-) - -Index: gnuplot-4.6.0/Makefile.am -=================================================================== ---- gnuplot-4.6.0.orig/Makefile.am -+++ gnuplot-4.6.0/Makefile.am -@@ -1,5 +1,4 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- --AUTOMAKE_OPTIONS = foreign 1.2h - - SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share - -Index: gnuplot-4.6.0/configure.in -=================================================================== ---- gnuplot-4.6.0.orig/configure.in -+++ gnuplot-4.6.0/configure.in -@@ -10,7 +10,7 @@ AC_INIT(gnuplot, 4.6.0) - AC_CONFIG_SRCDIR(src/graphics.c) - AC_PREREQ(2.58) - AM_CONFIG_HEADER(config.h:config.hin) --AM_INIT_AUTOMAKE(1.7.9) -+AM_INIT_AUTOMAKE([foreign 1.7.9]) - - AM_MAINTAINER_MODE - -@@ -24,7 +24,6 @@ dnl Check for ANSI C prototypes, the con - dnl and ANSI style stringification - AC_GNU_SOURCE - AC_PROG_CC --AM_C_PROTOTYPES - AC_PROG_CPP - AC_C_CONST - AC_C_INLINE -Index: gnuplot-4.6.0/src/Makefile.am -=================================================================== ---- gnuplot-4.6.0.orig/src/Makefile.am -+++ gnuplot-4.6.0/src/Makefile.am -@@ -1,5 +1,4 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- --AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h - - # in the spirit of automake ... - pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ -@@ -40,7 +39,7 @@ binonly: $(bin_PROGRAMS) - transform = @program_transform_name@ - GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT) - --AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\" -+AM_CPPFLAGS = -DPROTOTYPES -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\" - - gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h binary.c \ - breaders.c breaders.h bitmap.h color.c color.h command.c \ diff --git a/gnuplot.changes b/gnuplot.changes index afcb3f0..39c4e7c 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 6 09:19:06 UTC 2012 - burnus@net-b.de + +- Update to 4.6.1 + * Bug fixes. + * Support tabulation of variable color column. + * Support tabulation (set table) of pixel values from image plot + styles +- Remove now obsolete patches gnuplot-automake.diff and + gnuplot-4.6.0-fix-format-errors.diff. + ------------------------------------------------------------------- Tue Oct 16 08:23:37 UTC 2012 - coolo@suse.com diff --git a/gnuplot.spec b/gnuplot.spec index 971516a..0a24303 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -62,7 +62,7 @@ BuildRequires: plotutils-devel BuildRequires: plotutils %endif Url: http://www.gnuplot.info/ -Version: 4.6.0 +Version: 4.6.1 Release: 0 Summary: GNUplot a Function Plotting Utility License: SUSE-Gnuplot and GPL-2.0+ @@ -75,8 +75,6 @@ Patch0: gnuplot-4.6.0.dif Patch1: gnuplot-4.4.0-x11ovf.dif Patch2: gnuplot-4.6.0-fonts.diff Patch4: gnuplot-4.6.0-demo.diff -Patch6: gnuplot-4.6.0-fix-format-errors.diff -Patch7: gnuplot-automake.diff Patch8: gnuplot-4.6.0-backtick.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -130,8 +128,6 @@ test $? -eq 0 || exit 1 %patch1 -p 0 -b .x11ovf %patch2 -p 0 -b .font %patch4 -p 0 -b .demo -%patch6 -p 0 -b .formaterrors -%patch7 -p 1 -b .auto %patch8 -p 0 -b .btick %patch0 -p 0 -b .0 @@ -217,7 +213,7 @@ test $? -eq 0 || exit 1 install -m 0444 demo/* %{buildroot}/%{_docdir}/gnuplot/demo/ install -m 0444 README* %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 Copyright %{buildroot}/%{_docdir}/gnuplot/ - install -m 0444 TODO VERSION %{buildroot}/%{_docdir}/gnuplot/ + install -m 0444 VERSION %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 NEWS BUGS %{buildroot}/%{_docdir}/gnuplot/ install -m 0444 %{SOURCE3} %{buildroot}/%{_docdir}/gnuplot/ rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*