simplify flatpak build and add flathub link to website

Author: nschimme

docs/linux.md

@@ -5,6 +5,10 @@ title: Download MMapper for Linux
 
 ## Download MMapper for Linux
 
+<a href='https://flathub.org/apps/org.mume.MMapper'>
+    <img width='200' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=en' style="vertical-align: middle;"/>
+</a>
+
 [![Get it from the Snap Store](https://snapcraft.io/en/dark/install.svg)](https://snapcraft.io/mmapper)
 
 {% for asset in site.github.latest_release.assets %}

org.mume.MMapper.json

@@ -1,40 +1,27 @@
 {
   "app-id": "org.mume.MMapper",
   "runtime": "org.kde.Platform",
-  "runtime-version": "6.8",
+  "runtime-version": "6.9",
   "sdk": "org.kde.Sdk",
   "finish-args": [
     "--share=network",
     "--socket=wayland",
     "--socket=fallback-x11",
     "--share=ipc",
     "--device=dri",
-    "--filesystem=xdg-documents:rw"
+    "--filesystem=xdg-documents"
   ],
   "command": "mmapper",
   "cleanup": [
-    "/app/images",
-    "/app/include",
-    "/app/arda.xml",
-    "*.a"
+    "*.a",
+    "/arda.xml",
+    "/images",
+    "/include",
+    "/lib/cmake",
+    "/lib/pkgconfig",
+    "/mkspecs"
   ],
   "modules": [
-    {
-      "name": "openssl3",
-      "buildsystem": "simple",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/openssl/openssl.git",
-          "tag": "openssl-3.5.1"
-        }
-      ],
-      "build-commands": [
-        "./config shared no-tests no-unit-test no-weak-ssl-ciphers no-idea no-mdc2 no-rc5 --prefix=/app",
-        "make",
-        "make install"
-      ]
-    },
     {
       "name": "glm",
       "buildsystem": "simple",
@@ -46,7 +33,8 @@
         }
       ],
       "build-commands": [
-        "cp -r glm /app/include/"
+        "mkdir -p /app/include/glm",
+        "cp -r glm/* /app/include/glm/"
       ]
     },
     {
@@ -91,8 +79,8 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.3.tar.gz",
-          "sha256": "a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7",
+          "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.15.tar.gz",
+          "sha256": "2bf85c721315f69f6b486323a2833c2f38b9c1807941bbb3ac16cf11c5b26588",
           "x-checker-data": {
             "type": "anitya",
             "project-id": 4138,
@@ -102,11 +90,8 @@
         }
       ],
       "config-opts": [
-        "-DCMAKE_INSTALL_LIBDIR=/app/lib",
-        "-DLIB_INSTALL_DIR=/app/lib",
         "-DBUILD_TRANSLATIONS=OFF",
-        "-DBUILD_WITH_QT6=ON",
-        "-DCMAKE_PREFIX_PATH=/app"
+        "-DBUILD_WITH_QT6=ON"
       ]
     },
     {
@@ -130,7 +115,7 @@
         {
           "type": "git",
           "url": "https://github.com/MUME/images.git",
-          "tag": "main"
+          "commit": "235b9d6c4d66304f52af16bae982b3e0ae7f4738"
         }
       ],
       "build-commands": [
@@ -155,11 +140,7 @@
         "-DWITH_MAP=/app/arda.xml",
         "-DWITH_IMAGES=/app/images/",
         "-DWITH_TESTS=OFF",
-        "-DOPENSSL_ROOT_DIR=/app",
-        "-DCMAKE_PREFIX_PATH=/app/lib/qt6:/app"
-      ],
-      "build-commands": [
-        "sed -i 's|^Exec=.*|Exec=/app/bin/mmapper|' ../src/org.mume.MMapper.desktop"
+        "-DWITH_UPDATER=OFF"
       ]
     }
   ]