From 24003239203acc40c883b5e7363943710bd53f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Wed, 19 Feb 2025 17:28:16 +0100
Subject: [PATCH 1/8] ci: pin craft/craft-blueprints-owncloud to
 e7e98ec5da0210d74ddf229718c39f73be928069

---
 .craft.shelf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.craft.shelf b/.craft.shelf
index 51f9d44bfeb..7daaa5993a2 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -11,6 +11,7 @@ revision = 9be073decbb06b7425655806c4e57ccc85ea2117
 
 [craft/craft-blueprints-owncloud]
 version = 5
+revision = e7e98ec5da0210d74ddf229718c39f73be928069
 
 [craft/craft-core]
 version = master

From 75dfa249b454c3645e7d275f4cc7caa8849959e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 09:30:48 +0100
Subject: [PATCH 2/8] x

---
 .craft.shelf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.craft.shelf b/.craft.shelf
index 7daaa5993a2..2c17c0b5f8b 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -7,7 +7,7 @@ version = 2023-01-10
 
 [craft/craft-blueprints-kde]
 version = master
-revision = 9be073decbb06b7425655806c4e57ccc85ea2117
+revision = a99ed6ddb981974b65945e70a943776511c03c9d
 
 [craft/craft-blueprints-owncloud]
 version = 5

From df2287d54c1d74cc4f9648064664892abd390399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:15:48 +0100
Subject: [PATCH 3/8] x

---
 .craft.shelf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.craft.shelf b/.craft.shelf
index 2c17c0b5f8b..7af0873de7e 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -1,12 +1,12 @@
 [General]
 version = 2
-blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|master|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
+blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|5+openssl+dbus|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
 
 [core/cacert]
 version = 2023-01-10
 
 [craft/craft-blueprints-kde]
-version = master
+version = 5+openssl+dbus
 revision = a99ed6ddb981974b65945e70a943776511c03c9d
 
 [craft/craft-blueprints-owncloud]

From 713736ba519a7aedd795b8e24921f1d8ed1c226d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:32:43 +0100
Subject: [PATCH 4/8] x

---
 .craft.shelf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.craft.shelf b/.craft.shelf
index 7af0873de7e..be196856846 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -7,7 +7,7 @@ version = 2023-01-10
 
 [craft/craft-blueprints-kde]
 version = 5+openssl+dbus
-revision = a99ed6ddb981974b65945e70a943776511c03c9d
+revision = 0d9cbe209b1197e0c9f4e556597eaa526261b2e1
 
 [craft/craft-blueprints-owncloud]
 version = 5

From 14fbc6eb41844376dfcb7f88d3c55dc698b76a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:55:26 +0100
Subject: [PATCH 5/8] ci: drop mac-debug

---
 .github/workflows/main.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b32bd7efd35..2f4c42c12a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,11 +39,6 @@ jobs:
               os: macos-latest
               fetch-depth: 1
               container:
-            - name: macos-clang-arm64-debug
-              target: macos-clang-arm64-debug
-              os: macos-latest
-              fetch-depth: 1
-              container:
 
     name: ${{ matrix.name }}
 
@@ -97,12 +92,6 @@ jobs:
 
     - name: Build
       run: |
-        if ("${{ matrix.target }}" -eq "macos-64-clang-debug" ) {
-            # https://api.kde.org/ecm/module/ECMEnableSanitizers.html
-            # address;leak;undefined
-            # clang: error: unsupported option '-fsanitize=leak' for target 'x86_64-apple-darwin21.6.0'
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set args="-DECM_ENABLE_SANITIZERS='address;undefined'" owncloud/owncloud-client
-        }
         if ("${{ matrix.target }}" -eq "windows-cl-msvc2022-x86_64") {
             & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --src-dir "${env:GITHUB_WORKSPACE}" --configure owncloud/owncloud-client
             $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client)

From cc4893b38fb8fc7bdaf8da0ea12634c1dea04800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:58:01 +0100
Subject: [PATCH 6/8] ci: disable cache

---
 .github/workflows/main.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2f4c42c12a9..3f698d04904 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,12 +58,6 @@ jobs:
         fetch-depth: ${{ matrix.fetch-depth }}
         submodules: true
 
-    - name: Restore cache
-      uses: actions/cache@v4
-      with:
-        path: ~/cache
-        key: ${{ runner.os }}-${{ matrix.target }}
-
     - name: Clone CraftMaster
       run: git clone --depth=1 https://invent.kde.org/kde/craftmaster.git "$env:HOME/craft/CraftMaster/CraftMaster"
 

From 26b182870ec828fbfcc193019d76bce9b660f159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:01:12 +0100
Subject: [PATCH 7/8] x

---
 .craft.shelf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.craft.shelf b/.craft.shelf
index be196856846..38f0d7b0f6d 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -1,13 +1,12 @@
 [General]
 version = 2
-blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|5+openssl+dbus|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
+blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|5+openssl+dbus+pyimports|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
 
 [core/cacert]
 version = 2023-01-10
 
 [craft/craft-blueprints-kde]
-version = 5+openssl+dbus
-revision = 0d9cbe209b1197e0c9f4e556597eaa526261b2e1
+version = 5+openssl+dbus+pyimports
 
 [craft/craft-blueprints-owncloud]
 version = 5

From f538377f65f229534d55a884560fa7fcdbc8fea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:09:31 +0100
Subject: [PATCH 8/8] x

---
 .craft.shelf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.craft.shelf b/.craft.shelf
index 38f0d7b0f6d..9c0dcb743ef 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -1,12 +1,12 @@
 [General]
 version = 2
-blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|5+openssl+dbus+pyimports|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
+blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|5+openssl+dbus|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
 
 [core/cacert]
 version = 2023-01-10
 
 [craft/craft-blueprints-kde]
-version = 5+openssl+dbus+pyimports
+version = 5+openssl+dbus
 
 [craft/craft-blueprints-owncloud]
 version = 5