From nobody Thu Jan 23 15:17:04 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 4Yf4L82l8gz5l4GN; Thu, 23 Jan 2025 15:17:04 +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 4Yf4L825v5z3mY2; Thu, 23 Jan 2025 15:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737645424; 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=kPKcMonGRiT8ZsQP78If5kO2x0RTHORCJe+1CMSMzTE=; b=j+veXbFRvvB+CLFWqHRnmT9nFk4UtwDuiLUT6gM86z22bo2D8jykzsxPVWR1n7ekX6wxh4 rUE+UDRqtum87WyTQcvJpXADuuqS5dkcuieWetssqrT57Kxiu02LtdmBAAZFeLtJSiN6Cu w8QWT78zC/AVuzY0n6YuUGvHYS+yk4xiWS+tqNtM1RjqCptBx8zNNodxlu68TNgqlFMnO9 E3QYIkWn5sSdid0fU06EjzI+R332TOvfQwkzRtNbQDd7J9R/DFyyYfs5bIRzIyKAEQM30k OJnkiDb3PfodQPBnBRkTwmQ2Ljub3pDixKvVqpACtAwvYUh40rZk+kiWJXaopg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737645424; 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=kPKcMonGRiT8ZsQP78If5kO2x0RTHORCJe+1CMSMzTE=; b=IWVN4sodzyPbHpHGBp5Uee3zdlSZTjiDaXsZPMOPcw68tWlFzOxRRHS3xyM5ewud1ZcYE2 IXxMi+8jAxoiWlyEYSSB02C26vcls9ok38X/wPuYIvEUNFtZ4pz4QP86UvHpw9T4dVn3DZ fYgRl/JVM+7/rA69MqhtjkZgpnHH1UwlFCG/257F3YrYkHg8j5gsA9rkyreTD+W5XMM61+ A+tO0Su96EGpFYdI0dhC4uulrJPU+rG/Y42cB4Jo2dhDAuIjhvy+9Q3NyrT+wIvKBFP5Fq uHlKkpRGBq1JVeh3C1ud67eGCj1ExeekF+D/fM3FQQbPLnuyb0lmXOWAJhy1lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737645424; a=rsa-sha256; cv=none; b=jdVZyMQK5a6K+zb0O0TroLBZbWrBIcSBdGwQzWWIkAzV96GQoWCaqaZrYHKl/N2ZRrjX4j 1col7TXl2a4O8U1rVz2ua3v/l+1QBO4dHTpWe/swrw2P49Oz7z43JYi/lrFpxskwOPo+eo c1mFlhzlul4R+3ol+60Zz9pQYZymbN0HHGUBZuJNVszpeQ3uP4LmTAzCqvZiHq1Q6ItcKm JLoYryurE88b2/vN/oqrqRDpzkwTxUQTnDdKWS5GErkFeTkECxJdZRHJpB80fHEbYv5K3A +GoDzigOVRzl7QnycZ/D+e3jX2Xp4sLZ3ju/XY4AszyFHZvuKBgQjU0jcQ6uGg== 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 4Yf4L81hgKzl9M; Thu, 23 Jan 2025 15:17:04 +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 50NFH48n076771; Thu, 23 Jan 2025 15:17:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NFH4cs076768; Thu, 23 Jan 2025 15:17:04 GMT (envelope-from git) Date: Thu, 23 Jan 2025 15:17:04 GMT Message-Id: <202501231517.50NFH4cs076768@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: ff094ce6aee4 - 2025Q1 - emulators/rpcs3: unbreak build after d458041ef5aa 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: ff094ce6aee465d8965155ccdb694e9435f17835 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff094ce6aee465d8965155ccdb694e9435f17835 commit ff094ce6aee465d8965155ccdb694e9435f17835 Author: Jan Beich AuthorDate: 2025-01-23 15:16:00 +0000 Commit: Jan Beich CommitDate: 2025-01-23 15:16:44 +0000 emulators/rpcs3: unbreak build after d458041ef5aa 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/emulators/rpcs3/files/patch-pugixml-1.14 b/emulators/rpcs3/files/patch-pugixml-1.14 index c22392a8a9c0..ccb54b8dfe02 100644 --- a/emulators/rpcs3/files/patch-pugixml-1.14 +++ b/emulators/rpcs3/files/patch-pugixml-1.14 @@ -1,6 +1,17 @@ Revert https://github.com/RPCS3/rpcs3/commit/196617183870 until textproc/pugixml >= 1.15 update +--- 3rdparty/CMakeLists.txt.orig 2025-01-22 19:47:07 UTC ++++ 3rdparty/CMakeLists.txt +@@ -44,7 +44,7 @@ if (USE_SYSTEM_PUGIXML) + + # pugixml + if (USE_SYSTEM_PUGIXML) +- pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.15) ++ pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.11) + add_library(pugixml INTERFACE) + target_link_libraries(pugixml INTERFACE PkgConfig::PUGIXML) + else() --- Utilities/File.cpp.orig 2025-01-15 23:43:33 UTC +++ Utilities/File.cpp @@ -21,7 +21,7 @@ using namespace std::literals::string_literals;