From 4d4ade161aabb70c6c2b284de18d2c3b6f5a786adc46141d5bc3f4901d71d940 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 5 Mar 2010 10:44:10 +0000 Subject: [PATCH] Accepting request 34006 from Publishing Copy from Publishing/gnuplot based on submit request 34006 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/34006 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuplot?expand=0&rev=18 --- gnuplot-4.2.5-gcc45.dif | 13 ++++ gnuplot-4.2.5-utf8.dif | 169 +++++++++++++++++++++++++--------------- gnuplot-4.2.5.tar.bz2 | 3 - gnuplot-4.2.6.tar.bz2 | 3 + gnuplot.changes | 17 ++++ gnuplot.spec | 32 ++------ 6 files changed, 149 insertions(+), 88 deletions(-) create mode 100644 gnuplot-4.2.5-gcc45.dif delete mode 100644 gnuplot-4.2.5.tar.bz2 create mode 100644 gnuplot-4.2.6.tar.bz2 diff --git a/gnuplot-4.2.5-gcc45.dif b/gnuplot-4.2.5-gcc45.dif new file mode 100644 index 0000000..d47a3e0 --- /dev/null +++ b/gnuplot-4.2.5-gcc45.dif @@ -0,0 +1,13 @@ +Index: gnuplot-4.2.6/src/gplt_x11.c +=================================================================== +--- gnuplot-4.2.6.orig/src/gplt_x11.c 2010-03-04 10:45:10.000000000 +0100 ++++ gnuplot-4.2.6/src/gplt_x11.c 2010-03-04 11:59:35.000000000 +0100 +@@ -1189,7 +1189,7 @@ static int + read_input() + { + const int rdbuf_size = 10 * Nbuf; +- static char rdbuf[rdbuf_size+1]; ++ static char rdbuf[10*Nbuf+1]; + static int total_chars; + static int rdbuf_offset; + static int buf_offset; diff --git a/gnuplot-4.2.5-utf8.dif b/gnuplot-4.2.5-utf8.dif index f403b11..1fc1b38 100644 --- a/gnuplot-4.2.5-utf8.dif +++ b/gnuplot-4.2.5-utf8.dif @@ -1,5 +1,7 @@ ---- docs/gnuplot.doc -+++ docs/gnuplot.doc 2009-05-09 13:53:00.000000000 +0200 +Index: docs/gnuplot.doc +=================================================================== +--- docs/gnuplot.doc.orig 2009-05-18 04:47:35.000000000 +0200 ++++ docs/gnuplot.doc 2010-03-04 10:44:07.000000000 +0100 @@ -5871,6 +5871,7 @@ C ... and restart the table: ?show encoding ?encoding @@ -26,8 +28,10 @@ Generally you must set the encoding before setting the terminal type. Note that encoding is not supported by all terminal drivers and that ---- src/set.c -+++ src/set.c 2009-05-09 13:53:00.000000000 +0200 +Index: src/set.c +=================================================================== +--- src/set.c.orig 2009-09-01 18:38:55.000000000 +0200 ++++ src/set.c 2010-03-04 10:44:07.000000000 +0100 @@ -1211,7 +1211,7 @@ set_encoding() temp = lookup_table(&set_encoding_tbl[0],c_token); @@ -37,8 +41,10 @@ c_token++; } encoding = temp; ---- src/term.c -+++ src/term.c 2009-05-09 13:53:00.000000000 +0200 +Index: src/term.c +=================================================================== +--- src/term.c.orig 2010-03-04 10:44:00.000000000 +0100 ++++ src/term.c 2010-03-04 10:44:07.000000000 +0100 @@ -134,19 +134,23 @@ TBOOLEAN multiplot = FALSE; enum set_encoding_id encoding; /* table of encoding names, for output of the setting */ @@ -74,8 +80,10 @@ char *text, JUSTIFY hor, /* horizontal ... */ VERT_JUSTIFY vert, /* ... and vertical just - text in hor direction despite angle */ ---- src/term_api.h -+++ src/term_api.h 2009-05-09 13:53:00.000000000 +0200 +Index: src/term_api.h +=================================================================== +--- src/term_api.h.orig 2008-12-15 05:18:36.000000000 +0100 ++++ src/term_api.h 2010-03-04 10:44:07.000000000 +0100 @@ -124,7 +124,9 @@ typedef enum termlayer { TERM_LAYER_RESET, TERM_LAYER_BACKTEXT, @@ -133,8 +141,10 @@ S_ENC_INVALID }; ---- src/util.c -+++ src/util.c 2009-05-09 13:53:00.000000000 +0200 +Index: src/util.c +=================================================================== +--- src/util.c.orig 2009-02-09 05:43:44.000000000 +0100 ++++ src/util.c 2010-03-04 10:44:07.000000000 +0100 @@ -1218,3 +1218,85 @@ getusername () return fullname; @@ -221,8 +231,10 @@ + *wch = INVALID_UTF8; + return FALSE; +} ---- term/Makefile.am.in -+++ term/Makefile.am.in 2009-05-09 13:53:00.000000000 +0200 +Index: term/Makefile.am.in +=================================================================== +--- term/Makefile.am.in.orig 2006-06-20 00:02:46.000000000 +0200 ++++ term/Makefile.am.in 2010-03-04 10:44:07.000000000 +0100 @@ -13,7 +13,7 @@ postscriptdir = $(pkgdatadir)/$(VERSION_ postscript_DATA = PostScript/8859-15.ps PostScript/8859-1.ps\ PostScript/8859-2.ps PostScript/cp1250.ps PostScript/cp437.ps\ @@ -232,8 +244,10 @@ Makefile.am: Makefile.am.in rm -f $@ $@t ---- term/gd.trm -+++ term/gd.trm 2009-05-09 13:53:00.000000000 +0200 +Index: term/gd.trm +=================================================================== +--- term/gd.trm.orig 2009-03-03 03:43:52.000000000 +0100 ++++ term/gd.trm 2010-03-04 10:44:07.000000000 +0100 @@ -1861,7 +1861,7 @@ ENHGD_FLUSH() #ifdef gdFTEX_Adobe_Custom /* libgd defaults to UTF-8 encodings. We have limited options for */ @@ -243,8 +257,10 @@ PNG_FONT_INFO.flags |= gdFTEX_CHARMAP; PNG_FONT_INFO.charmap = gdFTEX_Adobe_Custom; } else { ---- term/post.trm -+++ term/post.trm 2009-05-09 13:53:00.000000000 +0200 +Index: term/post.trm +=================================================================== +--- term/post.trm.orig 2009-03-03 03:44:07.000000000 +0100 ++++ term/post.trm 2010-03-04 10:44:07.000000000 +0100 @@ -1,5 +1,5 @@ /* Hello, Emacs: this is -*-C-*- ! - * $Id: post.trm,v 1.203.2.17 2009/03/02 17:40:06 mikulik Exp $ @@ -1442,15 +1458,10 @@ "", "" END_HELP(post) ---- term/pslatex.trm -+++ term/pslatex.trm 2009-05-09 13:53:00.000000000 +0200 -@@ -1,5 +1,5 @@ - /* Hello, Emacs, this is -*-C-*- -- * $Id: pslatex.trm,v 1.69.2.1 2008/02/22 20:34:41 sfeam Exp $ -+ * $Id: pslatex.trm,v 1.72 2008/02/22 20:02:26 sfeam Exp $ - */ - - /* GNUPLOT - pslatex.trm */ +Index: term/pslatex.trm +=================================================================== +--- term/pslatex.trm.orig 2009-05-17 07:34:12.000000000 +0200 ++++ term/pslatex.trm 2010-03-04 10:44:26.000000000 +0100 @@ -441,7 +441,10 @@ EPSLATEX_common_init() case S_ENC_ISO8859_2: inputenc = "latin2"; @@ -1463,8 +1474,10 @@ inputenc = "latin9"; break; case S_ENC_CP437: ---- term/PostScript/8859-1.ps -+++ term/PostScript/8859-1.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/8859-1.ps +=================================================================== +--- term/PostScript/8859-1.ps.orig 2006-03-24 22:48:47.000000000 +0100 ++++ term/PostScript/8859-1.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,3 +1,6 @@ +% +% Encoding for ISO-8859-1 (also called Latin1) @@ -1472,8 +1485,10 @@ /reencodeISO { dup dup findfont dup length dict begin { 1 index /FID ne { def }{ pop pop } ifelse } forall ---- term/PostScript/8859-15.ps -+++ term/PostScript/8859-15.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/8859-15.ps +=================================================================== +--- term/PostScript/8859-15.ps.orig 2006-03-24 22:48:47.000000000 +0100 ++++ term/PostScript/8859-15.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,3 +1,6 @@ +% +% Encoding for ISO-8859-15 (also called Latin9) @@ -1481,8 +1496,10 @@ /reencodeISO15 { dup dup findfont dup length dict begin { 1 index /FID ne { def }{ pop pop } ifelse } forall ---- term/PostScript/8859-2.ps -+++ term/PostScript/8859-2.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/8859-2.ps +=================================================================== +--- term/PostScript/8859-2.ps.orig 2006-08-12 00:35:05.000000000 +0200 ++++ term/PostScript/8859-2.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,4 +1,5 @@ -% Encoding for ISO-8859-2 (also called as Latin-2), with +% @@ -1490,8 +1507,10 @@ % minor differences to "true" ISO-8859-2 (*commaaccent % instead of *cedilla for sStT -> incorrect in ISO-8859-2, % the standard will probably be modified in this respect) ---- term/PostScript/8859-9.ps -+++ term/PostScript/8859-9.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/8859-9.ps +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/8859-9.ps 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,44 @@ +% +% Encoding for ISO_8859_9 (also called Latin5) @@ -1537,13 +1556,17 @@ +/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis +/dotlessi/scedilla/ydieresis +] def ---- term/PostScript/NOTE.aglfn -+++ term/PostScript/NOTE.aglfn 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/NOTE.aglfn +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/NOTE.aglfn 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,2 @@ +The document aglfn.txt was obtained from http://www.adobe.com/devnet/opentype/archives/aglfn.txt +Do never change this document as this is not allowed by the license found therein. ---- term/PostScript/aglfn.txt -+++ term/PostScript/aglfn.txt 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/aglfn.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/aglfn.txt 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,932 @@ +# ################################################################################### +# Copyright (c) 2003,2005,2006,2007 Adobe Systems Incorporated @@ -2477,8 +2500,10 @@ +017C;zdotaccent;LATIN SMALL LETTER Z WITH DOT ABOVE +0030;zero;DIGIT ZERO +03B6;zeta;GREEK SMALL LETTER ZETA ---- term/PostScript/cp1250.ps -+++ term/PostScript/cp1250.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/cp1250.ps +=================================================================== +--- term/PostScript/cp1250.ps.orig 2009-05-06 05:55:05.000000000 +0200 ++++ term/PostScript/cp1250.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,3 +1,6 @@ +% +% Encoding for code page 1250 (Microsoft Windows Central and Eastern European) @@ -2486,8 +2511,10 @@ /reencodeCP1250 { dup dup findfont dup length dict begin { 1 index /FID ne { def }{ pop pop } ifelse } forall ---- term/PostScript/cp437.ps -+++ term/PostScript/cp437.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/cp437.ps +=================================================================== +--- term/PostScript/cp437.ps.orig 2006-08-12 00:35:05.000000000 +0200 ++++ term/PostScript/cp437.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,4 +1,5 @@ -% encoding for code page 437 +% @@ -2495,8 +2522,10 @@ % version 1.0: - Mainly letters are mapped. The following positions % (JFi) are left blank (undefined): % -- first 32 positions, ---- term/PostScript/cp850.ps -+++ term/PostScript/cp850.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/cp850.ps +=================================================================== +--- term/PostScript/cp850.ps.orig 2006-08-12 00:35:05.000000000 +0200 ++++ term/PostScript/cp850.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,4 +1,5 @@ -% encoding for code page 850 +% @@ -2504,8 +2533,10 @@ % version 1.0: - Mainly letters are mapped. The following positions % (JFi) are left blank (undefined): % -- first 32 positions, ---- term/PostScript/cp852.ps -+++ term/PostScript/cp852.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/cp852.ps +=================================================================== +--- term/PostScript/cp852.ps.orig 2006-08-12 00:22:05.000000000 +0200 ++++ term/PostScript/cp852.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,4 +1,5 @@ -% encoding for code page 852 +% @@ -2513,8 +2544,10 @@ /reencodeCP852 { dup dup findfont dup length dict begin { 1 index /FID ne { def }{ pop pop } ifelse } forall ---- term/PostScript/koi8r.ps -+++ term/PostScript/koi8r.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/koi8r.ps +=================================================================== +--- term/PostScript/koi8r.ps.orig 2006-08-12 00:35:05.000000000 +0200 ++++ term/PostScript/koi8r.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,4 +1,5 @@ -% encoding for code page koi8r +% @@ -2522,16 +2555,20 @@ % version 1.0: - Mainly letters are mapped. The following positions % (JFi) are left blank (undefined): % -- first 32 positions, ---- term/PostScript/koi8u.ps -+++ term/PostScript/koi8u.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/koi8u.ps +=================================================================== +--- term/PostScript/koi8u.ps.orig 2006-03-24 22:48:47.000000000 +0100 ++++ term/PostScript/koi8u.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,4 +1,5 @@ % +% encoding for code page koi8r (8-bit Ukrainian) /reencodeKOI8U { dup dup findfont dup length dict begin { 1 index /FID ne { def }{ pop pop } ifelse } forall ---- term/PostScript/prologue.ps -+++ term/PostScript/prologue.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/prologue.ps +=================================================================== +--- term/PostScript/prologue.ps.orig 2007-10-01 22:49:08.000000000 +0200 ++++ term/PostScript/prologue.ps 2010-03-04 10:44:07.000000000 +0100 @@ -1,5 +1,5 @@ % -% Gnuplot Prolog Version 4.2 (August 2006) @@ -2547,8 +2584,10 @@ /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def /Lshow {currentpoint stroke M 0 vshift R ---- term/PostScript/prologues.h -+++ term/PostScript/prologues.h 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/prologues.h +=================================================================== +--- term/PostScript/prologues.h.orig 2006-11-20 20:06:01.000000000 +0100 ++++ term/PostScript/prologues.h 2010-03-04 10:44:07.000000000 +0100 @@ -2,6 +2,9 @@ * in a form suitable to inclusion in a C source code */ @@ -2778,8 +2817,10 @@ +NULL +}; + ---- term/PostScript/unicode_big.map -+++ term/PostScript/unicode_big.map 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/unicode_big.map +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/unicode_big.map 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,863 @@ +=00 U+0000 +=01 U+0001 @@ -3644,8 +3685,10 @@ +!37f U+25C7 uni25C7 +!380 U+2297 uni2297 +!381 U+2299 uni2299 ---- term/PostScript/unicode_maps.README -+++ term/PostScript/unicode_maps.README 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/unicode_maps.README +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/unicode_maps.README 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,75 @@ + unicode maps README + =================== @@ -3722,8 +3765,10 @@ +But if you need more, probably you would do better to use a different +gnuplot terminal that supports direct use of UTF-8 TTF fonts (pdf, png, svg). + ---- term/PostScript/unicode_small.map -+++ term/PostScript/unicode_small.map 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/unicode_small.map +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/unicode_small.map 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,462 @@ +=00 U+0000 +=01 U+0001 @@ -4187,8 +4232,10 @@ +!362 U+25FB uni25FB +!363 U+25FC uni25FC +!365 U+2609 uni2609 ---- term/PostScript/utf-8.ps -+++ term/PostScript/utf-8.ps 2009-05-09 13:53:00.000000000 +0200 +Index: term/PostScript/utf-8.ps +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ term/PostScript/utf-8.ps 2010-03-04 10:44:07.000000000 +0100 @@ -0,0 +1,58 @@ +% +% Base ISO8859-1 character encoding plus support macros for UTF-8 encoding diff --git a/gnuplot-4.2.5.tar.bz2 b/gnuplot-4.2.5.tar.bz2 deleted file mode 100644 index cf48805..0000000 --- a/gnuplot-4.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36fbbf48f6561a087c664272b991268bb299ac926b5fc72e5cd2bf67347b6a15 -size 2347067 diff --git a/gnuplot-4.2.6.tar.bz2 b/gnuplot-4.2.6.tar.bz2 new file mode 100644 index 0000000..cf7d75f --- /dev/null +++ b/gnuplot-4.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43bce5066e0473f3de80215a8b93d0ca5f9efbe30cf5ffd9db3fca652b5b7026 +size 2409639 diff --git a/gnuplot.changes b/gnuplot.changes index 361f239..dd20154 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Mar 4 11:48:39 UTC 2010 - coolo@novell.com + +- fix compilation with gcc 4.5 +- update to gnuplot 4.2.6 + * NEW xterm tektronix emulation 'set term xterm' + * FIX 'set xtics mirror' didn't work if xtics were previously unset + * FIX off-by-one pixel bug in width of boxes with palette or rgb color + * FIX center rotation of 'set view equal xyz' mode at screen center + * FIX sanity-check time ranges for axes with timeformat + * FIX pslatex blacktext and broken format specifier + * FIX PostScript code points for Lcaron, lcaron in encoding cp1250 + * CHANGE If a 2D plot uses a Z-based palette, then autoscale cbrange + * CHANGE aquaterm accepts "size xx,yy" with a comma + * CHANGE Remove the EXPERIMENTAL flag from the wxt terminal + * CHANGE Remove the EXPERIMENTAL flag from the x11 terminal binary polygon mode + ------------------------------------------------------------------- Mon Jun 15 15:12:38 CEST 2009 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 6a855c2..e12dd6d 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # -# spec file for package gnuplot (Version 4.2.5) +# spec file for package gnuplot (Version 4.2.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -26,12 +26,12 @@ BuildRequires: plotutils-devel BuildRequires: plotutils %endif Url: http://www.gnuplot.info/ -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: Productivity/Graphics/Visualization/Graph AutoReqProv: on PreReq: %install_info_prereq -Version: 4.2.5 -Release: 3 +Version: 4.2.6 +Release: 1 Summary: GNUplot a Function Plotting Utility Source0: gnuplot-%{version}.tar.bz2 Source2: gnuplot-fr.doc.bz2 @@ -43,6 +43,7 @@ Patch3: gnuplot-4.2.5-wxt.dif Patch4: gnuplot-4.2.5-demo.dif Patch5: gnuplot-4.2.5-utf8.dif Patch6: gnuplot-4.2.5-fix-format-errors.dif +Patch7: gnuplot-4.2.5-gcc45.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -65,17 +66,8 @@ GNUplot is a command line driven interactive function plotting utility. printers (including many color devices and pseudodevices like LaTeX) and can easily be extended to include new devices. - - -Authors: --------- - Mailingliste - Mailingliste - Mailingliste - Mailingliste - %package doc -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: Documentation of GNUplot Group: Productivity/Graphics/Visualization/Graph Requires: %{name} @@ -88,15 +80,6 @@ GNUplot supports many different types of terminals, plotters, and printers (including many color devices and pseudodevices like LaTeX) and can easily be extended to include new devices. - - -Authors: --------- - Mailingliste - Mailingliste - Mailingliste - Mailingliste - %{name} documentation files including the man and info pages %prep @@ -110,6 +93,7 @@ test $? -eq 0 || exit 1 %patch -P 5 -p 0 %patch -P 6 -p 0 %patch -P 0 -p 0 +%patch -P 7 -p 1 %build SECSVGA="-DSVGA_IS_SECURE=1"