From 91ad9af7dbb19100408de34c097627a06a0979f2 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:59:43 +0200 Subject: [PATCH] Reverted to QT5 and added QT6 as module --- net.retrodeck.retrodeck.yml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b5b8e718..9c31754d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,9 +1,7 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -#runtime-version: 5.15-21.08 -runtime-version: - - 5.15-21.08 - - 6.3 # bumped because of pcsx2-qt +runtime-version: 5.15-21.08 +#runtime-version: 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 @@ -107,6 +105,34 @@ modules: - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||: cleanup: ['*'] + # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) + - name: qt6-core5compat + buildsystem: cmake-ninja + 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 + x-checker-data: + type: html + url: https://download.qt.io/official_releases/qt/6.2/ + version-pattern: '>([\d\.-]*)/<' + url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz + + post-install: + - mv /app/mkspecs /app/lib + - ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ + - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' + ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake + - sed -e 's@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" + \"/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/cmake/\" NO_DEFAULT_PATH@' -i + ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake + - sed -e 's@\\($$QT_MODULE_BIN_BASE\\)@\\1 '${FLATPAK_DEST}'/bin @' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + - sed -e 's@\\($$QT_MODULE_INCLUDE_BASE \\)@\\1'${FLATPAK_DEST}'/include @' + -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + - sed -e 's@$$QT_MODULE_INCLUDE_BASE/@'${FLATPAK_DEST}'/include/@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + - sed -e 's@$$QT_MODULE_LIB_BASE@'${FLATPAK_DEST}'/lib@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails, # this affects even the shared-modules's glu so I have to replace it temporarly # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335