From nobody Fri Nov 22 10:58:12 2024 X-Original-To: dev-commits-ports-all@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 4XvsX50CSVz5dlPN; Fri, 22 Nov 2024 10:58:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvsX46Pz8z4dJW; Fri, 22 Nov 2024 10:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732273092; 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=l/TSZPeXtdaOvNHTpt/4uvPax7V8CEd5UdyqW1uVb1E=; b=ppcKPu3j1vyno5QKmkcu5Ye9gpwCVJKJC2F0pq9R2KRg9808mJ+K5NkAP+++ZWaIwGBYaL 9vw7abFZ+/Tr8KfaM/l/LLJ+3IEzhRTTlKJKmq5Z9J6ol/BBlBH6feF3O6b301lIA8eVHX mSc0VrZXWMt2K5hlt1WLU2FbdAoQZgbItBBDeBBxWhrEFT9o7CGoAaWguzxLP0V65qZ00H y8H5PQVna5pj7Kx15nsiUR3ttZEXTNGx/RfDz+g0g6xSR0E1sMbWOXrIOCQQvgxeDCOr4R +Mb0gmK+aMZjaoJEJWKEfTbSI6S+WlfP5JlkycE3eUnFC/wwB9ZDxwtg8O8HDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732273092; 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=l/TSZPeXtdaOvNHTpt/4uvPax7V8CEd5UdyqW1uVb1E=; b=TVnK3vMKsuMP0jZ6lxrvtJFTMLj1vigxJJ6L12xZAGyAyEpEeFiAMGmge3iDDdNFMzjMUC CUcmaS0Kpm4vOtU6qVdJRqyePSRbvFd8mhFOu5tMkKoWW5qH4P/CPK6e2gH2N1X/ntGLdM /OLSEZHL1PKRWovSGF7G2tjyjSxMXPg0PuZWEpGg8veZqckwodO+aCkMQ3mEj/jjXxir1F pic3BbwX6CBPaaifcA3ydeEFKTdxig7WHBUpeTsuCwGZO2ZxvS0xJ3d9it7fhTuLmqETTt u/n96D2Wd1s2Pw2n3E/XXrlOWfZME1UTS1YaFa41H9YF8NLfTZpvNelp3woirQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732273092; a=rsa-sha256; cv=none; b=e4Wg3WTaUiQChUbz/DgeR53qv02/D6XU2qO/8jV2pTjbZ4wANxzqYB2tSuYGuFK73eUyBl bCp43zhKOgQIdfSi0cM2aTH4jyTpXNTk1wClNQ624L7EZIh0e2VEe+bR5ZWj6xcTeWu1lm kuas3tlT4KBZwMMhIQWmJfOPgzsalSsxG4IH9uUmp9a9jFU7ZDX7ougGrRT5owddo+t7qz L67IFrUt2u1fl90D6Ca+YfxUmYOzguIr7fT+dYD3tJ8OCKam/thGGsfr46fMjNU6osXRi9 Feww+WyuYyOOwnkhHbBmqMEFaWx9VHCfFJbQ9R1gIetrzIc1IulrZd//8K36uA== 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 4XvsX45tmmzLp6; Fri, 22 Nov 2024 10:58:12 +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 4AMAwC8A011764; Fri, 22 Nov 2024 10:58:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AMAwCKd011761; Fri, 22 Nov 2024 10:58:12 GMT (envelope-from git) Date: Fri, 22 Nov 2024 10:58:12 GMT Message-Id: <202411221058.4AMAwCKd011761@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: dd18cfad31d3 - main - misc/far2l: update the port to version 2.6.4 (aka second chance) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd18cfad31d3e9c7eb8037389de6f97064f2fa73 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd18cfad31d3e9c7eb8037389de6f97064f2fa73 commit dd18cfad31d3e9c7eb8037389de6f97064f2fa73 Author: Alexey Dokuchaev AuthorDate: 2024-11-22 10:55:22 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-11-22 10:55:22 +0000 misc/far2l: update the port to version 2.6.4 (aka second chance) - Drop no longer applicable and hopefully no longer needed ARM64 intrinsic patches as __attribute__((__target__("+crypto"))) now apparently works as intended - Add somewhat hackish SetIcon() call to the GUI initialization routine so users can see the icon in the window title and while alt-tabbing through running programs - Disable WSL-specific clipboard support code and do not install related Windows-only scripts - Colorer had been rewritten to use libxml2 instead of Xerces-C Reported by: portscout Tested on: ref1{3,4}-aarch64.freebsd.org (clang 18.1.6) --- misc/far2l/Makefile | 18 +++++++------ misc/far2l/distinfo | 6 ++--- .../patch-WinPort_src_Backend_WinPortMain.cpp | 30 ++++++++++++++++++++++ .../files/patch-multiarc_src_formats_7z_C_AesOpt.c | 12 --------- .../patch-multiarc_src_formats_7z_C_CpuArch.c | 19 -------------- .../patch-multiarc_src_formats_7z_C_Sha1Opt.c | 12 --------- .../patch-multiarc_src_formats_7z_C_Sha256Opt.c | 12 --------- misc/far2l/pkg-plist | 18 +++++++++++-- 8 files changed, 59 insertions(+), 68 deletions(-) diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile index 3a6fd9530455..85a7b26d37db 100644 --- a/misc/far2l/Makefile +++ b/misc/far2l/Makefile @@ -1,7 +1,6 @@ PORTNAME= far2l -PORTVERSION= 2.6.3 +PORTVERSION= 2.6.4 DISTVERSIONPREFIX= v_ -PORTREVISION= 1 CATEGORIES= misc MAINTAINER= danfe@FreeBSD.org @@ -11,15 +10,15 @@ WWW= https://github.com/elfmz/far2l LICENSE= GPLv2 LIB_DEPENDS= libpcre.so:devel/pcre \ - libuchardet.so:textproc/uchardet \ - libxerces-c.so:textproc/xerces-c3 + libuchardet.so:textproc/uchardet RUN_DEPENDS= bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= elfmz -USES= cmake compiler:c++11-lang libarchive perl5 pkgconfig \ - shebangfix ssl +USES= cmake compiler:c++11-lang desktop-file-utils gnome \ + libarchive perl5 pkgconfig shebangfix ssl +USE_GNOME= libxml2 USE_PERL5= build SHEBANG_FILES= far2l/bootstrap/view.sh @@ -52,12 +51,15 @@ post-patch: @${REINPLACE_CMD} -e \ 's,pkg_search_module\(([[:alpha:]]*\)[^)]*,find_package\1,' \ ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's,^if (fmt_FOUND,& AND FALSE,' \ - ${WRKSRC}/colorer/CMakeLists.txt @${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \ -0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,' + @${REINPLACE_CMD} -e '/SetBackgroundColour/ { x; \ + s|^|SetIcon(wxIcon(wxStandardPaths::Get().GetInstallPrefix()\ + + "/share/icons/far2l.svg", wxBITMAP_TYPE_ICO));|; H; x; }' \ + ${WRKSRC}/WinPort/src/Backend/WX/wxMain.cpp post-stage: ${RMDIR} ${STAGEDIR}${PREFIX}/lib/far2l/Plugins/NetRocks/plug/SHELL + ${RM} ${STAGEDIR}${DATADIR}/wslgclip.* .include diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo index 8d36dc67ad6d..9ad4179dea8d 100644 --- a/misc/far2l/distinfo +++ b/misc/far2l/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1721934377 -SHA256 (elfmz-far2l-v_2.6.3_GH0.tar.gz) = ffb216a4f9b24bb45a2194d5e833c60334a4f4e9150c1ce0fc8eddffa6a9e173 -SIZE (elfmz-far2l-v_2.6.3_GH0.tar.gz) = 6730071 +TIMESTAMP = 1731913079 +SHA256 (elfmz-far2l-v_2.6.4_GH0.tar.gz) = 49bf67dd5cb2069b1212ff3256d85123ceaee74470bedeef9ef1836582e4a5bc +SIZE (elfmz-far2l-v_2.6.4_GH0.tar.gz) = 6854330 diff --git a/misc/far2l/files/patch-WinPort_src_Backend_WinPortMain.cpp b/misc/far2l/files/patch-WinPort_src_Backend_WinPortMain.cpp new file mode 100644 index 000000000000..3d2eb56e0951 --- /dev/null +++ b/misc/far2l/files/patch-WinPort_src_Backend_WinPortMain.cpp @@ -0,0 +1,30 @@ +--- WinPort/src/Backend/WinPortMain.cpp.orig 2024-11-18 06:57:59 UTC ++++ WinPort/src/Backend/WinPortMain.cpp +@@ -480,6 +480,7 @@ extern "C" int WinPortMain(const char *full_exe_path, + #endif + } + ++#ifdef __linux__ + bool wsl_clipboard_workaround = (arg_opts.ext_clipboard.empty() + && getenv("WSL_DISTRO_NAME") + && !getenv("FAR2L_WSL_NATIVE")); +@@ -498,6 +499,7 @@ extern "C" int WinPortMain(const char *full_exe_path, + arg_opts.ext_clipboard.clear(); + } + } ++#endif + + int result = -1; + if (!arg_opts.tty) { +@@ -518,9 +520,11 @@ extern "C" int WinPortMain(const char *full_exe_path, + if (!WinPortMainBackend_p(&a) ) { + fprintf(stderr, "Cannot use GUI backend\n"); + arg_opts.tty = !arg_opts.notty; ++#ifdef __linux__ + if (wsl_clipboard_workaround) { + //arg_opts.ext_clipboard.clear(); + } ++#endif + } + } else { + fprintf(stderr, "Cannot find backend entry point, error %s\n", dlerror()); diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_AesOpt.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_AesOpt.c deleted file mode 100644 index e2f318f57b1c..000000000000 --- a/misc/far2l/files/patch-multiarc_src_formats_7z_C_AesOpt.c +++ /dev/null @@ -1,12 +0,0 @@ ---- multiarc/src/formats/7z/C/AesOpt.c.orig 2023-01-14 23:53:02 UTC -+++ multiarc/src/formats/7z/C/AesOpt.c -@@ -537,7 +537,8 @@ VAES_COMPAT_STUB (AesCtr_Code_HW) - - #if defined(__clang__) || defined(__GNUC__) - #ifdef MY_CPU_ARM64 -- #define ATTRIB_AES __attribute__((__target__("+crypto"))) -+ #define __ARM_FEATURE_AES -+ #define ATTRIB_AES __attribute__((__target__("aes"))) - #else - #define ATTRIB_AES __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) - #endif diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_CpuArch.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_CpuArch.c deleted file mode 100644 index c8af49af90ff..000000000000 --- a/misc/far2l/files/patch-multiarc_src_formats_7z_C_CpuArch.c +++ /dev/null @@ -1,19 +0,0 @@ ---- multiarc/src/formats/7z/C/CpuArch.c.orig 2023-01-14 23:53:02 UTC -+++ multiarc/src/formats/7z/C/CpuArch.c -@@ -422,7 +422,16 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP - - #ifdef USE_HWCAP - -+#ifdef __FreeBSD__ -+static unsigned long getauxval(int aux) -+{ -+ unsigned long auxval = 0; -+ elf_aux_info(aux, &auxval, sizeof(auxval)); -+ return auxval; -+} -+#else - #include -+#endif - - #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ - BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP) & (HWCAP_ ## name2)) ? 1 : 0; } diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha1Opt.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha1Opt.c deleted file mode 100644 index 39bb0317e2d6..000000000000 --- a/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha1Opt.c +++ /dev/null @@ -1,12 +0,0 @@ ---- multiarc/src/formats/7z/C/Sha1Opt.c.orig 2023-01-14 23:53:02 UTC -+++ multiarc/src/formats/7z/C/Sha1Opt.c -@@ -234,7 +234,8 @@ void MY_FAST_CALL Sha1_UpdateBlocks_HW(UInt32 state[5] - - #if defined(__clang__) || defined(__GNUC__) - #ifdef MY_CPU_ARM64 -- #define ATTRIB_SHA __attribute__((__target__("+crypto"))) -+ #define __ARM_FEATURE_SHA2 -+ #define ATTRIB_SHA __attribute__((__target__("sha2"))) - #else - #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) - #endif diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha256Opt.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha256Opt.c deleted file mode 100644 index c36041a3e2cf..000000000000 --- a/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha256Opt.c +++ /dev/null @@ -1,12 +0,0 @@ ---- multiarc/src/formats/7z/C/Sha256Opt.c.orig 2023-01-14 23:53:02 UTC -+++ multiarc/src/formats/7z/C/Sha256Opt.c -@@ -234,7 +234,8 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[ - - #if defined(__clang__) || defined(__GNUC__) - #ifdef MY_CPU_ARM64 -- #define ATTRIB_SHA __attribute__((__target__("+crypto"))) -+ #define __ARM_FEATURE_SHA2 -+ #define ATTRIB_SHA __attribute__((__target__("sha2"))) - #else - #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) - #endif diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist index 12f363a5c123..0231550995ae 100644 --- a/misc/far2l/pkg-plist +++ b/misc/far2l/pkg-plist @@ -27,6 +27,8 @@ lib/far2l/far2l_askpass lib/far2l/far2l_sudoapp %%X11%%lib/far2l/far2l_ttyx.broker share/applications/far2l.desktop +share/applications/far2ledit.desktop +share/bash-completion/completions/far2l %%DATADIR%%/FarBel.lng %%DATADIR%%/FarCze.lng %%DATADIR%%/FarEng.hlf @@ -498,6 +500,7 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/filecase/plug/CaseRus.lng %%DATADIR%%/Plugins/incsrch/plug/incsrche.hlf %%DATADIR%%/Plugins/incsrch/plug/incsrchr.hlf +%%DATADIR%%/Plugins/incsrch/plug/isrcbel.lng %%DATADIR%%/Plugins/incsrch/plug/isrceng.lng %%DATADIR%%/Plugins/incsrch/plug/isrcrus.lng %%DATADIR%%/Plugins/inside/plug/bel.lng @@ -523,22 +526,33 @@ share/applications/far2l.desktop %%DATADIR%%/trash.sh %%DATADIR%%/unmount.sh %%DATADIR%%/view.sh -%%DATADIR%%/wslgclip.sh -%%DATADIR%%/wslgclip.vbs %%DATADIR%%/xlats.ini share/icons/far2l.svg +share/icons/far2ledit.svg share/icons/hicolor/1024x1024/apps/far2l.svg +share/icons/hicolor/1024x1024/apps/far2ledit.svg share/icons/hicolor/128x128/apps/far2l.svg +share/icons/hicolor/128x128/apps/far2ledit.svg share/icons/hicolor/16x16/apps/far2l.svg +share/icons/hicolor/16x16/apps/far2ledit.svg share/icons/hicolor/192x192/apps/far2l.svg +share/icons/hicolor/192x192/apps/far2ledit.svg share/icons/hicolor/24x24/apps/far2l.svg +share/icons/hicolor/24x24/apps/far2ledit.svg share/icons/hicolor/256x256/apps/far2l.svg +share/icons/hicolor/256x256/apps/far2ledit.svg share/icons/hicolor/32x32/apps/far2l.svg +share/icons/hicolor/32x32/apps/far2ledit.svg share/icons/hicolor/48x48/apps/far2l.svg +share/icons/hicolor/48x48/apps/far2ledit.svg share/icons/hicolor/512x512/apps/far2l.svg +share/icons/hicolor/512x512/apps/far2ledit.svg share/icons/hicolor/64x64/apps/far2l.svg +share/icons/hicolor/64x64/apps/far2ledit.svg share/icons/hicolor/72x72/apps/far2l.svg +share/icons/hicolor/72x72/apps/far2ledit.svg share/icons/hicolor/96x96/apps/far2l.svg +share/icons/hicolor/96x96/apps/far2ledit.svg share/man/man1/far2l.1.gz share/man/ru/man1/far2l.1.gz @dir lib/far2l/Plugins/calc/plug/units