From 22b836e2f6c7e5e5e98c8a5c701134d51914912c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 28 Nov 2025 00:56:02 +0300
Subject: [PATCH] opencloud-desktop: 2.0.0 -> 3.0.2, drop hacks

---
 pkgs/by-name/op/opencloud-desktop/package.nix | 32 ++-----------------
 .../op/opencloud-desktop/qt-6.10.1.patch      | 13 --------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch

diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix
index da1dfad4fbeb..c6c77bd75e74 100644
--- a/pkgs/by-name/op/opencloud-desktop/package.nix
+++ b/pkgs/by-name/op/opencloud-desktop/package.nix
@@ -3,7 +3,6 @@
   cmake,
   kdePackages,
   fetchFromGitHub,
-  fetchFromGitLab,
   libre-graph-api-cpp-qt-client,
   kdsingleapplication,
   nix-update-script,
@@ -11,46 +10,21 @@
   versionCheckHook,
   stdenv,
 }:
-let
-  # See issue https://github.com/NixOS/nixpkgs/issues/455981
-  # It was spotted upstream that ecm 6.19.0 caused this issue
-  # Therefore we pin ecm 6.18.0 which makes opencloud function correctly
-  ecm618 = kdePackages.extra-cmake-modules.overrideAttrs (
-    finalAttrs: prevAttrs: {
-      version = "6.18.0";
-      src = fetchFromGitLab {
-        domain = "invent.kde.org";
-        owner = "frameworks";
-        repo = "extra-cmake-modules";
-        tag = "v${finalAttrs.version}";
-        hash = "sha256-hpqczRaV32yyXXRWxR30tOBEUNWDkeSzVrv0SHMrz1Y=";
-      };
-      patches = [ ];
-    }
-  );
-
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencloud-desktop";
-  version = "2.0.0";
+  version = "3.0.2";
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY=";
+    hash = "sha256-ILOapZfySDJWZJDVFwNs46SEw/yPpe/+2dctyRl8iJ8=";
   };
 
-  # Fix build with Qt 6.10.1
-  # Submitted upstream: https://github.com/opencloud-eu/desktop/pull/710
-  patches = [
-    ./qt-6.10.1.patch
-  ];
-
   buildInputs = [
-    ecm618
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qttools
+    kdePackages.extra-cmake-modules
     kdePackages.qtkeychain
     libre-graph-api-cpp-qt-client
     kdsingleapplication
diff --git a/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch b/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch
deleted file mode 100644
index c3e59ca05482..000000000000
--- a/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/libsync/globalconfig.h b/src/libsync/globalconfig.h
-index 7094385b4..2ef8a44d2 100644
---- a/src/libsync/globalconfig.h
-+++ b/src/libsync/globalconfig.h
-@@ -6,7 +6,7 @@
- #include "libsync/opencloudsynclib.h"
- 
- #include <QVariant>
--#include <QtQmlMeta>
-+#include <QtQmlIntegration/QtQmlIntegration>
- 
- namespace OCC {
- class OPENCLOUD_SYNC_EXPORT GlobalConfig : public QObject