From 18bea02fa00d3ee3dc44ab5732751549511560d4 Mon Sep 17 00:00:00 2001
From: Tobias Fella <tobias.fella@kde.org>
Date: Sat, 22 Mar 2025 17:17:39 +0100
Subject: [PATCH] WIP

---
 .flatpak-manifest.json | 31 +++----------------------------
 .gitlab-ci.yml         | 18 +++++++++---------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json
index 796641ce0..694cede55 100644
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -50,25 +50,6 @@
                 }
             ]
         },
-        {
-            "name": "olm",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DOLM_TESTS=OFF"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.matrix.org/matrix-org/olm.git",
-                    "tag": "3.2.16",
-                    "x-checker-data": {
-                        "type": "git",
-                        "tag-pattern": "^([\\d.]+)$"
-                    },
-                    "commit": "7e0c8277032e40308987257b711b38af8d77cc69"
-                }
-            ]
-        },
         {
             "name": "libsecret",
             "buildsystem": "meson",
@@ -117,20 +98,14 @@
             ]
         },
         {
-            "name": "libQuotient",
+            "name": "integral",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "dev",
-                    "disable-submodules": true
+                    "url": "https://invent.kde.org/tfella/integral.git",
+                    "branch": "master"
                 }
-            ],
-            "config-opts": [
-                "-DBUILD_WITH_QT6=ON",
-                "-DQuotient_ENABLE_E2EE=ON",
-                "-DBUILD_TESTING=OFF"
             ]
         },
         {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20cf66f10..027c3d9cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,14 +8,14 @@ include:
       - /gitlab-templates/json-validation.yml
       - /gitlab-templates/xml-lint.yml
       - /gitlab-templates/yaml-lint.yml
-      - /gitlab-templates/android-qt6.yml
-      - /gitlab-templates/linux-qt6.yml
-      - /gitlab-templates/linux-qt6-next.yml
-      - /gitlab-templates/windows-qt6.yml
+      # - /gitlab-templates/android-qt6.yml
+      # - /gitlab-templates/linux-qt6.yml
+      # - /gitlab-templates/linux-qt6-next.yml
+      # - /gitlab-templates/windows-qt6.yml
       # - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
-      - /gitlab-templates/snap-snapcraft-lxd.yml
-      - /gitlab-templates/craft-android-qt6-apks.yml
-      - /gitlab-templates/craft-appimage-qt6.yml
-      - /gitlab-templates/craft-windows-x86-64-qt6.yml
-      - /gitlab-templates/craft-windows-appx-qt6.yml
+      # - /gitlab-templates/snap-snapcraft-lxd.yml
+      # - /gitlab-templates/craft-android-qt6-apks.yml
+      # - /gitlab-templates/craft-appimage-qt6.yml
+      # - /gitlab-templates/craft-windows-x86-64-qt6.yml
+      # - /gitlab-templates/craft-windows-appx-qt6.yml