git: 94a49ccb0d1d - main - x11-fm/doublecmd: Fix runtime
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Jul 2024 23:14:00 UTC
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=94a49ccb0d1dd2369ab5fa4a7c78f12c1e56d5bf commit 94a49ccb0d1dd2369ab5fa4a7c78f12c1e56d5bf Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2024-07-22 23:11:53 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2024-07-22 23:13:53 +0000 x11-fm/doublecmd: Fix runtime - Remove obsolete patch files Approved by: fluffy --- x11-fm/doublecmd/Makefile | 1 + ...-components_virtualterminal_source_unix_vtemupty.pas | 11 ----------- .../files/patch-src_platform_unix_upollthread.pas | 11 ----------- x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas | 17 +++++++++++++---- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index caa2503c911b..5ba6419dfc73 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -1,6 +1,7 @@ PORTNAME= doublecmd PORTVERSION= 1.1.15 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11-fm PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/x11-fm/doublecmd/files/patch-components_virtualterminal_source_unix_vtemupty.pas b/x11-fm/doublecmd/files/patch-components_virtualterminal_source_unix_vtemupty.pas deleted file mode 100644 index 66da8cc01f3a..000000000000 --- a/x11-fm/doublecmd/files/patch-components_virtualterminal_source_unix_vtemupty.pas +++ /dev/null @@ -1,11 +0,0 @@ ---- components/virtualterminal/source/unix/vtemupty.pas.orig 2024-01-04 17:04:32 UTC -+++ components/virtualterminal/source/unix/vtemupty.pas -@@ -171,7 +171,7 @@ end; - constructor TPtyDevice.Create(AOwner: TComponent); - begin - inherited Create(AOwner); -- if fpPipe(FEventPipe) < 0 then -+ if fpPipe(FEventPipe,0) < 0 then - WriteLn(SysErrorMessage(fpGetErrNo)) - else begin - // Set both ends of pipe non blocking diff --git a/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas b/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas deleted file mode 100644 index f378eb8b4f5a..000000000000 --- a/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas +++ /dev/null @@ -1,11 +0,0 @@ ---- src/platform/unix/upollthread.pas.orig 2019-12-08 11:40:55 UTC -+++ src/platform/unix/upollthread.pas -@@ -161,7 +161,7 @@ begin - // Create pipe for user triggered fake event - FEventPipe[0] := -1; - FEventPipe[1] := -1; -- if fpPipe(FEventPipe) < 0 then -+ if fpPipe(FEventPipe, longint(0)) < 0 then - Print(SysErrorMessage(fpGetErrNo)) - else begin - // Set both ends of pipe non blocking diff --git a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas index c7cc83f548b4..4d05ae5869f8 100644 --- a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas +++ b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas @@ -1,6 +1,6 @@ ---- src/uGlobsPaths.pas.orig 2024-02-29 18:56:08 UTC +--- src/uGlobsPaths.pas.orig 2024-07-22 23:07:50 UTC +++ src/uGlobsPaths.pas -@@ -3,7 +3,7 @@ var +@@ -3,7 +3,7 @@ unit uGlobsPaths; interface var @@ -9,11 +9,20 @@ gpCfgDir : String = ''; // directory from which configuration files are used gpGlobalCfgDir : String = ''; // config dir global for all user gpCmdLineCfgDir : String = ''; // config dir passed on the command line -@@ -11,6 +11,7 @@ var - gpPixmapPath : String = ''; // path to pixmaps +@@ -12,6 +12,7 @@ var gpHighPath : String = ''; // editor highlighter directory + gpCacheDir : String = ''; // cache directory gpThumbCacheDir : String = ''; // thumbnails cache directory + gpDocsDir : String = '%%DOCSDIR%%/'; // directory for help files //Global Configuration Filename const +@@ -87,7 +88,7 @@ procedure Initialize; + begin + gpExeFile := ParamStr(0); + gpExeFile := TryReadAllLinks(gpExeFile); +- gpExePath := ExtractFilePath(gpExeFile); ++ //gpExePath := ExtractFilePath(gpExeFile); + gpGlobalCfgDir := gpExePath + 'settings' + DirectorySeparator; + end; +