From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ECFTHIu+w2RyNAAASxT56A (envelope-from ) for ; Fri, 28 Jul 2023 15:11:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kDExHIu+w2SaVgEA9RJhRA (envelope-from ) for ; Fri, 28 Jul 2023 15:11:39 +0200 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 226584BCD1 for ; Fri, 28 Jul 2023 15:11:39 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="Yjxp/+dh"; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690549899; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=9YjVtmVReMBWK+3l4CvEEuQiJBvCwAnmbO4+HBdbaCU=; b=M5n1GGr3iuHbS1xljVpTN2RxrR/crs9f/aTZhpbX8DCR6FFB8kv7IFPYY8NtxfPY5PYTvL KW4pooc8yJ7a9i5cG8mpjexG2bqopNY6mpikfmLeJo+/DZ26eYnP3JfFiON2bOwO2HFpFu oq5behc9rb3abau8yDNv9/8asiBoMqf2TSrpHnfooC0MGxwFFV96PGiunTSBNzbdGA72tu iAj8Uf4C6I4E4RPZQaM7T0D9/7ry5mKCs3ErtGYpphfaAi0UsUrOiCUFNLz8zdRy7VQOE0 n3tQLbSbQPR6hDqSIHRkTH4b2GICX/lOpnTX5g065Wru2uiKwS0WoIeQE2vSNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="Yjxp/+dh"; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690549899; a=rsa-sha256; cv=none; b=qMQeae2zb5FqK7J1X+KYW1xkZMSqZFBydtSKk3UV8NX5kc+3UAT+Y/0iiCXLvcZwpvYSjt Fwl86m7mQRN/Jav3rqCI7aIy9hOu08M9Sm7bNlPghK2ZTfNqqhLjEgPVYnhhJDaZI0KsEL 6JtfOLHBAXTkcMI1B9PJtdst1xlTeLqpYdeUyuUOMYhbQ+vZUXbIVaJzp9HSjzt/jFCgNr 1nNp/Mw60hp3YOAftDO6mZtb2oKWFf4RM2czbw2/1UplYuFo0yI4NoQI+55mGdM7Vtd4oD KLkAmrLhMEubQf2AaihAGUI8sUK6fHlcOrBIS44XJSBbwT+Br7ZvKI1u9VOzIg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPMy1-0006ie-I6; Fri, 28 Jul 2023 08:53:13 -0400 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 1qPMxx-0006f3-36 for guix-patches@gnu.org; Fri, 28 Jul 2023 08:53:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPMxt-0006X3-QQ for guix-patches@gnu.org; Fri, 28 Jul 2023 08:53:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPMxq-0008FD-D0; Fri, 28 Jul 2023 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64918] [PATCH 2/3] gnu: Add ibus-table Resent-From: =?UTF-8?Q?Nguy=E1=BB=85n?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 28 Jul 2023 12:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64918@debbugs.gnu.org Cc: =?UTF-8?Q?Nguy=E1=BB=85n?= Gia Phong , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 64918-submit@debbugs.gnu.org id=B64918.169054876531645 (code B ref 64918); Fri, 28 Jul 2023 12:53:02 +0000 Received: (at 64918) by debbugs.gnu.org; 28 Jul 2023 12:52:45 +0000 Received: from localhost ([127.0.0.1]:44098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPMxY-0008EL-Ow for submit@debbugs.gnu.org; Fri, 28 Jul 2023 08:52:45 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPMxW-0008E7-M8 for 64918@debbugs.gnu.org; Fri, 28 Jul 2023 08:52:43 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 274EC402F9; Fri, 28 Jul 2023 14:52:39 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R2ww9mIqRKbz; Fri, 28 Jul 2023 14:52:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690548757; bh=vrkZp7om3W0Zut1bU9sWLTehmSnsmsCg2zBw6jt3W2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Yjxp/+dh5PSHYkjqzHVDSoHjQoh9WHYRUX+1u4Tj2ZhH+4GB2JAjMKsG/vef872QG qE5htw7qKiYSyRtM46GEvFyDe8nSda+g7lx8YJX/qpzo21CrlojCaf9d3goFTFrWlY H312Dkzg6TP22rBVwhLxGRpAb3RLp0KmZTBiM/OavGVFMXx2Eo/3qGBXtUXbmTVKhS BhAK0AXXVN9HdUy4JjlN1YvWsFaUeAIikO5n+uZH80EXb7oWu+vPZP68lNkXqAmrSk 56rhgoyvi7O0ozAk9COVUwazYUMPdGbvank8YSvJK0AWC54cdEwrKtq/gvUTHMfHjE RsuJrzHodPDqQ== Date: Fri, 28 Jul 2023 21:51:58 +0900 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: =?UTF-8?Q?Nguy=E1=BB=85n?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= From: guix-patches--- via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -6.64 X-Migadu-Queue-Id: 226584BCD1 X-Migadu-Spam-Score: -6.64 X-Migadu-Scanner: mx0.migadu.com X-TUID: 9n1Lgvj3PH+I * gnu/packages/ibus.scm (ibus-table): New variable. * gnu/packages/patches/ibus-table-paths.patch: New file. Co-authored-by: 宋文武 --- gnu/packages/ibus.scm | 43 +++++++++++++++++++++ gnu/packages/patches/ibus-table-paths.patch | 38 ++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 gnu/packages/patches/ibus-table-paths.patch diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 435960c5729a..a905ad78564e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -898,6 +898,49 @@ (define-public ibus-libhangul "ibus-hangul is a Korean input method engine for IBus.") (license gpl2+))) +(define-public ibus-table + (package + (name "ibus-table") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/mike-fabian/ibus-table/releases/download/" + version "/ibus-table-" version ".tar.gz")) + (sha256 (base32 "063ba4fwk04lh0naj8z9r9x15ikckp94pd3f8xn40z3lnwsjx2sj")) + (patches (search-patches "ibus-table-paths.patch")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "engine/tabcreatedb.py" + (("/usr/share/ibus-table") + (string-append #$output "/share/ibus-table"))) + (substitute* "engine/ibus_table_location.py" + (("/usr/share/ibus-table") + (string-append #$output "/share/ibus-table")) + (("/usr/libexec") + (string-append #$output "/libexec"))))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd))))))) ; tests write to $HOME + (native-inputs (list (list glib "bin") + pkg-config)) + (inputs (list glib gtk+ ibus python python-pygobject)) + (native-search-paths + (list (search-path-specification + (variable "IBUS_TABLE_LOCATION") + (files '("share/ibus-table")) + (separator #f)))) + (home-page "https://mike-fabian.github.io/ibus-table") + (synopsis "Table based input framework for IBus") + (description + "ibus-table is a framework for table based input methods using IBus.") + (license lgpl2.1+))) + (define-public ibus-speech-to-text (package (name "ibus-speech-to-text") diff --git a/gnu/packages/patches/ibus-table-paths.patch b/gnu/packages/patches/ibus-table-paths.patch new file mode 100644 index 000000000000..bc0c5e78e1c8 --- /dev/null +++ b/gnu/packages/patches/ibus-table-paths.patch @@ -0,0 +1,38 @@ +diff --git a/engine/ibus-engine-table.in b/engine/ibus-engine-table.in +index e79d62a6cad4..675007204abd 100644 +--- a/engine/ibus-engine-table.in ++++ b/engine/ibus-engine-table.in +@@ -24,8 +24,6 @@ prefix=@prefix@ + exec_prefix=@prefix@ + datarootdir=@datarootdir@ + datadir=@datadir@ +-export IBUS_TABLE_LOCATION=@datarootdir@/ibus-table +-export IBUS_TABLE_LIB_LOCATION=@libexecdir@ + + # Set this variable to something > 0 to get more debug output. + # (Debug output may show up in the log file and/or in the lookup table): +diff --git a/engine/ibus-table-createdb.in b/engine/ibus-table-createdb.in +index 91eb28b7cbe5..187dddf2c952 100644 +--- a/engine/ibus-table-createdb.in ++++ b/engine/ibus-table-createdb.in +@@ -24,6 +24,4 @@ exec_prefix=@exec_prefix@ + bindir=@bindir@ + datarootdir=@datarootdir@ + datadir=@datadir@ +-export IBUS_TABLE_DATA_DIR=@datarootdir@ +-export IBUS_TABLE_BIN_PATH=@bindir@ + exec @PYTHON@ @datarootdir@/ibus-table/engine/tabcreatedb.py $@ +diff --git a/setup/ibus-setup-table.in b/setup/ibus-setup-table.in +index 7f7405c37296..ae6f96921c56 100644 +--- a/setup/ibus-setup-table.in ++++ b/setup/ibus-setup-table.in +@@ -22,9 +22,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ +-export IBUS_PREFIX=@prefix@ +-export IBUS_DATAROOTDIR=@datarootdir@ +-export IBUS_LOCALEDIR=@localedir@ + cd @prefix@/share/ibus-table/setup/ + exec @PYTHON@ main.py $@ + -- 2.41.0