diff options
| -rw-r--r-- | games/puNES/puNES.SlackBuild | 4 | ||||
| -rw-r--r-- | games/puNES/qt-6.7.1.patch | 23 |
2 files changed, 26 insertions, 1 deletions
diff --git a/games/puNES/puNES.SlackBuild b/games/puNES/puNES.SlackBuild index b78c69a73b..b2d175d56b 100644 --- a/games/puNES/puNES.SlackBuild +++ b/games/puNES/puNES.SlackBuild @@ -63,7 +63,7 @@ fi # 20240829 bkw: Qt6 is supported, but the user has to ask for it # specifically. I don't see much difference in the UI either way. # This may break horribly any time qt6 is updated, and I don't much care. -if [ -x /usr/bin/qmake-qt6 -a "${QT6:-no}" = "yes" ]; then +if [ -x $(which qmake6) -a "${QT6:-no}" = "yes" ]; then QTVER=6 QTOPT="-DENABLE_QT6_LIBS=ON" else @@ -81,6 +81,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +patch -p1 < $CWD/qt-6.7.1.patch + # 20240828 bkw: make .desktop file validate properly. sed -i -e '/^Encoding/d' \ -e '/^Comment/d' \ diff --git a/games/puNES/qt-6.7.1.patch b/games/puNES/qt-6.7.1.patch new file mode 100644 index 0000000000..447ed25689 --- /dev/null +++ b/games/puNES/qt-6.7.1.patch @@ -0,0 +1,23 @@ +From 6e51b1a6107ad3de97edd40ae4ec2d41b32d804f Mon Sep 17 00:00:00 2001 +From: Cosima Neidahl <opna2608@protonmail.com> +Date: Fri, 31 May 2024 14:48:50 +0200 +Subject: [PATCH] Fix compatibility with Qt 6.7.1 (#403) + +Upstream QTBUG-105023 fix made it mandatory that arguments to QObject::findChild[ren] calls must be Q_OBJECTs. +--- + src/gui/dlgStdPad.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gui/dlgStdPad.hpp b/src/gui/dlgStdPad.hpp +index 0b064634d..ef4c07876 100644 +--- a/src/gui/dlgStdPad.hpp ++++ b/src/gui/dlgStdPad.hpp +@@ -47,6 +47,8 @@ typedef struct _joy_list { + extern _joy_list joy_list; + + class pixmapButton: public QPushButton { ++ Q_OBJECT ++ + private: + QPixmap pixmap; + |