Merge remote-tracking branch 'origin/develop' into rip-out-folder-data

Author: lighterowl

.github/build_macos.sh

@@ -33,11 +33,10 @@ fpc_lazarus_build_install() {
   mkdir -p "$sdk_dir"
   cd "$sdk_dir"
 
-  # use a private fork which includes a fix for compilation under Sequoia
-  readonly fpc324_rc1_commit='dae96b96a1839e1a3624c664d6293661cc4bed67'
-  curl -L -o fpc-src.tar.bz2 "https://gitlab.com/dkk089/fpc-src/-/archive/${fpc324_rc1_commit}/fpc-src-${fpc324_rc1_commit}.tar.bz2"
+  readonly fpc324_rc1_commit='56baf314b5ebf4e5a44fe3e214914fa2e1b34adb'
+  curl -L -o fpc-src.tar.bz2 "https://gitlab.com/freepascal.org/fpc/source/-/archive/${fpc324_rc1_commit}/fpc-src-${fpc324_rc1_commit}.tar.bz2"
   tar xf fpc-src.tar.bz2
-  mv "fpc-src-${fpc324_rc1_commit}" fpc-src
+  mv "source-${fpc324_rc1_commit}" fpc-src
   cd fpc-src
 
   mkdir -p "${fpc_installdir}"

.github/build_windows.ps1

@@ -28,7 +28,7 @@ function FPC-Lazarus-Build-Install {
 
     $env:Path = "${fpc322}\bin\i386-win32;" + $env:Path
 
-    $fpc324_commit = 'cd84c2d5cd1f7b17de0ca0b62c3d35c661f535b1'
+    $fpc324_commit = '56baf314b5ebf4e5a44fe3e214914fa2e1b34adb'
     My-Download -Uri "https://gitlab.com/freepascal.org/fpc/source/-/archive/${fpc324_commit}/source-${fpc324_commit}.zip" -OutFile fpc-324-rc1.zip
 
     # we could use Expand-Archive but it takes an eternity and then some
@@ -43,7 +43,7 @@ function FPC-Lazarus-Build-Install {
     fpcmkcfg -d basepath=${fpc324} -o "${fpc324}\bin\i386-win32\fpc.cfg"
 
     cd "$sdk_dir"
-    $lazarus_commit = 'dab5c509c6fd70f8fac2144e468291899286616f'
+    $lazarus_commit = 'cadda6230398688d6106fe37fb0673a9a2bf0cf3'
     My-Download -Uri "https://gitlab.com/dkk089/lazarus/-/archive/${lazarus_commit}/lazarus-${lazarus_commit}.zip" -OutFile lazarus-src.zip
     7z x lazarus-src.zip
 

.github/workflows/linux.yml

@@ -10,7 +10,7 @@ jobs:
   build-linux:
 
     runs-on: ubuntu-latest
-    container: lighterowl/transgui-sdk:1.2
+    container: lighterowl/transgui-sdk:1.3
 
     steps:
     - uses: actions/checkout@v1

main.pas

@@ -1246,14 +1246,12 @@ function CheckAppParams: boolean;
   Ini.CacheUpdates:=True;
 
   // Check for outdated IPC file
-  if FileExistsUTF8(FIPCFileName) then begin
-    h:=FileOpenUTF8(FIPCFileName, fmOpenRead or fmShareDenyNone);
-    if h <> INVALID_HANDLE_VALUE then begin
-      i:=FileGetDate(h);
-      FileClose(h);
-      if (i > 0) and (Abs(Now - FileDateToDateTime(i)) > 1/MinsPerDay) then
-        DeleteFileUTF8(FIPCFileName);
-    end;
+  h:=FileOpenUTF8(FIPCFileName, fmOpenRead or fmShareDenyNone);
+  if h <> System.THandle(feInvalidHandle) then begin
+    i:=FileGetDate(h);
+    FileClose(h);
+    if (i > 0) and (Abs(Now - FileDateToDateTime(i)) > 1/MinsPerDay) then
+      DeleteFileUTF8(FIPCFileName);
   end;
 
   for i:=1 to ParamCount do begin