From nobody Fri Dec 02 23:38:10 2022 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 4NP8Wk54jNz4jgY1; Fri, 2 Dec 2022 23:38:10 +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 4NP8Wk4cTZz4bGr; Fri, 2 Dec 2022 23:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670024290; 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=OwQ92D+LD4ylVEt4qrvd2+1Tf0ETK9VyqRqWmjoEynU=; b=D7AS9jddw1LTqJCFglEjd38RCXhUdo3cvIj9kGiSv3/mvXI8xDDyLznqknLXo3Jz4HxR4v xEmDvDd4qtuUIXefRQw8CNcPEoxDd/VLm0LyfEnRJ3NWCJzAXprxUTysXueFyDZ7U8mVeG 6BRnSIuXjYTxRtIP+4sZmBIctAlMvR74dwZikTGxoNnt1WYUJxypVF6ParvT3fsF/TFZTt vxGSuTojLhSt+fyuU44vKXAXejFlE+dKG+AD7eTItP4ydJgug7HuN5rQa2mf9lI25NnDM+ ff0V69Xtw6H8cgdZhCg//Lh7dWw771jwX+/HTNcT73vrEzaFyPdfgEfyCdNcDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670024290; 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=OwQ92D+LD4ylVEt4qrvd2+1Tf0ETK9VyqRqWmjoEynU=; b=ZFbNnTzD009Y11C66OVcOCgzXe80sZyznYyomnzj+bdrw49JHcfQKTBdtIZmxS2n6Y+5Ec MoKKZTsPYTFnyNYIkZUtqtcGMu8oKi57q+ulwlAJewKHS+xW2OfzEhg+cKs3PI8j034pGk KaUhHcPR1z2D8PwNvgdWzsCKVeOIunBaapJoDfAetTazQ+2QIq3YP8T0E3XE8RNc09KUb8 3XGxlFYMSioyMpqcFkyz7PgomqnL7PGywz2BXN8hQjot0GhWCgiYZn8QVI840SaYHT1iMO TFSajroEgUzSwUT3TIT0CW9U+WvbCg1+6FljeLCiOjWvM1U4RqfPTJcxv0G5Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670024290; a=rsa-sha256; cv=none; b=XsuL7kxClCG6cuOICdpLwl8O1ZRQdBIUwlRynJ7IDJAhn24TjCXKnyGmz4e1k7UI4/UYZv vaTXb3LYvheSCk2TC8fP4zpWsWNxpgGuwxnPxP8WJ6TvAkTCdBIYJumEOuaVpDSv3blOYJ jRMv8/PaFc1N48LDeJrIR+GFWRXTMIRweQxYH+UQujPzLvF4BDIL8zdV29lZAq+Gs7agB8 AYtwqimcG11JxCpg9GRxZld3GUvUPU7i8wPcDGDicmr46EW91n88a2vjpFIc3BVq2ny7n9 qXfImsQL1UG7ydNs6Z2pmIrxRBQZei59GgtYztuWXak+on3pudEBOCNYusLjkg== 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 4NP8Wk3gpGzYqQ; Fri, 2 Dec 2022 23:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B2NcAWS004164; Fri, 2 Dec 2022 23:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B2NcArS004163; Fri, 2 Dec 2022 23:38:10 GMT (envelope-from git) Date: Fri, 2 Dec 2022 23:38:10 GMT Message-Id: <202212022338.2B2NcArS004163@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7840793885c2 - main - archivers/zstr: Patch build problems that users encounter 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7840793885c2b662b1fab22f23cf12da79806e76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7840793885c2b662b1fab22f23cf12da79806e76 commit 7840793885c2b662b1fab22f23cf12da79806e76 Author: Yuri Victorovich AuthorDate: 2022-12-02 15:44:59 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-02 23:38:07 +0000 archivers/zstr: Patch build problems that users encounter --- archivers/zstr/Makefile | 1 + archivers/zstr/files/patch-src_strict__fstream.hpp | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/archivers/zstr/Makefile b/archivers/zstr/Makefile index 42ce94eec2a1..da85e6db034a 100644 --- a/archivers/zstr/Makefile +++ b/archivers/zstr/Makefile @@ -1,6 +1,7 @@ PORTNAME= zstr DISTVERSIONPREFIX= v DISTVERSION= 1.0.6-12 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g85a5bd5 CATEGORIES= archivers devel diff --git a/archivers/zstr/files/patch-src_strict__fstream.hpp b/archivers/zstr/files/patch-src_strict__fstream.hpp new file mode 100644 index 000000000000..02e38142256f --- /dev/null +++ b/archivers/zstr/files/patch-src_strict__fstream.hpp @@ -0,0 +1,13 @@ +- https://github.com/mateidavid/zstr/issues/60 + +--- src/strict_fstream.hpp.orig 2022-12-02 20:40:17 UTC ++++ src/strict_fstream.hpp +@@ -64,7 +64,7 @@ static std::string strerror() + } else { + return "Unknown error (" + std::to_string(err_num) + ")"; + } +-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__APPLE__)) && ! _GNU_SOURCE) || defined(__MUSL__) ++#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__APPLE__) || defined(__FreeBSD__)) && ! _GNU_SOURCE) || defined(__MUSL__) + // XSI-compliant strerror_r() + const int err_num = errno; // See above + if (strerror_r(err_num, buff.data(), buff.size()) == 0) {