diff --git a/flatpak/sa.sy.qocker.json b/flatpak/sa.sy.qocker.json index 2215a7b..3ce08a0 100644 --- a/flatpak/sa.sy.qocker.json +++ b/flatpak/sa.sy.qocker.json @@ -1,53 +1,12 @@ { "app-id": "sa.sy.Qocker", "runtime": "org.kde.Platform", - "runtime-version": "5.15", + "runtime-version": "5.15-23.08", "sdk": "org.kde.Sdk", + "base": "com.riverbankcomputing.PyQt.BaseApp", + "base-version": "5.15-23.08", "command": "qocker", "modules": [ - { - "name": "PyQt5", - "cleanup": [ - "/bin/sip", - "/include", - "/lib/python3.9/site-packages/*.pyi" - ], - "config-opts": [ - "--disable-static", - "--enable-x11" - ], - "buildsystem": "simple", - "build-commands": [ - "python configure.py --confirm-license --no-docstrings --assume-shared --no-sip-files --no-qml-plugin --no-tools --no-qsci-api -d ${FLATPAK_DEST}/lib/python3.9/site-packages --sip=${FLATPAK_DEST}/bin/sip --sip-incdir=${FLATPAK_DEST}/include --stubsdir=${FLATPAK_DEST}/lib/python3.9/site-packages --disable=QtSensors --disable=QtWebEngine --disable=QtQuick --disable=QtQml --disable=QtWebChannel --disable=QtWebEngineCore --disable=QWebEngineWidgets --disable=QtQuickWidgets --disable=QtSql --disable=QtXmlPatterns --disable=QtMultimedia --disable=QtMultimediaWidgets --disable=QtLocation --disable=QtDesigner --disable=QtOpenGL --disable=QtBluetooth --disable=QtWebKit --disable=QtWebKitWidgets --disable=QtNfc --disable=QtPositioning", - "make -j $FLATPAK_BUILDER_N_JOBS", - "make install" - ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.io/packages/source/P/PyQt5/PyQt5-5.15.4.tar.gz", - "sha256": "2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be" - } - ], - "modules": [ - { - "name": "sip", - "buildsystem": "simple", - "build-commands": [ - "python configure.py --sip-module PyQt5.sip -b ${FLATPAK_DEST}/bin -d ${FLATPAK_DEST}/lib/python3.9/site-packages -e ${FLATPAK_DEST}/include -v ${FLATPAK_DEST}/share/sip --stubsdir=${FLATPAK_DEST}/lib/python3.9/site-packages", - "make", - "make install" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.riverbankcomputing.com/static/Downloads/sip/4.19.25/sip-4.19.25.tar.gz", - "sha256": "b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211" - } - ] - } - ] - }, { "name": "qocker", "buildsystem": "simple", @@ -65,8 +24,8 @@ ], "finish-args": [ "--share=network", - "--socket=x11", - "--socket=pulseaudio", - "--env=QT_QPA_PLATFORM=xcb" + "--socket=fallback-x11", + "--socket=wayland", + "--filesystem=/run/docker.sock" ] } \ No newline at end of file