From 8f50659ffa04a204c9857e50fdfcb9b9de35ecf5 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Fri, 1 Oct 2021 18:21:29 +0200
Subject: [PATCH] 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"
-                    ]
-                }
-            ]
-
-        }
-    ]
-}