From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0LhPIm21AGL0OQAAgWs5BA (envelope-from ) for ; Mon, 07 Feb 2022 07:00:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AIFpH221AGIzMQAA9RJhRA (envelope-from ) for ; Mon, 07 Feb 2022 07:00:13 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C649838D63 for ; Mon, 7 Feb 2022 07:00:11 +0100 (CET) Received: from localhost ([::1]:36134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGx4M-00013i-BK for larch@yhetil.org; Mon, 07 Feb 2022 01:00:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGx4E-00013V-QE for guix-patches@gnu.org; Mon, 07 Feb 2022 01:00:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGx4E-0003c4-FN for guix-patches@gnu.org; Mon, 07 Feb 2022 01:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGx4E-0001qm-Bm for guix-patches@gnu.org; Mon, 07 Feb 2022 01:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53648] [PATCH] gnu: fcitx5-gtk: Add GTK 4 support. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 06:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53648 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 53648@debbugs.gnu.org Received: via spool by 53648-submit@debbugs.gnu.org id=B53648.16442135457013 (code B ref 53648); Mon, 07 Feb 2022 06:00:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644213613; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=QSrjfm2h1DbxtyFScoM7Vjkj3v/aAMGSiH2jlo5qpWA=; b=Zdlu2uz/EKmuzEZ4JGzD0xRFrsocmmBvNarSoYj5H0PUKasGMPQopb7yvTHmwbBOYAEaoQ 6L62JPfaLUFLU8ZChtHwCzvsnfLXLL7z9+1UNt1gPlHly7UAM2ASbG4BIFh/k7j33onIW2 +c54b9LxuTxL8v7kNLLvx2bgDPZitcZVQrC6NsNCFEFa90iK+IrHM2CgFwJz8CzXR2xCzy /zmVV8AqWcw31lvu62h/KKGEZexXvkhC0H9NVRU38k3sf7eIaR6fyDf843d8bQCV21wfG9 gKGKNbBdZaLYc3IDrpwlewaI3El+J7wDAEEW9M6M0yoGUZhk1ShsM6IkzbbY5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644213613; a=rsa-sha256; cv=none; b=bVDczI5gO/Lk0ziRvEGALD9JwY9kdbiNDR+dBBySSDyUMktiHMHesN5QOvlsrJpHpdfrxV Di5SrUNAU8pZvIbX5XasMoUapPruBadcJXMsGzxw9ibSArkHamNuy44pcM7kT89QyY9ESS UhF9lnN9Gxg4OkVfQpAAqTZcYLQ9U0aKeRVXGAYY0Quq3FPcnoVB3L74kdT1j15hBD6oCk S/TXqe8cbmDi5ceNZnsy5mYRRnKwSCXinhOTxNvTFXj5rB1f833w5Q244sAerN+V0gjRQ2 qOuqjPzodv7xEEsJS/QnpowYX1CsA0zs/XDF7agOlP1a7EJH0lDZZgQugwo00Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=iFUuIrgW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=iFUuIrgW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C649838D63 X-Spam-Score: -4.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8+5v/qBIrfpy --=-=-= 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 --=-=-=--