From patchwork Thu Apr 15 12:28:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28569 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 AC20C27BC77; Thu, 15 Apr 2021 13:35:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 156F227BC76 for ; Thu, 15 Apr 2021 13:35:37 +0100 (BST) Received: from localhost ([::1]:45020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1Dc-0002Ce-8u for patchwork@mira.cbaines.net; Thu, 15 Apr 2021 08:35:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18G-0005va-Pc for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18G-0007cP-A9 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18G-0007XR-7B for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 1/5] gnu: ibus: Update to 1.5.24. References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47770@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.161848977928871 (code B ref 47770); Thu, 15 Apr 2021 12:30:04 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:39 +0000 Received: from localhost ([127.0.0.1]:36669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17q-0007VV-Er for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:38 -0400 Received: from out2.migadu.com ([188.165.223.204]:51853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17f-0007UW-OR for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:34 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1618489766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tDvv/6RmGqYSJewopfH3iI3Np7CxLUTi52VlV0Rl17k=; b=Hh+0ffeSbsqnKvSQgKtpxJyFcjTMiKDiHfJA3enUfuXIjerMyO5uNlb9Ukwvf865tIzSOt d1gSJAAqXHjWOg2ZzXae0GOycjhFOLP+UWOo/lF3S095qid2g7RrYU2+Cx0Wq6DyK+z3Ho G1Wvccg/++i9p1jD/J+rMApo4D/KiKdzMt9lnP7pid1tz8uSeD9jOy9KNoPme0EZqKfUmv zjGL+g6vf/Gj1mdyQr7M1c+H0UL7Hge5fsNiMj+n8Y3h1kU0G4FVGoRWhFWxrVgtpemUH5 Qlxg4ik4UExckknHzWHadh0OFEQkaiPwcAK7VXDaFREi5ZSQ7I/CiSyy7fZ6QA== Date: Thu, 15 Apr 2021 08:28:58 -0400 Message-Id: <20210415122902.2608-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ibus.scm (ibus)[version]: Update to 1.5.24. [inputs]: Add glib, libxkbcommon, libxtst and python-dbus. Move ucd, unicode-cldr-common and unicode-emoji from ... [native-inputs]: ... here. Add gnome-common, perl, python-wrapper and which. --- gnu/packages/ibus.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index fc59ea1c6b..e566993b08 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -49,18 +49,21 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages iso-codes) #:use-module (gnu packages logging) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages unicode) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg)) (define-public ibus (package (name "ibus") - (version "1.5.22") + (version "1.5.24") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -68,7 +71,7 @@ version "/ibus-" version ".tar.gz")) (sha256 (base32 - "0jmy2w01phpmqnjnfnak7nvfna57mpgfnl87jwc4iai8ijjynw41")))) + "07s2ly75xv50bqg37mn37i9akqvcfd45k2mbplxrsqk3a2b3mwxb")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus @@ -138,26 +141,34 @@ (inputs `(("dbus" ,dbus) ("dconf" ,dconf) + ("glib" ,glib) ("gtk2" ,gtk+-2) ("gtk+" ,gtk+) + ("iso-codes" ,iso-codes) ("json-glib" ,json-glib) ("libnotify" ,libnotify) ("libx11" ,libx11) + ("libxkbcommon" ,libxkbcommon) + ("libxtst" ,libxtst) + ("pygobject" ,python-pygobject) + ("python" ,python) + ("python-dbus" ,python-dbus) ("setxkbmap" ,setxkbmap) + ("ucd" ,ucd) + ("unicode-cldr-common" ,unicode-cldr-common) + ("unicode-emoji" ,unicode-emoji) ("wayland" ,wayland) - ("xmodmap" ,xmodmap) - ("iso-codes" ,iso-codes) - ("pygobject2" ,python-pygobject) - ("python" ,python))) + ("xmodmap" ,xmodmap))) (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal + `(("glib" ,glib "bin") ; for glib-genmarshal ("gettext" ,gettext-minimal) + ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler - ("ucd" ,ucd) - ("unicode-emoji" ,unicode-emoji) - ("unicode-cldr-common" ,unicode-cldr-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) ("vala" ,vala) - ("pkg-config" ,pkg-config))) + ("which" ,which))) (native-search-paths (list (search-path-specification (variable "IBUS_COMPONENT_PATH") From patchwork Thu Apr 15 12:28:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28568 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 0700B27BC77; Thu, 15 Apr 2021 13:34:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5EBB727BC76 for ; Thu, 15 Apr 2021 13:34:42 +0100 (BST) Received: from localhost ([::1]:43412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1Cj-0001Ri-El for patchwork@mira.cbaines.net; Thu, 15 Apr 2021 08:34:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18G-0005vZ-Q3 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18E-0007cG-Un for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18E-0007X5-R5 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 2/5] gnu: ibus: Enable documentation. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47770@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.161848977228817 (code B ref 47770); Thu, 15 Apr 2021 12:30:02 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:32 +0000 Received: from localhost ([127.0.0.1]:36657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17j-0007Uj-B2 for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:31 -0400 Received: from out2.migadu.com ([188.165.223.204]:51860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17g-0007UZ-Lc for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:29 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1618489766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=87CROTeJU+RTLMoygpyE8a5xMgDL13TEevJXbryj5P8=; b=dXc1HoBE5a4RzgGr5zpYMwmMnzs+7PEgGZ1YwkRFI13ssVqb8saT4zkE/4Gbw/3+mzbfhw O3E+K/0i+aLQUHIMuqQTSHf81GfzChy9+PTZjblkKdaGhFuogu9sVAouQ0rcXmQCVQxeF3 MB5Ll2wkbty7u+5dQNWRbB4+es0zYpy256H3+iL7j0W52zL5TiC0SVcMjnTod0B2Y1Bgee 0XZV9FPxvAuD2gu7EZPom3vvW7Yodvxhs7A+3iud4I0FdppsxU/5uKNmCF4Dfz7ndKjfO6 r5uaNHZuLWQZZinlBuo9flge7UNjRJDbZWKl+KrS68TdQtOT01ofI3KsysIUOw== Date: Thu, 15 Apr 2021 08:28:59 -0400 Message-Id: <20210415122902.2608-2-rg@raghavgururajan.name> In-Reply-To: <20210415122902.2608-1-rg@raghavgururajan.name> References: <20210415122902.2608-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ibus.scm (ibus)[outputs](doc): New output. [configure-flags](enable-gtk-doc): New flag. [phases](patch-docbook-xml): New phase. (move-doc): New phase. [native-inputs]: Add docbook-xml and gtk-doc. --- gnu/packages/ibus.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index e566993b08..b6687239df 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages dbm) + #:use-module (gnu packages docbook) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -73,10 +74,12 @@ (base32 "07s2ly75xv50bqg37mn37i9akqvcfd45k2mbplxrsqk3a2b3mwxb")))) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus #:parallel-build? #f ; race condition discovered with emoji support #:configure-flags (list "--enable-python-library" + "--enable-gtk-doc" (string-append "--with-unicode-emoji-dir=" (assoc-ref %build-inputs "unicode-emoji") @@ -91,6 +94,14 @@ "--enable-wayland") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference/ibus" + (substitute* "ibus-docs.sgml.in" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-after 'unpack 'patch-python-target-directories (lambda* (#:key outputs #:allow-other-keys) (let ((root (string-append (assoc-ref outputs "out") @@ -127,6 +138,15 @@ (("\"(setxkbmap|xmodmap)\"" _ prog) (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))) #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t))) (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and @@ -160,10 +180,12 @@ ("wayland" ,wayland) ("xmodmap" ,xmodmap))) (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal + `(("docbook-xml" ,docbook-xml-4.1.2) + ("glib" ,glib "bin") ; for glib-genmarshal ("gettext" ,gettext-minimal) ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("gtk-doc" ,gtk-doc) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) From patchwork Thu Apr 15 12:29:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28571 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 0FE9627BC77; Thu, 15 Apr 2021 13:36:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B91F527BC76 for ; Thu, 15 Apr 2021 13:36:24 +0100 (BST) Received: from localhost ([::1]:48024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1EN-0003RN-Vo for patchwork@mira.cbaines.net; Thu, 15 Apr 2021 08:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18G-0005vb-Q8 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18F-0007cJ-Bm for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18F-0007XC-8J for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 3/5] gnu: ibus: Enable memconf. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47770@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.161848977528845 (code B ref 47770); Thu, 15 Apr 2021 12:30:03 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:35 +0000 Received: from localhost ([127.0.0.1]:36663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17m-0007VB-Sk for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:35 -0400 Received: from out2.migadu.com ([188.165.223.204]:51874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17j-0007Uh-DZ for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:32 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1618489768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sgmClCZL4Y51kDgNRBAZMEcPXy0LZhIo88KlLDZLWI4=; b=fM4ipjkektHZVD7lKxQ1uaBnEdsy2LV2QrfI9pOkwDbptElbVFuKBEQNAXcNG508LF+S5O qnQ5u9zkVwzAiDOk/OUtX4dDl/ItUvnKpl9MMhzC7Lnaq1o62b4zeLROBHc7vYRJCFtEle V3BDuQf7LzD0DCFb5q6bWLNx8LCIcrcqkZ1cZADP55rodz5jjKtI5iN76l9s2TT5YD0+HZ qitut50oBz17bwv9c5GEgXWBEbxOWp8FQZBY13loc065UM9PEGm/sSNChhtaVs7bsVfVjQ slkh4TG7dl6Zt1bmffvGAOZiHeH3ePMW27XP3qFyrMBEYshLqPhInV0zwrgRBg== Date: Thu, 15 Apr 2021 08:29:00 -0400 Message-Id: <20210415122902.2608-3-rg@raghavgururajan.name> In-Reply-To: <20210415122902.2608-1-rg@raghavgururajan.name> References: <20210415122902.2608-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ibus.scm (ibus)[configure-flags](enable-memconf): New flag. --- gnu/packages/ibus.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index b6687239df..3f151d9cd7 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -80,6 +80,7 @@ #:parallel-build? #f ; race condition discovered with emoji support #:configure-flags (list "--enable-python-library" "--enable-gtk-doc" + "--enable-memconf" (string-append "--with-unicode-emoji-dir=" (assoc-ref %build-inputs "unicode-emoji") From patchwork Thu Apr 15 12:29:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28572 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 53F3927BC77; Thu, 15 Apr 2021 13:37:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D450A27BC76 for ; Thu, 15 Apr 2021 13:37:47 +0100 (BST) Received: from localhost ([::1]:50190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1Fj-0004LR-3W for patchwork@mira.cbaines.net; Thu, 15 Apr 2021 08:37:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18G-0005vc-QO for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53364) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18F-0007cK-VU for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18F-0007XK-N1 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 4/5] gnu: ibus: Enable tests. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47770@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.161848977828864 (code B ref 47770); Thu, 15 Apr 2021 12:30:03 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:38 +0000 Received: from localhost ([127.0.0.1]:36667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17q-0007VT-3E for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:38 -0400 Received: from out2.migadu.com ([188.165.223.204]:51874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17l-0007Uh-PI for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:34 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1618489771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9TKFt6ftgyOef43Evh2nKfB61HZ4e0Nvma1F7EFVBWI=; b=CJ57sbM/fUbk+jbJuV9v4AfB59hacEs3t1TKmiP8ogmz0YeJyWfQvUKs/ub2l06KqxKw35 ZE1EbHYm+ZOF/xRC3KWaWaHKLVcIGRIjf5DaQ0nZhpmZTuBn2W9TIBIfnOcosDw1YG5Pcp 1utScXwS1FqktdH1/k53lonU6iV05740kYhoiKCP1R2tAWbQytvDygniSw8VvWY0x/B5Il QXO0klFMz41ljCQUtYKZHkZkQR9dfqoQtZFE3jqgHtBO57xZPosS9sv1he6kO9GOst2iQ5 8hEMQ1FLZmXvWO9CZ4mOvEsgoSvlpMHFScbsT4TfKD0N+Sn3JbMdT/hd0ZcD4Q== Date: Thu, 15 Apr 2021 08:29:01 -0400 Message-Id: <20210415122902.2608-4-rg@raghavgururajan.name> In-Reply-To: <20210415122902.2608-1-rg@raghavgururajan.name> References: <20210415122902.2608-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ibus.scm (ibus)[arguments](tests): Remove argument. (parallel-tests): New argument. [patches](disable-failing-tests): New phase. (pre-check): New phase. [native-inputs]: Add xorg-server-for-tests. --- gnu/packages/ibus.scm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 3f151d9cd7..fa12499bb9 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -76,8 +76,7 @@ (build-system glib-or-gtk-build-system) (outputs '("out" "doc")) (arguments - `(#:tests? #f ; tests fail because there's no connection to dbus - #:parallel-build? #f ; race condition discovered with emoji support + `(#:parallel-build? #f ; race condition discovered with emoji support #:configure-flags (list "--enable-python-library" "--enable-gtk-doc" "--enable-memconf" @@ -95,6 +94,14 @@ "--enable-wayland") #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; These tests require /etc/machine-id. + (with-directory-excursion "src/tests" + (substitute* '("ibus-share.c" "ibus-compose.c" + "ibus-keypress.c") + (("[ \t]*return g_test_run \\(\\);") ""))) + #t)) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "docs/reference/ibus" @@ -102,7 +109,7 @@ (("http://www.oasis-open.org/docbook/xml/4.1.2/") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/")))) - #t)) + #t)) (add-after 'unpack 'patch-python-target-directories (lambda* (#:key outputs #:allow-other-keys) (let ((root (string-append (assoc-ref outputs "out") @@ -139,6 +146,20 @@ (("\"(setxkbmap|xmodmap)\"" _ prog) (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))) #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests require running iBus daemon. + (system "./bus/ibus-daemon --daemonize") + #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -186,12 +207,14 @@ ("gettext" ,gettext-minimal) ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("gtk+:bin" ,gtk+ "bin") ("gtk-doc" ,gtk-doc) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("vala" ,vala) - ("which" ,which))) + ("which" ,which) + ("xorg-server" ,xorg-server-for-tests))) (native-search-paths (list (search-path-specification (variable "IBUS_COMPONENT_PATH") From patchwork Thu Apr 15 12:29:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28570 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 78C9D27BC77; Thu, 15 Apr 2021 13:35:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ACC3E27BC76 for ; Thu, 15 Apr 2021 13:35:45 +0100 (BST) Received: from localhost ([::1]:45686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1Dk-0002Tc-Rp for patchwork@mira.cbaines.net; Thu, 15 Apr 2021 08:35:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18H-0005vh-6O for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18G-0007dE-Ud for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18G-0007Xa-Ml for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 5/5] gnu: ibus: Remove trailing #t in phases. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47770@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.161848977928878 (code B ref 47770); Thu, 15 Apr 2021 12:30:04 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:39 +0000 Received: from localhost ([127.0.0.1]:36671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17q-0007Vc-Rm for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:39 -0400 Received: from out2.migadu.com ([188.165.223.204]:51886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17o-0007VL-07 for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:36 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1618489774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N9hHFEZ65x3Aefp/zIisbMIcgiD3uvE1Kqx55um+mns=; b=lPobvuQWXpDlA1kl3J9h9xwph6g085HvJnAGYDpaeRNh2WTIke1mOSEmErG9JQ6z5FcEN/ finHc4UQ7nMH9PkhMsVj1qGwLnP5UkpaTiHowg9XohRYoMQhvh4Zs69AXranSyOJTFG+Gn R7ZD/6KqDn4rA4ixPDgFxsBB853rm9KpAICFbUbzmG4kShLKNKoFXAcZmUD5ZgV3CDbK9V MJ2RRvZ/9XGWul2SMdGfgYoU8Vv5SR/lsRwougPYaBKVZqNijvdoiaXwuJvG4nUqE2SDEA yjOX9TeXmtmNqb9ThSxc+TM6gj59wOeQyWFnxyClgh774my6yZLaWx3yWd2K2w== Date: Thu, 15 Apr 2021 08:29:02 -0400 Message-Id: <20210415122902.2608-5-rg@raghavgururajan.name> In-Reply-To: <20210415122902.2608-1-rg@raghavgururajan.name> References: <20210415122902.2608-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ibus.scm (ibus)[phases]: Remove trailing #t. --- gnu/packages/ibus.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index fa12499bb9..cdd4708d22 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -100,16 +100,14 @@ (with-directory-excursion "src/tests" (substitute* '("ibus-share.c" "ibus-compose.c" "ibus-keypress.c") - (("[ \t]*return g_test_run \\(\\);") ""))) - #t)) + (("[ \t]*return g_test_run \\(\\);") ""))))) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "docs/reference/ibus" (substitute* "ibus-docs.sgml.in" (("http://www.oasis-open.org/docbook/xml/4.1.2/") (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-after 'unpack 'patch-python-target-directories (lambda* (#:key outputs #:allow-other-keys) (let ((root (string-append (assoc-ref outputs "out") @@ -120,13 +118,11 @@ (("(py2?overridesdir)=.*" _ var) (string-append var "=" root "/gi/overrides/")) (("(pkgpython2dir=).*" _ var) - (string-append var root "/ibus")))) - #t)) + (string-append var root "/ibus")))))) (add-before 'configure 'disable-dconf-update (lambda _ (substitute* "data/dconf/Makefile.in" - (("dconf update") "echo dconf update")) - #t)) + (("dconf update") "echo dconf update")))) (add-after 'unpack 'delete-generated-files (lambda _ (for-each (lambda (file) @@ -134,8 +130,7 @@ (when (file-exists? c) (format #t "deleting ~a\n" c) (delete-file c)))) - (find-files "." "\\.vala")) - #t)) + (find-files "." "\\.vala")))) (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/ibusenginesimple.c" @@ -144,8 +139,7 @@ "/share/X11/locale"))) (substitute* "ui/gtk3/xkblayout.vala" (("\"(setxkbmap|xmodmap)\"" _ prog) - (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))) - #t)) + (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))))) (add-before 'check 'pre-check (lambda _ ;; Tests write to $HOME. @@ -158,8 +152,7 @@ (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") ;; Tests require running iBus daemon. - (system "./bus/ibus-daemon --daemonize") - #t)) + (system "./bus/ibus-daemon --daemonize"))) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -167,8 +160,7 @@ (mkdir-p (string-append doc "/share")) (rename-file (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t))) + (string-append doc "/share/gtk-doc"))))) (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and @@ -178,8 +170,7 @@ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH") - ,(string-append out "/lib/girepository-1.0"))))) - #t))))) + ,(string-append out "/lib/girepository-1.0")))))))))) (inputs `(("dbus" ,dbus) ("dconf" ,dconf)