From e2f931c2627c7e5ba6ff2c272327f55954118634 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 22 Sep 2021 14:04:46 +0200 Subject: [PATCH 1/8] Created repository for flathub. --- eu.ad5001.LogarithmPlotter.json | 42 +++++++++++++++++++++++++++++++++ flathub.json | 3 +++ python3-pyside2.json | 32 +++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 eu.ad5001.LogarithmPlotter.json create mode 100644 flathub.json create mode 100644 python3-pyside2.json diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json new file mode 100644 index 0000000..90be731 --- /dev/null +++ b/eu.ad5001.LogarithmPlotter.json @@ -0,0 +1,42 @@ +{ + "app-id": "eu.ad5001.LogarithmPlotter", + "runtime": "org.kde.Platform", + "runtime-version": "5.15", + "sdk": "org.kde.Sdk", + "finish-args": [ + "--share=ipc", + "--device=dri", + "--socket=x11", + "--socket=wayland", + "--talk-name=org.freedesktop.DBus.Proprieties", + "--talk-name=org.freedesktop.IBus", + "--talk-name=org.freedestkop.portal.*", + "--filesystem=home" + ], + "command": "logarithmplotter", + "rename-desktop-file": "logarithmplotter.desktop", + "rename-icon": "logplotter", + "rename-appdata-file": "eu.ad5001.LogarithmPlotter.metainfo.xml", + "cleanup": [ ], + "post-install": [ + "install -D mimetypes /app/share/mime/packages/x-logarithm-plot.xml" + ], + "modules": [ + "python3-pyside2.json", + { + "name": "LogarithmPlotter", + "buildsystem": "simple", + "config-opts": ["no-debuginfo-compression"], + "build-commands": [ + "PREFIX=\"/app/share\" FLATPAK_INSTALL=1 python3 setup.py install --prefix=/app" + ], + "sources": [ + { + "type": "git", + "url": "https://git.ad5001.eu/Ad5001/LogarithmPlotter", + "tag": "v0.1" + } + ] + } + ] +} diff --git a/flathub.json b/flathub.json new file mode 100644 index 0000000..9e301be --- /dev/null +++ b/flathub.json @@ -0,0 +1,3 @@ +{ + "only-arches": ["x86_64"] +} diff --git a/python3-pyside2.json b/python3-pyside2.json new file mode 100644 index 0000000..7865949 --- /dev/null +++ b/python3-pyside2.json @@ -0,0 +1,32 @@ +{ + "name": "python3-pyside2", + "buildsystem": "simple", + "build-commands": [], + "config-opts": [], + "modules": [ + { + "name": "PySide2", + "buildsystem": "cmake-ninja", + "builddir": true, + "config-opts": [ + "-DCMAKE_BUILD_TYPE=Release", + "-DBUILD_TESTS=OFF" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz", + "sha256": "b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418" + }, + { + "type": "shell", + "commands": [ + "mkdir -p /app/include/qt5tmp && cp -R /usr/include/Qt* /app/include/qt5tmp # https://bugreports.qt.io/broswse/PYSIDE-787", + "sed -i 's|--include-paths=|--include-paths=/app/include/qt5tmp:|' sources/pyside2/cmake/Macros/PySideModules.cmake" + ] + } + ] + + } + ] +} From 026a2c6e51d9d8019422d8ed52995863b711ff63 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 24 Sep 2021 12:23:40 +0200 Subject: [PATCH 2/8] Bumping to v0.1.1. --- eu.ad5001.LogarithmPlotter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index 90be731..14d6793 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -34,7 +34,7 @@ { "type": "git", "url": "https://git.ad5001.eu/Ad5001/LogarithmPlotter", - "tag": "v0.1" + "tag": "v0.1.1" } ] } From 6eab1e3cc0fb433e9958e079dfd1f126b6828284 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 1 Oct 2021 17:28:18 +0200 Subject: [PATCH 3/8] Updating to v0.1.2 --- eu.ad5001.LogarithmPlotter.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index 14d6793..ac8e625 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -28,13 +28,14 @@ "buildsystem": "simple", "config-opts": ["no-debuginfo-compression"], "build-commands": [ + "rm -rf .git", "PREFIX=\"/app/share\" FLATPAK_INSTALL=1 python3 setup.py install --prefix=/app" ], "sources": [ { "type": "git", "url": "https://git.ad5001.eu/Ad5001/LogarithmPlotter", - "tag": "v0.1.1" + "tag": "v0.1.2" } ] } From 0eb8840e46070bd01684def10046e448e3fbf992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=8B=80d5001?= Date: Fri, 1 Oct 2021 16:13:55 +0000 Subject: [PATCH 4/8] Apply suggestions from code review (more changes to come) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated KDE runtime to v5.15-21.08 * Removing old bits that shouldn't be there anymore. Co-authored-by: Hubert Figuière Co-authored-by: Bartłomiej Piotrowski --- eu.ad5001.LogarithmPlotter.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index ac8e625..6461719 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -1,12 +1,12 @@ { "app-id": "eu.ad5001.LogarithmPlotter", "runtime": "org.kde.Platform", - "runtime-version": "5.15", + "runtime-version": "5.15-21.08", "sdk": "org.kde.Sdk", "finish-args": [ "--share=ipc", "--device=dri", - "--socket=x11", + "--socket=fallback-x11", "--socket=wayland", "--talk-name=org.freedesktop.DBus.Proprieties", "--talk-name=org.freedesktop.IBus", @@ -17,7 +17,6 @@ "rename-desktop-file": "logarithmplotter.desktop", "rename-icon": "logplotter", "rename-appdata-file": "eu.ad5001.LogarithmPlotter.metainfo.xml", - "cleanup": [ ], "post-install": [ "install -D mimetypes /app/share/mime/packages/x-logarithm-plot.xml" ], From 8f50659ffa04a204c9857e50fdfcb9b9de35ecf5 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 1 Oct 2021 18:21:29 +0200 Subject: [PATCH 5/8] Working in resoliving more issues (only one remaining in the mime type issue). --- eu.ad5001.LogarithmPlotter.json | 37 ++++++++++++++++++++++++++------- flathub.json | 2 +- python3-pyside2.json | 32 ---------------------------- 3 files changed, 30 insertions(+), 41 deletions(-) delete mode 100644 python3-pyside2.json diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index ac8e625..fbcdaed 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -16,26 +16,47 @@ "command": "logarithmplotter", "rename-desktop-file": "logarithmplotter.desktop", "rename-icon": "logplotter", - "rename-appdata-file": "eu.ad5001.LogarithmPlotter.metainfo.xml", - "cleanup": [ ], - "post-install": [ - "install -D mimetypes /app/share/mime/packages/x-logarithm-plot.xml" - ], "modules": [ - "python3-pyside2.json", + { + "name": "PySide2", + "buildsystem": "cmake-ninja", + "builddir": true, + "config-opts": [ + "-DCMAKE_BUILD_TYPE=Release", + "-DBUILD_TESTS=OFF" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz", + "sha256": "b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418" + }, + { + "type": "shell", + "commands": [ + "mkdir -p /app/include/qt5tmp && cp -R /usr/include/Qt* /app/include/qt5tmp # https://bugreports.qt.io/broswse/PYSIDE-787", + "sed -i 's|--include-paths=|--include-paths=/app/include/qt5tmp:|' sources/pyside2/cmake/Macros/PySideModules.cmake" + ] + } + ] + + }, { "name": "LogarithmPlotter", "buildsystem": "simple", - "config-opts": ["no-debuginfo-compression"], "build-commands": [ "rm -rf .git", "PREFIX=\"/app/share\" FLATPAK_INSTALL=1 python3 setup.py install --prefix=/app" ], + "post-install": [ + "install -D mimetypes /app/share/mime/packages/x-logarithm-plot.xml" + ], "sources": [ { "type": "git", "url": "https://git.ad5001.eu/Ad5001/LogarithmPlotter", - "tag": "v0.1.2" + "tag": "v0.1.2", + "commit": "9833e7ae65d6c5c4b9dcb2707bf632e3a3e4ca96" } ] } diff --git a/flathub.json b/flathub.json index 9e301be..55bbe81 100644 --- a/flathub.json +++ b/flathub.json @@ -1,3 +1,3 @@ { - "only-arches": ["x86_64"] + "only-arches": ["x86_64", "aarch64"] } diff --git a/python3-pyside2.json b/python3-pyside2.json deleted file mode 100644 index 7865949..0000000 --- a/python3-pyside2.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "python3-pyside2", - "buildsystem": "simple", - "build-commands": [], - "config-opts": [], - "modules": [ - { - "name": "PySide2", - "buildsystem": "cmake-ninja", - "builddir": true, - "config-opts": [ - "-DCMAKE_BUILD_TYPE=Release", - "-DBUILD_TESTS=OFF" - ], - "sources": [ - { - "type": "archive", - "url": "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz", - "sha256": "b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418" - }, - { - "type": "shell", - "commands": [ - "mkdir -p /app/include/qt5tmp && cp -R /usr/include/Qt* /app/include/qt5tmp # https://bugreports.qt.io/broswse/PYSIDE-787", - "sed -i 's|--include-paths=|--include-paths=/app/include/qt5tmp:|' sources/pyside2/cmake/Macros/PySideModules.cmake" - ] - } - ] - - } - ] -} From 8d221f21ee62d75100014d4211c6959140a46b9c Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 1 Oct 2021 18:32:16 +0200 Subject: [PATCH 6/8] Removed flathub.json, updated mime type installation to file renaming (untested) --- eu.ad5001.LogarithmPlotter.json | 2 +- flathub.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 flathub.json diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index 4130de1..44c47ce 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -49,7 +49,7 @@ "PREFIX=\"/app/share\" FLATPAK_INSTALL=1 python3 setup.py install --prefix=/app" ], "post-install": [ - "install -D mimetypes /app/share/mime/packages/x-logarithm-plot.xml" + "mv /app/share/mime/packages/x-logarithm-plot.xml /app/share/mime/packages/eu.ad5001.LogarithmPlotter.xml" ], "sources": [ { diff --git a/flathub.json b/flathub.json deleted file mode 100644 index 55bbe81..0000000 --- a/flathub.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "only-arches": ["x86_64", "aarch64"] -} From cbfe7e2431965559de29d0b5f2639fcff70f0341 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 1 Oct 2021 18:46:52 +0200 Subject: [PATCH 7/8] Reverting Runtime version to v5.15 due to issues with building PySide2 on v5.15-21.08. --- eu.ad5001.LogarithmPlotter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index 44c47ce..bacda08 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -1,7 +1,7 @@ { "app-id": "eu.ad5001.LogarithmPlotter", "runtime": "org.kde.Platform", - "runtime-version": "5.15-21.08", + "runtime-version": "5.15", "sdk": "org.kde.Sdk", "finish-args": [ "--share=ipc", From 2706bf8f28808f45713d4554edc1e365f146a319 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 2 Oct 2021 11:48:33 +0200 Subject: [PATCH 8/8] Fixed DBus talk-to to org.freedesktop.DBus.Properties. --- eu.ad5001.LogarithmPlotter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu.ad5001.LogarithmPlotter.json b/eu.ad5001.LogarithmPlotter.json index bacda08..46f2c8c 100644 --- a/eu.ad5001.LogarithmPlotter.json +++ b/eu.ad5001.LogarithmPlotter.json @@ -8,7 +8,7 @@ "--device=dri", "--socket=fallback-x11", "--socket=wayland", - "--talk-name=org.freedesktop.DBus.Proprieties", + "--talk-name=org.freedesktop.DBus.Properties", "--talk-name=org.freedesktop.IBus", "--talk-name=org.freedestkop.portal.*", "--filesystem=home"