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=4

Browse Source
This commit is contained in:
OBS User unknown 2007-04-24 11:56:15 +00:00 committed by Git OBS Bridge
parent 3ff654ee3b
commit 2e1791cfc5
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gnuplot-4.2.0-wxt.dif Normal file
View File

@ -0,0 +1,46 @@
--- src/plot.c
+++ src/plot.c 2007-04-24 12:21:32.000000000 +0200
@@ -591,6 +591,8 @@
#endif /* GNUPLOT_HISTORY */
fprintf(stderr, "\nTerminal type set to '%s'\n", term->name);
+ if (!strncmp("wxt", term->name, 3))
+ fprintf(stderr, "Warning: terminal 'wxt' is experimental\n");
} /* 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 2007-04-24 12:21:51.000000000 +0200
@@ -1555,6 +1555,8 @@
}
if (interactive)
fprintf(stderr, "Terminal type set to '%s'\n", term->name);
+ if (interactive && !strncmp("wxt", term->name, 3))
+ fprintf(stderr, "Warning: terminal 'wxt' is experimental\n");
/* Invalidate any terminal-specific structures that may be active */
invalidate_palette();
@@ -1620,11 +1622,6 @@
term_name = "sun";
#endif /* SUN */
-#ifdef WXWIDGETS
- if (term_name == (char *) NULL)
- term_name = "wxt";
-#endif
-
#ifdef _Windows
/* let the wxWidgets terminal be the default when available */
if (term_name == (char *) NULL)
@@ -1660,6 +1657,11 @@
term_name = "x11";
#endif /* x11 */
+#ifdef WXWIDGETS
+ if (term_name == (char *) NULL)
+ term_name = "wxt";
+#endif
+
#ifdef AMIGA
term_name = "amiga";
#endif

5
gnuplot.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 24 12:32:31 CEST 2007 - werner@suse.de
- Enable new but experimental wxt terminal (bug #266693)
-------------------------------------------------------------------
Fri Apr 20 09:51:29 CEST 2007 - aj@suse.de

11
gnuplot.spec
View File

@ -11,14 +11,14 @@
# norootforbuild
Name: gnuplot
BuildRequires: cairo-devel freetype2-devel gd-devel latex2html libjpeg-devel libpng-devel pango-devel plotutils readline-devel texlive-latex xorg-x11-devel
BuildRequires: cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel plotutils readline-devel texlive-latex wxGTK-devel xorg-x11-devel
URL: http://www.gnuplot.info/
License: BSD License and BSD-like
Group: Productivity/Graphics/Visualization/Graph
Autoreqprov: on
PreReq: %install_info_prereq
Version: 4.2.0
Release: 2
Release: 4
Summary: Function Plotting Utility
Source0: gnuplot-4.2.0.tar.bz2
Source2: gnuplot-fr.doc.bz2
@ -26,6 +26,7 @@ Source3: README.whynot
Patch0: gnuplot-4.2.0.dif
Patch1: gnuplot-4.2.0-x11ovf.dif
Patch2: gnuplot-4.0.0-fonts.dif
Patch3: gnuplot-4.2.0-wxt.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"
@ -62,6 +63,7 @@ Authors:
bunzip2 -dc $RPM_SOURCE_DIR/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
@ -69,7 +71,8 @@ test $? -eq 0 || exit 1
SECSVGA="-DSVGA_IS_SECURE=1"
export CPPFLAGS="-I/usr/X11R6/include -I/usr/include/gd"
export CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA}"
export LDFLAGS="-L/usr/X11R6/%_lib"
export CXXFLAGS="$CFLAGS -fno-strict-aliasing"
export LDFLAGS="-L%{_x11lib}"
export ARCHLIB=%_lib
for f in docs/makefile*; do
test -e $f || continue
@ -160,6 +163,8 @@ test $? -eq 0 || exit 1
%{_appdef}/Gnuplot.app-defaults
%changelog
* Tue Apr 24 2007 - werner@suse.de
- Enable new but experimental wxt terminal (bug #266693)
* Fri Apr 20 2007 - aj@suse.de
- Use texlive for Building.
* Thu Apr 05 2007 - werner@suse.de