From nobody Mon Jul 03 12:15:19 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 4QvlHW5qljz4m1Gx; Mon, 3 Jul 2023 12:15: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 4QvlHW5LDrz4Hsb; Mon, 3 Jul 2023 12:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688386519; 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=hb+adEGOjqyxKNFWWZZo15+Gx4PwY94N5SzGwRGW4PY=; b=ZlTBG2AvfON2brrJkYITIV54fY2PBs/MUN7U0vKlzwGz3w7IpI4io5C7UqB3hHHDiKC9nB YEAmtCG7UJ+VRSZwHU5CEtnX2R7zSLjF51hn3OPb4f12hVHXGKO35UKERH6jy4sjBl7SnL uYMH6QgKf6E5VM0HGYh46BbPU+7pteV47zv9n1pxe1u/OPyPmPq58t8aCh8EF7ip2TbG8E cCET58ehOMYGAsoqyh72JtW6gxir5it3nsVVJfiipshB8qKlKPj4WrhQ2v9iLjFTVHL3/V xt75qTnOFGsK8r8q65M9oQ3Wdp/RY88J1wwiBWNzoM2KIDnWLRLoSLYK9yTUGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688386519; 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=hb+adEGOjqyxKNFWWZZo15+Gx4PwY94N5SzGwRGW4PY=; b=weGrnX2g2C15ZLoyviv8zhQTJd2ZpUqZmXmBu+FuJUyMOZJFZXwXDx/l91OL8Vhjwzct6r Bp+aATGTbM0g2mnEcaZYzXPfBc0PUhTE3Sg5w7kuc3zyldmlrEsxCIvW6+VNTjjulOIqe/ xt9Wc3k1foDPo6KdUMujwc/8rxLbAmJ6fBiv/rI7TnmDrsyDnJTCSLcO6WAJgiCPQx3+io ea5AzjXXAKIiD9Q4yf4qHp27qHxbNOBVSAXibAsNGYCeTV66nUUoM2ytPAxfmq3S4O4OXw mKZxqeDFVqkjy59Cer6Uf+Fu0RYVZNpEzRsgqnzYtE3z/kKGysavuOC1TpxVVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688386519; a=rsa-sha256; cv=none; b=UKrA5TjTcy9F/iKNbs/E84dlApH9zNGXcTkZX1JBmhLfCm/Sdf8ztIWXoLWeT6CD1FrXg5 heuzZ7KKsJkEgGNbrgl2YMLlAvyppAN7fdoQSumMFPANWqXHbZvW2yIYards1yscBVI7yG sChk9Y3t8LJZjtAyL8oj49uCC3KintIhJwnbDQP9/M7q9yyzEixSCyM9DU236NEYmjc9hY GG6KW0hWqquKqZ6i55fpp7Jjkn/5EGf9W+IUzACDgKzrnMxWA3HSk/H8/uLcpPjozzFUMT LVYao60pmEczsQ1KSrJFfdklGjLuUmsaGcMa3v+rOchx1f/YHWq1BaTJ1/pboA== 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 4QvlHW4Pw7zpwc; Mon, 3 Jul 2023 12:15:19 +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 363CFJG0019770; Mon, 3 Jul 2023 12:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363CFJTY019769; Mon, 3 Jul 2023 12:15:19 GMT (envelope-from git) Date: Mon, 3 Jul 2023 12:15:19 GMT Message-Id: <202307031215.363CFJTY019769@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: 7cb3d96ec56d - main - games/xray_re-tools: unbreak the port's build against Clang 16 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cb3d96ec56ddb45d5d1099b710098b84e28c7bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cb3d96ec56ddb45d5d1099b710098b84e28c7bf commit 7cb3d96ec56ddb45d5d1099b710098b84e28c7bf Author: Alexey Dokuchaev AuthorDate: 2023-07-03 12:14:26 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-07-03 12:14:26 +0000 games/xray_re-tools: unbreak the port's build against Clang 16 Both `std::const_mem_fun1_t' and `std::binary_function' template classes had been deprecated in C++11 and removed in C++17, let's get rid of them: the latter is just some typedefs and the former holds a pointer to a member function and provides `operator()'. Reported by: pkg-fallout --- .../files/patch-sources_xray__re_xr__writer.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/games/xray_re-tools/files/patch-sources_xray__re_xr__writer.h b/games/xray_re-tools/files/patch-sources_xray__re_xr__writer.h index 1fd78c9e0256..687f268be452 100644 --- a/games/xray_re-tools/files/patch-sources_xray__re_xr__writer.h +++ b/games/xray_re-tools/files/patch-sources_xray__re_xr__writer.h @@ -1,6 +1,24 @@ --- sources/xray_re/xr_writer.h.orig 2018-09-02 12:42:44 UTC +++ sources/xray_re/xr_writer.h -@@ -268,9 +268,9 @@ template inline void xr_ini_wr +@@ -68,12 +68,13 @@ class xr_writer { (public) + + void w_packet(const xr_packet& packet); + +- template struct f_w: public std::binary_function {}; +- struct f_w_sz: public f_w { ++ struct f_w_sz { + void operator()(const std::string& s, xr_writer& w) { w.w_sz(s); } + }; +- template struct f_w_const: public std::const_mem_fun1_t { +- explicit f_w_const(void (T::*_pmf)(xr_writer& w) const): std::const_mem_fun1_t(_pmf) {} ++ template struct f_w_const { ++ void (T::*_m_f)(xr_writer&) const; ++ explicit f_w_const(void (T::*_pmf)(xr_writer& w) const): _m_f(_pmf) {} ++ void operator()(const T* t, xr_writer& w) const { (t->*_m_f)(w); } + }; + + private: +@@ -268,9 +269,9 @@ template inline void xr_ini_wr template inline void xr_ini_writer::w_ini_seq(const T& container, F write, const char* prefix) { char buf[1024];