From nobody Thu Jun 8 00:51:22 2023 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 4Qc5Ht74Cpz4bxnj; Thu, 8 Jun 2023 00:51:22 +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 4Qc5Ht6XTqz3hd0; Thu, 8 Jun 2023 00:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686185482; 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=WOBiciRuSiZLvMb5m2AIA83OpJW+oN/tG0q/kpK3cVk=; b=rtFujSx9SZYpBVV0Lzx/FuI1zLOlM7d3Mdf57fjX+6Psq2yqOV5ypmAEHfz58uv1f/30pu n4PBb8kLKq/UqHySrB7YVjoPmOJXbafxigGsXzwKPnA7cCbl62x8LsAW1sVj9JBS+Qtfgr Ik54lmrg6n6qtViEcZ3aU8WHFsNJE0QCDUiuAJkFfKtXO2XbQgOjxYxeGiD1WhWb1wLhS0 peksOfz7zy+wIpuPxAiaKOPzULkKhBfjx+DnYPLf1vi8J4FTyYoPOwfdttWpdzdhyWVnpM t7rF7X89txd6/NnKpudaJ0FlFxzNm7lE+keyvrXPF4i0BqVyONiNaTCAnJSPDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686185482; 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=WOBiciRuSiZLvMb5m2AIA83OpJW+oN/tG0q/kpK3cVk=; b=VOyeu3N+4dIN/v/N5u459tqCX55Ii96kteBP1imvYR/IRkTFCZHcC9hvCtsIknVRifZP/B AtUeQEaj673wXkVn3nGNl356kOx2l+6pFeEkC3irCUqrtWl18170ZJXgA0sAudPeMqV3/F 1oDnOceq18Z9OgC5A9IRhRkZlW686J1A0fhFpbE+F9vVSaGvPTGpWQ85vzY2ohN7T0Xi3O 81DTd9eqV1fTNopfUm8H7dGcpLrJVEpK5vB7E4KsLNrqc3Th5ue1VnP/GJ5OVq5XkPrq0X rtuGQjLVop86KcYTtxJBp8efwFhM63AjaC/QpcAoWmhDondlfmlDsyIoi3GSxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686185482; a=rsa-sha256; cv=none; b=qBCcm6xJYSsdpBazp3OmVpEfcAefXoes2M6uy7GLcbv0UVK4JfthJsede1eL9wbIGGcBpS GJzPyqh+0B0ly5tH2aJMo91hIbnku8i3uikdF5K6AkmiN96rFzp+fSNKvSWiUeX3fxDTJu tJ+IXHmV2NK4C4rrJDGroAv1suACqF6QIdBgpOY8681ahO9/g4uYyzh5mDOZIXSy6YXCIl +NZRAW2nj43VJy5lpDMViimm7zEz+tYkzTozV7F+/LbHwwPAmYsmf+ogGQ01NyDStu70/o +vfcGtVsZoaWMGgbg7U0P0B9B42QPUof7ekx/5aHVwyYDvtKklqKH48eKg2iGQ== 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 4Qc5Ht5YdXzYj3; Thu, 8 Jun 2023 00:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3580pMjB006942; Thu, 8 Jun 2023 00:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3580pMNf006941; Thu, 8 Jun 2023 00:51:22 GMT (envelope-from git) Date: Thu, 8 Jun 2023 00:51:22 GMT Message-Id: <202306080051.3580pMNf006941@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: 6bd53125c43c - 2023Q2 - emulators/rpcs3: unbreak -qt6 flavor after 0d02969b8923 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 6bd53125c43cb79f0766cd1c31d728a970594ce8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bd53125c43cb79f0766cd1c31d728a970594ce8 commit 6bd53125c43cb79f0766cd1c31d728a970594ce8 Author: Jan Beich AuthorDate: 2023-06-06 01:36:39 +0000 Commit: Jan Beich CommitDate: 2023-06-07 23:39:28 +0000 emulators/rpcs3: unbreak -qt6 flavor after 0d02969b8923 ===> Patching for rpcs3-qt6-0.0.28.15132 ===> Applying distribution patches for rpcs3-qt6-0.0.28.15132 1 out of 2 hunks failed--saving rejects to .ci/install-freebsd.sh.rej ===> FAILED Applying distribution patch c196f09833b4.patch with -p1 *** Error code 1 Reported by: pkg-fallout (cherry picked from commit 4721ce9c91f2ded403241128176d010cef0e1c73) --- emulators/rpcs3/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 5e03c7548782..6fe4e310b9cf 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -58,6 +58,11 @@ USE_QT= base multimedia svg CONFLICTS_INSTALL= ${PORTNAME} +pre-patch: ${FLAVOR}-pre-patch +${FLAVOR}-pre-patch: +# XXX Drop after reverting https://github.com/RPCS3/rpcs3/commit/5e6aa45658ef + @${REINPLACE_CMD} '/quarterly/s/^#//' ${WRKSRC}/.ci/install-freebsd.sh + post-patch: ${FLAVOR}-post-patch ${FLAVOR}-post-patch: # XXX Drop after devel/qt6-base >= 6.5 update