devel/pl pl-5.4.6-visibilityabuse.patch,NONE,1.1 pl.spec,1.11,1.12

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/devel/pl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26057

Modified Files:
	pl.spec 
Added Files:
	pl-5.4.6-visibilityabuse.patch 
Log Message:
Fix ppc and probably also x86_64 build

pl-5.4.6-visibilityabuse.patch:

--- NEW FILE pl-5.4.6-visibilityabuse.patch ---
--- pl-5.4.6/packages/xpce/src/ker/proto.h.orig	2005-02-23 14:36:14.105778596 +0000
+++ pl-5.4.6/packages/xpce/src/ker/proto.h	2005-02-23 14:38:54.422339376 +0000
@@ -1,3 +1,5 @@
+#include "../config.h"
+
 #define COMMON(type) type SO_LOCAL
 
 /* /staff/jan/src/pl/packages/xpce/src/ker/alloc.c */
@@ -152,7 +154,9 @@
 COMMON(void)	msleep(int time);
 COMMON(void)	msleep(int time);
 COMMON(void)	msleep(int time);
+#ifndef HAVE_GETDTABLESIZE
 COMMON(int)	getdtablesize(void);
+#endif
 COMMON(int)	pceAssert(int expr, char *text, char *file, int line);
 COMMON(void)	at_pce_exit(atexit_function f, int flags);
 COMMON(void)	run_pce_exit_hooks(int rval);
@@ -305,8 +309,6 @@
 COMMON(status)	debuggingPce(Pce pce, Bool val);
 COMMON(status)	exceptionPcev(Pce pce, Name name, int argc, Any *argv);
 COMMON(status)	exceptionPce(Pce pce, Name kind, ...);
-COMMON(int)	getdtablesize(void);
-COMMON(int)	getdtablesize(void);
 COMMON(Name)	getHostnamePce(Pce pce);
 COMMON(status)	catchErrorSignalsPce(Pce pce, Bool val);
 COMMON(status)	resetPce(Pce pce);


Index: pl.spec
===================================================================
RCS file: /cvs/extras/devel/pl/pl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pl.spec	21 Feb 2005 22:29:43 -0000	1.11
+++ pl.spec	23 Feb 2005 14:55:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.4.6
-Release:	6
+Release:	7
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
@@ -11,10 +11,10 @@
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch:		pl-5.4.6-rpath.patch
 Patch1:		pl-5.4.6-multilib.patch
+Patch2:		pl-5.4.6-visibilityabuse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
-ExcludeArch:	x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -28,6 +28,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1 -b .multilib
+%patch2 -p1 -b .vis
 (
    mkdir doc-install
    cd doc-install
@@ -73,6 +74,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Feb 23 2005 David Woodhouse <dwmw2 at infradead.org> - 5.4.6-7
+- Fix visibility abuse. This may well fix x86_64 too, so re-enable that.
+
 * Mon Feb 21 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.6-6
 - Exclude x86_64 for now (bugzilla 149038)