From nobody Thu Jul 20 10:38:24 2023 X-Original-To: dev-commits-ports-all@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 4R68Kr4dvWz4nnBp; Thu, 20 Jul 2023 10:38:24 +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 4R68Kr467bz3FrL; Thu, 20 Jul 2023 10:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689849504; 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=G8WAlfXgzKl5BptKG0WkB2JyU0gJ/FQfaEoENtETv3w=; b=TEMAU9fcH8xe2j+82SoROJSefDbDO2K7dhQr6IND+D4i1kdad11q3StFzm+rcWvZCKkbnX bukcuoHVTmorA/qPsK3tWaU2i1jCyYmUyPGvs1clQLdO/U8+jolzQEy4WzSgspBEefL0+q M+Wa4qecXUKtWzDFE/RvrLv23fBHO5mFmzM08dwgOGw4/mJZ/z1sTbzSxT9BVgxYvLRrHc 9I3csHPow85gPR2G4kOtpKAdUZMGF6RWNptY035f3uuZZ7wPyl4v6IpiDlif14Sl8CqkJt M00edg3hlkAMV+Vk+6GgUbRAP2QYoN2fO3mr1aeBxniA5W++jqIyBGRwvyBpPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689849504; 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=G8WAlfXgzKl5BptKG0WkB2JyU0gJ/FQfaEoENtETv3w=; b=O79xJbynOkUmu8Qb/IUflYrvu9GKFjCBd1jl8HNZM9DPzHk+uIXRDL7KLavvApr20k2etk 8Z/QqOdnMZKAykCZcZkJYs1IKswqphH/oBCFrF/VI4hnZXNxiVmKSNsmeLe+KlJNMrev6K 2HLEDIau2exrgD7B1b0t8WYSSFXI1Zu+y/HUm+F7i0w1cKj2+8x1h+vfThO6ndq4jrXHpu HDXCAMm3TlK+qa0Miu1MKbBRWv1iCntUHfuwnC5b+KEk7mQVrfGbIVSKyIAZFFl6fnkr9J 8ltK1YRuzNcv8fCF1lijxtYcQ3zJY6Hl5M0I+2FRKIfT5111wyL9yoyoTkEC8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689849504; a=rsa-sha256; cv=none; b=EwBcCWb6APfybXB2P2iQlV5Qn3ZcgLFZJPA4r1iohWybpyxe5PZ5sE9sdzGe0VarfuG2NY sPZGdvZcOlOi52oUvkoxtHX6ORWgJHfKKOBsGRkswKF8oVx/iot9VLk7ZvolykAKuOlFwn 5cAI8OuZyCRG0+m/+hYr9hb9c+/KyP92kZhwGIgPlCF3GiSEOz1/3yKB2gG3hSJlgriSpw xid2xpZLix5kWtRqdatrz2m7r7gpfJHm3chOt6MQULcazcEllkVml/3blq6AgeUf9pHZKC /VolNa+ISbZrhGqXzARAESXqzuHyNsgIW+jJgreeiGTaVI/w7pMKRNXNVpnP2w== 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 4R68Kr39cBzSFw; Thu, 20 Jul 2023 10:38:24 +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 36KAcOaH024972; Thu, 20 Jul 2023 10:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KAcOPD024971; Thu, 20 Jul 2023 10:38:24 GMT (envelope-from git) Date: Thu, 20 Jul 2023 10:38:24 GMT Message-Id: <202307201038.36KAcOPD024971@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: bef73eea18b0 - main - games/xray_re-tools: try harder to fix the port's build on -CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: bef73eea18b070ccf8a9de2093764c041772a980 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=bef73eea18b070ccf8a9de2093764c041772a980 commit bef73eea18b070ccf8a9de2093764c041772a980 Author: Alexey Dokuchaev AuthorDate: 2023-07-20 10:37:26 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-07-20 10:37:26 +0000 games/xray_re-tools: try harder to fix the port's build on -CURRENT Commit 7cb3d96ec56d (n624509) was incomplete as it had only addressed the writer part, not the reader. While here, reduce the differences between both counterparts and make the T::* pointer a private member. Reported by: pkg-fallout --- .../files/patch-sources_xray__re_xr__reader.h | 16 ++++++++++++++++ .../files/patch-sources_xray__re_xr__writer.h | 11 ++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/games/xray_re-tools/files/patch-sources_xray__re_xr__reader.h b/games/xray_re-tools/files/patch-sources_xray__re_xr__reader.h new file mode 100644 index 000000000000..f99ccdaed150 --- /dev/null +++ b/games/xray_re-tools/files/patch-sources_xray__re_xr__reader.h @@ -0,0 +1,16 @@ +--- sources/xray_re/xr_reader.h.orig 2018-09-02 12:42:44 UTC ++++ sources/xray_re/xr_reader.h +@@ -79,11 +79,10 @@ class xr_reader { (public) + void r_sdir(fvector3& v); + void r_packet(xr_packet& packet, size_t size); + +- template struct f_r: public std::binary_function {}; +- struct f_r_sz: public f_r { ++ struct f_r_sz { + void operator()(std::string& s, xr_reader& r) { r.r_sz(s); } + }; +- template struct f_r_new: public f_r { ++ template struct f_r_new { + explicit f_r_new(void (T::*_pmf)(xr_reader& r)): pmf(_pmf) {} + void operator()(T*& p, xr_reader& r) { T* _p = new T; (_p->*pmf)(r); p = _p; } + private: 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 687f268be452..bc96f3174bbf 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,6 @@ --- sources/xray_re/xr_writer.h.orig 2018-09-02 12:42:44 UTC +++ sources/xray_re/xr_writer.h -@@ -68,12 +68,13 @@ class xr_writer { (public) +@@ -68,12 +68,14 @@ class xr_writer { (public) void w_packet(const xr_packet& packet); @@ -12,13 +12,14 @@ - 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); } ++ explicit f_w_const(void (T::*_pmf)(xr_writer& w) const): pmf(_pmf) {} ++ void operator()(const T* p, xr_writer& w) const { (p->*pmf)(w); } ++ private: ++ void (T::*pmf)(xr_writer& w) const; }; private: -@@ -268,9 +269,9 @@ template inline void xr_ini_wr +@@ -268,9 +270,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];