From nobody Wed Jun 7 22:00:53 2023 X-Original-To: dev-commits-ports-all@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 4Qc1WB1blBz4bTHY; Wed, 7 Jun 2023 22:00:54 +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 4Qc1WB0q12z4JRW; Wed, 7 Jun 2023 22:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686175254; 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=R5EvxqxvgzSvmU8m3q50pNknxA3UmjGKhOFZt4wavOg=; b=ZsMWEEGN9GvnnoLiiGvo1uI7QIyphKItb1a1WAY7ly+C1VfmghTvIPWx5WxBA4V/3FPINK x4j2/FK2eID7tPtNjH8AVcZfngOznNC2xOww968s3g/up8acdJjyAb8xFCbL8xvL6Jxs4T vF/x8QcmftSHMlwdqha+cry1Zpp5z76RJ/GyjufmuyWmeGWecVFKtQN/xWa7+gNCJ0aBbg Zcy7lvgfts7VIY+4BYHOQflWKip2ZEulFTzqbA5Wlf3CEf/HAqJeHgtSCVxixwunhdgG9X anVCI1WtzE+0wEo3s46eq7yN9uYSpESEMkJr1+9chMgx85dzvTQjVlX8rY/7FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686175254; 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=R5EvxqxvgzSvmU8m3q50pNknxA3UmjGKhOFZt4wavOg=; b=GVb1Qp9nTu3gCocKzUUNmGhKYgOKf1hIv+mD3eARe+PzYk+aIU8oKbbsuDxrEj4jB7XJab YGi7WFVYWvyWuL/h262U3FZCF4/dPd+8ewXN9yfBv8RdIbhEzsPMWSdrRt3LY6N9QrL3rh top8uiXEzLqCz5/wV+6bA0+euEcPE2T1TQuDtADLqMP5GDHVNULlZX1PpiGbNrPm4+yxEi ngOXWf5i7sBs1TY1xbWeSiB3ybHM6s9MagcdqrT5nho3P7c3wxbp/yb4Dhif3gFUpUTTCN t1Y4Pz3dhFvlJMc0lNMqyfnuCzRWuDNi+3YZedriewkuh71y8DBKkK5bRXE47Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686175254; a=rsa-sha256; cv=none; b=Q76rNKxqzeS12Kr8wYIi+kc2o/f4271Hzl/Ykri6ZWr5jLGgwmJe00bKgTBZPweguS14lD jAxt1xT5YXZS82OuxTD0dcg3cW+98ycY4Uqpz4nvUWj6/tufNqozI8mctm0nYK9SX+u31z IygevxeEHCV/JB+AQZWqzh6Jijaf2xhUZxx750k2dWavzs+IwaePGcA5JgSCg/U+Glo6Ej PjPjhmxT9sUFYVFkMVu/3pbTlRlZPtaMLd4hET+mgfZns27f6c+QU27idjjVIJyT4EoLpK 1RKC1TpUank7IMCXDlZitT8R8eenaHeYucKud4+6oHPoUt8K4jhSMT4As0EweA== 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 4Qc1W970YHzS7t; Wed, 7 Jun 2023 22:00:53 +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 357M0raS026592; Wed, 7 Jun 2023 22:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 357M0rFj026591; Wed, 7 Jun 2023 22:00:53 GMT (envelope-from git) Date: Wed, 7 Jun 2023 22:00:53 GMT Message-Id: <202306072200.357M0rFj026591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4721ce9c91f2 - main - emulators/rpcs3: unbreak -qt6 flavor after 0d02969b8923 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 4721ce9c91f2ded403241128176d010cef0e1c73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4721ce9c91f2ded403241128176d010cef0e1c73 commit 4721ce9c91f2ded403241128176d010cef0e1c73 Author: Jan Beich AuthorDate: 2023-06-06 01:36:39 +0000 Commit: Jan Beich CommitDate: 2023-06-07 21:59:41 +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 --- emulators/rpcs3/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index ff53680acb1e..b3deef08ac45 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: # patch(1) doesn't support renames unlike git-apply(1)