From patchwork Wed Apr 14 11:53:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28545 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 2FC3727BC74; Wed, 14 Apr 2021 13:52:26 +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 57E5927BC75 for ; Wed, 14 Apr 2021 13:52:25 +0100 (BST) Received: from localhost ([::1]:37698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWf0K-00010f-EZ for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 08:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWe6o-0008Hy-6J for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWe6n-0003CE-Td for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWe6n-0005EY-RN for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates 1/4] 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: Wed, 14 Apr 2021 11:55:01 +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.161840124920006 (code B ref 47770); Wed, 14 Apr 2021 11:55:01 +0000 Received: (at 47770) by debbugs.gnu.org; 14 Apr 2021 11:54:09 +0000 Received: from localhost ([127.0.0.1]:33778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5x-0005Cb-2M for submit@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:09 -0400 Received: from out2.migadu.com ([188.165.223.204]:56946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5u-0005C8-I1 for 47770@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:07 -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=1618401244; 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=eGqNB15l3VdcyIW+Qie+T4H1AtU+JoiVSrKc19UfaRyC00SgBKbQOkli0GTbx8qn2NI5Jz Ae8aXK692d8N8OeP/SXkz1mjhKDNOEpwlBW3EAS2x3whEoFNOHj+Z/R4q9a9W/oC71OSAr Dvu4rMkPYuw2tt7GZIofKZaGwgODouHJZbjfxDGS/yncphqIjfuXKyZjO9O3Wkg2j/VxAu nRF8bXhKkWWowDWwCt8VJ2KCHnn/IhzAf+li5cwUsh2OCUtyqjXzCgCP25niaX3l16jLgm msFZ4WkFqDJAb2cIL8xYhRdmOHDO9NPOmzcoWBqF6GF/ZgGgiXyiwh5JoGxVVg== Date: Wed, 14 Apr 2021 07:53:46 -0400 Message-Id: <20210414115349.14040-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 Wed Apr 14 11:53:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28544 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 3099227BC75; Wed, 14 Apr 2021 13:48:52 +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 AD28827BC74 for ; Wed, 14 Apr 2021 13:48:51 +0100 (BST) Received: from localhost ([::1]:58010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWews-0005xd-PB for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 08:48:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWe6p-0008LH-B1 for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWe6p-0003D5-2Q for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWe6p-0005Ev-1h for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 11:55: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.161840125320034 (code B ref 47770); Wed, 14 Apr 2021 11:55:03 +0000 Received: (at 47770) by debbugs.gnu.org; 14 Apr 2021 11:54:13 +0000 Received: from localhost ([127.0.0.1]:33784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe60-0005D3-Tm for submit@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:13 -0400 Received: from out2.migadu.com ([188.165.223.204]:56951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5u-0005C9-MF for 47770@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:08 -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=1618401245; 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=LfBykUg1UXhGZiySEMP11eBszfNb2ebomMJkgLfo6C8+C+QLvm8SHii7M7gUr3Zd13yh4c BlVDA+FUf8LU++8M3scuKKf1d4jZxxcoNYpnhWmdtpaIGW9xbtYTaZcAN3Hh2xoP9YJNkE ThCbzTecnMhBr9Xtb0m65LOF2cMq1JEmKfnKkyVs8PhMxb8+QkBkfHlDpE292wF3+SCDi+ MFtfiB1OA6liF0ilEn/zwOMYKEEvWnncJWBBI4UGQuDPLS9NS0Xr1WyybP5i0oqy3i8ySr 0jt1gJJF/LM9+RxNfr6owmji4Xllcsve3Me6WYljzQtLqL4Z1iqZwjtCobNtfQ== Date: Wed, 14 Apr 2021 07:53:47 -0400 Message-Id: <20210414115349.14040-2-rg@raghavgururajan.name> In-Reply-To: <20210414115349.14040-1-rg@raghavgururajan.name> References: <20210414115349.14040-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 Wed Apr 14 11:53:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28540 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 C299527BC74; Wed, 14 Apr 2021 13:37:29 +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 D88A027BC75 for ; Wed, 14 Apr 2021 13:37:23 +0100 (BST) Received: from localhost ([::1]:60130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWelm-0003FJ-Vi for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 08:37:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWe6o-0008Iw-Hi for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWe6o-0003CN-8U for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWe6o-0005Eg-7J for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates 3/4] gnu: ibus: Enable memconf. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 11:55: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.161840124920015 (code B ref 47770); Wed, 14 Apr 2021 11:55:02 +0000 Received: (at 47770) by debbugs.gnu.org; 14 Apr 2021 11:54:09 +0000 Received: from localhost ([127.0.0.1]:33780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5x-0005Cd-Aw for submit@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:09 -0400 Received: from out2.migadu.com ([188.165.223.204]:56956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5u-0005CB-Qi for 47770@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:07 -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=1618401246; 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=ArNPr9HFgJ2+TTZBtmxb93UqmRsGSxBz15ctetRzYPnIPxdUJ3bWo3sYSD3rsxRBVCJihr 61YI5bLCA6om0HuSqy768xBvGTkwBPN92P5Dl1Qy1SUeIHOsm+TVNCBYAf1KyLL6x/HLka IkIUKnC6VQ5RxXzn0M6t4F9kDoq9Rg0DYUTeAjFLg5AsXFkjBpilT09sWmH+ObnTAIXebj XG+1onw3Nrf+FDKdhyD5z5hvTUBvFcMyZhu5HdJ+8R/FtAKafyjHkM6f+88Eud2eY9Cemk GD1t5Ey54yEiUbP0Aof6fJ9GrTYR4JiWTVLi+KdLVOHPVWmZokuJRafTs/K2pw== Date: Wed, 14 Apr 2021 07:53:48 -0400 Message-Id: <20210414115349.14040-3-rg@raghavgururajan.name> In-Reply-To: <20210414115349.14040-1-rg@raghavgururajan.name> References: <20210414115349.14040-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 Wed Apr 14 11:53:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28541 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 6593E27BC74; Wed, 14 Apr 2021 13:37: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 D02C227BC74 for ; Wed, 14 Apr 2021 13:37:36 +0100 (BST) Received: from localhost ([::1]:60836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWem0-0003XI-16 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 08:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWe6o-0008KB-UV for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWe6o-0003CT-LY for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWe6o-0005En-L1 for guix-patches@gnu.org; Wed, 14 Apr 2021 07:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates 4/4] gnu: ibus: Enable tests. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 11:55: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.161840125020022 (code B ref 47770); Wed, 14 Apr 2021 11:55:02 +0000 Received: (at 47770) by debbugs.gnu.org; 14 Apr 2021 11:54:10 +0000 Received: from localhost ([127.0.0.1]:33782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5x-0005Cm-IN for submit@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:09 -0400 Received: from out2.migadu.com ([188.165.223.204]:56961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWe5v-0005CC-E8 for 47770@debbugs.gnu.org; Wed, 14 Apr 2021 07:54:08 -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=1618401246; 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=6HGT6NsZjX+SqBeAo7csBsp/i8WYOW/jfI2Q6PXpCZU=; b=g4yfA1unVrC7ygXd77N82ZUBllbt7ir6ykROqwqwkYC4Io/yQtk+z2+3CmtDw9gPdxs6JA TT4e2dUyk3r30tC6NsD/fRAXanXMc/FLwqg0ffQCSCODuShzJYXBRMHub1xYJfkGo4mq+k x+h4XO2+xn1lvMk9yeet9Unmd+ceRSe/vqnyjKMsPgQcXRh+Pfnf5019P8VPluMkp/kDpn aoNk0J0i6z70iDuyO6dUVTodko7kT4ySO+q0xkmiLtOpQeqGUfe9kHE/jaJSNYDzLxVlgd w4LUtexmdQWpxUKDeL4k6YFkcbKkWBzU+K+dSe87XPWUnGczbra8WpN7jAHmkg== Date: Wed, 14 Apr 2021 07:53:49 -0400 Message-Id: <20210414115349.14040-4-rg@raghavgururajan.name> In-Reply-To: <20210414115349.14040-1-rg@raghavgururajan.name> References: <20210414115349.14040-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 | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 3f151d9cd7..7e7d6c64d1 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -76,7 +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-tests? #f #:parallel-build? #f ; race condition discovered with emoji support #:configure-flags (list "--enable-python-library" "--enable-gtk-doc" @@ -95,6 +95,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 +110,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 +147,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 +208,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")