From cd70251b8c6da04f90b8773d710703acae3973c1 Mon Sep 17 00:00:00 2001 From: Mikael Urankar Date: Sun, 29 Nov 2020 10:42:29 +0000 Subject: x11-fm/doublecmd: Fix build with FreePascal 3.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 251426 Submitted by: Beñat Gonzalez Etxepare (maintainer) --- x11-fm/doublecmd/Makefile | 2 +- .../patch-components_multithreadprocs_mtpcpu.pas | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas (limited to 'x11-fm') diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index 234172073bc1..55304c4b76d3 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -25,7 +25,7 @@ USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \ fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr USE_GNOME= cairo glib20 USE_XORG= x11 -DOS2UNIX_FILES= src/dmhelpmanager.pas +DOS2UNIX_FILES= src/dmhelpmanager.pas components/multithreadprocs/mtpcpu.pas PLIST= ${WRKDIR}/pkg-plist diff --git a/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas b/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas new file mode 100644 index 000000000000..db3dc06a4aba --- /dev/null +++ b/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas @@ -0,0 +1,22 @@ +--- components/multithreadprocs/mtpcpu.pas.orig 2015-09-06 12:19:32 UTC ++++ components/multithreadprocs/mtpcpu.pas +@@ -69,15 +69,17 @@ end; + t = sysconf(_SC_NPROC_ONLN); + end; + {$ELSEIF defined(freebsd) or defined(darwin)} ++type ++ PSysCtl = {$IF FPC_FULLVERSION>=30200}pcint{$ELSE}pchar{$ENDIF}; + var + mib: array[0..1] of cint; +- len: cint; ++ len: csize_t; + t: cint; + begin + mib[0] := CTL_HW; + mib[1] := HW_NCPU; + len := sizeof(t); +- fpsysctl(pchar(@mib), 2, @t, @len, Nil, 0); ++ fpsysctl(PSysCtl(@mib), 2, @t, @len, Nil, 0); + Result:=t; + end; + {$ELSEIF defined(linux)} -- cgit v1.2.3