From patchwork Tue Feb 8 04:19:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 37080 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3254327BBE9; Tue, 8 Feb 2022 04:21:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B83127BBEA for ; Tue, 8 Feb 2022 04:21:11 +0000 (GMT) Received: from localhost ([::1]:36062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHI06-0005g3-C3 for patchwork@mira.cbaines.net; Mon, 07 Feb 2022 23:21:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHHzy-0005fZ-Ip for guix-patches@gnu.org; Mon, 07 Feb 2022 23:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHHzy-000188-9n for guix-patches@gnu.org; Mon, 07 Feb 2022 23:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHHzy-0002Sf-6w for guix-patches@gnu.org; Mon, 07 Feb 2022 23:21: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: Tue, 08 Feb 2022 04:21: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.16442940529419 (code B ref 53648); Tue, 08 Feb 2022 04:21:02 +0000 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 Date: Tue, 08 Feb 2022 12:19:52 +0800 In-reply-to: Message-ID: <86pmnyyooc.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: GtxpCgAXK1aU7wFio1XZBQ--.11258S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4R5Ef2UUUUU X-Originating-IP: [27.46.106.102] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPRahr2AY+vNFUQAAsA 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I use @table texinfo command to make the use of different output clear :) 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 method 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 © 2020 Zhu Zihao +;;; Copyright © 2020, 2022 Zhu Zihao ;;; Copyright © 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")))) - ;; 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 module -for GTK+2/GTK+3 application.") + (description "Fcitx5-gtk provides following functionality in 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+))) (define-public fcitx5-qt -- 2.34.0