From nobody Mon Jul 22 23:14:00 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WSbgs3vRfz5QPLY; Mon, 22 Jul 2024 23:14:01 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSbgs0BLvz4s0h; Mon, 22 Jul 2024 23:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721690041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6NQRk5RFk+Jma84P2lRU5CTAHsWNITmJk63t1GC1q8=; b=XrKwqoOsQeZEPuZmv2O1OOeKf4U4ia0K0/z3avLd6OlaLTj5HIyHj7GknzXE9tUxXcnBFp lN1cV0ovFeOCF3M/YL/QIICV3Kv69+I1zgBbXeHYfmjoWK4B/xWKq58+nfi1Q8p94tIGd4 JgSDOTq3mGvYVuzg6DbjSaYj95ze7TC6OnCqW8Pf4poGZzRBqEwX8N0UUR4zptaoIQj3cq jkDsVR41OBG3AI1XicvBvOMjMHB9S5TnLij/mJP2MVGAgWZiQM6fqs4QCpQL55zcrG+GgX JeBY6/dh9Aa85Cb4Gd4Iv5nMPyRQqAGSfoTaZTAU+Vj5gUOYX5rTBfwVOPwDtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721690041; a=rsa-sha256; cv=none; b=l1BGxAq9MPJxrlXBinR8hXY/Vzbjgt0u7V7JSGqmcS+5OT/ka4BXk0A+jMcyTsRRyodsX0 uMUMwJUfEMQuFvstSx0S8k3hQNWXUKhK8SHTKz+fRJPGoYKQ1bRQVa2PIPOhu7cQ8h3SAR 1sn3wbLd7JmPhQ0Gsef5xxsGIAtfNWTc0A7i0ojw9FP/u+fsWz902eNMHq4yd4IfjbnYPy QAGmAJjoWzBXIyDDJEq6Y9l0CtRWZTQTQuvjLrzh8iLYabJd/5zcoUpX/GD7VcEnVrBUCF siLE8wl6QKYDiUK/DhLUtnaN4vT67HY80hRotABTs/kwO61C87IzSBCSxsJfDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721690041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6NQRk5RFk+Jma84P2lRU5CTAHsWNITmJk63t1GC1q8=; b=qSv7KL3ppVEPb26smvBd7WxWLtL6Q4I8UYyCoFvh9pxRAflqCBgeDSpDkVjn+8S1WpjNtm RojSV8pKjmRBG/c4Qgc60buQWtvCkPDDrhWCfCTwij5l3tXyQ4XLBLSkgwM0gvPmnwiOyl 9wq6vJ9vq4/dLZgBzHX8jRsVU8taHOOmIY46yHhxUTh3HRLO33XHLVfz2FqsB4/b6AmU36 CJM8I3lGpverenRVpAwigkkp1VLvDEzbCIem8mYB0p4l+9jTBZk/InMav03W6q9BqHbizX vw8zoPumebtePzsyuTFQhf/i+gx8/kIj/aliWlLxOdwxf9nvS8OABmo8qXQXew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WSbgr6wV9z13r6; Mon, 22 Jul 2024 23:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46MNE03u081624; Mon, 22 Jul 2024 23:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MNE00F081621; Mon, 22 Jul 2024 23:14:00 GMT (envelope-from git) Date: Mon, 22 Jul 2024 23:14:00 GMT Message-Id: <202407222314.46MNE00F081621@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 94a49ccb0d1d - main - x11-fm/doublecmd: Fix runtime List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94a49ccb0d1dd2369ab5fa4a7c78f12c1e56d5bf Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=94a49ccb0d1dd2369ab5fa4a7c78f12c1e56d5bf commit 94a49ccb0d1dd2369ab5fa4a7c78f12c1e56d5bf Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-07-22 23:11:53 +0000 Commit: Jose Alonso Cardenas Marquez 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; +