git: 6bd53125c43c - 2023Q2 - emulators/rpcs3: unbreak -qt6 flavor after 0d02969b8923
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 08 Jun 2023 00:51:22 UTC
The branch 2023Q2 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6bd53125c43cb79f0766cd1c31d728a970594ce8
commit 6bd53125c43cb79f0766cd1c31d728a970594ce8
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-06-06 01:36:39 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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