From nobody Fri Oct 6 16:39:18 2023 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 4S2DfH1Wvzz4x2TB; Fri, 6 Oct 2023 16:39:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S2DfH0XTGz4QD1; Fri, 6 Oct 2023 16:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696610359; 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=Dao1hMMFkzQAReAeCpX/fZgTe0HG0Y4iJ27jlwolYBE=; b=BAohP2Jl05XbICJhNOVOLzCoyviMT2Ov23Z/3DMvWnuxpSyO8cyOZBVgNo05NsN6X+8TKW iTowWt8BRpI6dMdilyNuqsZf5XphJupIabxuEbwPcqDHOTpn+R6QVL6LBZoTQWycAto+Dt A9iCmHbGP6S4sLJ5S4A6qOwqErxXncnJD+Z0Dw++JZC6SwlnYpSs4ezgve1pdL0Pw5rRNg vmm6K1UldrL1uaSLObG/uNqCBwLVa2TcZnz7JCTBL8q6q4I2aPMCmTgXg7wIImcCOjfJXF xs11TX9LKsW0ECXHHZy188kUGc0YtiAH1NhKsaQTbnUZD2nAkMv4CK8Wwun2UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696610359; a=rsa-sha256; cv=none; b=dIoZjXZh++diQpOMigWx0u3DJUh5MiEzPLv68N6vOcUTmWaROh2hNH0cANxHgzZMD8Se7V PGiS092HSxbYEh8B/1MPDUET+xJjujMDGnvaLFhYausP97kCx5Lke+V8u6qtmk+c4+dqFq t/ehV+925IvWPM0R5KYKKaaM3gOsDviXxQhZ+S0kRId6pZWqQUVEY6ONsRpU8A9UDr/H03 ysX3iEZGhFF5zFNzek4oEkDLHQOGM2C3ty66Kpn2OkP3w19iSYeJ+8wM5nO2Hw8ak3wGYy scGsveF+LPjbBkP45rLhVqqTNJpYivVhrmsnuot3mnvbmPJ5jTP+Ik/hGVEHxA== 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=1696610359; 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=Dao1hMMFkzQAReAeCpX/fZgTe0HG0Y4iJ27jlwolYBE=; b=G/gJqqOsmcxOPAqFmUn4IOGH1onnHOlje3wUrhM8paX6xZl4RyGlg6YSEHKQ3/vUf8fFdH XRIekMtkaOzkuuc6jxTsjCnoGQEc+hHrvXbQUM1+ub1f83q7N1wsoN1PPio2HWZouq8Yow l9aeS907KlPl55wB88hAv/kRN3Xs+T96eaFEIUQaCmzuqZRziY+rh4eFimKkI8l3nKGB9I NTdkN7/4ADbVXkRdql9vXD6ZermyP6sELJizSKw/PKoAmnyF4/SgNRKhYsfnF1MaB/Ej7N m94VYY7aRpSo76KMbvuFytAlqBnRz/tJTNEE0s0KKWRx6rvoiC2O9DHkPcyN5Q== 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 4S2DfG6H55zvwW; Fri, 6 Oct 2023 16:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396GdImb010419; Fri, 6 Oct 2023 16:39:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396GdIbS010416; Fri, 6 Oct 2023 16:39:18 GMT (envelope-from git) Date: Fri, 6 Oct 2023 16:39:18 GMT Message-Id: <202310061639.396GdIbS010416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 9df38c9ba1c5 - main - misc/far2l: fix build on big-endian 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df38c9ba1c5c3d5afa9ad7a7c9fb43ad10d4a7c Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9df38c9ba1c5c3d5afa9ad7a7c9fb43ad10d4a7c commit 9df38c9ba1c5c3d5afa9ad7a7c9fb43ad10d4a7c Author: Piotr Kubaj AuthorDate: 2023-10-06 16:08:15 +0000 Commit: Piotr Kubaj CommitDate: 2023-10-06 16:39:11 +0000 misc/far2l: fix build on big-endian /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:534:10: error: non-constant-expression cannot be narrowed from type 'DWORD' (aka 'unsigned int') to 'LONG' (aka 'int') in initializer list [-Wc++11-narrowing] {a->dwLowDateTime, (LONG)a->dwHighDateTime} ^~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:534:10: note: insert an explicit cast to silence this issue {a->dwLowDateTime, (LONG)a->dwHighDateTime} ^~~~~~~~~~~~~~~~ static_cast( ) /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:534:28: error: non-constant-expression cannot be narrowed from type 'LONG' (aka 'int') to 'DWORD' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] {a->dwLowDateTime, (LONG)a->dwHighDateTime} ^~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:534:28: note: insert an explicit cast to silence this issue {a->dwLowDateTime, (LONG)a->dwHighDateTime} ^~~~~~~~~~~~~~~~~~~~~~~ static_cast( ) /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:536:11: error: non-constant-expression cannot be narrowed from type 'DWORD' (aka 'unsigned int') to 'LONG' (aka 'int') in initializer list [-Wc++11-narrowing] B = {{b->dwLowDateTime, (LONG)b->dwHighDateTime}}; ^~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:536:11: note: insert an explicit cast to silence this issue B = {{b->dwLowDateTime, (LONG)b->dwHighDateTime}}; ^~~~~~~~~~~~~~~~ static_cast( ) /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:536:29: error: non-constant-expression cannot be narrowed from type 'LONG' (aka 'int') to 'DWORD' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] B = {{b->dwLowDateTime, (LONG)b->dwHighDateTime}}; ^~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/misc/far2l/work/far2l-v_2.5.2/far2l/src/datetime.cpp:536:29: note: insert an explicit cast to silence this issue B = {{b->dwLowDateTime, (LONG)b->dwHighDateTime}}; ^~~~~~~~~~~~~~~~~~~~~~~ static_cast( ) 4 errors generated. --- misc/far2l/files/patch-far2l_src_datetime.cpp | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/misc/far2l/files/patch-far2l_src_datetime.cpp b/misc/far2l/files/patch-far2l_src_datetime.cpp new file mode 100644 index 000000000000..95cd26f1daf2 --- /dev/null +++ b/misc/far2l/files/patch-far2l_src_datetime.cpp @@ -0,0 +1,42 @@ +--- far2l/src/datetime.cpp.orig 2023-10-06 15:57:46 UTC ++++ far2l/src/datetime.cpp +@@ -531,15 +531,27 @@ int64_t FileTimeDifference(const FILETIME *a, const FI + { + LARGE_INTEGER A = + { ++#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++ {(LONG)a->dwHighDateTime, a->dwLowDateTime} ++#else + {a->dwLowDateTime, (LONG)a->dwHighDateTime} ++#endif + }, ++#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++ B = {{(LONG)b->dwHighDateTime, b->dwLowDateTime}}; ++#else + B = {{b->dwLowDateTime, (LONG)b->dwHighDateTime}}; ++#endif + return A.QuadPart - B.QuadPart; + } + + uint64_t FileTimeToUI64(const FILETIME *ft) + { ++#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++ ULARGE_INTEGER A = { {ft->dwHighDateTime, ft->dwLowDateTime} }; ++#else + ULARGE_INTEGER A = { {ft->dwLowDateTime, ft->dwHighDateTime} }; ++#endif + return A.QuadPart; + } + +@@ -761,7 +773,11 @@ void ConvertRelativeDate(const FILETIME &ft, FARString + + void ConvertRelativeDate(const FILETIME &ft, FARString &strDaysText, FARString &strTimeText) + { ++#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++ ULARGE_INTEGER time = { {ft.dwHighDateTime, ft.dwLowDateTime}}; ++#else + ULARGE_INTEGER time = { {ft.dwLowDateTime, ft.dwHighDateTime}}; ++#endif + + UINT64 ms = (time.QuadPart/= 10000) % 1000; + UINT64 s = (time.QuadPart/= 1000) % 60;