fpc: 3.0.4 -> 3.2.0
There was no 3.1 for some reason. The old sed-based path patching was broken and resulted in syntax errors since it was a bit over-eager. Instead of fixing it, I decided to replace it with a patch file which is easier to inspect and will fail in a more obvious way next time. The patch is now applied unconditionally, since it actually applies to all linux platforms. The changes are localized to linux-specific code, so it does not hurt to apply it on non-linux platforms as well. Hedgewars needs a small fix to work with the new version. Done in the same commit to avoid a broken commit.
This commit is contained in:
@@ -34,6 +34,10 @@ mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace gameServer/CMakeLists.txt \
|
||||
--replace mask evaluate
|
||||
|
||||
# compile with fpc >= 3.2.0
|
||||
# https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26
|
||||
sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -42,7 +46,7 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
|
||||
# hslogger brings network-3 and network-bsd which conflict with
|
||||
# hslogger brings network-3 and network-bsd which conflict with
|
||||
# network-2.6.3.1
|
||||
preConfigure = ''
|
||||
substituteInPlace gameServer/CMakeLists.txt \
|
||||
|
||||
Reference in New Issue
Block a user