The attached patches fix some small problems I have noticed:
xml.patch - reading CDATA strings includes the terminating ]]>
exec.patch - intFpExecVEMaybeP ignores the first argument if it doesn't have a / in it which seems wrong. The patch is a possible fix for this.
rpm.patch - I had trouble with make rpm on my system, because I had overridden some of the defaults. The patch enforces the required defaults
Colin
diff -uNr fpc/fcl/xml/xmlread.pp fpc.w/fcl/xml/xmlread.pp
--- fpc/fcl/xml/xmlread.pp 2004-11-06 17:47:24.000000000 +0000
+++ fpc.w/fcl/xml/xmlread.pp 2005-01-22 10:07:27.000000000 +0000
@@ -1046,7 +1046,7 @@
begin
Inc(buf);
end;
- AOwner.AppendChild(doc.CreateCDATASection(GetString(OldBuf,buf-OldBuf)));
+
AOwner.AppendChild(doc.CreateCDATASection(GetString(OldBuf,buf-OldBuf-3))); {
Copy CDATA, discarding terminator }
Result := True;
end
else
--- fpc/rtl/unix/unix.pp 2004-11-27 12:20:46.000000000 +0000
+++ fpc.w/rtl/unix/unix.pp 2005-01-22 10:07:27.000000000 +0000
@@ -313,11 +313,12 @@
// execp puts newcmd here.
args^:=pchar(newcmd);
- End;
+ End else
+ newcmd:=pathname;
// repeat
// if searchpath then args^:=pchar(commandtorun)
- IntFpExecVEMaybeP:=fpExecVE(Args^,Args,MyEnv);
+ IntFpExecVEMaybeP:=fpExecVE(newcmd,Args,MyEnv);
{
// Code that if exec fails due to permissions, tries to run it with sh
// Should we deallocate p on fail? -> no fpexit is run no matter what
diff -uNr fpc/Makefile.fpc fpc.w/Makefile.fpc
--- fpc/Makefile.fpc 2005-01-11 20:53:05.000000000 +0000
+++ fpc.w/Makefile.fpc 2005-01-22 10:07:27.000000000 +0000
@@ -623,6 +623,10 @@
rm -rf $(RPMSRCDIR)
# Create fpc.spec, include our own builddir
echo "%define _topdir $(RPMDIR)" > $(RPMSPECFILE)
+ echo "%define _sourcedir $(RPMDIR)/SOURCES" >> $(RPMSPECFILE)
+ echo "%define _builddir $(RPMDIR)/BUILD" >> $(RPMSPECFILE)
+ echo "%define _rpmdir $(RPMDIR)/RPMS" >> $(RPMSPECFILE)
+ echo "%define _srcrpmdir $(RPMDIR)/SRPMS" >> $(RPMSPECFILE)
cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
ifndef NODOCS
cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)
_______________________________________________ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/mailman/listinfo/fpc-devel
