Remove duplicated corrosion

.flatpak-manifest.json

@@ -22,7 +22,20 @@
         "--talk-name=org.freedesktop.secrets",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
+    "sdk-extensions": [
+        "org.freedesktop.Sdk.Extension.rust-stable"
+    ],
+    "build-options": {
+        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "env": {
+            "RUST_BACKTRACE": "1",
+            "CARGO_NET_OFFLINE": "true",
+            "RUSTFLAGS": "--remap-path-prefix =../"
+        }
+    },
+
     "modules": [
+        "flatpak/corrosion.json",
         {
             "name": "kirigamiaddons",
             "config-opts": [
@@ -50,25 +63,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 +111,15 @@
             ]
         },
         {
-            "name": "libQuotient",
+            "name": "integral",
             "buildsystem": "cmake-ninja",
             "sources": [
+                "flatpak/generated-sources.json",
                 {
                     "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"
             ]
         },
         {

.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

flatpak/corrosion.json

@@ -0,0 +1,30 @@
+{
+    "build-options": {
+        "env": {
+            "CARGO_HOME": "/run/build/corrosion/cargo"
+        }
+    },
+    "buildsystem": "cmake-ninja",
+    "cleanup": [
+        "/app"
+    ],
+    "config-opts": [
+        "-DCORROSION_INSTALL_EXECUTABLE=OFF",
+        "-DCORROSION_BUILD_TESTS=OFF",
+        "-DCORROSION_DEV_MODE=OFF"
+    ],
+    "name": "corrosion",
+    "sources": [
+        {
+            "sha256": "843334a9f0f5efbc225dccfa88031fe0f2ec6fd787ca1e7d55ed27b2c25d9c97",
+            "type": "archive",
+            "url": "https://github.com/corrosion-rs/corrosion/archive/refs/tags/v0.5.1.tar.gz",
+            "x-checker-data": {
+                "type": "anitya",
+                "project-id": 242799,
+                "stable-only": true,
+                "url-template": "https://github.com/corrosion-rs/corrosion/archive/refs/tags/v0.5.1.tar.gz"
+            }
+        }
+    ]
+}

flatpak/corrosion.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Jonah Brüchert <jbb@kaidan.im>
+SPDX-License-Identifier: CC0-1.0

flatpak/generated-sources.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: None
+SPDX-License-Identifier: CC0-1.0

flatpak/regenerate-sources.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# SPDX-FileCopyrightText: Jonah Brüchert <jbb@kaidan.im>
+# SPDX-License-Identifier: CC0-1.0
+set -e
+
+export GIT_CLONE_ARGS="--depth 1 --single-branch"
+export FLATPAK_DIR="$(readlink -f $(dirname $0))"
+cd ${FLATPAK_DIR}
+
+if [ ! -d flatpak-builder-tools ]; then
+        git clone ${GIT_CLONE_ARGS} https://github.com/flatpak/flatpak-builder-tools
+else
+	git -C flatpak-builder-tools pull
+fi
+
+./flatpak-builder-tools/cargo/flatpak-cargo-generator.py -o generated-sources.json ../../integral/src/sdk/Cargo.lock