Date: Fri, 12 Feb 2021 11:05:36 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r565006 - in branches/2021Q1/x11-fm/doublecmd: . files Message-ID: <202102121105.11CB5aZg082756@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Fri Feb 12 11:05:35 2021 New Revision: 565006 URL: https://svnweb.freebsd.org/changeset/ports/565006 Log: MFH: r565005 x11-fm/doublecmd: multiple instances fix * Fix fatal error when multiple instances of the app are executed PR: 253432 Submitted by: bbtruk@users.sourceforge.net (maintainer) Added: branches/2021Q1/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas - copied unchanged from r565005, head/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas Modified: branches/2021Q1/x11-fm/doublecmd/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/x11-fm/doublecmd/Makefile ============================================================================== --- branches/2021Q1/x11-fm/doublecmd/Makefile Fri Feb 12 11:02:44 2021 (r565005) +++ branches/2021Q1/x11-fm/doublecmd/Makefile Fri Feb 12 11:05:35 2021 (r565006) @@ -3,6 +3,7 @@ PORTNAME= doublecmd PORTVERSION= 0.9.10 +PORTREVISION= 3 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} Copied: branches/2021Q1/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas (from r565005, head/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas Fri Feb 12 11:05:35 2021 (r565006, copy of r565005, head/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas) @@ -0,0 +1,44 @@ +--- src/platform/unix/upipeserver.pas.orig 2020-12-31 11:38:58 UTC ++++ src/platform/unix/upipeserver.pas +@@ -30,9 +30,13 @@ function GetPipeFileName(const FileName: String; Globa + + implementation + ++{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)} ++ {$DEFINE USE_XDG} ++{$ENDIF} ++ + uses + SimpleIPC, BaseUnix, uPollThread +-{$IF DEFINED(LINUX)} ++{$IF DEFINED(USE_XDG)} + , uXdg + {$ENDIF} + ; +@@ -65,7 +69,7 @@ Type + + function GetPipeFileName(const FileName: String; Global : Boolean): String; + begin +-{$IF DEFINED(LINUX)} ++{$IF DEFINED(USE_XDG)} + Result:= IncludeTrailingBackslash(GetUserRuntimeDir) + FileName; + {$ELSE} + Result:= GetTempDir(Global) + ApplicationName + '-' + IntToStr(fpGetUID) + PathDelim + FileName; +@@ -89,7 +93,7 @@ begin + end; + + constructor TPipeServerComm.Create(AOWner: TSimpleIPCServer); +-{$IF NOT DEFINED(LINUX)} ++{$IF NOT DEFINED(USE_XDG)} + var + Info: TStat; + Directory: String; +@@ -101,7 +105,7 @@ begin + FFileName:= FFileName + '-' + IntToStr(fpGetPID); + if FFileName[1] <> '/' then + FFileName:= GetPipeFileName(FFileName, Owner.Global); +-{$IF NOT DEFINED(LINUX)} ++{$IF NOT DEFINED(USE_XDG)} + // Verify directory owner + Directory:= ExtractFileDir(FFileName); + if not DirectoryExists(Directory) then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102121105.11CB5aZg082756>