Cleanup flatpak build

Akaflieg-Freiburg · Nov 25, 2024 · 779155e · 779155e
1 parent 0809c77
commit 779155e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 117 deletions.
diff --git a/packaging/flatpak/CMakeLists.txt b/packaging/flatpak/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target(flatpak-binary
   COMMAND echo ""
   COMMAND echo "Run your flatpak with the following command"
   COMMAND echo ""
-  COMMAND echo " flatpak-builder --run ${CMAKE_CURRENT_BINARY_DIR}/flatpakBuildDirectory ${CMAKE_CURRENT_BINARY_DIR}/${APP_ID}.json addhoursandminutes"
+  COMMAND echo " flatpak-builder --run ${CMAKE_CURRENT_BINARY_DIR}/flatpakBuildDirectory ${CMAKE_CURRENT_BINARY_DIR}/${APP_ID}.json addhoursandminutes -platform wayland"
   COMMAND echo ""
   COMMAND echo ""
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/packaging/flatpak/de.akaflieg_freiburg.cavok.add_hours_and_minutes.json b/packaging/flatpak/de.akaflieg_freiburg.cavok.add_hours_and_minutes.json
@@ -1,120 +1,16 @@
 {
   "app-id": "${APP_ID}",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "23.08",
-  "sdk": "org.freedesktop.Sdk",
+  "runtime": "org.kde.Platform",
+  "runtime-version": "6.8",
+  "sdk": "org.kde.Sdk",
   "command": "addhoursandminutes",
   "finish-args": [
+    "--device=dri",
     "--share=ipc",
-    "--socket=x11",
-    "--device=dri"
-  ],
-  "cleanup": [
-    "/app/qtTemporary",
-    "/qtTemporary"
+    "--socket=fallback-x11",
+    "--socket=wayland"
   ],
   "modules": [
-    {
-      "name": "qtbase",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qt/qtbase.git",
-          "tag": "v${Qt6_VERSION}"
-        }
-      ],
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
-        "-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
-        "-DQT_BUILD_TESTS_BY_DEFAULT=OFF"
-      ]
-    },
-    {
-      "name": "qtsvg",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qt/qtsvg.git",
-          "tag": "v${Qt6_VERSION}"
-        }
-      ],
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
-        "-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary"
-      ]
-    },
-    {
-      "name": "qttools",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qt/qttools.git",
-          "tag": "v${Qt6_VERSION}"
-        }
-      ],
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
-        "-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
-        "-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
-        "-DQT_BUILD_TESTS_BY_DEFAULT=OFF",
-        "-DFEATURE_assistant=ON",
-        "-DFEATURE_clang=OFF",
-        "-DFEATURE_clangcpp=OFF",
-        "-DFEATURE_designer=ON",
-        "-DFEATURE_distancefieldgenerator=OFF",
-        "-DFEATURE_kmap2qmap=OFF",
-        "-DFEATURE_macdeployqt=OFF",
-        "-DFEATURE_pixeltool=OFF",
-        "-DFEATURE_pkg_config=OFF",
-        "-DFEATURE_qdbus=OFF",
-        "-DFEATURE_qev=OFF",
-        "-DFEATURE_qtattributionsscanner=OFF",
-        "-DFEATURE_qtdiag=OFF",
-        "-DFEATURE_qtplugininfo=OFF",
-        "-DFEATURE_windeployqt=OFF"
-      ]
-    },
-    {
-      "name": "qtshadertools",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qt/qtshadertools.git",
-          "tag": "v${Qt6_VERSION}"
-        }
-      ],
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
-        "-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary"
-      ]
-    },
-    {
-      "name": "qtdeclarative",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qt/qtdeclarative.git",
-          "tag": "v${Qt6_VERSION}"
-        }
-      ],
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
-        "-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
-        "-DFEATURE_qml_debug=OFF",
-        "-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
-        "-DQT_BUILD_TESTS_BY_DEFAULT=OFF"
-      ]
-    },
     {
       "name": "addHoursAndMinutes",
       "buildsystem": "cmake-ninja",
@@ -124,12 +20,7 @@
           "url": "https://github.com/Akaflieg-Freiburg/addhoursandminutes.git",
           "commit": "${GIT_COMMIT}"
         }
-      ],
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary"
       ]
     }
   ]
-}
+}