From b8604ff8e3b2a4fa348f774527ac30b79bc18392 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Tue, 9 Jan 2024 04:53:06 +0100 Subject: [PATCH] Updating to Qt 6.6, readding aarch64 builds, improvements for new metadata requirements (including new icon!) --- eu.ad5001.LogarithmPlotter.metainfo.xml | 10 ++-- eu.ad5001.LogarithmPlotter.yml | 24 +++++++--- flathub.json | 3 -- icon_flatpak.svg | 64 +++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 14 deletions(-) delete mode 100644 flathub.json create mode 100644 icon_flatpak.svg diff --git a/eu.ad5001.LogarithmPlotter.metainfo.xml b/eu.ad5001.LogarithmPlotter.metainfo.xml index da47929..57ac498 100644 --- a/eu.ad5001.LogarithmPlotter.metainfo.xml +++ b/eu.ad5001.LogarithmPlotter.metainfo.xml @@ -9,11 +9,11 @@ LogarithmPlotter http://apps.ad5001.eu/icons/apps/svg/logarithmplotter.svg - 2D logarithmic-scaled plotter software to make Bode plots, sequences and distribution functions - 2D-Grafiksoftware mit logarithmischer Skalierung zur Erstellung von Bode-Diagramms, Folgen und Verteilungsfunktionen - Logiciel de traçage 2D pour les diagrammes de Bode, les suites et les fonctions de répartition - Síkbeli ábrázolásszoftver Bode-ábrák, sorozatok és eloszlási funkciók készítéséhez - 2D-plotterprogramvare laget for opprettelse av Bode-diagram, sekvenser, og distribusjonsfunksjoner + Create and edit Bode plots + Erstellen und Bearbeiten von Bode-Diagrammen + Créez et éditez des diagrammes de Bode + Bode-diagramok létrehozása és szerkesztése + Opprette og redigere Bode-diagrammer

diff --git a/eu.ad5001.LogarithmPlotter.yml b/eu.ad5001.LogarithmPlotter.yml index d2555fd..f451001 100644 --- a/eu.ad5001.LogarithmPlotter.yml +++ b/eu.ad5001.LogarithmPlotter.yml @@ -1,7 +1,7 @@ --- app-id: eu.ad5001.LogarithmPlotter runtime: org.kde.Platform -runtime-version: '6.5' +runtime-version: '6.6' sdk: org.kde.Sdk finish-args: - "--share=ipc" @@ -38,8 +38,11 @@ modules: - rm -rf ${FLATPAK_DEST}/lib/python3.*/site-packages/PySide6/Qt/{lib,libexec} sources: - type: file - url: https://files.pythonhosted.org/packages/d0/de/9a089e91c2e0fe4f122218bba4f9dbde46338659f412739bd9db1ed9df4f/PySide6_Essentials-6.5.2-cp37-abi3-manylinux_2_28_x86_64.whl - sha256: 1620e82b38714a1570b142c01694d0415a25526517b24620ff9b00c9f76cfca9 + url: https://files.pythonhosted.org/packages/56/65/50d0ced768b717f709a5ab224b648eb533a862efd0cde67d19c2727200b0/PySide6_Essentials-6.6.1-cp38-abi3-manylinux_2_28_x86_64.whl + sha256: c7185616083eab6f42eaed598d97d49fac4f60ae2e7415194140d54f58c2b42c + - type: file + url: https://files.pythonhosted.org/packages/73/28/1313720f3e30304b1fd13aab139ec21f30a01f237e70e631663ddad21fd1/PySide6_Essentials-6.6.1-cp38-abi3-manylinux_2_31_aarch64.whl + sha256: a383c3d60298392cfb621ec1a0cf24b4799321e6c5bbafc021d4cc8076ea1315 modules: - name: shiboken6 buildsystem: simple @@ -48,8 +51,11 @@ modules: --prefix=${FLATPAK_DEST} shiboken6 --no-build-isolation sources: - type: file - url: https://files.pythonhosted.org/packages/55/44/d8c366dd4f069166ab9890acb44d004c5e6122714e44c169273dcbbca897/shiboken6-6.5.2-cp37-abi3-manylinux_2_28_x86_64.whl - sha256: 3fbc35ff3c19e7d39433671bfc1be3d7fa9d071bfdd0ffe1c2a4d27acd6cf6a5 + url: https://files.pythonhosted.org/packages/47/f0/334bb65c0bf9ed61df642d10722ddb30562bcf7c3b514bec4e51b32dd6ab/shiboken6-6.6.1-cp38-abi3-manylinux_2_31_aarch64.whl + sha256: a605960e72af5eef915991cee7eef4cc72f5cabe63b9ae1a955ceb3d3b0a00b9 + - type: file + url: https://files.pythonhosted.org/packages/bb/72/e54f758e49e8da0dcd9490d006c41a814b0e56898ce4ca054d60cdba97bd/shiboken6-6.6.1-cp38-abi3-manylinux_2_28_x86_64.whl + sha256: fb102e4bc210006f0cdd0ce38e1aaaaf792bd871f02a2b3f01d07922c5cf4c59 - name: texlive buildsystem: simple @@ -72,9 +78,13 @@ modules: build-commands: - rm -rf .git - cd LogarithmPlotter/i18n && bash release.sh - - mkdir -p /app/share/metainfo/ # Add metainfo file from current repository. + - mkdir -p /app/share/metainfo/ - mv eu.ad5001.LogarithmPlotter.metainfo.xml /app/share/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml + # Use new icon (temporary) + - cp icon_flatpak.svg logplotter.svg + - cp icon_flatpak.svg ./LogarithmPlotter/logarithmplotter.svg + # Install - PREFIX="/app/share" FLATPAK_INSTALL=1 pip3 install --verbose --no-index --prefix=${FLATPAK_DEST} --no-build-isolation --no-deps . # Copy changelog into the directory needed for it to be cached. - cp CHANGELOG.md /app/lib/python3.*/site-packages/LogarithmPlotter/util/ @@ -90,5 +100,7 @@ modules: commit: 19e403ce9883e8debd2905e0773b0dba370bffca - type: file path: eu.ad5001.LogarithmPlotter.metainfo.xml + - type: file + path: icon_flatpak.svg - type: file path: logarithmplotter.desktop diff --git a/flathub.json b/flathub.json deleted file mode 100644 index 9e301be..0000000 --- a/flathub.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "only-arches": ["x86_64"] -} diff --git a/icon_flatpak.svg b/icon_flatpak.svg new file mode 100644 index 0000000..77a2817 --- /dev/null +++ b/icon_flatpak.svg @@ -0,0 +1,64 @@ + +LogarithmPlotter Icon v1.0image/svg+xmlLogarithmPlotter Icon v1.02021Ad5001(c) Ad5001 2021 - All rights reserved