[fpc] - Upgrade to upstream release 2.4.2rc1.
Joost van der Sluis
joost at fedoraproject.org
Sat Oct 23 20:30:26 UTC 2010
commit d7cfaeb3876f7992dbe6d8d1afffedff3ac23ea7
Author: Joost van der Sluis <joost at cnoc.nl>
Date: Sat Oct 23 22:25:57 2010 +0200
- Upgrade to upstream release 2.4.2rc1.
.gitignore | 1 +
....2.4-build-id.patch => fpc-2.4.2-build-id.patch | 6 ++--
fpc-2.4.2-r15671.patch | 26 ++++++++++++++++++++
...t.patch => fpc-2.4.2-samplecfg_32and64bit.patch | 15 ++++-------
fpc.spec | 21 ++++++++++-----
sources | 2 +-
6 files changed, 51 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 693a633..0bd1b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
fpcbuild-2.4.0.tar.gz
+/fpcbuild-2.4.2rc1.tar.gz
diff --git a/fpc-2.2.4-build-id.patch b/fpc-2.4.2-build-id.patch
similarity index 79%
rename from fpc-2.2.4-build-id.patch
rename to fpc-2.4.2-build-id.patch
index a94b256..8bc4a6d 100644
--- a/fpc-2.2.4-build-id.patch
+++ b/fpc-2.4.2-build-id.patch
@@ -1,9 +1,9 @@
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
---- fpcsrc/compiler/utils/samplecfg (version 2.2.4)
+--- fpcsrc/compiler/utils/samplecfg (version 2.4.2)
+++ fpcsrc/compiler/utils/samplecfg (working copy)
-@@ -367,6 +367,11 @@
- # to perform
+@@ -379,6 +379,11 @@
+ #endif
# -----------------------
+# Use BuildId by default
diff --git a/fpc-2.4.2-r15671.patch b/fpc-2.4.2-r15671.patch
new file mode 100644
index 0000000..7db69cb
--- /dev/null
+++ b/fpc-2.4.2-r15671.patch
@@ -0,0 +1,26 @@
+Index: fpcsrc/utils/fpdoc/dwlinear.pp
+===================================================================
+--- fpcsrc/utils/fpdoc/dwlinear.pp (revision 15670)
++++ fpcsrc/utils/fpdoc/dwlinear.pp (revision 15671)
+@@ -869,7 +869,9 @@
+ WriteSeeAlso(DocNode);
+ EndProcedure;
+ WriteExample(DocNode);
+- end;
++ end
++ else
++ EndProcedure;
+ end;
+ end;
+
+@@ -970,7 +972,9 @@
+ WriteSeeAlso(DocNode);
+ EndProperty;
+ WriteExample(DocNode);
+- end;
++ end
++ else
++ EndProperty;
+ end;
+ end;
+
diff --git a/fpc-2.2.4-samplecfg_32and64bit.patch b/fpc-2.4.2-samplecfg_32and64bit.patch
similarity index 89%
rename from fpc-2.2.4-samplecfg_32and64bit.patch
rename to fpc-2.4.2-samplecfg_32and64bit.patch
index d7ef734..18d69aa 100644
--- a/fpc-2.2.4-samplecfg_32and64bit.patch
+++ b/fpc-2.4.2-samplecfg_32and64bit.patch
@@ -1,6 +1,6 @@
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
---- fpcsrc/compiler/utils/samplecfg (version 2.2.4)
+--- fpcsrc/compiler/utils/samplecfg (version 2.4.2)
+++ fpcsrc/compiler/utils/samplecfg (working copy)
@@ -34,9 +34,10 @@
@@ -21,7 +21,7 @@ Index: fpcsrc/compiler/utils/samplecfg
fi
-FPCBIN=`dirname "$1"`/../../bin/fpc
-FPBIN=`dirname "$1"`/../../bin/fp
--sysfpdirbase=`dirname "$1"`/`$FPCBIN -iV`
+-sysfpdirbase=`dirname "$1"`/`"$FPCBIN" -iV`
+FPCBIN="$1"/bin/fpc
+FPBIN="$1"/bin/fp
+fpctargetproc=`$FPCBIN -iTP`
@@ -32,13 +32,13 @@ Index: fpcsrc/compiler/utils/samplecfg
+ libdir=lib
+fi
+if [ "$3" ]; then
-+ sysfpdirbase="$3"/"$libdir"/fpc/`$FPCBIN -iV`
++ sysfpdirbase="$3"/"$libdir"/fpc/`"$FPCBIN" -iV`
+else
-+ sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
++ sysfpdirbase="$1"/"$libdir"/fpc/`"$FPCBIN" -iV`
+fi
sysfpdirbase2=$sysfpdirbase/ide
sysfpdir=$sysfpdirbase2/text
- fpctargetos=`$FPCBIN -iTO`
+ fpctargetos=`"$FPCBIN" -iTO`
@@ -223,7 +236,9 @@
@@ -50,7 +50,7 @@ Index: fpcsrc/compiler/utils/samplecfg
# Write (.)fpc.cfg
echo Writing sample configuration file to $fpccfgfile
-@@ -359,26 +374,48 @@
+@@ -372,23 +386,45 @@
# path to the messagefile, not necessary anymore but can be used to override
# the default language
@@ -61,9 +61,6 @@ Index: fpcsrc/compiler/utils/samplecfg
+#-Fr$FPCPATH64/msg/errore.msg
+#-Fr$FPCPATH64/msg/errorn.msg
- # searchpath for includefiles
- #-Fi/pp/inc;/pp/rtl/inc
-
#IFDEF FPCAPACHE_1_3
--Fu$FPCPATH/units/\$fpctarget/httpd13/
+#IFDEF CPU64
diff --git a/fpc.spec b/fpc.spec
index 3658c7d..7827e63 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -1,18 +1,20 @@
Name: fpc
-Version: 2.4.0
-Release: 1%{?dist}
+Version: 2.4.2
+Release: 0.1.rc1%{?dist}
Summary: Free Pascal Compiler
Group: Development/Languages
License: GPLv2+ and LGPLv2+ with exceptions
URL: http://www.freepascal.org/
-Source0: ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-%{version}.tar.gz
+Source0: ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-%{version}rc1.tar.gz
# This is only needed when useprebuiltcompiler is defined.
# But it's not in an 'if defined' block, since the file has to be included in the srpm
# Thus you should enable this line when useprebuildcompiler is defined for any target
# Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
-Patch0: fpc-2.2.4-samplecfg_32and64bit.patch
-Patch1: fpc-2.2.4-build-id.patch
+Patch0: fpc-2.4.2-samplecfg_32and64bit.patch
+Patch1: fpc-2.4.2-build-id.patch
+Patch2: fpc-2.4.2-r15671.patch
+Patch3: fpc-2.4.2-r16198.patch
Requires: gpm, ncurses, binutils
%if ! %{defined useprebuiltcompiler}
@@ -67,12 +69,14 @@ automatical-code generation purposes.
%prep
%if %{defined useprebuiltcompiler}
-%setup -a1 -n fpcbuild-%{version} -q
+%setup -a1 -n fpcbuild-%{version}rc1 -q
%else
-%setup -n fpcbuild-%{version} -q
+%setup -n fpcbuild-%{version}rc1 -q
%endif
%patch0
%patch1
+%patch2
+%patch3
%build
# The source-files:
@@ -173,6 +177,9 @@ rm -rf %{buildroot}
%{_datadir}/fpcsrc
%changelog
+* Sat Oct 23 2010 Joost van der Sluis <joost at cnoc.nl> - 2.4.2-0.1.rc1
+- Upgrade to upstream release 2.4.2rc1.
+
* Wed May 5 2010 Joost van der Sluis <joost at cnoc.nl> - 2.4.0-1.fc14
- Drop fpc-2.2.4-stackexecute.patch since bug was fixed in 2.4.0
diff --git a/sources b/sources
index 1a33b8b..6f03249 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af49e9a8bb632f361395add30ece8934 fpcbuild-2.4.0.tar.gz
+0e8ef45bbb6b788f009e6eeed9003250 fpcbuild-2.4.2rc1.tar.gz
More information about the scm-commits
mailing list