From ce00d56da4fabb2f9d2233c7c704e26c46420ead Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 7 Oct 2025 08:33:35 +0530 Subject: [PATCH] gnu: qxmpp: Move to kde-internet.scm. * gnu/packages/messaging.scm (qxmpp): Remove variable. * gnu/packages/kde-internet.scm (qxmpp): New variable. Change-Id: Id78d60057d790463de113b9babc07ce7737902d6 --- gnu/packages/kde-internet.scm | 44 +++++++++++++++++++++++++++++++++++ gnu/packages/messaging.scm | 43 +--------------------------------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index a4a731e3e7e..21eb6de8889 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -25,6 +25,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system qt) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -38,6 +39,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages kde) @@ -72,6 +74,48 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) +(define-public qxmpp + (package + (name "qxmpp") + ;; kaidan requires a precise version + (version "1.10.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://invent.kde.org/libraries/qxmpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qinrbr63b1baqv1a7cph8bma6kj1ib8s8ywq6d9497lc1yl2kgi")))) + (build-system qt-build-system) + (arguments + `(#:qtbase ,qtbase + #:configure-flags (list "-DBUILD_EXAMPLES=false" + "-DWITH_GSTREAMER=true" + "-DBUILD_OMEMO=ON") ;needed by kaidan + #:test-exclude + (string-join ;; These tests use the network. + (list "tst_qxmppiceconnection" + "tst_qxmppcallmanager" + "tst_qxmpptransfermanager") + "|"))) + (native-inputs + (list pkg-config)) + (inputs + (list + gstreamer + libomemo-c + qca-qt6 + qt5compat)) + (home-page "https://invent.kde.org/libraries/qxmpp") + (synopsis "XMPP client and server library") + (description + "QXmpp is a XMPP client and server library written in C++ and uses the Qt +framework. It builds XMPP clients complying with the XMPP Compliance Suites +2021 for IM and Advanced Mobile.") + (license license:lgpl2.1+))) + (define-public falkon (package (name "falkon") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e3de2c4b10c..7b7f6f02d6c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -113,6 +113,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-internet) #:use-module (gnu packages kerberos) #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) @@ -399,48 +400,6 @@ conferencing.") license:gpl2+ license:bsd-2)))) -(define-public qxmpp - (package - (name "qxmpp") - ;; kaidan requires a precise version - (version "1.10.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://invent.kde.org/libraries/qxmpp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0qinrbr63b1baqv1a7cph8bma6kj1ib8s8ywq6d9497lc1yl2kgi")))) - (build-system qt-build-system) - (arguments - `(#:qtbase ,qtbase - #:configure-flags (list "-DBUILD_EXAMPLES=false" - "-DWITH_GSTREAMER=true" - "-DBUILD_OMEMO=ON") ;needed by kaidan - #:test-exclude - (string-join ;; These tests use the network. - (list "tst_qxmppiceconnection" - "tst_qxmppcallmanager" - "tst_qxmpptransfermanager") - "|"))) - (native-inputs - (list pkg-config)) - (inputs - (list - gstreamer - libomemo-c - qca-qt6 - qt5compat)) - (home-page "https://invent.kde.org/libraries/qxmpp") - (synopsis "XMPP client and server library") - (description - "QXmpp is a XMPP client and server library written in C++ and uses the Qt -framework. It builds XMPP clients complying with the XMPP Compliance Suites -2021 for IM and Advanced Mobile.") - (license license:lgpl2.1+))) - (define-public meanwhile (package (name "meanwhile")