Attachment 220032 Details for Bug 251426 – Fix build with FreePascal 3.2.0

[patch] Fix build with FreePascal 3.2.0

doublecmd-0.9.9_1-fix.patch (text/plain), 1.63 KB, created by Beñat Gonzalez Etxepare on 2020-11-27 18:04:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beñat Gonzalez Etxepare

Created: 2020-11-27 18:04:23 UTC

Size: 1.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 556442)
>+++ Makefile	(working copy)
>@@ -25,7 +25,7 @@
> 		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
> 
>Index: files/patch-components_multithreadprocs_mtpcpu.pas
>===================================================================
>--- files/patch-components_multithreadprocs_mtpcpu.pas	(nonexistent)
>+++ files/patch-components_multithreadprocs_mtpcpu.pas	(working copy)
>@@ -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)}
>
>Property changes on: files/patch-components_multithreadprocs_mtpcpu.pas
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

bbtruk: maintainer-approval+

Actions: View | Diff

Attachments on bug 251426: 220032