From unknown Sun Jun 22 11:42:21 2025 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== From: Sughosha Date: Mon, 28 Oct 2024 18:24:56 +0530 Message-ID: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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(-) 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") base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 29 02:27:46 2024 Received: (at control) by debbugs.gnu.org; 29 Oct 2024 06:27:46 +0000 Received: from localhost ([127.0.0.1]:55635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5fhi-0005K8-77 for submit@debbugs.gnu.org; Tue, 29 Oct 2024 02:27:46 -0400 Received: from layka.disroot.org ([178.21.23.139]:52500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5fhf-0005Jy-FC for control@debbugs.gnu.org; Tue, 29 Oct 2024 02:27:44 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B154625378 for ; Tue, 29 Oct 2024 07:27:41 +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 DEhRDnld99f0 for ; Tue, 29 Oct 2024 07:27:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1730183261; bh=CRfd27I+tfyVZoJ7nBsz11flLetcx0nQhxkfrnfwgds=; h=From:To:Subject:Date; b=dBIy5tYeh2kueBbmidijZOQd/7QgOpd/wNqDbSV0S3P/WZtwtilcVEtxtXmSO5zzn y+OvWr73wbFq8wVgj//frTziq28lmEEq1XpyNl8DSZZOnQgmEQjiqtG1PuMvM7jV8s jdUP3MfRDK0DI3h8yQyIAzMxfL2suDD4UbojRiF09PVeEQOmMBK1MA39GRJZfbhRU7 0em2m9fMIq24YgI6i1QtiNCe9TI/dTLhewet7mlnepn5bBWg8/OOxRFXzGHiT61NxF LJEvuH4CnMTU4qlBRXwFTL68yNfCZ8UVfAMYqlnguHUMe2mMVw5kntb2Cdf1yi7tmW aHzwOrpO11Tdw== From: Sughosha To: control@debbugs.gnu.org Subject: Retitle #74061 Date: Tue, 29 Oct 2024 11:57:36 +0530 Message-ID: <5827987.DvuYhMxLoT@localhost.localdomain> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) retitle 74061 gnu: kommit: Use Qt6. quit -- Sughosha From unknown Sun Jun 22 11:42:21 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74061] [PATCH] gnu: commit: Use Qt6. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Oct 2024 07:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74061 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74061@debbugs.gnu.org Cc: sughosha@disroot.org X-Debbugs-Original-To: Sughosha via Guix-patches via X-Debbugs-Original-Cc: 74061@debbugs.gnu.org, Sughosha Received: via spool by submit@debbugs.gnu.org id=B.173036072021873 (code B ref -1); Thu, 31 Oct 2024 07:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Oct 2024 07:45:20 +0000 Received: from localhost ([127.0.0.1]:40605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Prr-0005gi-Tg for submit@debbugs.gnu.org; Thu, 31 Oct 2024 03:45:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:38014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Pro-0005gS-3L for submit@debbugs.gnu.org; Thu, 31 Oct 2024 03:45:17 -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 1t6Prn-0003ah-Rl for guix-patches@gnu.org; Thu, 31 Oct 2024 03:45:15 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1t6Prk-0002xk-UH for guix-patches@gnu.org; Thu, 31 Oct 2024 03:45:15 -0400 Received: from m (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowABHLmV6NSNn8Rb3Cw--.2141S2; Thu, 31 Oct 2024 15:45:02 +0800 (CST) From: Z572 In-Reply-To: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> (Sughosha via Guix-patches via's message of "Mon, 28 Oct 2024 18:24:56 +0530") References: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> Date: Thu, 31 Oct 2024 15:44:56 +0800 Message-ID: <8734kcn2br.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: zQCowABHLmV6NSNn8Rb3Cw--.2141S2 X-Coremail-Antispam: 1UD129KBjvJXoWxXw4fKr47CFWxGr1fKF45ZFb_yoW5Xw18pF yfJa9a9rs5Jr4rJa1SqrW8uw13urZ7KF4Ygw4xJwsaqF45u340yFyjgw4Yy347Cw1fXw17 uryDGa1UGFy5ArJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvGb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVWxJr0_GcWlnx0Ee4C267I2x7xF54xIwI0E7I0Y6sxI4wAS0I0E 0xvYzxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I 80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCj c4AY6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0x vE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa 73UjIFyTuYvjxU6cdbDUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Sughosha via Guix-patches via writes: > * 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(-) > > 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") > > base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 push, and fix typo. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmcjNXgACgkQO1qpk+Gi 3/CIVg/+Ox+US9fGC959qJ5218JUTXT3yQj7V/5idF658isVSFZ2zJ88yD6H0SEe 5eriF5+DBd+X2ah3QfKqOFFNgA4AdkvR/3FdZ5bQJnMo2dIDcuPkuD2Wa+CRrBoe NbCiHMcZOq4GY1wYjqoYIh34DxPDAktfS8Mg2zZT+iB/dUjVQtcvTwZkVbXSZzUG RAsaxlvArBkvy/gSy3rnVvPY+ytJYRmtrtlHRXLeaqaBpJMlGtz/j4ZQnrEYcgbX GQNRuW+Rv5DNhTiKR1omNZivSPj5GsuaAh7/2lP0MQKQ0XGQTU8K/KRqI7fE8DzC RAKvTXcIQrKpOR4/AjUQaLk+FTTYwTViwDAWER7qhqlDI23W3Kh4lFtZbHGaRrUv zFtyGCBijLmyDIN0t9wR7tj5AJTyK5TjHsDP9D1cLscqbqk5EbxlGgCDSD2N1Hag 6mLcb4p9WGJesA7GfNPdfRz7hLZK2l+swjSjJZbB2N5P6qf5uTM5T+4McWSo6yvy cKh0ot4fDsRL8u6atsRjT8IxlosLXKiI3ACkeDWiWbkv56Ohcm+hh1axviPnVC+j +c+AhNVr1rM+pRJvaya5TQIkboI2/o3ghv7XQXnFzr36YYCgrkrRh2QetMR277e8 TV/nVNdEUUxTX7eU/kUSflYxGG0SyFA0FAwgUEl6OCabq4e5YHc= =0KwV -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 11:42:21 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Sughosha Subject: bug#74061: closed (Re: [bug#74061] [PATCH] gnu: commit: Use Qt6.) Message-ID: References: <87a5ejl852.fsf@iscas.ac.cn> <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> X-Gnu-PR-Message: they-closed 74061 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74061@debbugs.gnu.org Date: Fri, 01 Nov 2024 07:35:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1730446502-23401-1" This is a multi-part message in MIME format... ------------=_1730446502-23401-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74061: gnu: kommit: Use Qt6. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74061@debbugs.gnu.org. --=20 74061: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74061 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1730446502-23401-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74061-done) by debbugs.gnu.org; 1 Nov 2024 07:34:55 +0000 Received: from localhost ([127.0.0.1]:47498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6mBK-000658-L9 for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:34:55 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:51524 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6mBG-00064x-Tj for 74061-done@debbugs.gnu.org; Fri, 01 Nov 2024 03:34:53 -0400 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowAD3_MSLhCRnOFs9DA--.40617S2; Fri, 01 Nov 2024 15:34:39 +0800 (CST) From: Z572 To: Sughosha via Guix-patches via Subject: Re: [bug#74061] [PATCH] gnu: commit: Use Qt6. In-Reply-To: <8734kcn2br.fsf@iscas.ac.cn> (zhengjunjie@iscas.ac.cn's message of "Thu, 31 Oct 2024 15:44:56 +0800") References: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> <8734kcn2br.fsf@iscas.ac.cn> Date: Fri, 01 Nov 2024 15:34:33 +0800 Message-ID: <87a5ejl852.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAD3_MSLhCRnOFs9DA--.40617S2 X-Coremail-Antispam: 1UD129KBjvJXoWxZw1UXFy3GrWkWF1rtw1kKrg_yoW5Ar17pF yfJayFvrs5Jr4rJanaqr4YgFnxZ392kF4Ygw4xGwnaqw15ua48AFyqqw45Aasruw1fXw17 uryUWa1UGry5JFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvlb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW0oVCq3wAa7VASzI0EjI02j7AqF2xKxVCjxxvEa2IrM2AIxVAI cxkEcVAq07x20xvEncxIr21le4C267I2x7xF54xIwI1l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr 0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY 17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcV C0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY 6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvj DU0xZFpf9x07jEOJOUUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74061-done Cc: 74061-done@debbugs.gnu.org, Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Z572 writes: > Sughosha via Guix-patches via writes: > >> * 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(-) >> >> 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") >> >> base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 > > push, and fix typo. close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmckhIkACgkQO1qpk+Gi 3/DUcA/9EGuFR716X3OOdeodtLHx0X9150tEVd+vdPNNbjLNzvCh4Z5Xa2FEahU5 igjFoR17zSCLnF6difKEeWsk2GMdj2C4GexEi4Uf323wgz4HT91HYKYWMq+eTvTG dwA5eXOKIjqAyPciuQG1959PQNtQUj8F7b/+GKcD06sj/CUa3kfNxRqD10ZQ25R+ Cppimc+A2u7nFR2H/yH9kAVpRbr/Zs8YUzE70VSMyTExxwhyQI+msxlzOH5etw0o XdzJsByS1fiR3XaeYxDDMbcQrtdniYSWVpaBrW9605EeqCptyd8+mFiK7RxZaG/o tVShQNf8bzWfBk/91/9JyNIW7PofzkLez+Omifd2WakZ6lrf1neNTafrA8gx7bYv TWtunspij1jQ/Vhhe68rJRbAXXCI8TWOaA+0xgOdK90mrH9NoDn1rVA8FqC9fGcN sdSHVunmoToTkjzMz04THe3tA5CdGiISsPKd8RN9ZacaettPGIrjLXB/xqS/75CY hLhubwCFeMgImchB+3DkErJz1B2GiEZCxvtk85twBk5i3Rhfgivj6sMR6C3RkCa8 j1q6AOyqOYhGtoJC9qXk1Ndd+OjspRTIqEyc3xhdn1R9qqlZv9+Wb73nlxVGvFNO mBiaMqKDa4wp3jkBj4HEjo7AlEuKQ0Ng1gOxyi8ezVAeXr3K4qw= =vpSM -----END PGP SIGNATURE----- --=-=-=-- ------------=_1730446502-23401-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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== From: Sughosha To: guix-patches@gnu.org Subject: [PATCH] gnu: commit: Use Qt6. Date: Mon, 28 Oct 2024 18:24:56 +0530 Message-ID: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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(-) 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") base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 -- 2.46.0 ------------=_1730446502-23401-1-- From unknown Sun Jun 22 11:42:21 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74061] [PATCH] gnu: commit: Use Qt6. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 07:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74061 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74061@debbugs.gnu.org Cc: 74061-done@debbugs.gnu.org, Sughosha X-Debbugs-Original-To: Sughosha via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.173044650823624 (code B ref -1); Fri, 01 Nov 2024 07:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Nov 2024 07:35:08 +0000 Received: from localhost ([127.0.0.1]:47506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6mBX-00067y-9g for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:35:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:54776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6mBU-00067I-Sv for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:35:05 -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 1t6mBU-0008Rz-N6 for guix-patches@gnu.org; Fri, 01 Nov 2024 03:35:04 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1t6mBR-0003jy-5Z for guix-patches@gnu.org; Fri, 01 Nov 2024 03:35:04 -0400 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowAD3_MSLhCRnOFs9DA--.40617S2; Fri, 01 Nov 2024 15:34:39 +0800 (CST) From: Z572 In-Reply-To: <8734kcn2br.fsf@iscas.ac.cn> (zhengjunjie@iscas.ac.cn's message of "Thu, 31 Oct 2024 15:44:56 +0800") References: <70bae7e5b1afe3c445b3da090377c3fc5ae80ed8.1730120096.git.sughosha@disroot.org> <8734kcn2br.fsf@iscas.ac.cn> Date: Fri, 01 Nov 2024 15:34:33 +0800 Message-ID: <87a5ejl852.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAD3_MSLhCRnOFs9DA--.40617S2 X-Coremail-Antispam: 1UD129KBjvJXoWxZw1UXFy3GrWkWF1rtw1kKrg_yoW5Ar17pF yfJayFvrs5Jr4rJanaqr4YgFnxZ392kF4Ygw4xGwnaqw15ua48AFyqqw45Aasruw1fXw17 uryUWa1UGry5JFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvlb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW0oVCq3wAa7VASzI0EjI02j7AqF2xKxVCjxxvEa2IrM2AIxVAI cxkEcVAq07x20xvEncxIr21le4C267I2x7xF54xIwI1l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr 0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY 17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcV C0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY 6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvj DU0xZFpf9x07jEOJOUUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Z572 writes: > Sughosha via Guix-patches via writes: > >> * 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(-) >> >> 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") >> >> base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 > > push, and fix typo. close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmckhIkACgkQO1qpk+Gi 3/DUcA/9EGuFR716X3OOdeodtLHx0X9150tEVd+vdPNNbjLNzvCh4Z5Xa2FEahU5 igjFoR17zSCLnF6difKEeWsk2GMdj2C4GexEi4Uf323wgz4HT91HYKYWMq+eTvTG dwA5eXOKIjqAyPciuQG1959PQNtQUj8F7b/+GKcD06sj/CUa3kfNxRqD10ZQ25R+ Cppimc+A2u7nFR2H/yH9kAVpRbr/Zs8YUzE70VSMyTExxwhyQI+msxlzOH5etw0o XdzJsByS1fiR3XaeYxDDMbcQrtdniYSWVpaBrW9605EeqCptyd8+mFiK7RxZaG/o tVShQNf8bzWfBk/91/9JyNIW7PofzkLez+Omifd2WakZ6lrf1neNTafrA8gx7bYv TWtunspij1jQ/Vhhe68rJRbAXXCI8TWOaA+0xgOdK90mrH9NoDn1rVA8FqC9fGcN sdSHVunmoToTkjzMz04THe3tA5CdGiISsPKd8RN9ZacaettPGIrjLXB/xqS/75CY hLhubwCFeMgImchB+3DkErJz1B2GiEZCxvtk85twBk5i3Rhfgivj6sMR6C3RkCa8 j1q6AOyqOYhGtoJC9qXk1Ndd+OjspRTIqEyc3xhdn1R9qqlZv9+Wb73nlxVGvFNO mBiaMqKDa4wp3jkBj4HEjo7AlEuKQ0Ng1gOxyi8ezVAeXr3K4qw= =vpSM -----END PGP SIGNATURE----- --=-=-=--