From nobody Thu Jan 23 15:20:06 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 4Yf4Pg2y17z5l4tD; Thu, 23 Jan 2025 15:20:07 +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 4Yf4Pg0j2wz3mYj; Thu, 23 Jan 2025 15:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737645607; 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=FJO8XkqCWZXRg3vbItwZBO7svScsYW4cDKe5jAEl2ps=; b=APmc8ux6qB62QMhPZD2fZjClybg8FpunP89n9tu2mh0lRckNnLHlWMUGOwPt2MX/5dDMlc Ghane34c1mqTIOzdY2gohSGpbflw2qDJXJHGHgqVyVAdwvHzge7Xl6QGtM9dosOK8/EPdS O1XxRQ9J2CuCEeF5QI0gcHjztIxYvQcgzKGdEHxfwkQ+MA+BN00+tlDHukjaeZqUubIlrz e49mDNlioTpxgAsXmvBuBwI0HdQHd7/iWEzzDov4Sy0aBzKTR2rfaEaDJku7r1fUv5Mrae dO4CjVHGaFzwn42Tl/aPMO+73VSVelAt4MyvJo9SQC2vQaCiGILvveAAXgcFoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737645607; 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=FJO8XkqCWZXRg3vbItwZBO7svScsYW4cDKe5jAEl2ps=; b=Fl2c+ZRaoEZAaZVFG+N0hbuF74FiAqD3grZIKreqRN2IDpbgz2Bkvj9UOcbkPc28n06z5l UzROmWbBJMxM40diEMQoII3xlmQs3/zQfWhEdBerT0aP3k/0OtNhrdNgQJD55YGiu/G3Eg flcPnbrqZwBdHmC7QXFv41grtuIw+jav5mNjPhFmoU62VdtMpBQ8K8Fmtli4rZ+nNo9dq4 +xBz/sztDMkVyezzlUT3hdhc7UtYZEPmKhAZf9XRQMH4VX6Vid5Kz+TLBD0R6S2ghSeaTj b50dv7NOD1DCNHzSiMu9Zl6dGvg9ZsGv6UxlVKPxA6p5dFRhph7mr84YV7Tj5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737645607; a=rsa-sha256; cv=none; b=NW6wVtu8zgjJSLlCExk1dPu+R2Ozqye17rn/c5CT0ySJGkJxvJkRsJKm/gVr3ltdjuLD6k izsgCwiVVnOrRXgBM8saiC9Io2WRmlAoF6tdMb49jVEKExacaXlvJbvXnenHEb3nKGy+JY QmxYjZeq53Q10GQH1L83OoT6qSu3FXnyPiIU22sjUFG6XQfejD0DK97MpOyzHi9lFwrJa/ jV01Bvz2QegTx0SvuX0SP2aygLGjxRh520QbG3vH0JAivucDXTyjVcLrE/X4a02kQNuN2D 9BWDDGjPZFPbVFtY1rD54/72Myewhu/0KVIDAcxBcTwSOhI8agHX/BU+O3Gt3g== 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 4Yf4Pg09gpzkkc; Thu, 23 Jan 2025 15:20:07 +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 50NFK6YK080919; Thu, 23 Jan 2025 15:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NFK68d080914; Thu, 23 Jan 2025 15:20:06 GMT (envelope-from git) Date: Thu, 23 Jan 2025 15:20:06 GMT Message-Id: <202501231520.50NFK68d080914@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: dc72f2fe3f7b - 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: dc72f2fe3f7b275a123497420cdcc0551a2f5075 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc72f2fe3f7b275a123497420cdcc0551a2f5075 commit dc72f2fe3f7b275a123497420cdcc0551a2f5075 Author: Jan Beich AuthorDate: 2025-01-23 15:16:00 +0000 Commit: Jan Beich CommitDate: 2025-01-23 15:19:28 +0000 emulators/rpcs3: unbreak build after d458041ef5aa -- Checking for module 'pugixml>=1.15' -- Package dependency requirement 'pugixml >= 1.15' could not be satisfied. Package 'pugixml' has version '1.14', required version is '>= 1.15' CMake Error at /usr/local/share/cmake/Modules/FindPkgConfig.cmake:645 (message): The following required packages were not found: - pugixml>=1.15 Reported by: pkg-fallout (direct commit to 2025Q1 as bbc08dcb46a3 is missing on the branch) --- emulators/rpcs3/files/patch-pugixml-1.14 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/emulators/rpcs3/files/patch-pugixml-1.14 b/emulators/rpcs3/files/patch-pugixml-1.14 index c22392a8a9c0..7b51e0e2469e 100644 --- a/emulators/rpcs3/files/patch-pugixml-1.14 +++ b/emulators/rpcs3/files/patch-pugixml-1.14 @@ -1,6 +1,18 @@ Revert https://github.com/RPCS3/rpcs3/commit/196617183870 +and https://github.com/RPCS3/rpcs3/commit/9c5584956e32 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;