diff --git a/build-aux/flatpak/org.qelectrotech.QElectroTech.json b/build-aux/flatpak/org.qelectrotech.QElectroTech.json index 355ee223f..be409970c 100644 --- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json +++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json @@ -4,7 +4,7 @@ "runtime-version": "5.15-25.08", "sdk": "org.kde.Sdk", "command": "qelectrotech", - "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop", + "rename-desktop-file": "qelectrotech.desktop", "rename-appdata-file": "qelectrotech.appdata.xml", "rename-icon": "qelectrotech", "copy-icon": true, @@ -26,50 +26,8 @@ "*.a" ], "modules": [ - { - "name": "tkinter", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=${FLATPAK_DEST} ." - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/iwalton3/tkinter-standalone", - "commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785" - } - ], - "modules": [ - { - "name": "tcl", - "sources": [ - { - "type": "archive", - "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcl8.6.11-src.tar.gz", - "sha256": "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258" - } - ], - "subdir": "unix", - "post-install": [ - "chmod +w ${FLATPAK_DEST}/lib/libtcl8.6.so" - ] - }, - { - "name": "tk", - "sources": [ - { - "type": "archive", - "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11-src.tar.gz", - "sha256": "5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282" - } - ], - "subdir": "unix", - "post-install": [ - "chmod +w ${FLATPAK_DEST}/lib/libtk8.6.so" - ] - } - ] - }, + "tkinter.json", + "pypi-dependencies.json", { "name": "qelectrotech", "buildsystem": "qmake", @@ -83,37 +41,12 @@ }, { "type": "patch", - "path": "patches/0001-build-Fix-the-installation-paths.patch" + "paths": [ + "patches/fix-the-installation-paths.patch", + "patches/fix-appdata.patch" + ] } ] - }, - { - "name": "python3-PySimpleGUI", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz", - "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11" - } - ] -}, - { - "name": "python3-qet-tb-generator", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} qet-tb-generator" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz", - "sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907" - } - ] -} + } ] }