From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oNkvOL+EJGcTCAAA62LTzQ:P1 (envelope-from ) for ; Fri, 01 Nov 2024 07:35:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oNkvOL+EJGcTCAAA62LTzQ (envelope-from ) for ; Fri, 01 Nov 2024 08:35:28 +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="n/kifRCL"; 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=1730446527; a=rsa-sha256; cv=none; b=MdonHIPX2unhBmgmBJUIxjNOQqUUBKGek/l1hBhzX25HSCaA9oIP/TrUNW1hdBpvbbfnGW SWftpEtg9LbekdgAtVOXewUYKzMdYmQu//dhqkAQkzBoMXjXhKNUXuT6y8XJfzputBnuDN a4ee+r5XPVy6HCd7giSXS2aBHo5C7cA8PuaVBmSoXTspU9lt4yyRh78LrV60CbCtBTZpxz R7rX4j3qk//r23k7nY60i/2plHzGX7AxUgFPtGbGFBpauO49wrVRtF5H/sbXQHZgc+CpTB 6Z1t5jVSydnHqM/OPQ+5qjCHN4NrWFrpwzb36zp4mBoCIXwPYLZuhqWP69Oemg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="n/kifRCL"; 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=1730446527; 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-to: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=pW/kiIAuMG8omO8WWlrKdVTYOPAwJrUw8MfE+iPY+Ac=; b=WZA5XhQnWkyiRF6hwcp8FM64EbhOvRDISkPL8W6Hb0DUDUw1elfg28k+k96+BFtFEFyNqo laU14qEi5hHSpevZhsz23++ImQwVyN5JtlqCiIEqfXsryOnw63dp/GndaNRZCDELcCSPtb KTOVjoGUTadvo1jqB4RJfKlMoe9/sxZpCabPQAhEeY8y23Ii6diNttgH/MHS8HyaOu6dz3 Ogm2zpKPYN7RFMKDXAARa3M3hsCpPdDKr8FdfMziXnCwM6358lsE7dfPHiNXdSzzbiUlpd +Nf9wFotYo7TrEiyv1G66aXG2HiYHo3KOK4M8oG/xQ9FJg7hs80xGz/1U6xi+g== 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 AE90F847A7 for ; Fri, 01 Nov 2024 08:35:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6mBW-0008S0-1S; Fri, 01 Nov 2024 03:35:06 -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 1t6mBS-0008RT-PE for guix-patches@gnu.org; Fri, 01 Nov 2024 03:35:02 -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 1t6mBS-0003kO-Gc for guix-patches@gnu.org; Fri, 01 Nov 2024 03:35: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=pW/kiIAuMG8omO8WWlrKdVTYOPAwJrUw8MfE+iPY+Ac=; b=n/kifRCLixaUSJlKyWWj165tyMsuJSMTHN0d5wkKE/EWNa5RK3uD44I9DLXXvArLkVp4aPrSPvKcB8bhl2gKAg8RjK32++G8QUO00cyY1c5T31LVutLzFFSjJ6wnl0/5WSpwug6QK1bH5FGcJjd9vcAGIj+zUivEB0nmkO86b8Db3tJQQLVnhJGnjvCo29lFWnkpnKKqKT6pwaSJYVDgoyZe0nhLUO32CLDtfcak/mdba0HhVhKiE/p4qOYPw+oHA6J+R7qvvSyv8nWInhZfzxKUYc6DUYJwoXiDwiYcnDkT4QprfViXF246VKYdTGDLYy4ZNJ3ThoE2WrStA7krFg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6mBS-00065X-9W for guix-patches@gnu.org; Fri, 01 Nov 2024 03:35:02 -0400 Subject: bug#74061: [PATCH] gnu: commit: Use Qt6. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 07:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 74061 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sughosha via Guix-patches via Cc: 74061-done@debbugs.gnu.org, Sughosha Mail-Followup-To: 74061@debbugs.gnu.org, zhengjunjie@iscas.ac.cn, sughosha@disroot.org Received: via spool by 74061-done@debbugs.gnu.org id=D74061.173044649523386 (code D ref 74061); Fri, 01 Nov 2024 07:35:01 +0000 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 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-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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.48 X-Spam-Score: -3.48 X-Migadu-Queue-Id: AE90F847A7 X-Migadu-Scanner: mx12.migadu.com X-TUID: TuviDGk5urdf --=-=-= 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----- --=-=-=--