Date: Thu, 23 Jan 2025 15:17:04 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: ff094ce6aee4 - 2025Q1 - emulators/rpcs3: unbreak build after d458041ef5aa Message-ID: <202501231517.50NFH4cs076768@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff094ce6aee465d8965155ccdb694e9435f17835 commit ff094ce6aee465d8965155ccdb694e9435f17835 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2025-01-23 15:16:00 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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<char>') 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501231517.50NFH4cs076768>