From patchwork Sun Nov 6 20:46:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 44355 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 1329C27BBEA; Sun, 6 Nov 2022 20:47:46 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 37AC427BBEA for ; Sun, 6 Nov 2022 20:47:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ormXq-0004KA-QV; Sun, 06 Nov 2022 15:47:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ormXn-0004Im-Tk for guix-patches@gnu.org; Sun, 06 Nov 2022 15:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ormXn-00047g-Dx for guix-patches@gnu.org; Sun, 06 Nov 2022 15:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ormXn-0001DQ-7q for guix-patches@gnu.org; Sun, 06 Nov 2022 15:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59084] [PATCH 3/7] gnu: fcitx5-gtk: Update to 5.0.19. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Nov 2022 20:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59084 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59084@debbugs.gnu.org Received: via spool by 59084-submit@debbugs.gnu.org id=B59084.16677676224659 (code B ref 59084); Sun, 06 Nov 2022 20:47:03 +0000 Received: (at 59084) by debbugs.gnu.org; 6 Nov 2022 20:47:02 +0000 Received: from localhost ([127.0.0.1]:60766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ormXl-0001Cr-PB for submit@debbugs.gnu.org; Sun, 06 Nov 2022 15:47:02 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ormXi-0001C0-Qu for 59084@debbugs.gnu.org; Sun, 06 Nov 2022 15:46:59 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id BFE425C008B for <59084@debbugs.gnu.org>; Sun, 6 Nov 2022 15:46:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 06 Nov 2022 15:46:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667767613; x=1667854013; bh=Hq d4ylR5A2+fMgjFwkjoDapaKBNUA6QrgcT6INysVBY=; b=XSBna8Lqg4Mz6Jndkg rmre8XMI6nDagU+GyDL88y7w8WoQbi3Teo3/IjL5SkE9xHB+Qye38lAA0njKUDua lFFFZ3y6tI8Ze3udhY+/0BKvmeZjIN6uzlk5dnB4ownHPBdIc07L6DoMEIy0yIKw znajIJifHgsxKB57ApKTY4Ople0ICrVsqdyvA2Iw5BLKIpNog2iV3ySYL28x/o92 mNetxBm8jFhYCs4E3cgabPSFt3BX8/friv5/FPvZypx8eiZypo1FCmm0SPnhHpAi ZmMcpFTp4v0wt1/dsTNWrAhW0da0Fl6qve+qdheGyMod6GT3b+WXH7TEC9LD3Ktv avgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667767613; x=1667854013; bh=Hqd4ylR5A2+fM gjFwkjoDapaKBNUA6QrgcT6INysVBY=; b=WFSb2RDM+fo69+ZvdosK1npYSndhy vrs/X53iwqLziXIjrE1MJ5bUtFXwE9dzKqZ6QKQmwoInlo1xpwuT+I8i4BcmIo7f fr0HH84D3pJWkbGjPMg6kzeSQRssxrrVqiPpy9nlsPKFGmqLhnjE2jyu2aI2ZuZn jU6tA0+1cp3i5K8aKBXiFr2xxd8pfNWO84WzqeTFibXfuux2fC0Y+hNAD0gyjYMW YksAb8BnFHVm2YCeOnck9KonKdxDa/Zy9TqVArhJbpBwIVcM3W1Be0r6Vmjwwk/6 RkmIFgOTgT+7FgYimNmAc7lzQztjVf7Xl8N308BvjbVerpoVIzpYJdMfA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdeigddufeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgteeivdetgeegtdejtdduud eludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi segurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <59084@debbugs.gnu.org>; Sun, 6 Nov 2022 15:46:52 -0500 (EST) From: dan Date: Mon, 7 Nov 2022 04:46:35 +0800 Message-Id: <20221106204639.14621-3-i@dan.games> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221106204639.14621-1-i@dan.games> References: <20221106204639.14621-1-i@dan.games> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fcitx5.scm (fcitx5-gtk): Update to 5.0.19. * gnu/packages/fcitx5.scm (fcitx5-gtk4) [phases]: Make gtk4/gtk4inputwindow.cpp properly find fcitxtheme.h. --- gnu/packages/fcitx5.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 634c0395c4..3bc0636fb8 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -188,7 +188,7 @@ (define-public libime (define-public fcitx5-gtk (package (name "fcitx5-gtk") - (version "5.0.9") + (version "5.0.19") (source (origin (method url-fetch) @@ -196,7 +196,7 @@ (define-public fcitx5-gtk "/fcitx5-gtk/fcitx5-gtk-" version ".tar.xz")) (sha256 - (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n")))) + (base32 "007ls91jfbs3anvcfbza1pjbbsi7q5nrw7f3nzdbyngsl3nj6k37")))) (build-system cmake-build-system) (arguments (list @@ -275,6 +275,11 @@ (define-public fcitx5-gtk4 "-DENABLE_GTK3_IM_MODULE=OFF") #:phases #~(modify-phases %standard-phases + (add-before 'configure 'fix-fcitxtheme-path + (lambda _ + (substitute* "gtk4/gtk4inputwindow.cpp" + (("") + "\"fcitxtheme.h\"")))) (add-before 'configure 'fix-gclient (lambda* (#:key inputs #:allow-other-keys) (define gclient