Witam, w załączniku poprawiony spec dla spice i patch na gcc >= 4.1. Buduje się na aktualnym Th, działa.
Pozdrawiam, -- Remigiusz "Enleth" Marcinkiewicz, [email protected] WWW http://enleth.com http://heroes.net.pl JID [email protected]
Index: spice.spec =================================================================== RCS file: /cvsroot/packages/spice/spice.spec,v retrieving revision 1.16 diff -u -r1.16 spice.spec --- spice.spec 12 Feb 2007 22:09:15 -0000 1.16 +++ spice.spec 8 Dec 2009 07:19:12 -0000 @@ -5,12 +5,14 @@ Summary(pt_BR.UTF-8): SPICE simulador de circuitos Name: spice Version: 3f5sfix -Release: 4 +Release: 5 License: BSD Group: Applications/Math Source0: http://www.ibiblio.org/pub/Linux/apps/circuits/%{name}%{version}.tar.gz # Source0-md5: b4a86690d2d56db3045a27ff75245356 -BuildRequires: XFree86-devel +Patch0: %{name}-gcc-4.1.patch +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXaw-devel BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -76,13 +78,15 @@ %prep %setup -q -n %{name}%{version} +%patch0 -p1 + %build ./util/build linux \ - CC_OPT="%{rpmcflags}" \ + CC_OPT="-I/usr/include/X11/ -I/usr/include/X11/Xaw/ %{rpmcflags}" \ LDFLAGS="-ltinfo -lm %{rpmldflags}" \ S_SPICE_EXEC_DIR="%{_libdir}/spice/" \ S_SPICE_LIB_DIR="%{_datadir}/spice/" \ - LIBX="-L/usr/X11R6/%{_lib} -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11" + LIBX="-L/usr/lib/X11/ -lXaw -lX11" %install rm -rf $RPM_BUILD_ROOT
diff -Nadurp spice3f5sfix.orig/src/lib/fte/graf.c spice3f5sfix/src/lib/fte/graf.c
--- spice3f5sfix.orig/src/lib/fte/graf.c 1999-06-11 14:38:56.000000000 +0200
+++ spice3f5sfix/src/lib/fte/graf.c 2006-05-21 21:49:52.000000000 +0200
@@ -52,6 +52,9 @@ double *readtics();
#define XFACTOR 2 /* How much to expand the X scale during iplot. */
#define YFACTOR 1.5 /* How much to expand the Y scale during iplot. */
+static drawlegend();
+static gr_resize_internal();
+
/*
* Start of a new graph.
* Fill in the data that gets displayed.
diff -Nadurp spice3f5sfix.orig/src/lib/fte/grid.c spice3f5sfix/src/lib/fte/grid.c
--- spice3f5sfix.orig/src/lib/fte/grid.c 1999-05-30 09:14:12.000000000 +0200
+++ spice3f5sfix/src/lib/fte/grid.c 2006-05-21 21:49:52.000000000 +0200
@@ -34,6 +34,9 @@ typedef enum { x_axis, y_axis } Axis;
ie, can get rid of it */
static bool scaleunits = true;
+static drawlingrid();
+static drawloggrid();
+
void
gr_fixgrid(graph, xdelta, ydelta, xtype, ytype)
GRAPH *graph;
diff -Nadurp spice3f5sfix.orig/src/lib/fte/x11.c spice3f5sfix/src/lib/fte/x11.c
--- spice3f5sfix.orig/src/lib/fte/x11.c 1999-06-19 14:09:37.000000000 +0200
+++ spice3f5sfix/src/lib/fte/x11.c 2006-05-21 21:50:35.000000000 +0200
@@ -81,6 +81,10 @@ static GRAPH *lasthardcopy; /* graph use
static int X11_Open = 0;
static int numdispplanes;
+static initlinestyles();
+static initcolors();
+static X_ScreentoData();
+
X11_Init()
{
diff -Nadurp spice3f5sfix.orig/src/lib/hlp/readhelp.c spice3f5sfix/src/lib/hlp/readhelp.c
--- spice3f5sfix.orig/src/lib/hlp/readhelp.c 1993-06-17 23:32:43.000000000 +0200
+++ spice3f5sfix/src/lib/hlp/readhelp.c 2006-05-21 21:49:52.000000000 +0200
@@ -41,8 +41,8 @@ Author: 1986 Wayne A. Christopher, U. C.
static char *getsubject();
static toplink *getsubtoplink();
-extern void sortlist(), tlfree();
-extern int sortcmp();
+static void sortlist(), tlfree();
+static int sortcmp();
static topic *alltopics = NULL;
diff -Nadurp spice3f5sfix.orig/src/lib/mfb/mfbcaps.c spice3f5sfix/src/lib/mfb/mfbcaps.c
--- spice3f5sfix.orig/src/lib/mfb/mfbcaps.c 1993-06-17 23:34:25.000000000 +0200
+++ spice3f5sfix/src/lib/mfb/mfbcaps.c 2006-05-21 21:49:52.000000000 +0200
@@ -43,9 +43,9 @@ static int hopcount; /* detect inf
FILE *POpen();
char *strcpy();
-char *MFBSkip();
+static char *MFBSkip();
char *MFBGetStr();
-char *MFBCapDecod();
+static char *MFBCapDecod();
int MFBGetNum();
int MFBGetFlag();
int MFBGetEnt();
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ pld-devel-pl mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
