From d9f3fd4d31c561b86dd6a393719e0b116389a4f3 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Sun, 5 Jul 2026 19:10:55 +0200
Subject: [PATCH] qxmpp: 1.15.1 -> 1.16.1

---
 pkgs/by-name/qx/qxmpp/package.nix | 33 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix
index e2d934d1d762..afc6aba94b68 100644
--- a/pkgs/by-name/qx/qxmpp/package.nix
+++ b/pkgs/by-name/qx/qxmpp/package.nix
@@ -5,22 +5,24 @@
   cmake,
   pkg-config,
   kdePackages,
+  ctestCheckHook,
   withGstreamer ? true,
   gst_all_1,
   withOmemo ? true,
   libomemo-c,
+  withEncryption ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qxmpp";
-  version = "1.15.1";
+  version = "1.16.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "qxmpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PkdzEQKI0NiLvDyI+SEoKainF7UiAU3UVJQjgwYKHuo=";
+    hash = "sha256-JuGSLi0oqlUTbJnjlqd9qo0Dk2yCY1hfryQy0CuEjLo=";
   };
 
   nativeBuildInputs = [
@@ -46,21 +48,30 @@ stdenv.mkDerivation (finalAttrs: {
       libomemo-c
     ];
   cmakeFlags = [
-    "-DBUILD_EXAMPLES=false"
-    "-DBUILD_TESTS=false"
-  ]
-  ++ lib.optionals withGstreamer [
-    "-DWITH_GSTREAMER=ON"
-  ]
-  ++ lib.optionals withOmemo [
-    "-DBUILD_OMEMO=ON"
+    (lib.cmakeBool "BUILD_DOCUMENTATION" false)
+    (lib.cmakeBool "BUILD_EXAMPLES" false)
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
+    (lib.cmakeBool "BUILD_OMEMO" withOmemo)
+    (lib.cmakeBool "WITH_ENCRYPTION" withEncryption)
+    (lib.cmakeBool "WITH_GSTREAMER" withGstreamer)
+  ];
+
+  doCheck = true;
+  nativeCheckInputs = [ ctestCheckHook ];
+  disabledTests = [
+    "tst_QXmppIceConnection"
+    "tst_QXmppTransferManager"
   ];
 
   meta = {
     description = "Cross-platform C++ XMPP client and server library";
+    changelog = "https://invent.kde.org/libraries/qxmpp/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     homepage = "https://invent.kde.org/libraries/qxmpp";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ astro ];
+    maintainers = with lib.maintainers; [
+      astro
+      haansn08
+    ];
     platforms = with lib.platforms; linux;
   };
 })