From d77b770f280ba06f8d5bcda73da05417519dab9a Mon Sep 17 00:00:00 2001 From: xargon Date: Tue, 30 Aug 2022 21:50:36 +0200 Subject: [PATCH 1/3] Updated qt6-core5compact to 6.3.0 to reflect the flatpak runtime version --- net.retrodeck.retrodeck.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fef63589..32103436 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -112,13 +112,13 @@ modules: builddir: true sources: - type: archive - url: https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qt5compat-everywhere-src-6.2.4.tar.xz - sha256: 5de2b9e25bf7de161fbb88ecdd468ed1788bc899392fc05ed80aa590ebb352fa + url: https://download.qt.io/official_releases/qt/6.3/6.3.0/submodules/qt5compat-everywhere-src-6.3.0.tar.xz + sha256: 2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e x-checker-data: type: html - url: https://download.qt.io/official_releases/qt/6.2/ + url: https://download.qt.io/official_releases/qt/6.3/ version-pattern: '>([\d\.-]*)/<' - url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz + url-template: https://download.qt.io/official_releases/qt/6.3/$version/submodules/qt5compat-everywhere-src-$version.tar.xz post-install: - mkdir -p /app/lib/mkspecs From 0996a7bf0861287dafa381307c5cf5c0500e4b1b Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 21:52:46 +0200 Subject: [PATCH 2/3] Updated qt6-core5compact to 6.3.0 to reflect the flatpak runtime version --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 32103436..c7b3e657 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -106,7 +106,7 @@ modules: cleanup: ['*'] # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) - # from: https://github.com/flathub/org.profex_xrd.Profex + # from: https://github.com/flathub/org.profex_xrd.Profex - name: qt6-core5compat buildsystem: cmake-ninja builddir: true From 47e4bc5ad25c62ddeb211253d0ed213116533ed0 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 22:14:52 +0200 Subject: [PATCH 3/3] YUZU: trying to add buildcommands for QT5 --- net.retrodeck.retrodeck.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c7b3e657..0124ed7e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -106,7 +106,7 @@ modules: cleanup: ['*'] # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) - # from: https://github.com/flathub/org.profex_xrd.Profex + # from: https://github.com/flathub/org.profex_xrd.Profex - name: qt6-core5compat buildsystem: cmake-ninja builddir: true @@ -515,6 +515,7 @@ modules: x-checker-data: type: git tag-pattern: ^n([\d.]+)$ + - name: yuzu buildsystem: cmake-ninja builddir: true @@ -534,6 +535,10 @@ modules: TITLEBARFORMATIDLE: yuzu {} TITLEBARFORMATRUNNING: yuzu {} | {} LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed + build-commands: + - | + find_package(Qt6 REQUIRED COMPONENTS Core5Compat) + target_link_libraries(mytarget PRIVATE Qt6::Core5Compat) cleanup: - /share/man - /share/pixmaps