From unknown Fri Jun 20 07:20:49 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#53648 <53648@debbugs.gnu.org> To: bug#53648 <53648@debbugs.gnu.org> Subject: Status: [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Reply-To: bug#53648 <53648@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:20:49 +0000 retitle 53648 [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. reassign 53648 guix-patches submitter 53648 Zhu Zihao severity 53648 normal tag 53648 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 31 01:54:58 2022 Received: (at submit) by debbugs.gnu.org; 31 Jan 2022 06:54:58 +0000 Received: from localhost ([127.0.0.1]:38208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEQaY-0006a2-0U for submit@debbugs.gnu.org; Mon, 31 Jan 2022 01:54:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:46676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEQaW-0006Zv-8z for submit@debbugs.gnu.org; Mon, 31 Jan 2022 01:54:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEQaS-0008MZ-Mg for guix-patches@gnu.org; Mon, 31 Jan 2022 01:54:53 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:62070) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEQaL-0002Lh-CP for guix-patches@gnu.org; Mon, 31 Jan 2022 01:54:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=63TuL fkEI51Qt0CVnzHb1Ar2IRkyZJiup3/PHqmXmns=; b=GhJErM67n0YUMV7H1fkMc R5GWS4q+1f1CoUL8NUDO65YSCkJIiRhylkg0YaWoGA+v7bziMwreO0iM1GSUe59D BMiBstRUmohxazNBsAZKeyteJMVuamMZLqvDg7BOGlxm/4tCcb5ungEfVn4/c0l5 IMBTEBRAq5VE2N7Wdkmy7o= Received: from asus-laptop (unknown [27.46.106.14]) by smtp1 (Coremail) with SMTP id GdxpCgDn+4ych_dhPFC4AQ--.26174S2; Mon, 31 Jan 2022 14:54:21 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: guix-patches@gnu.org Subject: [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Mon, 31 Jan 2022 14:53:57 +0800 Message-ID: <86ilu09yzs.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgDn+4ych_dhPFC4AQ--.26174S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU1T5LUUUUU X-Originating-IP: [27.46.106.14] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBax2Zr1et2+U94QAAsY Received-SPF: pass client-ip=123.126.97.1; envelope-from=all_but_last@163.com; helo=mail-m971.mail.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: submit 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYfeHlxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/mEjQD+OI9AiZb4xp9x3ykvPE/ZpaovpzRQ eBcHaVpKBWvN9XgA/2cKeAPNWpVMj8oPxd40aVmAZtmkurc1T54Xdjwm6icD =XKjL -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 06 07:48:27 2022 Received: (at submit) by debbugs.gnu.org; 6 Feb 2022 12:48:27 +0000 Received: from localhost ([127.0.0.1]:36705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGgxv-0006WE-1c for submit@debbugs.gnu.org; Sun, 06 Feb 2022 07:48:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:47866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGgxt-0006W6-0s for submit@debbugs.gnu.org; Sun, 06 Feb 2022 07:48:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGgxs-0004LY-Q2 for guix-patches@gnu.org; Sun, 06 Feb 2022 07:48:24 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:1225) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGgxl-0005vU-85 for guix-patches@gnu.org; Sun, 06 Feb 2022 07:48:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=aD4Pq mfxfxavhvUsy39cOLxJNAP2SHnceeR6C4N5i2k=; b=ki1WCeUXKeDuAIJLpYUVH orEExQUTWuUoI1yymP+3H9/lNQvmt/bsvsodiRA/3I/P7UHx32FNM9INFVwpIeSB ZPLLSaqDo0o4yaElE72VqW1VVLZgLGsvhJR3kUffdQXBcMZBQpLcURMI290qPhgB NgdFKhtd8TkvhRw/wlvfkA= Received: from asus-laptop (unknown [27.46.106.189]) by smtp2 (Coremail) with SMTP id GtxpCgD3PFKDw_9h3SPqBA--.19232S2; Sun, 06 Feb 2022 20:48:03 +0800 (CST) References: <86ilu09yzs.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: guix-patches@gnu.org Subject: Re: [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Sun, 06 Feb 2022 20:47:37 +0800 In-reply-to: <86ilu09yzs.fsf@163.com> Message-ID: <868ruocgb6.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgD3PFKDw_9h3SPqBA--.19232S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRVT5HDUUUU X-Originating-IP: [27.46.106.189] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgSfr1aD+-l8QAAAs5 Received-SPF: pass client-ip=123.126.97.2; envelope-from=all_but_last@163.com; helo=mail-m972.mail.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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 Content-Transfer-Encoding: quoted-printable ping. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYf/DbRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/mxogEA0njVKKipIVcpc4WP5h+l4QZzOFLM l4jsaaerxquNEvkBAIQkqQrEX28Mzcopx7ToiIXrV6aN011QFGgrKH6njMgK =tSoI -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 06 10:48:12 2022 Received: (at 53648) by debbugs.gnu.org; 6 Feb 2022 15:48:12 +0000 Received: from localhost ([127.0.0.1]:39626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGjls-0003Sy-GO for submit@debbugs.gnu.org; Sun, 06 Feb 2022 10:48:12 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:33482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGjlr-0003Sp-1k for 53648@debbugs.gnu.org; Sun, 06 Feb 2022 10:48:11 -0500 Received: from [172.20.10.5] ([188.188.37.53]) by baptiste.telenet-ops.be with bizsmtp id rro92600H18o4tG01ro9qQ; Sun, 06 Feb 2022 16:48:09 +0100 Message-ID: Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. From: Maxime Devos To: Zhu Zihao , 53648@debbugs.gnu.org Date: Sun, 06 Feb 2022 16:48:08 +0100 In-Reply-To: <86ilu09yzs.fsf@163.com> References: <86ilu09yzs.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-/ZQseapXyRmQgIgQNF7y" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1644162489; bh=ndWEeiDmSo1Nel2RFOVG0IaSkoUtoAn59fSfjPVIwjg=; h=Subject:From:To:Date:In-Reply-To:References; b=PwCYhdy/l2HTMEpUVjMMRbVtP+cqmALxf9xLQ1NfGfbOEK1zsFONBpdaPxidHFzO2 mfElIHp+z+UC1M8gD0jCtDya0m2yhEoezcFZqu+2Ww8P4HYUrpA66pAwQJ2z6OSJqU mDV2nnrugs330bqWRLva+pVsbWeLxEjoHby6WAnwrJmX0YUYoiBv41bjz3nQpzsvP3 bm0dcXzobRnysA/AjOsih3Cq2RA+imVy1KYYNZQ1MZBV8OLPkBEEXSQ15tRKAqy3/J QC2hU1L2FwqZNP0LAxVId3CC19mS+TuroC4rCoRVTdh70GGEw8ca2w1cUMf3iH8dcF vtkCNEvD4WTqg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53648 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.7 (-) --=-/ZQseapXyRmQgIgQNF7y Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op ma 31-01-2022 om 14:53 [+0800]: > -=C2=A0=C2=A0=C2=A0 (outputs '("out" "gtk2")) > +=C2=A0=C2=A0=C2=A0 (outputs '("out" "gtk2" "gtk4")) What's the point of building for three separate gtk versions? Why not just build for gtk@4? Also, if we go for multiple outputs, shouldn't the latest gtk version go into "out" instead of the middle version gtk@3? Greetings, Maxime. --=-/ZQseapXyRmQgIgQNF7y Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYf/tuRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pKdAP9bD3JLxa3fsbx2yl4q7egEJ0Tu DAffQ396FXluWJwIPwD+I8bMVrhCKoIUGSK3lz9sanYwWcLdbuxWJT7feKY5Agc= =jubl -----END PGP SIGNATURE----- --=-/ZQseapXyRmQgIgQNF7y-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 06 11:04:16 2022 Received: (at 53648) by debbugs.gnu.org; 6 Feb 2022 16:04:17 +0000 Received: from localhost ([127.0.0.1]:39671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGk1Q-0003tG-Mo for submit@debbugs.gnu.org; Sun, 06 Feb 2022 11:04:16 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:12971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGk1L-0003ss-Iu for 53648@debbugs.gnu.org; Sun, 06 Feb 2022 11:04:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=YJv+M woo7dT0KBDy5m7cFWp0btLf3kTfCMI9DKrydgI=; b=mauBmsx9BIRG7QSM1c6hj MaMyB04jHA3gAHNsW8dzlgPkk06p7hHsAivAMCkmclyujSnAzyIRFAEsp5YexfnA Vxni6mu9i7DGVT+x5FPXdRY0uuRoN693u72rnurDlE9Ih3B9FUsL1ZM7w2VIekP7 oK4vo3+Ul9HKRulY9d0+fA= Received: from asus-laptop (unknown [27.46.106.189]) by smtp2 (Coremail) with SMTP id GtxpCgB3Axtu8f9hYij7BA--.21331S2; Mon, 07 Feb 2022 00:03:59 +0800 (CST) References: <86ilu09yzs.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Mon, 07 Feb 2022 00:02:40 +0800 In-reply-to: Message-ID: <8635kwasnn.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgB3Axtu8f9hYij7BA--.21331S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RY9amUUUUU X-Originating-IP: [27.46.106.189] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbByR6fr11vnlmrmAABsg X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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 Content-Transfer-Encoding: quoted-printable Maxime Devos writes: > What's the point of building for three separate gtk versions? > Why not just build for gtk@4? Many packages still use GTK3, aren't they? > Also, if we go for multiple outputs, shouldn't the latest gtk version > go into "out" instead of the middle version gtk@3? IMO, GTK3 is still majority, so put it under "out", and make gtk2 and gtk4 separated. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYf/xbBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lrlAD/bNUIA3/TTaL0wCdtHP55p+vnlE7s gz5cj/Sb5briOt4BAPr1Blf3krItwxIrwkHq8ht67RqIbKArCg3EBP1evMgI =ffqO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 06 12:03:42 2022 Received: (at 53648) by debbugs.gnu.org; 6 Feb 2022 17:03:42 +0000 Received: from localhost ([127.0.0.1]:39727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGkww-0005PB-3m for submit@debbugs.gnu.org; Sun, 06 Feb 2022 12:03:42 -0500 Received: from laurent.telenet-ops.be ([195.130.137.89]:42208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGkwr-0005Oz-0X for 53648@debbugs.gnu.org; Sun, 06 Feb 2022 12:03:41 -0500 Received: from [172.20.10.5] ([188.188.37.53]) by laurent.telenet-ops.be with bizsmtp id rt3a2600F18o4tG01t3bL3; Sun, 06 Feb 2022 18:03:35 +0100 Message-ID: Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. From: Maxime Devos To: Zhu Zihao Date: Sun, 06 Feb 2022 18:03:34 +0100 In-Reply-To: <8635kwasnn.fsf@163.com> References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-vReQqTJUczYx8RjYFN5a" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1644167015; bh=fy6RK0GUwtYH+3e6h/kIs/tj5Ak31SlxAdCWTHhENqc=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=AcNKuroZhu3eBHApbG1dJyg1FZajZUFfgBqCBGTPbz0TDAkuZ4zT8XTNgqPyW8zCF c9ZcLCdzjJoR2lhvgcwJaDkKyX5HUN5zh6kwSHIQoFq+5p6pABbVjk1jzu5RHB7P1G v3bELwFS3FcRPTu3nUAvEnmkIyLJJLG4du/u4pG/WB2ZnHrGDpKQsvg9X9jojy7RPH I6FI4zpqWORsUGoq4cRU3zzAoxKhyz5uRX2JdjFqaE7RhFrrE5b1bNWFAjSXObcPmV WA7hbJc1RMlRPeRlWJqwZW5lw+HbAPOBo2JuuUmsn+2jR92XF9n9bkFjRlqIiAcamv Jn2+1TxYM3csA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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.7 (-) --=-vReQqTJUczYx8RjYFN5a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op ma 07-02-2022 om 00:02 [+0800]: > Maxime Devos writes: >=20 > > What's the point of building for three separate gtk versions? > > Why not just build for gtk@4? >=20 > Many packages still use GTK3, aren't they? >=20 > > Also, if we go for multiple outputs, shouldn't the latest gtk > version > > go into "out" instead of the middle version gtk@3? >=20 > IMO, GTK3 is still majority, so put it under "out", and make gtk2 and > gtk4 separated. It doesn't seem relevant to me that most packages use gtk+@3, since fcitx5-gtk is not most packages. Majority is irrelevant here. Anyways, we try to use the latest version of packages in Guix whenever feasible (for features, for bugfixes, because eventually the old versions will be unsupported upstream and to have less versions to keep track of), and gtk@4 is the latest version of gtk, so it seems to me that we should simplify things here by just using the latest version of gtk, i.e., gtk@4. Greetings, Maximes --=-vReQqTJUczYx8RjYFN5a Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYf//ZhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7h0LAQDu6+Yc+4u0jEtUgC7DjN4XTgk2 vaGC5XgsvHr69VSb0AD9E9xkigv4SD1kuseEH1nMzlFYpQST4WZ7mKeRPqqDSgw= =549h -----END PGP SIGNATURE----- --=-vReQqTJUczYx8RjYFN5a-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 06 23:28:41 2022 Received: (at 53648) by debbugs.gnu.org; 7 Feb 2022 04:28:41 +0000 Received: from localhost ([127.0.0.1]:40653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGvdp-0007xE-3e for submit@debbugs.gnu.org; Sun, 06 Feb 2022 23:28:41 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:28123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGvdi-0007wq-Hh for 53648@debbugs.gnu.org; Sun, 06 Feb 2022 23:28:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=0M2nt 6V6ay51Lhy9SzNaYiwdqQefJeiVL47rUf7eRqE=; b=jr+8e+ROX+DsaszmCgwzg orh59J6ZNY+vQzNsWdjTm+W+MdI/3HtVuHrK/yCbu4n3TCMfoBeK+nG6iWkwbflr RXyF2G2iT42U/WzTfGFZi1+y1dTqFo74aSakPsV0i1jhHLmMXvCF8vBOAppvgzUW ui37vmeWxvhK+thzIkKAqQ= Received: from asus-laptop (unknown [27.46.106.85]) by smtp3 (Coremail) with SMTP id G9xpCgCXdrXmnwBiXrlXBQ--.10629S2; Mon, 07 Feb 2022 12:28:23 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Mon, 07 Feb 2022 12:25:14 +0800 In-reply-to: Message-ID: <86czjz8fmt.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: G9xpCgCXdrXmnwBiXrlXBQ--.10629S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zr47WrWDGrykCrW3Gw47CFg_yoW8WFWUp3 yfta4rKw1kJry5CFn3Cw4UuFyrKwnYkrs7GrZrJ3s8urZxWrW2vrW7GrWY9397Jr9rXr4j gw4vqFWfu3yYyFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0z_9a9kUUUUU= X-Originating-IP: [27.46.106.85] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPQCgr2AY+urmgQABs8 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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 Content-Transfer-Encoding: quoted-printable Maxime Devos writes: > [[PGP Signed Part:Undecided]] > Zhu Zihao schreef op ma 07-02-2022 om 00:02 [+0800]: >> Maxime Devos writes: >>=20 >> > What's the point of building for three separate gtk versions? >> > Why not just build for gtk@4? >>=20 >> Many packages still use GTK3, aren't they? >>=20 >> > Also, if we go for multiple outputs, shouldn't the latest gtk >> version >> > go into "out" instead of the middle version gtk@3? >>=20 >> IMO, GTK3 is still majority, so put it under "out", and make gtk2 and >> gtk4 separated. > > It doesn't seem relevant to me that most packages use gtk+@3, > since fcitx5-gtk is not most packages. Majority is irrelevant here. > > Anyways, we try to use the latest version of packages in Guix whenever > feasible (for features, for bugfixes, because eventually the old > versions will be unsupported upstream and to have less versions to > keep track of), and gtk@4 is the latest version of gtk, so it seems to > me that we should simplify things here by just using the latest version > of gtk, i.e., gtk@4. > > Greetings, > Maximes > > [[End of PGP Signed Part]] It matters, because fcitx5-gtk is not a GTK *application*, it provides IM module for GTK applications. Guix users may have both GTK3 & GTK4 application in same environment. If we drop gtk3 (or even gtk2), their input method will be broken. I just check the comment left by iyzsong, and I think it's better to make the glib client in "out", and make IM module for different GTK version in "gtk2" "gtk3" "gtk4" output. Thoughts? =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgCf2hUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/n6DAD+Lf3SqwYhY7OoDSZ/b3R6oAEqL+Ye u0neP0OHKfsGeIwA/jZH0W9j2OY03gTTDQJIHL3r1IiyWUL468gX6jmDf2MK =i0hg -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 07 00:59:05 2022 Received: (at 53648) by debbugs.gnu.org; 7 Feb 2022 05:59:05 +0000 Received: from localhost ([127.0.0.1]:40692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGx3I-0001p2-Oh for submit@debbugs.gnu.org; Mon, 07 Feb 2022 00:59:05 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:5250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGx3E-0001oV-KU for 53648@debbugs.gnu.org; Mon, 07 Feb 2022 00:59:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=QSrjf m2h1DbxtyFScoM7Vjkj3v/aAMGSiH2jlo5qpWA=; b=iFUuIrgWNoWYAXaL68q2u Oo2G1GMDZD6cKbz44ARBRCqisQE5FhKWFyh5EvIlNaP/nMzTw2YlxOYvfD6yTZg3 GlgpfVgtoEFb+Q24owvkIDAq3b+wnDfZcxIxV4mdpkDzwsTRwJ4mlUnFz1sf+a3/ yldnjmgewKraIZ+2/iVkGY= Received: from asus-laptop (unknown [27.46.106.249]) by smtp1 (Coremail) with SMTP id GdxpCgCH0osatQBiZfFmBQ--.2011S2; Mon, 07 Feb 2022 13:58:51 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Mon, 07 Feb 2022 13:58:28 +0800 In-reply-to: Message-ID: <86zgn36wva.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgCH0osatQBiZfFmBQ--.2011S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RWeHgUUUUU X-Originating-IP: [27.46.106.249] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBugr1aD-IdeAQAAsx X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgC1GRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kp+gD/Q8pLWs6KsEtQTNMNY2F8YceZ9t9F DtYJxeiv8cK1BKAA/27NV7oluwDU2YT6AmhXW+SFT+F+OSnx6t9o7blHdq0J =sp2X -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-fcitx5-gtk-Split-IM-module-output-for-different-.patch Content-Transfer-Encoding: quoted-printable >From ef83eb7614d8888fa538d16870a960cc84717147 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Feb 2022 13:55:26 +0800 Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different version of GTK. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments] : Split input met= hod module into different outputs for GTK2, GTK3 and GTK4. Now default output only provides GLib client of Fcitx5. [outputs]: Add new "gtk3" output. --- gnu/packages/fcitx5.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 123418cd4f..e9884d8f0a 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2022 Zhu Zihao ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -206,18 +206,12 @@ (define-public fcitx5-gtk (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2")) - (gtk4 (assoc-ref outputs "gtk4"))) - ;; Install GTK+ 2 input method module to its own output. - (substitute* "gtk2/CMakeLists.txt" + (define (split-immodule gtk-version) + (substitute* (string-append gtk-version "/CMakeLists.txt") (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))) + (string-append (assoc-ref outputs gtk-version) "/lib")))) =20 - ;; Install for GTK 4. - (substitute* "gtk4/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk4 "/lib"))))))))) + (for-each split-immodule '("gtk2" "gtk3" "gtk4"))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -233,7 +227,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2" "gtk4")) + (outputs '("out" "gtk2" "gtk3" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM mod= ule --=20 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 07 03:43:05 2022 Received: (at 53648) by debbugs.gnu.org; 7 Feb 2022 08:43:06 +0000 Received: from localhost ([127.0.0.1]:40876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzc1-0008Od-OT for submit@debbugs.gnu.org; Mon, 07 Feb 2022 03:43:05 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:43168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzc0-0008OU-6q for 53648@debbugs.gnu.org; Mon, 07 Feb 2022 03:43:05 -0500 Received: from [172.20.10.9] ([213.119.168.30]) by xavier.telenet-ops.be with bizsmtp id s8j2260060fhH05018j2hz; Mon, 07 Feb 2022 09:43:02 +0100 Message-ID: Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. From: Maxime Devos To: Zhu Zihao Date: Mon, 07 Feb 2022 09:42:57 +0100 In-Reply-To: <86czjz8fmt.fsf@163.com> References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-35V19UqnQWl/9xFieSUs" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1644223382; bh=/6O/1+3p96Hhg88cESF/hwXuvD8eqSihMmvLhQ5OaaA=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=dJ525FdUAKJBcjp2nyb7r2zcDs83nnzfjhebl0nyL57Zi9P1eDD2jFGQKqC76Hp4h OpU/RYQ+7Nt0EboOeWEUlpAiWZSltvWsrvuMSYbafFkMpqwLeiz8q/TMp3qSOBdfWp OQlifvjguTtfVP02NJaAolOjwJkZ/0C1wJ+cDwd6qHEIkJy2vJCb91b/VmNoqw7xsq F3E/7s+aw0y9DKVW9V+YzvqOUwwTBvzf/r029uXfv1MIPllEp6+NdyCmbuVixuMBLl c68xQhmkQCkJB7bvoFvwPEZivpExm/fwaTZCJApwsIat+Xbijjo0hVMOreywYZ2Pm7 rI/k6w5+ADHsA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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.7 (-) --=-35V19UqnQWl/9xFieSUs Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op ma 07-02-2022 om 12:25 [+0800]: > It matters, because fcitx5-gtk is not a GTK *application*, it > provides IM module for GTK applications. Guix users may have both > GTK3 & GTK4 application in same environment. If we drop gtk3 (or even > gtk2), their input method will be broken. Ok, that's a good reason, but it would deserve a comment in the package definition to explain matters to future readers. > I just check the comment left by iyzsong, and I think it's better to > make the glib client in "out", and make IM module for different GTK > version in "gtk2" "gtk3" "gtk4" output. Thoughts? It would be useful to explain in the description that the output that needs to be installed, depends on what other software in in the profile. E.g.: "Fcitx5-gtk provides a Glib-based D-bus client and IM module for GTK+2/GTK+3/GTK4 applications. The output that needs to be installed, depends on which variant of GTK that applications use. When in doubt, it is sufficient to simply install all outputs." Greetings, Maxime. --=-35V19UqnQWl/9xFieSUs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYgDbkRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nMgAP9Hz+QGnyapK6XvD7Sk/E0y0SfL nC2mzrMS2nlS+SwtpgEAx8nHWruzm4Sf9VIyKMkZFOh7T+YXMBlqyLcDHCOtNAI= =5kWj -----END PGP SIGNATURE----- --=-35V19UqnQWl/9xFieSUs-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 07 23:20:52 2022 Received: (at 53648) by debbugs.gnu.org; 8 Feb 2022 04:20:52 +0000 Received: from localhost ([127.0.0.1]:44655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHHzo-0002Rr-6X for submit@debbugs.gnu.org; Mon, 07 Feb 2022 23:20:52 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:35915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHHzj-0002RV-TD for 53648@debbugs.gnu.org; Mon, 07 Feb 2022 23:20:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=9sCNa WJVjlAZtv61hCl5Umpz0ymiUt3wA4x9U3ntoqA=; b=ewSpFO71cE4zp4MI1yMJn xupkXAIW7turslR4YNhC6j6+J0pkNKojUZlmphkTkExvuV7aJlUPkEyZRyNwNqWq 9pbD7K6nqmRHhWpGynkZurX4UjHek8Y7WH7yYKXkqqBKxV8xnl/N77CqY4tIWYOH /GVVZyA0ulIKV168eW68Hk= Received: from asus-laptop (unknown [27.46.106.102]) by smtp2 (Coremail) with SMTP id GtxpCgAXK1aU7wFio1XZBQ--.11258S2; Tue, 08 Feb 2022 12:20:37 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Tue, 08 Feb 2022 12:19:52 +0800 In-reply-to: Message-ID: <86pmnyyooc.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GtxpCgAXK1aU7wFio1XZBQ--.11258S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4R5Ef2UUUUU X-Originating-IP: [27.46.106.102] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPRahr2AY+vNFUQAAsA X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain I use @table texinfo command to make the use of different output clear :) --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgHvkxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kjnQEAsVX9EvaI/YqcAcIV2AOWX51FCmnG C/GAtfu48AsRA4gBANUOBqzfs4pzEix+6ANC5UNSa3U/zyTEPVXinEvrCpsF =CNgF -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-fcitx5-gtk-Split-IM-module-output-for-different-.patch Content-Transfer-Encoding: quoted-printable >From e54a1064c4c98f8a0c46e7151bcfb2b63b611ae0 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Feb 2022 13:55:26 +0800 Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different version of GTK. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments] : Split input met= hod module into different outputs for GTK2, GTK3 and GTK4. Now default output only provides GLib client of Fcitx5. [outputs]: Add new "gtk3" output. --- gnu/packages/fcitx5.scm | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 123418cd4f..b7a7d8c8c4 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2022 Zhu Zihao ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -206,18 +206,14 @@ (define-public fcitx5-gtk (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2")) - (gtk4 (assoc-ref outputs "gtk4"))) - ;; Install GTK+ 2 input method module to its own output. - (substitute* "gtk2/CMakeLists.txt" + ;; Take care of different versions of GTK because this package + ;; provides IM module for GTK application to use input method. + (define (split-immodule gtk-version) + (substitute* (string-append gtk-version "/CMakeLists.txt") (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))) + (string-append (assoc-ref outputs gtk-version) "/lib")))) =20 - ;; Install for GTK 4. - (substitute* "gtk4/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk4 "/lib"))))))))) + (for-each split-immodule '("gtk2" "gtk3" "gtk4"))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -232,12 +228,22 @@ (define-public fcitx5-gtk (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2" "gtk4")) + (outputs '("out" "gtk2" "gtk3" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") - (description "Fcitx5-gtk provides a Glib based D-Bus client and IM mod= ule -for GTK+2/GTK+3 application.") + (description "Fcitx5-gtk provides following functionality in correspon= ding +output: + +@table @code +@item out +GLib based D-Bus client of Fcitx5. +@item gtk2 +IM module for GTK+2 applications. +@item gtk3 +IM module for GTK+3 applications. +@item gtk4 +IM module for GTK4 applications. +@end table") (license license:lgpl2.1+))) =20 (define-public fcitx5-qt --=20 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 05:02:22 2022 Received: (at 53648) by debbugs.gnu.org; 8 Feb 2022 10:02:22 +0000 Received: from localhost ([127.0.0.1]:45374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHNKI-0005PB-AL for submit@debbugs.gnu.org; Tue, 08 Feb 2022 05:02:22 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:40474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHNKC-0005Ov-Uy for 53648@debbugs.gnu.org; Tue, 08 Feb 2022 05:02:21 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id sa2F260064UW6Th06a2F7x; Tue, 08 Feb 2022 11:02:15 +0100 Message-ID: Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. From: Maxime Devos To: Zhu Zihao Date: Tue, 08 Feb 2022 11:02:10 +0100 In-Reply-To: <86pmnyyooc.fsf@163.com> References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-4nssHPAfEistyylfM/Br" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1644314535; bh=+DhhWFN8fZxx5Ou45JcBU24lm95HfU6ahtdK477fVnk=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=nngz/jBWGp+quXr/Q+8gdTen/c/SaaFSLj6cNu+4Pyd2dHPUJABu7ShFLlVX/FPWD 6Jkd3GwplfrghNW4rj+FUDrafTQkddIlQgNDKOKhFG+3dG/qZupXV+m0pY7oSJsrnI 9c9GfrZUY3rjcH3qWYX7Cu5v3oRyYImiVO9Lt8lNespizloInFYWBCwhvDil9xKm26 +Gmb//7/oGl8p0Ii4rlXUMlexIbUyw8gcPSSG3pQuoImhaxNlcRdSnDP7Hsn15JR82 c8lV0IldeqscxMkIYIblJ/wVsS1pBPeF78FsgsjQCCxobGfcTAvU82SNqN0MTIHF45 WMOrvKRWpI7lw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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.7 (-) --=-4nssHPAfEistyylfM/Br Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 Wmh1IFppaGFvIHNjaHJlZWYgb3AgZGkgMDgtMDItMjAyMiBvbSAxMjoxOSBbKzA4MDBdOgo+IMKg wqDCoMKgwqDCoCAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCj4gwqDCoMKgwqDCoMKg wqDCoMKgIChhZGQtYmVmb3JlICdjb25maWd1cmUgJ3BhdGNoLWluc3RhbGwtcHJlZml4Cj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVy LWtleXMpCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGV0ICgob3V0IChhc3NvYy1yZWYg b3V0cHV0cyAib3V0IikpCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo Z3RrMiAoYXNzb2MtcmVmIG91dHB1dHMgImd0azIiKSkKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChndGs0IChhc3NvYy1yZWYgb3V0cHV0cyAiZ3RrNCIpKSkKClBlcmhh cHMgSSBzaG91bGQgaGF2ZSBtZW50aW9uZWQgdGhpcyBlYXJsaWVyLCBidXQgdGhpcyBjYW4gYmUK c2ltcGxpZmllZCBhIGxpdHRsZSB3aXRoIEctZXhwczoKCiAgIChvdXQgIyRvdXRwdXQpCiAgIChn dGsyICNvdXRwdXQ6Z3RrMikKICAgKGd0azQgIyRvdXRwdXQ6Z3RrNCkKCj4gLcKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgOzsgSW5zdGFsbCBHVEsrIDIgaW5wdXQgbWV0aG9kIG1vZHVsZSB0 byBpdHMgb3duCj4gb3V0cHV0Lgo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJz dGl0dXRlKiAiZ3RrMi9DTWFrZUxpc3RzLnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IDs7IFRha2UgY2FyZSBvZiBkaWZmZXJlbnQgdmVyc2lvbnMgb2YgR1RLIGJlY2F1c2UgdGhpcwo+ IHBhY2thZ2UKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHByb3ZpZGVzIElNIG1vZHVs ZSBmb3IgR1RLIGFwcGxpY2F0aW9uIHRvIHVzZSBpbnB1dAo+IG1ldGhvZC4KPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChkZWZpbmUgKHNwbGl0LWltbW9kdWxlIGd0ay12ZXJzaW9uKQoKZ3Rr LXZlcnNpb24gLT4gZ3RrLW91dHB1dAoKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo c3Vic3RpdHV0ZSogKHN0cmluZy1hcHBlbmQgZ3RrLXZlcnNpb24KPiAiL0NNYWtlTGlzdHMudHh0 IikKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIlxcJFxce0NNQUtFX0lO U1RBTExfTElCRElSXFx9IikKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo c3RyaW5nLWFwcGVuZCBndGsyICIvbGliIikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyBndGstdmVyc2lvbikK PiAiL2xpYiIpKSkpCgooYXNzb2MtcmVmIG91dHB1dHMgZ3RrLXZlcnNpb24pIC0+IGd0ay1vdXRw dXQKCj4gwqAKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBJbnN0YWxsIGZvciBH VEsgNC4KPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogImd0azQv Q01ha2VMaXN0cy50eHQiCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIlxc JFxce0NNQUtFX0lOU1RBTExfTElCRElSXFx9IikKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoc3RyaW5nLWFwcGVuZCBndGs0ICIvbGliIikpKSkpKSkpKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGZvci1lYWNoIHNwbGl0LWltbW9kdWxlICcoImd0azIiICJndGsz IiAiZ3RrNCIpKSkpKSkpCgonKCJndGsyIiAiZ3RrMyIgImd0azQiKSAtLT4gKGxpc3QgZ3RrMiBn dGszIGd0azQpCgpZTU1WIHdoZXRoZXIgdGhpcyBjaGFuZ2Ugd291bGQgYmUgYW4gaW1wcm92ZW1l bnQuCgpMaWtld2lzZSwgJW91dHB1dCBjYW4gYmUgZWxpbWluYXRlZCBieSB1c2luZyAjJG91dHB1 dC4uCgo+IMKgwqDCoMKgIChpbnB1dHMKPiDCoMKgwqDCoMKgIGAoKCJmY2l0eDUiICxmY2l0eDUp Cj4gwqDCoMKgwqDCoMKgwqAgKCJmbXQiICxmbXQpCj4gQEAgLTIzMiwxMiArMjI4LDIyIEBAIChk ZWZpbmUtcHVibGljIGZjaXR4NS1ndGsKPiDCoMKgwqDCoCAobmF0aXZlLWlucHV0cwo+IMKgwqDC oMKgwqAgKGxpc3QgZXh0cmEtY21ha2UtbW9kdWxlcyBwa2ctY29uZmlnCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCBgKCxnbGliICJiaW4iKSkpwqDCoMKgwqDCoMKgwqDCoMKgwqAgO2ZvciBnbGli LWdlbm1hcnNoYWwKPiAtwqDCoMKgIDs7IFRPRE86IEFkZCAibGliIiBvdXRwdXQgdG8gcmVkdWNl IHRoZSBjbG9zdXJlIHNpemUgb2YgImd0azIiLgo+IC3CoMKgwqAgKG91dHB1dHMgJygib3V0IiAi Z3RrMiIgImd0azQiKSkKPiArwqDCoMKgIChvdXRwdXRzICcoIm91dCIgImd0azIiICJndGszIiAi Z3RrNCIpKQo+IMKgwqDCoMKgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9mY2l0eC9m Y2l0eDUtZ3RrIikKPiDCoMKgwqDCoCAoc3lub3BzaXMgIkdsaWIgYmFzZWQgRC1CdXMgY2xpZW50 IGFuZCBHVEsgSU0gbW9kdWxlIGZvciBGY2l0eAo+IDUiKQo+IC3CoMKgwqAgKGRlc2NyaXB0aW9u ICJGY2l0eDUtZ3RrIHByb3ZpZGVzIGEgR2xpYiBiYXNlZCBELUJ1cyBjbGllbnQgYW5kCj4gSU0g bW9kdWxlCj4gLWZvciBHVEsrMi9HVEsrMyBhcHBsaWNhdGlvbi4iKQo+ICvCoMKgwqAgKGRlc2Ny aXB0aW9uICJGY2l0eDUtZ3RrIHByb3ZpZGVzIGZvbGxvd2luZyBmdW5jdGlvbmFsaXR5IGluCj4g Y29ycmVzcG9uZGluZwo+ICtvdXRwdXQ6Cj4gKwo+ICtAdGFibGUgQGNvZGUKPiArQGl0ZW0gb3V0 Cj4gK0dMaWIgYmFzZWQgRC1CdXMgY2xpZW50IG9mIEZjaXR4NS4KPiArQGl0ZW0gZ3RrMgo+ICtJ TSBtb2R1bGUgZm9yIEdUSysyIGFwcGxpY2F0aW9ucy4KPiArQGl0ZW0gZ3RrMwo+ICtJTSBtb2R1 bGUgZm9yIEdUSyszIGFwcGxpY2F0aW9ucy4KPiArQGl0ZW0gZ3RrNAo+ICtJTSBtb2R1bGUgZm9y IEdUSzQgYXBwbGljYXRpb25zLgo+ICtAZW5kIHRhYmxlIikKPiDCoMKgwqDCoCAobGljZW5zZSBs aWNlbnNlOmxncGwyLjErKSkpCgpMb29rcyBuaWNlIGFuZCBvcmRlcnJseS4KQSBmZXcgZGVmaW5p dGUgYXJ0aWNsZXMgd291bGQgc2VlbSB0byBiZSBpbiBwbGFjZSB0aG91Z2g6CuKAmEZjaXR4NS1n dGsgcHJvdmlkZXMgdGhlIGZvbGxvd2luZyBmdW5jdGlvbmFsaXR5IGluIHRoZSBjb3JyZXNwb25k aW5nCm91dHB1dDrigJkKCkknbSBub3QgMTAwJSBzdXJlIGJ1dCBJIHRoaW5rIGl0J3Mg4oCYR0xp Yi1iYXNlZOKAmSAod2l0aCBhIGh5cGhlbikgaW5zdGVhZApvZiDigJlHTGliIGJhc2Vk4oCZLgoK R3JlZXRpbmdzLApNYXhpbWUuCg== --=-4nssHPAfEistyylfM/Br Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYgI/ohccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7odOAP9bQGoVRMPW4JG/zBzhNWS+0neK rUw/RfVmYqiBKbhsjwD+MwVCjGqts8LQKADgodLzQJnl1avAa9X88ctknX1rjgw= =BDf3 -----END PGP SIGNATURE----- --=-4nssHPAfEistyylfM/Br-- From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 21:14:00 2022 Received: (at 53648) by debbugs.gnu.org; 9 Feb 2022 02:14:00 +0000 Received: from localhost ([127.0.0.1]:49231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHcUa-0003qm-52 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 21:14:00 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:59026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHcUW-0003qT-AV for 53648@debbugs.gnu.org; Tue, 08 Feb 2022 21:13:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=07IEB YXkQJ+BqbnGtgSevNNx59So+9JqRI8g82+CTXU=; b=a4beOApC11g1uhG4fizKH 2HtJTil7jL7Ey7c4o7PMY6QWc4XdreUNGHuj2fAC7QmmZfUp3oqfumntWea7xu7G ELFGKdnyNFTMaqaWGTY8eObwzEHculVjLWcEGE0RPbOTINpccmwPJo1bs3u+i9CR oHL+4y/aO51aoaNjP7sbRk= Received: from asus-laptop (unknown [112.95.111.199]) by smtp1 (Coremail) with SMTP id GdxpCgC3tKJZIwNiOeJrBg--.9098S2; Wed, 09 Feb 2022 10:13:47 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Wed, 09 Feb 2022 10:12:10 +0800 In-reply-to: Message-ID: <86wni4yeg9.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgC3tKJZIwNiOeJrBg--.9098S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RWeHgUUUUU X-Originating-IP: [112.95.111.199] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxuir1et3CFKjgAAs+ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgMjVhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lGIgEAxBQmZKsXlv9MJhlznti4QQlRKYev 00po+FpGIODa+VgBAK0Ineh8yt8SDvQzRummjsNSo5Z4iW/ymk2mlpqcHwoE =b2jI -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-fcitx5-gtk-Split-IM-module-output-for-different-.patch Content-Transfer-Encoding: quoted-printable >From 231d1a839daf5ff5f7845a0084d8cbefd7238ad3 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Feb 2022 13:55:26 +0800 Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different version of GTK. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Use G-Expression. : Split input method module into different outputs for GTK2, GTK3 a= nd GTK4. Now default output only provides GLib client of Fcitx5. [inputs]: Use label-less style inputs. [outputs]: Add new "gtk3" output. [synopsis]: Fix typo. [description]: Describe the functionality of each output. --- gnu/packages/fcitx5.scm | 87 +++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 123418cd4f..b1938619f9 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2022 Zhu Zihao ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (gnu packages fcitx5) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -196,48 +197,60 @@ (define-public fcitx5-gtk (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;No test - #:configure-flags - (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" - %output "/share/gir-1.0") - (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" - %output "/lib/girepository-1.0")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2")) - (gtk4 (assoc-ref outputs "gtk4"))) - ;; Install GTK+ 2 input method module to its own output. - (substitute* "gtk2/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))) + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" + #$output "/share/gir-1.0") + (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" + #$output "/lib/girepository-1.0")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-install-prefix + (lambda* (#:key outputs #:allow-other-keys) + ;; Take care of different versions of GTK because this packa= ge + ;; provides IM module for GTK application to use input metho= d. + (define (split-immodule gtk-version output) + (substitute* (string-append gtk-version "/CMakeLists.txt") + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append output "/lib")))) =20 - ;; Install for GTK 4. - (substitute* "gtk4/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk4 "/lib"))))))))) + (let ((gtk2 #$output:gtk2) + (gtk3 #$output:gtk3) + (gtk4 #$output:gtk4)) + (for-each split-immodule + '("gtk2" "gtk3" "gtk4") + (list gtk2 gtk3 gtk4)))))))) (inputs - `(("fcitx5" ,fcitx5) - ("fmt" ,fmt) - ("libxkbcommon" ,libxkbcommon) - ("gobject-introspection" ,gobject-introspection) - ("gtk2" ,gtk+-2) - ("gtk3" ,gtk+) - ("gtk4" ,gtk) - ("glib" ,glib) - ("libx11" ,libx11) - ("gettext" ,gettext-minimal))) + (list fcitx5 + fmt + libx11 + libxkbcommon + gettext + gobject-introspection + gtk+-2 + gtk+ + gtk + glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2" "gtk4")) + (outputs '("out" "gtk2" "gtk3" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") - (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") - (description "Fcitx5-gtk provides a Glib based D-Bus client and IM mod= ule -for GTK+2/GTK+3 application.") + (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") + (description "Fcitx5-gtk provides following functionality in correspon= ding +output: + +@table @code +@item out +GLib-based D-Bus client of Fcitx5. +@item gtk2 +IM module for GTK+2 applications. +@item gtk3 +IM module for GTK+3 applications. +@item gtk4 +IM module for GTK4 applications. +@end table") (license license:lgpl2.1+))) =20 (define-public fcitx5-qt --=20 2.34.0 --=-=-= Content-Type: text/plain #$ ungexp reader macro doesn't support variable as output specification makes code look a litte cumbersome... -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 09 06:05:31 2022 Received: (at 53648) by debbugs.gnu.org; 9 Feb 2022 11:05:31 +0000 Received: from localhost ([127.0.0.1]:50038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHkmw-0000rj-Qz for submit@debbugs.gnu.org; Wed, 09 Feb 2022 06:05:31 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:52146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHkmu-0000ra-W1 for 53648@debbugs.gnu.org; Wed, 09 Feb 2022 06:05:29 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id sz5S260094UW6Th06z5SMJ; Wed, 09 Feb 2022 12:05:27 +0100 Message-ID: <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. From: Maxime Devos To: Zhu Zihao Date: Wed, 09 Feb 2022 12:05:20 +0100 In-Reply-To: <86wni4yeg9.fsf@163.com> References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-yUjwLrEo1QjtYfrmbaKr" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1644404727; bh=1hnOhYiOiCXGXQ8nksn2GMHMyrFNHTXPIgeI/LzKKA4=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=XZTTEO91FOtGPP6avEZFCQMBic6rxJwAIHY14TXhSf0K5/5yRfCk47uahQTMFWYYD Yj1ayGDTLmV/QZyJol58V2yHaHhP7zwZF2JrYT1kNPwUM6O+leBTXGoRwZ3NLEnRuf LH0l+rr3cOblum5PeGpWj40WvLLImlbx8PTK95C4fzfGnppl5d1E/iJwKg7TOGioik f0phnLtKidQ++FIMH7XXZd64J9FYluMaNAwnRG7CKhNlpeI6GBeuhonmjdBH481Tpz sOY08dfkIrY/Jl88lAzxIkSRS4POf7aA3c5U84x79crptSie4cyKurRdz66pvqvD3a V1paWIp8L156g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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.7 (-) --=-yUjwLrEo1QjtYfrmbaKr Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op wo 09-02-2022 om 10:12 [+0800]: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lamb= da* (#:key outputs #:allow-other-keys) Since you're doing #$output:FOO instead of (assoc-ref outputs "foo") below now, 'outputs' is now unused, so this can be simplified to (lambda _ ; <-- no (#:key outputs #:allow-other-keys) argument list needed ;; Take care of [...] (define (split-immodule gtk-version output) [...]) [...]) > + (description "Fcitx5-gtk provides following functionality in corresp= onding As previously mentioned, a few definite articles would seem to be in place: =E2=80=98Fcitx5-gtk provides _the_ following functionality in _the_ corresp= onding output:=E2=80=99 (emphasis mine). Otherwise, LGTM, although I didn't test it. Greetings, Maxime. --=-yUjwLrEo1QjtYfrmbaKr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYgOf8BccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7h89AQCUPCbbQs5AYl5vdUOSjUWKPSRr IxpJvGQ9YJLHdIRhUgEA2uqD8BoYd+QzPTqFiNs05s3vLR4oKlKtwrjowb3c0w0= =u0dN -----END PGP SIGNATURE----- --=-yUjwLrEo1QjtYfrmbaKr-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 09 10:55:07 2022 Received: (at 53648) by debbugs.gnu.org; 9 Feb 2022 15:55:07 +0000 Received: from localhost ([127.0.0.1]:52368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHpJD-0007t9-4L for submit@debbugs.gnu.org; Wed, 09 Feb 2022 10:55:07 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:38547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHpJ7-0007sP-GG for 53648@debbugs.gnu.org; Wed, 09 Feb 2022 10:55:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=SlN5g Wf/aRs9uCCT2DDA6sN9VWUuYoyoQJIr54JsqbA=; b=GJYB5EehzlJkaqN+LX5xH CLSCevrsTaKHuHRq407jKvUuZcFdQNRc8PeaSpKswJ9pPChbKPV/iVcVnQ0791Ry qIy5zPB+Ut9FjZ0c0vTPLmyDZiWI7YRPFjTxShBaspUHgGTdDKgyNbBH1zv7h6oY 86PwUo46wsXwl5lBoAXWG4= Received: from asus-laptop (unknown [27.46.106.25]) by smtp1 (Coremail) with SMTP id GdxpCgAX0M3I4wNi8ii8Bg--.19933S2; Wed, 09 Feb 2022 23:54:49 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Wed, 09 Feb 2022 23:54:16 +0800 In-reply-to: <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> Message-ID: <86k0e4827w.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgAX0M3I4wNi8ii8Bg--.19933S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTE73sFUUUUU X-Originating-IP: [27.46.106.25] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgmir1aD-BXCugAAsm X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain I've clean the code. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgPjwxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/mRCwD9H660ZfyR8PlqjfcuRRm4XUCBI9z1 OKmbsA+gYU02t1YBAM1Dziwe2yts2gZcJCXxeBWKvitaS2czLainbg1vIDkJ =1gcM -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=shift_jis Content-Disposition: inline; filename=0002-gnu-fcitx5-gtk-Split-IM-module-output-for-different-.patch Content-Transfer-Encoding: quoted-printable >From 49f3d7e4f8a07f546c49a894867c8c633dd58309 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Feb 2022 13:55:26 +0800 Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different version of GTK. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Use G-Expression. : Split input method module into different outputs for GTK2, GTK3 a= nd GTK4. Now default output only provides GLib client of Fcitx5. [inputs]: Use label-less style inputs. [outputs]: Add new "gtk3" output. [synopsis]: Fix typo. [description]: Describe the functionality of each output. --- gnu/packages/fcitx5.scm | 87 +++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 123418cd4f..514c94ef2e 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2022 Zhu Zihao ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (gnu packages fcitx5) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -196,48 +197,60 @@ (define-public fcitx5-gtk (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;No test - #:configure-flags - (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" - %output "/share/gir-1.0") - (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" - %output "/lib/girepository-1.0")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2")) - (gtk4 (assoc-ref outputs "gtk4"))) - ;; Install GTK+ 2 input method module to its own output. - (substitute* "gtk2/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))) + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" + #$output "/share/gir-1.0") + (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" + #$output "/lib/girepository-1.0")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-install-prefix + (lambda _ + ;; Take care of different versions of GTK because this packa= ge + ;; provides IM module for GTK application to use input metho= d. + (define (split-immodule gtk-version output) + (substitute* (string-append gtk-version "/CMakeLists.txt") + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append output "/lib")))) =20 - ;; Install for GTK 4. - (substitute* "gtk4/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk4 "/lib"))))))))) + (let ((gtk2 #$output:gtk2) + (gtk3 #$output:gtk3) + (gtk4 #$output:gtk4)) + (for-each split-immodule + '("gtk2" "gtk3" "gtk4") + (list gtk2 gtk3 gtk4)))))))) (inputs - `(("fcitx5" ,fcitx5) - ("fmt" ,fmt) - ("libxkbcommon" ,libxkbcommon) - ("gobject-introspection" ,gobject-introspection) - ("gtk2" ,gtk+-2) - ("gtk3" ,gtk+) - ("gtk4" ,gtk) - ("glib" ,glib) - ("libx11" ,libx11) - ("gettext" ,gettext-minimal))) + (list fcitx5 + fmt + libx11 + libxkbcommon + gettext + gobject-introspection + gtk+-2 + gtk+ + gtk + glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2" "gtk4")) + (outputs '("out" "gtk2" "gtk3" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") - (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") - (description "Fcitx5-gtk provides a Glib based D-Bus client and IM mod= ule -for GTK+2/GTK+3 application.") + (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") + (description "Fcitx5-gtk provides the following functionality in the +corresponding output: + +@table @code +@item out +GLib-based D-Bus client of Fcitx5. +@item gtk2 +IM module for GTK+2 applications. +@item gtk3 +IM module for GTK+3 applications. +@item gtk4 +IM module for GTK4 applications. +@end table") (license license:lgpl2.1+))) =20 (define-public fcitx5-qt --=20 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 09 15:33:52 2022 Received: (at 53648) by debbugs.gnu.org; 9 Feb 2022 20:33:52 +0000 Received: from localhost ([127.0.0.1]:52900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHtey-0003lt-3a for submit@debbugs.gnu.org; Wed, 09 Feb 2022 15:33:52 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:43066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHtex-0003ll-0b for 53648@debbugs.gnu.org; Wed, 09 Feb 2022 15:33:51 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id t8Zo2600g4UW6Th018ZpKl; Wed, 09 Feb 2022 21:33:49 +0100 Message-ID: <96291bfa6f21ac08474c400b8c42c30d5629840b.camel@telenet.be> Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. From: Maxime Devos To: Zhu Zihao Date: Wed, 09 Feb 2022 21:33:48 +0100 In-Reply-To: <86k0e4827w.fsf@163.com> References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> <86k0e4827w.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-7RThcjh6ePlSwFhTwaHT" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1644438829; bh=4W4OYePi7pk/AnEZYyTJ6HxPxSd9kJoWr+CcJKDuwEg=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=RYh4949KzcyC+TJESWJkGRk+wvq93fRQ4ni0PauM8Hv4Td6dhYDEqtiMuiC8ObXee KIrNu+RhgYOHNI0IxtdjMZh8O19jO03y1RhZQ0e9lt+6xA3nEtQdo9Fu7bpzSotsct 4dWkEFvYZLaLKvr/51zK+7nOtXnTIPRWqo4eVRuux20QWGk4PIa4M1EmxqD1Qbwzbh tI8K5W/8R4LHxCbEDFfORec3wKsygOcq6GBDpxOVhCK3zBHLO//vLc/Xo+aliWAxE8 bnJDd/Zz64yvNqCat6mSGORz+iOSwqrkkm600R/DCpKyDonVCmf2h4CBiAng+H7XLh ojvSKA9kd2Xzw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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.7 (-) --=-7RThcjh6ePlSwFhTwaHT Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 dXNlcnMgZ3VpeAp1c2VydGFncyA1MzY0OCByZXZpZXdlZC1sb29rcy1nb29kCnRoYW5rcwoKWmh1 IFppaGFvIHNjaHJlZWYgb3Agd28gMDktMDItMjAyMiBvbSAyMzo1NCBbKzA4MDBdOgo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIsKlwqUkwqXCpXtDTUFLRV9JTlNUQUxM X0xJQkRJUsKlwqV9IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChz dHJpbmctYXBwZW5kIG91dHB1dCAiL2xpYiIpKSkpCgpBc2lkZSBmcm9tIHRoZSBmaWxlIGVuY29k aW5nIGlzc3VlIG9mIHRoZSBwYXRjaCBmaWxlICh3aGljaCB0aGUKY29tbWl0dGVyIG1pZ2h0IGJl IGluIGEgYmV0dGVyIHBvc2l0aW9uIHRvIGZpZ3VyZSBvdXQpLCBMR1RNCihhbHRob3VnaCBJIGRp ZG4ndCBwZXJzb25hbGx5IHRlc3QgaXQuKQoKR3JlZXRpbmdzLApNYXhpbWUuCg== --=-7RThcjh6ePlSwFhTwaHT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYgQlLBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7l0LAQDDfnW9kp7DLaSr4a1HDcu7Mjde 4/nGs8nIIeY0e+baGgD/ewdaHol7VasyjHwp2SU54IWhfOCoFKaCp1pqmrGrPgg= =MWd6 -----END PGP SIGNATURE----- --=-7RThcjh6ePlSwFhTwaHT-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 09 18:24:34 2022 Received: (at 53648) by debbugs.gnu.org; 9 Feb 2022 23:24:34 +0000 Received: from localhost ([127.0.0.1]:53090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHwK9-0008Th-UA for submit@debbugs.gnu.org; Wed, 09 Feb 2022 18:24:34 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:45123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHwK6-0008TN-ME for 53648@debbugs.gnu.org; Wed, 09 Feb 2022 18:24:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=j3BV/ AHbdhbJTuE0lFAnkDHPKiUsqklKtmZa1C722oc=; b=ohQWFZuy9ZL5hdJ2cpxQk Up2O4jww198jpIBWnbg6C2/JUb7dQ03qgVc05vX3hH8OKoO3XcjVPpkzmAs27Miy AfSPJPiahmNfo/v102qFn+i+6k+u6pqrBdDiJGXs74Ibkdw0IabXMT0nspEkMdYW 2UdKthUA3egqOY2beDcwGg= Received: from asus-laptop (unknown [27.46.106.25]) by smtp1 (Coremail) with SMTP id GdxpCgAHer8kTQRi06fjBg--.25590S2; Thu, 10 Feb 2022 07:24:20 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> <86k0e4827w.fsf@163.com> <96291bfa6f21ac08474c400b8c42c30d5629840b.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Thu, 10 Feb 2022 07:23:09 +0800 In-reply-to: <96291bfa6f21ac08474c400b8c42c30d5629840b.camel@telenet.be> Message-ID: <86y22j7hew.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgAHer8kTQRi06fjBg--.25590S2 X-Coremail-Antispam: 1Uf129KBjvdXoW5Kw13Kr15Zw4kWFyxXw18Xwb_yoWxXFc_AF 1DtF9rtrnrJ3yfKw12krW8JFZYy3yDtF4fAryagw4fWryrAFs8GF1Fq3sY9F4SqF4rtFy7 KFykXr4xtr129jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRXzV87UUUUU== X-Originating-IP: [27.46.106.25] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBawWir1et3Csz9QAAso X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Maxime Devos writes: > [[PGP Signed Part:Undecided]] > users guix > usertags 53648 reviewed-looks-good > thanks > > Zhu Zihao schreef op wo 09-02-2022 om 23:54 [+0800]: >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (("=C2=A5=C2=A5$=C2=A5=C2=A5{CMAKE_INSTAL= L_LIBDIR=C2=A5=C2=A5}") >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append output "/lib")))) > > Aside from the file encoding issue of the patch file (which the > committer might be in a better position to figure out), LGTM > (although I didn't personally test it.) > > Greetings, > Maxime. > > [[End of PGP Signed Part]] Re-format them in UTF-8 encoding. Sorry for that (maybe I tweaked the prefer encoding of Emacs but I forget it.) --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgRNFxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/k7jQD/aywXVj6WX/n4pjyvvo00qqAUu2Mw nESQ3MZGjIr16NoA/2HtEUDoVeoZtTwXMxQGWWp8bqwhNzwbxtW12ZgMHX8M =pfJL -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-fcitx5-gtk-Split-IM-module-output-for-different-.patch Content-Transfer-Encoding: quoted-printable >From 49f3d7e4f8a07f546c49a894867c8c633dd58309 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Feb 2022 13:55:26 +0800 Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different version of GTK. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Use G-Expression. : Split input method module into different outputs for GTK2, GTK3 a= nd GTK4. Now default output only provides GLib client of Fcitx5. [inputs]: Use label-less style inputs. [outputs]: Add new "gtk3" output. [synopsis]: Fix typo. [description]: Describe the functionality of each output. --- gnu/packages/fcitx5.scm | 87 +++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 123418cd4f..514c94ef2e 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2022 Zhu Zihao ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (gnu packages fcitx5) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -196,48 +197,60 @@ (define-public fcitx5-gtk (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;No test - #:configure-flags - (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" - %output "/share/gir-1.0") - (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" - %output "/lib/girepository-1.0")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2")) - (gtk4 (assoc-ref outputs "gtk4"))) - ;; Install GTK+ 2 input method module to its own output. - (substitute* "gtk2/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))) + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" + #$output "/share/gir-1.0") + (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" + #$output "/lib/girepository-1.0")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-install-prefix + (lambda _ + ;; Take care of different versions of GTK because this packa= ge + ;; provides IM module for GTK application to use input metho= d. + (define (split-immodule gtk-version output) + (substitute* (string-append gtk-version "/CMakeLists.txt") + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append output "/lib")))) =20 - ;; Install for GTK 4. - (substitute* "gtk4/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk4 "/lib"))))))))) + (let ((gtk2 #$output:gtk2) + (gtk3 #$output:gtk3) + (gtk4 #$output:gtk4)) + (for-each split-immodule + '("gtk2" "gtk3" "gtk4") + (list gtk2 gtk3 gtk4)))))))) (inputs - `(("fcitx5" ,fcitx5) - ("fmt" ,fmt) - ("libxkbcommon" ,libxkbcommon) - ("gobject-introspection" ,gobject-introspection) - ("gtk2" ,gtk+-2) - ("gtk3" ,gtk+) - ("gtk4" ,gtk) - ("glib" ,glib) - ("libx11" ,libx11) - ("gettext" ,gettext-minimal))) + (list fcitx5 + fmt + libx11 + libxkbcommon + gettext + gobject-introspection + gtk+-2 + gtk+ + gtk + glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2" "gtk4")) + (outputs '("out" "gtk2" "gtk3" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") - (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") - (description "Fcitx5-gtk provides a Glib based D-Bus client and IM mod= ule -for GTK+2/GTK+3 application.") + (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") + (description "Fcitx5-gtk provides the following functionality in the +corresponding output: + +@table @code +@item out +GLib-based D-Bus client of Fcitx5. +@item gtk2 +IM module for GTK+2 applications. +@item gtk3 +IM module for GTK+3 applications. +@item gtk4 +IM module for GTK4 applications. +@end table") (license license:lgpl2.1+))) =20 (define-public fcitx5-qt --=20 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 11 12:59:07 2022 Received: (at 53648) by debbugs.gnu.org; 11 Feb 2022 17:59:07 +0000 Received: from localhost ([127.0.0.1]:60923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIaCJ-0004Qg-BI for submit@debbugs.gnu.org; Fri, 11 Feb 2022 12:59:07 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:17023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIaCE-0004Q6-Pw for 53648@debbugs.gnu.org; Fri, 11 Feb 2022 12:59:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=OBgnO fisKqncGzj+K0lqwP3K8pXeimThnfuKR00CGLw=; b=LIckHioYXO4uARnCjDS9S QIhfKGz3/3ZcpbHcyJUxN4rPyGyoiZSmy0T86+SpFj6uUKIAocuiVTqrH5XXRjuz XSSpN+Qf7BANwTGvusnNlAuRTpvSdNAEdFoFCquL/sZmZWZl01rquY7KHU6QpVa1 4IjL+GYYw4KhGQIa8DEXVU= Received: from asus-laptop (unknown [112.95.112.240]) by smtp3 (Coremail) with SMTP id G9xpCgAXkrfaowZibVTgBw--.59136S2; Sat, 12 Feb 2022 01:58:51 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> <86k0e4827w.fsf@163.com> <96291bfa6f21ac08474c400b8c42c30d5629840b.camel@telenet.be> <86y22j7hew.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Sat, 12 Feb 2022 01:42:39 +0800 In-reply-to: <86y22j7hew.fsf@163.com> Message-ID: <865yplz3mx.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: G9xpCgAXkrfaowZibVTgBw--.59136S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RZDGODUUUU X-Originating-IP: [112.95.112.240] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZhukr1aD-C4kAwAAsW X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org 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: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain You can test it with # No immodule cache needed for GTK4 ./pre-inst-env guix shell fcitx5-gtk:gtk4 celluloid GUIX_GTK4_PATH=$GUIX_ENVIRONMENT/lib/gtk-4.0 celluloid --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgaj1hUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nyIQD+OVz10maDQDUSWxshWzAuGUC7E9cH anexoFOHcKWrRm4A/0Img51EpSN0++cydFNNJqr21Qtbu2swK1ywI1B75qkP =UZYz -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fcitx5-gtk-Add-GTK-4-support.patch >From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 31 Jan 2022 14:51:30 +0800 Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: : Enable GTK 4 IM module. : In 'patch-install-prefix', patch the install prefix of GTK 4 IM module. [inputs]: Add GTK 4. [outputs]: Add 'gtk4'. --- gnu/packages/fcitx5.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..123418cd4f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -201,19 +201,23 @@ (define-public fcitx5-gtk (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0") - ;; TODO: Enable it when Guix has GTK4. - "-DENABLE_GTK4_IM_MODULE=Off") + %output "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2"))) + (gtk2 (assoc-ref outputs "gtk2")) + (gtk4 (assoc-ref outputs "gtk4"))) ;; Install GTK+ 2 input method module to its own output. (substitute* "gtk2/CMakeLists.txt" (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))))))))) + (string-append gtk2 "/lib"))) + + ;; Install for GTK 4. + (substitute* "gtk4/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append gtk4 "/lib"))))))))) (inputs `(("fcitx5" ,fcitx5) ("fmt" ,fmt) @@ -221,6 +225,7 @@ (define-public fcitx5-gtk ("gobject-introspection" ,gobject-introspection) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) + ("gtk4" ,gtk) ("glib" ,glib) ("libx11" ,libx11) ("gettext" ,gettext-minimal))) @@ -228,7 +233,7 @@ (define-public fcitx5-gtk (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2")) + (outputs '("out" "gtk2" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-fcitx5-gtk-Split-IM-module-output-for-different-.patch Content-Transfer-Encoding: quoted-printable >From 429e4569a03af76a7fbd2b56726f35a1b38bc0b9 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Feb 2022 13:55:26 +0800 Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different version of GTK. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Use G-Expression. : Split input method module into different outputs for GTK2, GTK3 a= nd GTK4. Now default output only provides GLib client of Fcitx5. [inputs]: Use label-less style inputs. [outputs]: Add new "gtk3" output. [synopsis]: Fix typo. [description]: Describe the functionality of each output. --- gnu/packages/fcitx5.scm | 87 +++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 123418cd4f..9e1ccdd3eb 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2022 Zhu Zihao ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (gnu packages fcitx5) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -196,48 +197,60 @@ (define-public fcitx5-gtk (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;No test - #:configure-flags - (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" - %output "/share/gir-1.0") - (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" - %output "/lib/girepository-1.0")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtk2 (assoc-ref outputs "gtk2")) - (gtk4 (assoc-ref outputs "gtk4"))) - ;; Install GTK+ 2 input method module to its own output. - (substitute* "gtk2/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk2 "/lib"))) + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" + #$output "/share/gir-1.0") + (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" + #$output "/lib/girepository-1.0")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-install-prefix + (lambda _ + ;; Take care of different versions of GTK because this packa= ge + ;; provides IM module for GTK application to use input metho= d. + (define (split-immodule gtk-version output) + (substitute* (string-append gtk-version "/CMakeLists.txt") + (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") + (string-append output "/lib")))) =20 - ;; Install for GTK 4. - (substitute* "gtk4/CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_LIBDIR\\}") - (string-append gtk4 "/lib"))))))))) + (let ((gtk2 #$output:gtk2) + (gtk3 #$output:gtk3) + (gtk4 #$output:gtk4)) + (for-each split-immodule + '("gtk2" "gtk3" "gtk4") + (list gtk2 gtk3 gtk4)))))))) (inputs - `(("fcitx5" ,fcitx5) - ("fmt" ,fmt) - ("libxkbcommon" ,libxkbcommon) - ("gobject-introspection" ,gobject-introspection) - ("gtk2" ,gtk+-2) - ("gtk3" ,gtk+) - ("gtk4" ,gtk) - ("glib" ,glib) - ("libx11" ,libx11) - ("gettext" ,gettext-minimal))) + (list fcitx5 + fmt + libx11 + libxkbcommon + gettext-minimal + gobject-introspection + gtk+-2 + gtk+ + gtk + glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - ;; TODO: Add "lib" output to reduce the closure size of "gtk2". - (outputs '("out" "gtk2" "gtk4")) + (outputs '("out" "gtk2" "gtk3" "gtk4")) (home-page "https://github.com/fcitx/fcitx5-gtk") - (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") - (description "Fcitx5-gtk provides a Glib based D-Bus client and IM mod= ule -for GTK+2/GTK+3 application.") + (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") + (description "Fcitx5-gtk provides the following functionality in the +corresponding output: + +@table @code +@item out +GLib-based D-Bus client of Fcitx5. +@item gtk2 +IM module for GTK+2 applications. +@item gtk3 +IM module for GTK+3 applications. +@item gtk4 +IM module for GTK4 applications. +@end table") (license license:lgpl2.1+))) =20 (define-public fcitx5-qt --=20 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 08:36:28 2022 Received: (at 53648) by debbugs.gnu.org; 14 Feb 2022 13:36:28 +0000 Received: from localhost ([127.0.0.1]:40242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJbWl-0007n0-Ph for submit@debbugs.gnu.org; Mon, 14 Feb 2022 08:36:27 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:40126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJbWj-0007md-I2 for 53648@debbugs.gnu.org; Mon, 14 Feb 2022 08:36:26 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 73C54566; Mon, 14 Feb 2022 14:36:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kTPnEl6gfY0K; Mon, 14 Feb 2022 14:36:17 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 45065416; Mon, 14 Feb 2022 14:36:17 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#53648: [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> <86k0e4827w.fsf@163.com> <96291bfa6f21ac08474c400b8c42c30d5629840b.camel@telenet.be> <86y22j7hew.fsf@163.com> <865yplz3mx.fsf@163.com> Date: Mon, 14 Feb 2022 14:36:16 +0100 In-Reply-To: <865yplz3mx.fsf@163.com> (Zhu Zihao's message of "Sat, 12 Feb 2022 01:42:39 +0800") Message-ID: <87a6ety3hr.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-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 73C54566 X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_ENVRCPT(0.00)[163.com]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; FREEMAIL_TO(0.00)[163.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org, Maxime Devos 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: -0.0 (/) Hi, Zhu Zihao skribis: >>>From 0c23e8cbbfe8f0548b29176831a4358d41820159 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 31 Jan 2022 14:51:30 +0800 > Subject: [PATCH 1/2] gnu: fcitx5-gtk: Add GTK 4 support. > > * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: > : Enable GTK 4 IM module. > : In 'patch-install-prefix', patch the install prefix of GTK 4 IM > module. > [inputs]: Add GTK 4. > [outputs]: Add 'gtk4'. [...] >>>From 429e4569a03af76a7fbd2b56726f35a1b38bc0b9 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 7 Feb 2022 13:55:26 +0800 > Subject: [PATCH 2/2] gnu: fcitx5-gtk: Split IM module output for different > version of GTK. > > * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Use G-Expression. > > : Split input method module into different outputs for GTK2, GTK3= and GTK4. > > Now default output only provides GLib client of Fcitx5. > > [inputs]: Use label-less style inputs. > [outputs]: Add new "gtk3" output. > > [synopsis]: Fix typo. > [description]: Describe the functionality of each output. Applied! However, I wonder if this should not be split into several packages, rather than several outputs. The main reason is that merely building fcitx5-gtk now requires pulling all three GTK+ versions, and GTK4 has a lot more dependencies, some of which may be unavailable on platforms other than x86_64. WDYT? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 08:36:34 2022 Received: (at control) by debbugs.gnu.org; 14 Feb 2022 13:36:34 +0000 Received: from localhost ([127.0.0.1]:40246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJbWs-0007nL-16 for submit@debbugs.gnu.org; Mon, 14 Feb 2022 08:36:34 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:40148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJbWq-0007my-2V for control@debbugs.gnu.org; Mon, 14 Feb 2022 08:36:32 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A66ABB18 for ; Mon, 14 Feb 2022 14:36:26 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y_xqtn_pgj_o for ; Mon, 14 Feb 2022 14:36:26 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 43E6B416 for ; Mon, 14 Feb 2022 14:36:26 +0100 (CET) Date: Mon, 14 Feb 2022 14:36:25 +0100 Message-Id: <878rudy3hi.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #53648 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: A66ABB18 X-Spamd-Result: default: False [0.61 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[control@debbugs.gnu.org]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_MIXED_CHARSET(0.71)[subject]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.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: -0.0 (/) close 53648 quit From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 16 08:27:32 2022 Received: (at 53648) by debbugs.gnu.org; 16 Feb 2022 13:27:32 +0000 Received: from localhost ([127.0.0.1]:47766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKKLE-0007hx-KK for submit@debbugs.gnu.org; Wed, 16 Feb 2022 08:27:32 -0500 Received: from mail-m975.mail.163.com ([123.126.97.5]:9119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKKLC-0007hg-6m for 53648@debbugs.gnu.org; Wed, 16 Feb 2022 08:27:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=06v8w ZbbssSK6DWzZ2wWVYwZpHdoaWMwSXyR2enW6ro=; b=mbq8PWo+IVxaxFD8T9e7v sQ15ZQWw5KD0w6EXu6LtTl9bCAN8sbwzjGgdjOSdZixCg32l3sVbh7KxtUBbDuCg KA65D/pKoJNd0OEhSnh38VHkL93VxLg+vXzibYy60gHQ6uTPJ3xma5UQfFEVDZ7k u5ujvnQUDmCcBTz78b/av0= Received: from asus-laptop (unknown [27.38.114.206]) by smtp5 (Coremail) with SMTP id HdxpCgAnmrC4+wxiacWTCg--.9889S2; Wed, 16 Feb 2022 21:27:21 +0800 (CST) References: <86ilu09yzs.fsf@163.com> <8635kwasnn.fsf@163.com> <86czjz8fmt.fsf@163.com> <86pmnyyooc.fsf@163.com> <86wni4yeg9.fsf@163.com> <7352ac1f2762ffe4f24f22427a5ab1d56ba9237b.camel@telenet.be> <86k0e4827w.fsf@163.com> <96291bfa6f21ac08474c400b8c42c30d5629840b.camel@telenet.be> <86y22j7hew.fsf@163.com> <865yplz3mx.fsf@163.com> <87a6ety3hr.fsf_-_@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#53648: [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Date: Wed, 16 Feb 2022 21:25:54 +0800 In-reply-to: <87a6ety3hr.fsf_-_@gnu.org> Message-ID: <868rub6ixi.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HdxpCgAnmrC4+wxiacWTCg--.9889S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTi_OznDUUUU X-Originating-IP: [27.38.114.206] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxmpr1et3HSnKwAAsq X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53648 Cc: 53648@debbugs.gnu.org, Maxime Devos 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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Applied! > > However, I wonder if this should not be split into several packages, > rather than several outputs. The main reason is that merely building > fcitx5-gtk now requires pulling all three GTK+ versions, and GTK4 has a > lot more dependencies, some of which may be unavailable on platforms > other than x86_64. > > WDYT? > > Thanks, > Ludo=E2=80=99. Fcitx5-gtk doesn't provide option to build only GTK4 module(GLib client must build), it may requires heavily patch work. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYgz7qRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lekQD/WFRs8e4/+eQxOuFES/Y2UszibOzo 4XQkqE95zUTBUm4BAPdqRHueH2TR3FaWU9fFZ+91uppJiFpgYmfsPgUfeLoN =D+u7 -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 07:20:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 17 Mar 2022 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator