From owner-dev-commits-ports-all@freebsd.org Sun Jun 27 05:36:46 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 7DBB4660D87; Sun, 27 Jun 2021 05:36:46 +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 4GCKHL2tz7z3DQC; Sun, 27 Jun 2021 05:36:46 +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 4C7714AAF; Sun, 27 Jun 2021 05:36:46 +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 15R5aksB088008; Sun, 27 Jun 2021 05:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15R5akim088007; Sun, 27 Jun 2021 05:36:46 GMT (envelope-from git) Date: Sun, 27 Jun 2021 05:36:46 GMT Message-Id: <202106270536.15R5akim088007@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: eddbea3915c2 - main - devel/spdlog: Compatibility fixes with libfmt 8.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eddbea3915c23a4c27639478022bf73ce4d09a3c 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: Sun, 27 Jun 2021 05:36:46 -0000 The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=eddbea3915c23a4c27639478022bf73ce4d09a3c commit eddbea3915c23a4c27639478022bf73ce4d09a3c Author: Vanilla I. Shu AuthorDate: 2021-06-27 05:32:33 +0000 Commit: Vanilla I. Shu CommitDate: 2021-06-27 05:36:39 +0000 devel/spdlog: Compatibility fixes with libfmt 8.0.0. PR: 256810 Reported by: Daniel Engberg --- devel/spdlog/Makefile | 6 +++++- devel/spdlog/distinfo | 6 +++++- devel/spdlog/files/patch-include_spdlog_common-inl.h | 11 +++++++++++ devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h | 11 +++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/devel/spdlog/Makefile b/devel/spdlog/Makefile index 91b5ca949eda..a46be95ea907 100644 --- a/devel/spdlog/Makefile +++ b/devel/spdlog/Makefile @@ -3,9 +3,13 @@ PORTNAME= spdlog DISTVERSIONPREFIX= v DISTVERSION= 1.8.5 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel +PATCH_SITES= https://github.com/gabime/spdlog/commit/ +PATCHFILES= 7b14a65b2b8cbdca3c6bd1d36fe5b271389c1d07.patch:-p1 \ + 68111122086187761cca36c24e6d8c8daa96656d.patch:-p1 + MAINTAINER= vanilla@FreeBSD.org COMMENT= Super fast C++ logging library diff --git a/devel/spdlog/distinfo b/devel/spdlog/distinfo index bf3b9ebcf118..e0dbb0d02aad 100644 --- a/devel/spdlog/distinfo +++ b/devel/spdlog/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1616997697 +TIMESTAMP = 1624574846 SHA256 (gabime-spdlog-v1.8.5_GH0.tar.gz) = 944d0bd7c763ac721398dca2bb0f3b5ed16f67cef36810ede5061f35a543b4b8 SIZE (gabime-spdlog-v1.8.5_GH0.tar.gz) = 321229 +SHA256 (7b14a65b2b8cbdca3c6bd1d36fe5b271389c1d07.patch) = 5efa9e3b8d4dc4de351dc0e1d2516b2a6e141854e055ae420446785df85d9574 +SIZE (7b14a65b2b8cbdca3c6bd1d36fe5b271389c1d07.patch) = 6523 +SHA256 (68111122086187761cca36c24e6d8c8daa96656d.patch) = a491f1734429203bc298658c1cdc49d1b30b17f8fad6f342511ad1f8692ae666 +SIZE (68111122086187761cca36c24e6d8c8daa96656d.patch) = 753 diff --git a/devel/spdlog/files/patch-include_spdlog_common-inl.h b/devel/spdlog/files/patch-include_spdlog_common-inl.h new file mode 100644 index 000000000000..0a219ab8ea41 --- /dev/null +++ b/devel/spdlog/files/patch-include_spdlog_common-inl.h @@ -0,0 +1,11 @@ +--- include/spdlog/common-inl.h.orig 2021-06-24 13:59:17 UTC ++++ include/spdlog/common-inl.h +@@ -60,7 +60,7 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) + { + memory_buf_t outbuf; +- fmt::format_system_error(outbuf, last_errno, msg); ++ fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); + } + diff --git a/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h b/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h new file mode 100644 index 000000000000..26f9761a4058 --- /dev/null +++ b/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h @@ -0,0 +1,11 @@ +--- include/spdlog/fmt/bin_to_hex.h.orig 2021-06-24 14:01:22 UTC ++++ include/spdlog/fmt/bin_to_hex.h +@@ -209,7 +209,7 @@ struct formatter> + + if (put_positions) + { +- fmt::format_to(inserter, "{:<04X}: ", pos); ++ fmt::format_to(inserter, "{:04X}: ", pos); + } + } + };