From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oNeuFVwgR2JTrgAAgWs5BA (envelope-from ) for ; Fri, 01 Apr 2022 17:55:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uGkrElwgR2KdUAAAauVa8A (envelope-from ) for ; Fri, 01 Apr 2022 17:55:08 +0200 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 B73942BC5D for ; Fri, 1 Apr 2022 17:55:07 +0200 (CEST) Received: from localhost ([::1]:51186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naJcA-00046k-3i for larch@yhetil.org; Fri, 01 Apr 2022 11:55:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naJc6-00046N-1u for guix-patches@gnu.org; Fri, 01 Apr 2022 11:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49312) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naJc5-0006AX-Po for guix-patches@gnu.org; Fri, 01 Apr 2022 11:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naJc5-0004FI-Mn for guix-patches@gnu.org; Fri, 01 Apr 2022 11:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54261] [PATCH]: Update GTK to 4.6.1. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 15:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zhu Zihao Cc: 54261@debbugs.gnu.org, Maxime Devos , Liliana Marie Prikler Received: via spool by 54261-submit@debbugs.gnu.org id=B54261.164882849716307 (code B ref 54261); Fri, 01 Apr 2022 15:55:01 +0000 Received: (at 54261) by debbugs.gnu.org; 1 Apr 2022 15:54:57 +0000 Received: from localhost ([127.0.0.1]:43209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naJc0-0004Ex-Rb for submit@debbugs.gnu.org; Fri, 01 Apr 2022 11:54:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naJbz-0004Ek-Fy for 54261@debbugs.gnu.org; Fri, 01 Apr 2022 11:54:55 -0400 Received: from [2001:470:142:3::e] (port=55852 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naJbt-00068P-Ie; Fri, 01 Apr 2022 11:54:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=WW94ddfYJUrpoD7wffesz+ORxlKIpzbv49asrfI1yT8=; b=ABUilpCFXrUTlqyXnTJv vVL/FjKRfNzjNzD6BeE9Vr5XxYRcuHMdG2hrjwjMadwoZx1Zs1eQr8t6acWurKPtHPy1HFu4o6x/J Bl3NnekC1J+YerVqSkdY+3rRlUIXCsaPeSChISCKd5fuWevGYUKISAvkkkTfDtwoh2dnVrhEZtw7q 55pKAQ/LvGUDP2BTzPZpzYGVxH8c9gzzHH8cJjnBM8v2BobMut1LuuseEX+yDo//dV8B+kak6DFIq m/5oZTAbfps3lsuftVzyLe3AaibCoiGqZilJNVI9XJJOdKbl1DwP92a2czFXkhv+85ffjdN7liuJD ErKKwpprW/8UAQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=38746 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naJbt-0005wP-1Q; Fri, 01 Apr 2022 11:54:49 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <87o81oyj9o.fsf@gnu.org> <86czi4rtfu.fsf@163.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 12 Germinal an 230 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 01 Apr 2022 17:54:46 +0200 In-Reply-To: <86czi4rtfu.fsf@163.com> (Zhu Zihao's message of "Wed, 30 Mar 2022 11:45:49 +0800") Message-ID: <87tubcn6ih.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648828507; 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: content-transfer-encoding:content-transfer-encoding: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=WW94ddfYJUrpoD7wffesz+ORxlKIpzbv49asrfI1yT8=; b=SapDbY79afHaufxDIyzjT9ESdbn3BTwFdcqkDh6MvE86cdmt6EKp5oWoj9i177P1+33lDj /miI/CPeuOv/oCWwBs/l5UdwXdgvBp++GNmjluasVd2yupEvdisSNb0Ety7SqLhbvPOIk+ QPSx9KwzKmXaYR5eQyHFnyLF9UyYJ68ruYwbXHAAAhkgDtxBqBk5k8c0Qco+k/WTpwVhbJ PEuV6Jg60yMoO6vZtws6tNbVZFfppyQhBkHklbLs36LOOK+/w9F/p4m1nt4Ikqr14gt0mB mzWx5078bFMZpiAvfaHELxYVbAWN1YqR3cwG7ZYKwlChUu6PfyfyMznZfxXZ8Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648828507; a=rsa-sha256; cv=none; b=IM9kDzDmlS+m+xt3Ge+wnEVj/4/+SfoK9aFVYVd4XSy53Q4hqoblmAQeMhGQcy1ugfKyOc uGhbC/ZYk2X700yQETephtLe1zveryhkCDS9ug7/2mfKZ1bHVzAGoNmRVhlh8ikhSfr40j 5ZSAL42kXGeymXtrv1Ld39BJ+j30T62cxoArrm/i/cu4apFGVeL5tqs02rVa4ZXsY2wdMJ xQGx+2YVgxF4rkvjH3nvJsf1Z4vbMamft9BY735YfI9OXHzZHEeYiSJT0FNKgYYNobiNJY Loa6HZ0AnTYl9g2GIMmrhengo1NYUigGyaCtl2uO2lKDZyKOG4dPVn8hu4mRtw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ABUilpCF; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ABUilpCF; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: B73942BC5D X-Spam-Score: -3.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: fzSU9lq33xYM Hi, Zhu Zihao skribis: > From 62a640576ae1de9523fba593219fb50ac97b44c6 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 21 Mar 2022 09:16:38 +0800 > Subject: [PATCH 3/4] gnu: Add fcitx5-gtk4. > > * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. > --- > gnu/packages/fcitx5.scm | 42 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm > index 2d5917f3c0..be46a5036c 100644 > --- a/gnu/packages/fcitx5.scm > +++ b/gnu/packages/fcitx5.scm > @@ -250,6 +250,48 @@ (define (split-immodule gtk-version output) > @end table") > (license license:lgpl2.1+))) >=20=20 > +;; XXX: This package is separated from fcitx5-gtk for following reasons. > +;; 1. GTK4 has a lot more dependencies, some of which maybe unavailable = on > +;; platforms other than x86_64. See . > +;; 2. GTK4 now propagates pango@1.50, it will conflict with GTK3 and GTK2 > +;; (propagates pango@1.48) if they're all in the inputs of same packa= ge. > +;; See . > +(define-public fcitx5-gtk4 > + (package > + (inherit fcitx5-gtk) > + (name "fcitx5-gtk4") > + (arguments > + (list > + #:tests? #f ;No test > + #:configure-flags > + #~(list (string-append "-DCMAKE_CXX_FLAGS=3D-I" > + #$(this-package-input "fcitx5-gtk") > + "/include/Fcitx5/GClient")) This one fails to build for me: --8<---------------cut here---------------start------------->8--- -- Looking for shmat - found -- Checking for module 'gtk+-2.0' -- No package 'gtk+-2.0' found CMake Error at /gnu/store/zga679c4nldah9l8dhd5a4hdy820hcyf-cmake-minimal-3.= 21.4/share/cmake-3.21/Modules/FindPkgConfig.cmake:562 (message): A required package was not found Call Stack (most recent call first): /gnu/store/zga679c4nldah9l8dhd5a4hdy820hcyf-cmake-minimal-3.21.4/share/cm= ake-3.21/Modules/FindPkgConfig.cmake:784 (_pkg_check_modules_internal) gtk2/CMakeLists.txt:6 (pkg_check_modules) -- Configuring incomplete, errors occurred! See also "/tmp/guix-build-fcitx5-gtk4-5.0.9.drv-0/build/CMakeFiles/CMakeOut= put.log". error: in phase 'configure': uncaught exception: %exception #<&invoke-error program: "cmake" arguments: ("../fcitx5-gtk-5.0.= 9" "-DCMAKE_BUILD_TYPE=3DRelWithDebInfo" "-DCMAKE_INSTALL_PREFIX=3D/gnu/sto= re/5z0a2zrr19pmg4swzsb0jm5fwqh03x0y-fcitx5-gtk4-5.0.9" "-DCMAKE_INSTALL_LIB= DIR=3Dlib" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=3DTRUE" "-DCMAKE_INSTALL_RP= ATH=3D/gnu/store/5z0a2zrr19pmg4swzsb0jm5fwqh03x0y-fcitx5-gtk4-5.0.9/lib" "-= DCMAKE_VERBOSE_MAKEFILE=3DON" "-DCMAKE_CXX_FLAGS=3D-I/gnu/store/fkq1pgfp1r4= 3f2131f8yvx543n7gb7ww-fcitx5-gtk-5.0.9/include/Fcitx5/GClient") exit-status= : 1 term-signal: #f stop-signal: #f>=20 phase `configure' failed after 2.9 seconds command "cmake" "../fcitx5-gtk-5.0.9" "-DCMAKE_BUILD_TYPE=3DRelWithDebInfo"= "-DCMAKE_INSTALL_PREFIX=3D/gnu/store/5z0a2zrr19pmg4swzsb0jm5fwqh03x0y-fcit= x5-gtk4-5.0.9" "-DCMAKE_INSTALL_LIBDIR=3Dlib" "-DCMAKE_INSTALL_RPATH_USE_LI= NK_PATH=3DTRUE" "-DCMAKE_INSTALL_RPATH=3D/gnu/store/5z0a2zrr19pmg4swzsb0jm5= fwqh03x0y-fcitx5-gtk4-5.0.9/lib" "-DCMAKE_VERBOSE_MAKEFILE=3DON" "-DCMAKE_C= XX_FLAGS=3D-I/gnu/store/fkq1pgfp1r43f2131f8yvx543n7gb7ww-fcitx5-gtk-5.0.9/i= nclude/Fcitx5/GClient" failed with status 1 builder for `/gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.9.= drv' failed with exit code 1 @ build-failed /gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.= 9.drv - 1 builder for `/gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-g= tk4-5.0.9.drv' failed with exit code 1 derivation '/gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.9.d= rv' offloaded to 'localhost' failed: build of `/gnu/store/p9611ymj4mav45wi9= 2fdyslb2p7854hl-fcitx5-gtk4-5.0.9.drv' failed build of /gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.9.drv = failed --8<---------------cut here---------------end--------------->8--- Could you take a look and send an updated patch? Also, I find it surprising that =E2=80=98fcitx5-gtk4=E2=80=99 depends on = =E2=80=98fcitx5-gtk=E2=80=99; is it avoidable? The rest LGTM, thanks! Ludo=E2=80=99.