From nobody Thu Jan 16 04:25:02 2025 X-Original-To: dev-commits-ports-branches@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 4YYVC32dGCz5l7fX; Thu, 16 Jan 2025 04:25:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYVC30VyZz3NpK; Thu, 16 Jan 2025 04:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737001503; 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=36OdNCro5Pv+rKrH2rJPbDVjA8sj1YfXuwjkfR8rZCM=; b=bLC3CW2dlGwOpDrEEnbI9nWaUFdAtaulmTT0HjpwFCkQc+px0vpoCzmItLlIN1glzowBD5 xH23+k4SsAHEF1Q43Oxf+NW9rMA6Mk25lijeDiXzwDoS7cD5Zi4d2YZ/BZ7yDZT6jScDrV Bas0Q1Tgv7lPkrWy6aBf/uNuOhYYRKJdJPZpABlRlUhSo5pLf0cgiQ7spsiTnmBgSpGKNb UL+6ipqRNQxWWXpaow4hH7jLJdgNfUi678OP3MxE63mSWA1bIn7Nefufn14z35Obtr7RkF ieecxT58bwqSwpeoV0l7QER7R7CuV70C1ts+shtIyfGACPraoEW8wdMvbWmmFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737001503; 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=36OdNCro5Pv+rKrH2rJPbDVjA8sj1YfXuwjkfR8rZCM=; b=GJeTjUOqX5txmce0ROhDXq/R4ZNNLidcwFHdmgHdAprlIEref5AaBZ2xJITiOcz3I9h9fk bJ6R9LZ6DSN+9FEo7FqCPqJ7jNep6c9jped08AggkE3q11vjfc4KrEiPMM/KUTxCuaRTPz rFjeVoeIi9e1oAyFf5dSB4zEyYxmFrnfFx1EhsE8xq9lRLFH5mG05kCDym27Sr96TBjs1X ljIb9EMYhHHTfl84beEhFRQZuWiX8t88SnVibpxGQQ5CCa8gBl6g+3z/ztPn/YjzbD3CMX YR9Ddw+WmES0YEqGN9cf3zV5M/Qv+kgifOe72EqMjiqnfeyweFJuyyzbA60JNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737001503; a=rsa-sha256; cv=none; b=TMTBAJ+DE4nrHMXmisfk0Et0bN0aKCuH3b9CCdws4WnxHPUdsm+/A6sEO8Jv4Je5w/K7kf 8h83Ld5Auh8mCrHqGvWAtLpJUTI7+JCz+2UXYN60y5dt5ubQL89bUjK1ulKaz1nFcQhFlw sCX/z6XhDYVDyIOr7AHTijABG9V4xNiT7sveOIyIyaX4WK/CQb5RyVxpaXfaxp3r0JWqA2 W044jhfC4Ir2zC7ui3F0mTLzS7jr2Zy3vhf2DzkP5y9k6LLgQpElRz1AlBpRpTQaOO7Lu3 zxhX8s6ZaF5ZbIpsXNLkdZ7Biqwbe1QmqnZJ9NoX+pYKor1MQwvNfgF/KldlnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYVC305r1z2V4; Thu, 16 Jan 2025 04:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50G4P2ns051508; Thu, 16 Jan 2025 04:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50G4P21o051505; Thu, 16 Jan 2025 04:25:02 GMT (envelope-from git) Date: Thu, 16 Jan 2025 04:25:02 GMT Message-Id: <202501160425.50G4P21o051505@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: bb5cb7bb00e8 - 2025Q1 - emulators/rpcs3: unbreak build after b566fcf015cd List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: bb5cb7bb00e8d2e78bb51e78fe440babb5eb8022 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb5cb7bb00e8d2e78bb51e78fe440babb5eb8022 commit bb5cb7bb00e8d2e78bb51e78fe440babb5eb8022 Author: Jan Beich AuthorDate: 2025-01-16 04:04:39 +0000 Commit: Jan Beich CommitDate: 2025-01-16 04:04:43 +0000 emulators/rpcs3: unbreak build after b566fcf015cd Utilities/rXml.cpp:56:47: error: no matching member function for call to 'attribute' if (const pugi::xml_attribute attr = handle.attribute(name)) ~~~~~~~^~~~~~~~~ /usr/local/include/pugixml.hpp:546:17: note: candidate function not viable: no known conversion from 'std::string_view' (aka 'basic_string_view') to 'const char_t *' (aka 'const char *') for 1st argument xml_attribute attribute(const char_t* name) const; ^ /usr/local/include/pugixml.hpp:551:17: note: candidate function not viable: requires 2 arguments, but 1 was provided xml_attribute attribute(const char_t* name, xml_attribute& hint) const; ^ Reported by: pkg-fallout (direct commit to 2025Q1 as bbc08dcb46a3 is missing on the branch) --- emulators/rpcs3/files/patch-pugixml-1.14 | 69 ++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/emulators/rpcs3/files/patch-pugixml-1.14 b/emulators/rpcs3/files/patch-pugixml-1.14 new file mode 100644 index 000000000000..c22392a8a9c0 --- /dev/null +++ b/emulators/rpcs3/files/patch-pugixml-1.14 @@ -0,0 +1,69 @@ +Revert https://github.com/RPCS3/rpcs3/commit/196617183870 +until textproc/pugixml >= 1.15 update + +--- Utilities/File.cpp.orig 2025-01-15 23:43:33 UTC ++++ Utilities/File.cpp +@@ -21,7 +21,7 @@ using namespace std::literals::string_literals; + #include + #include + +-static std::unique_ptr to_wchar(std::string_view source) ++static std::unique_ptr to_wchar(const std::string& source) + { + // String size + null terminator + const usz buf_size = source.size() + 1; +@@ -44,7 +44,7 @@ static std::unique_ptr to_wchar(std::string + std::memcpy(buffer.get() + 32768 + 4, L"UNC\\", 4 * sizeof(wchar_t)); + } + +- ensure(MultiByteToWideChar(CP_UTF8, 0, source.data(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar" ++ ensure(MultiByteToWideChar(CP_UTF8, 0, source.c_str(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar" + + // Canonicalize wide path (replace '/', ".", "..", \\ repetitions, etc) + ensure(GetFullPathNameW(buffer.get() + 32768, 32768, buffer.get(), nullptr) - 1 < 32768 - 1); // "to_wchar" +--- Utilities/rXml.cpp.orig 2025-01-15 23:43:33 UTC ++++ Utilities/rXml.cpp +@@ -49,11 +49,12 @@ std::string rXmlNode::GetName() + return {}; + } + +-std::string rXmlNode::GetAttribute(std::string_view name) ++std::string rXmlNode::GetAttribute(const std::string& name) + { + if (handle) + { +- if (const pugi::xml_attribute attr = handle.attribute(name)) ++ const auto pred = [&name](const pugi::xml_attribute& attr) { return (name == attr.name()); }; ++ if (const pugi::xml_attribute attr = handle.find_attribute(pred)) + { + if (const pugi::char_t* value = attr.value()) + { +@@ -85,7 +86,7 @@ rXmlDocument::rXmlDocument() + { + } + +-pugi::xml_parse_result rXmlDocument::Read(std::string_view data) ++pugi::xml_parse_result rXmlDocument::Read(const std::string& data) + { + if (handle) + { +--- Utilities/rXml.h.orig 2025-01-15 23:43:33 UTC ++++ Utilities/rXml.h +@@ -23,7 +23,7 @@ struct rXmlNode + std::shared_ptr GetChildren(); + std::shared_ptr GetNext(); + std::string GetName(); +- std::string GetAttribute(std::string_view name); ++ std::string GetAttribute(const std::string& name); + std::string GetNodeContent(); + + pugi::xml_node handle{}; +@@ -34,7 +34,7 @@ struct rXmlDocument + rXmlDocument(); + rXmlDocument(const rXmlDocument& other) = delete; + rXmlDocument &operator=(const rXmlDocument& other) = delete; +- pugi::xml_parse_result Read(std::string_view data); ++ pugi::xml_parse_result Read(const std::string& data); + virtual std::shared_ptr GetRoot(); + + pugi::xml_document handle{};