From owner-svn-ports-all@freebsd.org Fri Feb 12 11:05:36 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CBD4D54AC61; Fri, 12 Feb 2021 11:05:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DcVz45G31z4kqy; Fri, 12 Feb 2021 11:05:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9CE85228FD; Fri, 12 Feb 2021 11:05:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11CB5ach082758; Fri, 12 Feb 2021 11:05:36 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11CB5aZg082756; Fri, 12 Feb 2021 11:05:36 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202102121105.11CB5aZg082756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Fri, 12 Feb 2021 11:05:36 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in branches/2021Q1/x11-fm/doublecmd: . files X-SVN-Commit-Revision: 565006 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2021 11:05:36 -0000 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