From 93b164d0779993111b709a321c61689fc9b698d1 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Thu, 20 May 2021 16:10:01 +0200 Subject: [PATCH] Update Flatpak, thanks kevinsmia1939 --- .../org.qelectrotech.QElectroTech.json | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/build-aux/flatpak/org.qelectrotech.QElectroTech.json b/build-aux/flatpak/org.qelectrotech.QElectroTech.json index 1db69b42f..4b0b18791 100644 --- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json +++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json @@ -78,18 +78,17 @@ ] }, { - "name": "python3.6.0", + "name": "python3-PySimpleGUI", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI" + ], "sources": [ { - "type": "archive", - "url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz", - "sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622" + "type": "file", + "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz", + "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11" } - ], - "config-opts": ["--enable-shared"], - "post-install": [ - "chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0", - "chmod +w ${FLATPAK_DEST}/lib/libpython3.so" ] }, { @@ -101,25 +100,10 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz", - "sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed" + "url": "https://files.pythonhosted.org/packages/45/be/d5940d365ebf256e490bc6c10837244e0b8dda08a7d790691767263c318d/qet_tb_generator-1.2.5.tar.gz", + "sha256": "37c3298602244f3152fbb7601caba9b4862bac782991fbb472eab91afb70d09c" } ] -}, - { - "name": "DXFtoQET-2020-1", - "buildsystem": "qmake", - "sources": [ - { - "type": "git", - "url": "https://github.com/qelectrotech/DXFtoQET-2020.git", - "commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d" - } - ], - "post-install": [ - "mkdir -p ${FLATPAK_DEST}/bin", - "cp DXFtoQET ${FLATPAK_DEST}/bin/" - ] } ] }