From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id JpiqDN41I2fuGAEAqHPOHw:P1 (envelope-from ) for ; Thu, 31 Oct 2024 07:46:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id JpiqDN41I2fuGAEAqHPOHw (envelope-from ) for ; Thu, 31 Oct 2024 08:46:38 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rL7aT9dY; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730360798; a=rsa-sha256; cv=none; b=n67evN0eozVzzW/3cGBfUM2i7jmVEFZkNPgiCyFD8cxaMFSMonDPFcjZtRA7q6bp+WFuC+ hvbExSqIlmQwwxeI37tdW9yMTXPTu35DuK42YnRs6KkdQ8N9Ff0yyt08dncvL6AACcwj1g cVyMRtdx9/eqnf8oh8Vuw1zLdgmNmaMDsmHDfm+acm/8wwg8tkiD7O/8LCuJB4bjctEljC oJ0oE5CBW4CO7x1xP+He5skFzGDKIY2ZCtx4pVGv9uIXXq7I8YD3Xap4S/8fT2SYneC9pV gQiEpnxqjgkv4/G7qnVMIAFOFSPPIUSKTtO1bsmP81p3n+th8EHLJoI3f6klCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rL7aT9dY; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730360798; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=kdFzHvCg27D8KI+2ElnrFWYtNpSna0JVMp/Mig8xMrE=; b=c7Gw7tfSRbtISBnXpiDtcPzJMZOdwMIuzvSLLbsJZzDhxlQAxH8nqIZUR3m/ZQI3H/ufdZ AnRq+1QQrwamqNsrxDYvNk2nhN+eoqUntFpDYj5wHHS+If4rRlD1GR2kHwJn2WTisaKrok F3THoPPJAIHbaMcGoGd71DLTXktTqyoaTzd+cO9MLWvH2+4CzR8cOxZCMNGwo/2JAU9MrA n4Cd093kIJBCnd/RU3S7pT9hyrU9w1B+Qu37RMT0DBdBkyO/FhB2U5512WdDNGPIK1cRlJ N0YO9fXqnlk4eYuYKQdmciRLfMDYdm2ndBUZCYx4MjOJ8/npt+IsILBbsX3LWg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D3C951FC38 for ; Thu, 31 Oct 2024 08:46:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6Psd-0004E5-1h; Thu, 31 Oct 2024 03:46:07 -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 1t6PsZ-0004BJ-ET for guix-patches@gnu.org; Thu, 31 Oct 2024 03:46:03 -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 1t6PsY-00033Q-NX for guix-patches@gnu.org; Thu, 31 Oct 2024 03:46:02 -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:References:In-Reply-To:From:To:Subject; bh=kdFzHvCg27D8KI+2ElnrFWYtNpSna0JVMp/Mig8xMrE=; b=rL7aT9dYKfA3TEseFDkoDzZXRudCr6XQ2/kf3ZqfIEgYsFbBjhXCUNTi/y17XgOylYmV7dMck9vfldyBCyowFOzCbJ9Dkb9ZxWC//a+r1Xn/4UkrDw7L+krKrXtsZTePjLqg89CZBHirdfUgHXZ38arGvi8zP8SVu0mpp36zCJtWExRNv+8bV+xXkrKpeIxnxmd/35svSNoeIQbCwDzVW6GdqSHCLbuli5OtwpCDxmCb+/Wr4Oi5hzLhzUkjjOa/YjCunptD5GmuoPVPEr3H/4SWxOj3Iqk0RC9dgTTgWEv2q2RG66l/TDW0whQH/b6Idb3v5eKqo7i8ZcOYO3Q4DA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6PsY-0005hh-J1 for guix-patches@gnu.org; Thu, 31 Oct 2024 03:46:02 -0400 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 74061-submit@debbugs.gnu.org id=B74061.173036071621857 (code B ref 74061); Thu, 31 Oct 2024 07:46:02 +0000 Received: (at 74061) by debbugs.gnu.org; 31 Oct 2024 07:45:16 +0000 Received: from localhost ([127.0.0.1]:40603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Pro-0005gT-Bu for submit@debbugs.gnu.org; Thu, 31 Oct 2024 03:45:16 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:44180 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Prk-0005bj-Ma for 74061@debbugs.gnu.org; Thu, 31 Oct 2024 03:45:14 -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/ 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -7.49 X-Spam-Score: -7.49 X-Migadu-Queue-Id: D3C951FC38 X-Migadu-Scanner: mx10.migadu.com X-TUID: h9fEnDrrw/HE --=-=-= 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----- --=-=-=--