From patchwork Mon Oct 28 12:54:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 69593 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E23E927BBEA; Mon, 28 Oct 2024 12:56:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 976F927BBE9 for ; Mon, 28 Oct 2024 12:56:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5PIL-0007yM-E1; Mon, 28 Oct 2024 08:56:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5PII-0007yD-U7 for guix-patches@gnu.org; Mon, 28 Oct 2024 08:56:26 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5PII-0007o9-LN for guix-patches@gnu.org; Mon, 28 Oct 2024 08:56:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=VTJmIhdfR9sbQl8Q/cEUlS+rDUk/QdF0BilsUw5yK+M=; b=q3+uRLHPNZ+a2Sd3OW3nMonMRvYYjVL13qjAPDexNzVLcDT64MHvpTIFpeVTUHktg22rYWwLU2Cpin/bACBhTHsi5kgtWRNpwGce0rr4FqA0KytW8unymvumT1AosN2IK9nHTNQumfuqT+ymC3llaaghloz4mauLdzpKrdmKMjDDQaZVikBLoiz9NWOoVGCcta0MWky8r6Oks8Xkw01F8DUu5CciPIHZrMzkJyCxIDtF3IQ8m2Rr8Zmht7xiRUa2P3od4JXn4qlzMqmdHaFu4kfY6ZHq7ahjAZkZE1gwJquT5ib6zVkD1fvMqn/ectxlhGUwnsm5KUgNa6imBeuKVg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5PIs-00076b-Nb for guix-patches@gnu.org; Mon, 28 Oct 2024 08:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74061] [PATCH] gnu: commit: Use Qt6. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 12:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74061 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74061@debbugs.gnu.org Cc: Sughosha X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173012017027232 (code B ref -1); Mon, 28 Oct 2024 12:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Oct 2024 12:56:10 +0000 Received: from localhost ([127.0.0.1]:52885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5PI1-000759-Um for submit@debbugs.gnu.org; Mon, 28 Oct 2024 08:56:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:46592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5PHz-000751-Tr for submit@debbugs.gnu.org; Mon, 28 Oct 2024 08:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5PHP-0007vy-Gg for guix-patches@gnu.org; Mon, 28 Oct 2024 08:55:31 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5PHN-0007lo-Ax for guix-patches@gnu.org; Mon, 28 Oct 2024 08:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 31D4024EE6; Mon, 28 Oct 2024 13:55:25 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LdxKgWl1SbQL; Mon, 28 Oct 2024 13:55:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1730120124; bh=ZEtWs2KGD5y6gvyuWNQaVYzEMzY6dFF3aKmJENQd7Xw=; h=From:To:Cc:Subject:Date; b=MY3LKlJ/Rrtq0X1jQaKb07hArUCxmMmPtoH33QSfQ/0s/pMd/Bd9sNPoMPYe3c5uj OgdTk1UaDjp6nOzzzSKjNER/tuDawWNIwnwhA4dB9vH+EWLCL2nrxkTVxKFMsFp6It MT6cUxYYCfNfaYMb6PJqzejZXGGSoTULMwLLd85RYbI/UtsepU+v4dudPEvUouVsfV IkxjWu5zAH8g5zKu8nP/v1pl8HVJErT1O4nz/842Wuh/fdycEJEZwX0AH24Ikq4+h6 0AxNowmWkuA7b9m05a+WBe4d3K3Fw9wBnPpiX6Ci3gFm4C2uvB/DqxenXmLZtllwoD dajOa/jnG8fdg== Date: Mon, 28 Oct 2024 18:24:56 +0530 Message-ID: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde.scm (kommit): Use Qt6. [arguments]: New argument. : New argument. [native-inputs]: Replace kdoctools-5 with kdoctools. [inputs]: Replace kconfigwidgets-5 with kconfigwidgets, kcoreaddons-5 with kcoreaddons, kcrash-5 with kcrash, kdbusaddons-5 with kdbusaddons, ki18n-5 with ki18n, kxmlgui-5 with kxmlgui, kio-5 with kio, ktextwidgets-5 with ktextwidgets, ktexteditor-5 with ktexteditor, ksyntaxhighlighting-5 with ksyntaxhighlighting. Add dolphin. Change-Id: I04ad9f42a74b3a21625f85ae8e47df4f5553b6f2 --- gnu/packages/kde.scm | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 2226230aab..95b44d80d3 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -83,6 +83,8 @@ (define-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-pim) #:use-module (gnu packages kde-plasma) + ;; Including this module breaks the build. + ;#:use-module ((gnu packages kde-systemtools) #:select (dolphin)) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -1065,7 +1067,10 @@ (define-public kommit "09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:configure-flags + #~(list "-DQT_MAJOR_VERSION=6") + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -1076,18 +1081,23 @@ (define-public kommit branchestest|configtest|stashtest|filetest|overlaytest|remotetest|clonetest|\ submoduletest)"))))))) (native-inputs - (list extra-cmake-modules kdoctools-5 pkg-config)) + (list extra-cmake-modules kdoctools pkg-config)) (inputs - (list kconfigwidgets-5 - kcoreaddons-5 - kcrash-5 - kdbusaddons-5 - ki18n-5 - kxmlgui-5 - kio-5 - ktextwidgets-5 - ktexteditor-5 - ksyntaxhighlighting-5 + (list ;; module cyclic referencing + (module-ref + (resolve-interface + '(gnu packages kde-systemtools)) + 'dolphin) ;for dolphin plugin + kconfigwidgets + kcoreaddons + kcrash + kdbusaddons + ki18n + kxmlgui + kio + ktextwidgets + ktexteditor + ksyntaxhighlighting libgit2-1.8)) (home-page "https://apps.kde.org/kommit/") (synopsis "Git client for KDE")