From owner-dev-commits-ports-all@freebsd.org Wed Jul 21 18:15:21 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7D0066995D; Wed, 21 Jul 2021 18:15:20 +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 4GVNzW4PHyz4Scy; Wed, 21 Jul 2021 18:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A2FF922BB0; Wed, 21 Jul 2021 18:15:17 +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 16LIFHYF045486; Wed, 21 Jul 2021 18:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16LIFHGf045485; Wed, 21 Jul 2021 18:15:17 GMT (envelope-from git) Date: Wed, 21 Jul 2021 18:15:17 GMT Message-Id: <202107211815.16LIFHGf045485@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fa3cd60121f6 - main - x11/waybar: Fix build with libfmt 8.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa3cd60121f67b7d15394eb616a123a827e50b46 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 18:15:21 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa3cd60121f67b7d15394eb616a123a827e50b46 commit fa3cd60121f67b7d15394eb616a123a827e50b46 Author: Po-Chuan Hsieh AuthorDate: 2021-07-21 17:59:55 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-07-21 18:12:13 +0000 x11/waybar: Fix build with libfmt 8.0.0 Obtained from: https://github.com/Alexays/Waybar/commit/1c2e0083ba5a80d0f22a14d2baa8df52024a7394 --- x11/waybar/files/patch-libfmt | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/x11/waybar/files/patch-libfmt b/x11/waybar/files/patch-libfmt new file mode 100644 index 000000000000..f80a7cd6cf9a --- /dev/null +++ b/x11/waybar/files/patch-libfmt @@ -0,0 +1,28 @@ +Obtained from: https://github.com/Alexays/Waybar/commit/1c2e0083ba5a80d0f22a14d2baa8df52024a7394 + +--- include/util/format.hpp.orig 2021-04-15 19:17:54 UTC ++++ include/util/format.hpp +@@ -35,7 +35,11 @@ namespace fmt { + // The rationale for ignoring it is that the only reason to specify + // an alignment and a with is to get a fixed width bar, and ">" is + // sufficient in this implementation. ++#if FMT_VERSION < 80000 + width = parse_nonnegative_int(it, end, ctx); ++#else ++ width = detail::parse_nonnegative_int(it, end, -1); ++#endif + } + return it; + } +--- src/modules/clock.cpp.orig 2021-04-15 19:17:54 UTC ++++ src/modules/clock.cpp +@@ -196,6 +196,9 @@ template <> + struct fmt::formatter : fmt::formatter { + template + auto format(const waybar_time& t, FormatContext& ctx) { ++#if FMT_VERSION >= 80000 ++ auto& tm_format = specs; ++#endif + return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); + } + };