rpm/gnuplot
SHA256
1
0
Fork 0
forked from pool/gnuplot
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuplot?expand=0&rev=15

Browse Source
This commit is contained in:
OBS User unknown 2009-06-15 14:35:00 +00:00 committed by Git OBS Bridge
parent af5ef76438
commit 9548cb7485
10 changed files with 1570 additions and 3244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnuplot-4.2.0-x11ovf.dif
View File

@ -1,13 +0,0 @@
--- src/gplt_x11.c
+++ src/gplt_x11.c 2006-01-31 11:09:17.000000000 +0000
@@ -1103,8 +1103,8 @@
static int
read_input()
{
- static int rdbuf_size = 10 * Nbuf;
- static char rdbuf[10 * Nbuf];
+ const int rdbuf_size = 10 * Nbuf;
+ static char rdbuf[rdbuf_size+1];
static int total_chars;
static int rdbuf_offset;
static int buf_offset;

2008
gnuplot-4.2.5-demo.dif
View File

File diff suppressed because it is too large Load Diff

8
gnuplot-4.2.5-fix-format-errors.dif
View File

@ -1,6 +1,6 @@
--- src/gplt_x11.c 2009-01-14 19:42:02.000000000 +0100
--- src/gplt_x11.c
+++ src/gplt_x11.c 2009-05-09 13:50:34.000000000 +0200
@@ -2889,22 +2889,22 @@
@@ -2903,22 +2903,22 @@ exec_cmd(plot_struct *plot, char *comman
case PseudoColor:
fprintf(stderr, ERROR_NOTICE("PseudoColor"));
@ -27,9 +27,9 @@
break;
case DirectColor:
--- term/post.trm 2009-03-03 03:44:07.000000000 +0100
--- term/post.trm
+++ term/post.trm 2009-05-09 13:50:34.000000000 +0200
@@ -1665,7 +1665,7 @@
@@ -1748,7 +1748,7 @@ gnudict begin\ngsave\n\
(ps_params->psformat == PSTERM_EPS ? 0.5 : 1.0)/PS_SC);
if (ps_params->psformat == PSTERM_LANDSCAPE)
fprintf(gppsfile,"90 rotate\n0 %d translate\n", -(int)(term->ymax));

14
gnuplot-4.2.2-fonts.dif → gnuplot-4.2.5-fonts.dif
View File

@ -1,5 +1,5 @@
--- src/gplt_x11.c
+++ src/gplt_x11.c 2008-03-14 15:26:15.789448595 +0100
+++ src/gplt_x11.c 2008-03-14 15:26:16.000000000 +0100
@@ -104,6 +104,10 @@ static char *RCSid() { return RCSid("$Id
* patches by Masahito Yamaga <ma@yama-ga.com>
*/
@ -20,7 +20,7 @@
# include <X11/Xlocale.h>
#endif
@@ -471,7 +477,7 @@ static double mouse_to_axis __PROTO((int
@@ -474,7 +480,7 @@ static double mouse_to_axis __PROTO((int
static char *FallbackFont = "fixed";
#ifdef USE_X11_MULTIBYTE
static char *FallbackFontMB =
@ -29,7 +29,7 @@
# define FontSetSep ';'
static int usemultibyte = 0;
static int multibyte_fonts_usable=1;
@@ -488,8 +494,8 @@ static char *gpFallbackFont __PROTO((voi
@@ -491,8 +497,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' */
@ -40,7 +40,7 @@
#define Nwidths 10
static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -2099,6 +2105,8 @@ exec_cmd(plot_struct *plot, char *comman
@@ -2116,6 +2122,8 @@ exec_cmd(plot_struct *plot, char *comman
/* Save the request default font */
c = &(buffer[strlen(buffer)-1]);
while (*c <= ' ') *c-- = '\0';
@ -49,7 +49,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;
@@ -5397,7 +5405,7 @@ XFontStruct *gpXLoadQueryFont (Display *
@@ -5326,7 +5334,7 @@ XFontStruct *gpXLoadQueryFont (Display *
}
#else
if (first_time) {
@ -58,7 +58,7 @@
first_time = FALSE;
}
while (n_miss-- > 0)
@@ -5490,6 +5498,18 @@ char *fontname;
@@ -5419,6 +5427,18 @@ char *fontname;
}
#ifdef USE_X11_MULTIBYTE
@ -78,7 +78,7 @@
if (multibyte_fonts_usable) {
usemultibyte = 1;
--- src/variable.c
+++ src/variable.c 2008-03-14 15:27:11.596615232 +0100
+++ src/variable.c 2009-06-15 13:55:04.902957631 +0200
@@ -263,6 +263,8 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif

2583
gnuplot-4.2.5-utf8.dif
View File

File diff suppressed because it is too large Load Diff

10
gnuplot-4.2.0-wxt.dif → gnuplot-4.2.5-wxt.dif
View File

@ -1,6 +1,6 @@
--- src/plot.c
+++ src/plot.c 2007-04-24 12:21:32.000000000 +0200
@@ -591,6 +591,8 @@
@@ -610,6 +610,8 @@ main(int argc, char **argv)
#endif /* GNUPLOT_HISTORY */
fprintf(stderr, "\nTerminal type set to '%s'\n", term->name);
@ -9,9 +9,9 @@
} /* if (interactive && term != 0) */
} else {
/* come back here from int_error() */
--- src/term.c 2006-10-06 01:52:18.000000000 +0200
--- src/term.c
+++ src/term.c 2007-04-24 12:21:51.000000000 +0200
@@ -1555,6 +1555,8 @@
@@ -1561,6 +1561,8 @@ change_term(const char *origname, int le
}
if (interactive)
fprintf(stderr, "Terminal type set to '%s'\n", term->name);
@ -20,7 +20,7 @@
/* Invalidate any terminal-specific structures that may be active */
invalidate_palette();
@@ -1620,11 +1622,6 @@
@@ -1626,11 +1628,6 @@ init_terminal()
term_name = "sun";
#endif /* SUN */
@ -32,7 +32,7 @@
#ifdef _Windows
/* let the wxWidgets terminal be the default when available */
if (term_name == (char *) NULL)
@@ -1660,6 +1657,11 @@
@@ -1666,6 +1663,11 @@ init_terminal()
term_name = "x11";
#endif /* x11 */

35
gnuplot-4.2.5-x11ovf.dif Normal file
View File

@ -0,0 +1,35 @@
--- src/gplt_x11.c
+++ src/gplt_x11.c 2009-06-15 13:17:19.021900688 +0200
@@ -901,6 +901,8 @@ mainloop()
nfds = cn + 1;
while (1) {
+ int ipc;
+
XFlush(dpy); /* see above */
FD_ZERO(&tset);
@@ -938,7 +940,11 @@ mainloop()
process_event(&xe);
}
}
- if ((X11_ipc = fopen(X11_ipcpath, "r"))) {
+
+ if ((ipc = open(X11_ipcpath, O_RDONLY|O_CREAT|O_CLOEXEC|O_EXCL)) < 0)
+ break;
+
+ if ((X11_ipc = dfopen(ipc, "r"))) {
unlink(X11_ipcpath);
record();
fclose(X11_ipc);
@@ -1176,8 +1182,8 @@ static int read_input __PROTO((void));
static int
read_input()
{
- static int rdbuf_size = 10 * Nbuf;
- static char rdbuf[10 * Nbuf];
+ const int rdbuf_size = 10 * Nbuf;
+ static char rdbuf[rdbuf_size+1];
static int total_chars;
static int rdbuf_offset;
static int buf_offset;

119
gnuplot-4.2.5.dif
View File

@ -1,10 +1,10 @@
--- .pkgextract 1970-01-01 01:00:00.000000000 +0100
--- .pkgextract
+++ .pkgextract 2009-05-09 13:32:24.000000000 +0200
@@ -0,0 +1 @@
+bzcat ../gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
--- configure.in 2009-03-15 04:39:15.000000000 +0100
--- configure.in
+++ configure.in 2009-05-09 13:32:24.000000000 +0200
@@ -230,7 +230,7 @@
@@ -230,7 +230,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'
@ -13,70 +13,7 @@
with_linux_vga=no)
fi
--- demo/poldat.dem 2003-10-28 06:35:54.000000000 +0100
+++ demo/poldat.dem 2009-05-09 13:32:24.000000000 +0200
@@ -11,7 +11,7 @@
unset polar
set title "Primitive Smith Chart"
unset key
-set xlabel "Impedance or Admittance Coordinates"
+set xlabel "Impedance or Admittance Coordinates" 12,-1
set para
set rrange [-0 : 10]
set trange [-pi : pi]
--- demo/simple.dem 2006-06-30 04:17:22.000000000 +0200
+++ demo/simple.dem 2009-05-09 13:32:24.000000000 +0200
@@ -7,12 +7,11 @@
# gnuplot> load 'simple.dem'
#
set key left box
-set samples 50
+set samples 400
plot [-10:10] sin(x),atan(x),cos(atan(x))
pause -1 "Hit return to continue"
set key right nobox
-set samples 100
plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
pause -1 "Hit return to continue"
--- demo/vector.dem 2006-07-12 19:21:14.000000000 +0200
+++ demo/vector.dem 2009-05-09 13:32:24.000000000 +0200
@@ -62,19 +62,19 @@
print "Now create a file with equipotential lines"
pause -1 "Hit return to continue"
-set table "equipo2.tmp"
+set table "/tmp/equipo2.tmp"
replot
unset table
reset
pause 0
-plot "equipo2.tmp" w l
+plot "/tmp/equipo2.tmp" w l
print "Now create a x/y datafile for plotting with vectors "
print "and display vectors parallel to the electrostatic field"
pause -1 "Hit return to continue"
set isosam 31,31
-set table "field2xy.tmp"
+set table "/tmp/field2xy.tmp"
splot vtot(x,y) w l
unset table
pause 0
@@ -84,8 +84,8 @@
set yr [ymin:ymax]
set isosam 31,31
set key under Left reverse
-plot "field2xy.tmp" u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \
- "equipo2.tmp" w l
+plot "/tmp/field2xy.tmp" u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \
+ "/tmp/equipo2.tmp" w l
pause -1 "Hit return to continue"
reset
--- docs/Makefile.in 2006-08-09 23:09:48.000000000 +0200
--- docs/Makefile.in
+++ docs/Makefile.in 2009-05-09 13:32:24.000000000 +0200
@@ -37,7 +37,7 @@
#
@ -87,7 +24,7 @@
# this tells GNU make not to export variables into the environment
# But other makes dont understand its significance, so it must
@@ -239,6 +239,8 @@
@@ -239,6 +239,8 @@ html: htmldocs/gnuplot.html
# emacs around to do lisp pre-processing
htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
mkdir -p htmldocs
@ -96,7 +33,7 @@
latex2html -dir htmldocs -local_icons gnuplot
### PDF documentation
@@ -321,12 +323,16 @@
@@ -321,12 +323,16 @@ doc2hlp: doc2hlp.o termdoc.o
$(LINK) doc2hlp.o termdoc.o $(LIBS)
### gnuplot interactive help format
@ -114,7 +51,7 @@
doc2gih: doc2gih.o termdoc.o
$(LINK) doc2gih.o termdoc.o $(LIBS)
@@ -415,6 +421,7 @@
@@ -415,6 +421,7 @@ install: install-gih install-info
install-gih: gnuplot.gih
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
@ -122,7 +59,7 @@
install-info: gnuplot.info
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
@@ -434,6 +441,7 @@
@@ -434,6 +441,7 @@ uninstall: uninstall-gih uninstall-info
uninstall-gih:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
@ -130,9 +67,9 @@
uninstall-info:
$(PRE_UNINSTALL)
--- docs/gnuplot-fr.doc 2009-05-09 11:53:20.000000000 +0200
--- docs/gnuplot-fr.doc
+++ docs/gnuplot-fr.doc 2009-05-09 13:32:24.000000000 +0200
@@ -436,8 +436,8 @@
@@ -436,8 +436,8 @@ C
#Home & same as \verb~^A~. \\
#Ctrl Home & same as \verb~^E~. \\
#Esc & same as \verb~^U~. \\
@ -143,9 +80,9 @@
%c l .
%Touche fléchée@Fonction
%_
--- src/command.c 2008-12-15 05:18:36.000000000 +0100
--- src/command.c
+++ src/command.c 2009-05-09 13:32:24.000000000 +0200
@@ -1177,14 +1177,24 @@
@@ -1177,14 +1177,24 @@ pause_command()
(void) fgets(buf, strlen(buf), stdin);
}
} else if (strcmp(term->name, "atari") == 0) {
@ -172,7 +109,7 @@
if (line)
free(line);
} else
@@ -2696,6 +2706,13 @@
@@ -2696,6 +2706,13 @@ read_line(const char *prompt)
# endif /* no READLINE */
do {
@ -186,9 +123,9 @@
/* grab some input */
# if defined(READLINE) || defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
if (((interactive)
--- src/gplt_x11.c 2009-01-14 19:42:02.000000000 +0100
--- src/gplt_x11.c
+++ src/gplt_x11.c 2009-05-09 13:32:24.000000000 +0200
@@ -2240,8 +2240,11 @@
@@ -2254,8 +2254,11 @@ exec_cmd(plot_struct *plot, char *comman
}
}
/* X11_justify_text(mode) - set text justification mode */
@ -202,7 +139,7 @@
else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle);
@@ -4710,7 +4713,9 @@
@@ -4724,7 +4727,9 @@ process_event(XEvent *event)
*/
#define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
@ -212,9 +149,9 @@
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 64
#endif
--- src/plot.c 2008-12-15 05:18:36.000000000 +0100
--- src/plot.c
+++ src/plot.c 2009-05-09 13:32:24.000000000 +0200
@@ -234,6 +234,7 @@
@@ -234,6 +234,7 @@ static int asked_privi = 0;
void
drop_privilege()
{
@ -222,7 +159,7 @@
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -247,11 +248,13 @@
@@ -247,11 +248,13 @@ drop_privilege()
if (seteuid(ruid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) ruid, strerror(errno));
@ -236,7 +173,7 @@
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -265,6 +268,7 @@
@@ -265,6 +268,7 @@ take_privilege()
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) euid, strerror(errno));
@ -244,7 +181,7 @@
}
#endif /* LINUXVGA */
@@ -290,8 +294,8 @@
@@ -290,8 +294,8 @@ main(int argc, char **argv)
int i;
#ifdef LINUXVGA
@ -254,7 +191,7 @@
#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 */
@@ -357,6 +361,23 @@
@@ -357,6 +361,23 @@ main(int argc, char **argv)
#if defined(HAVE_LIBEDITLINE)
rl_getc_function = getc_wrapper;
#endif
@ -278,7 +215,7 @@
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
using_history();
/* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
--- src/term.h 2006-04-29 07:30:07.000000000 +0200
--- src/term.h
+++ src/term.h 2009-05-09 13:32:24.000000000 +0200
@@ -321,9 +321,9 @@
#include "emf.trm"
@ -310,9 +247,9 @@
/* wire printers */
/* Epson LX-800, Star NL-10, NX-1000 and lots of others */
--- src/time.c 2008-09-02 23:12:59.000000000 +0200
--- src/time.c
+++ src/time.c 2009-05-09 13:32:24.000000000 +0200
@@ -291,11 +291,12 @@
@@ -291,11 +291,12 @@ gstrptime(char *s, char *fmt, struct tm
case 's':
#if 0 /* HBB 20040213: comment this out, but keep it around for now */
{
@ -329,9 +266,9 @@
tmwhen->tm_year += 1900;
*tm = *tmwhen;
break;
--- term/linux.trm 2006-07-21 04:35:47.000000000 +0200
--- term/linux.trm
+++ term/linux.trm 2009-05-09 13:32:24.000000000 +0200
@@ -80,7 +80,7 @@
@@ -80,7 +80,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));
@ -340,7 +277,7 @@
TERM_PUBLIC void LINUX_suspend __PROTO((void));
TERM_PUBLIC void LINUX_resume __PROTO((void));
@@ -293,7 +293,7 @@
@@ -293,7 +293,7 @@ LINUX_putc(
}
TERM_PUBLIC void

6
gnuplot.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 15 15:12:38 CEST 2009 - werner@suse.de
- Make demos more flexible (hint from dieter.jurzitza@t-online.de)
- Add netpbm and xorg-x11 to build requires or jpg's are zero
-------------------------------------------------------------------
Tue May 26 11:19:52 CEST 2009 - werner@suse.de

18
gnuplot.spec
View File

@ -19,7 +19,7 @@
Name: gnuplot
BuildRequires: cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11-devel
BuildRequires: cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel netpbm pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11 xorg-x11-devel
%if 0%{?suse_version} > 1110
BuildRequires: plotutils-devel
%else
@ -31,15 +31,15 @@ Group: Productivity/Graphics/Visualization/Graph
AutoReqProv: on
PreReq: %install_info_prereq
Version: 4.2.5
Release: 1
Release: 2
Summary: GNUplot a Function Plotting Utility
Source0: gnuplot-%{version}.tar.bz2
Source2: gnuplot-fr.doc.bz2
Source3: README.whynot
Patch0: gnuplot-4.2.5.dif
Patch1: gnuplot-4.2.0-x11ovf.dif
Patch2: gnuplot-4.2.2-fonts.dif
Patch3: gnuplot-4.2.0-wxt.dif
Patch1: gnuplot-4.2.5-x11ovf.dif
Patch2: gnuplot-4.2.5-fonts.dif
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
@ -104,16 +104,17 @@ Authors:
bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
test $? -eq 0 || exit 1
%patch -P 1 -p 0 -b .x11ovf
%patch -P 3 -p 0
%patch -P 0 -p 0
%patch -P 2 -p 0
%patch -P 3 -p 0
%patch -P 4 -p 0
%patch -P 5 -p 0
%patch -P 6 -p 0
%patch -P 0 -p 0
%build
SECSVGA="-DSVGA_IS_SECURE=1"
export CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
export CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\""
export CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA}"
export CXXFLAGS="$CFLAGS -fno-strict-aliasing"
export LDFLAGS="-L%{_x11lib}"
@ -220,6 +221,9 @@ test $? -eq 0 || exit 1
%doc %{_mandir}/man1/gnuplot.1.gz
%changelog
* Mon Jun 15 2009 werner@suse.de
- Make demos more flexible (hint from dieter.jurzitza@t-online.de)
- Add netpbm and xorg-x11 to build requires or jpg's are zero
* Tue May 26 2009 werner@suse.de
- Update changes file
* Sat May 09 2009 nico.laus.2001@gmx.de