OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Mar-2006 15:32:14
Branch: HEAD Handle: 2006030714321300
Added files:
openpkg-src/gnuplot gnuplot.patch
Modified files:
openpkg-src/gnuplot gnuplot.spec
Log:
fix building by removing symbol conflict with NCurses init_color()
function
Summary:
Revision Changes Path
1.1 +24 -0 openpkg-src/gnuplot/gnuplot.patch
1.25 +3 -1 openpkg-src/gnuplot/gnuplot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnuplot/gnuplot.patch
============================================================================
$ cvs diff -u -r0 -r1.1 gnuplot.patch
--- /dev/null 2006-03-07 15:32:05 +0100
+++ gnuplot.patch 2006-03-07 15:32:13 +0100
@@ -0,0 +1,24 @@
+Index: src/color.c
+--- src/color.c.orig 2003-12-15 00:23:04 +0100
++++ src/color.c 2006-03-07 15:19:52 +0100
+@@ -66,7 +66,7 @@
+
+
+ void
+-init_color()
++gnuplot_init_color()
+ {
+ /* initialize global palette */
+ sm_palette.colorFormulae = 37; /* const */
+Index: src/plot.c
+--- src/plot.c.orig 2004-04-14 17:26:21 +0200
++++ src/plot.c 2006-03-07 15:19:58 +0100
+@@ -525,7 +525,7 @@
+ * initialized arrays any more, this is now necessary... */
+ reset_command();
+ #ifdef PM3D
+- init_color(); /* Initialization of color */
++ gnuplot_init_color(); /* Initialization of color */
+ #endif /* PM3D */
+ load_rcfile();
+ init_fit(); /* Initialization of fitting module */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnuplot/gnuplot.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 gnuplot.spec
--- openpkg-src/gnuplot/gnuplot.spec 1 Jan 2006 13:14:10 -0000 1.24
+++ openpkg-src/gnuplot/gnuplot.spec 7 Mar 2006 14:32:13 -0000 1.25
@@ -33,13 +33,14 @@
Group: Graphics
License: GPL
Version: 4.0.0
-Release: 20040920
+Release: 20060307
# package options
%option with_x11 no
# list of sources
Source0:
http://osdn.dl.sourceforge.net/gnuplot/gnuplot-%{version}.tar.gz
+Patch0: gnuplot.patch
# build information
Prefix: %{l_prefix}
@@ -69,6 +70,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
