From patchwork Thu Nov 1 15:29:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meiyo Peng X-Patchwork-Id: 75 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 9E50B16786; Thu, 1 Nov 2018 18:20:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 16EDC16782 for ; Thu, 1 Nov 2018 18:20:20 +0000 (GMT) Received: from localhost ([::1]:43436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIHZr-0005FT-Bp for patchwork@mira.cbaines.net; Thu, 01 Nov 2018 14:20:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIEx6-0005ue-Sy for guix-patches@gnu.org; Thu, 01 Nov 2018 11:32:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIEx2-0003P5-OR for guix-patches@gnu.org; Thu, 01 Nov 2018 11:32:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:54396) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIEx2-0003Lj-9e for guix-patches@gnu.org; Thu, 01 Nov 2018 11:32:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gIEx0-0006Mk-7X for guix-patches@gnu.org; Thu, 01 Nov 2018 11:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33203] [patch] Rime Input Method Engine Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Nov 2018 15:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33203 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33203@debbugs.gnu.org Received: via spool by 33203-submit@debbugs.gnu.org id=B33203.154108627824420 (code B ref 33203); Thu, 01 Nov 2018 15:32:02 +0000 Received: (at 33203) by debbugs.gnu.org; 1 Nov 2018 15:31:18 +0000 Received: from localhost ([127.0.0.1]:58654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gIEwA-0006Lg-3C for submit@debbugs.gnu.org; Thu, 01 Nov 2018 11:31:18 -0400 Received: from mail-pf1-f174.google.com ([209.85.210.174]:44932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gIEw6-0006L8-Bn for 33203@debbugs.gnu.org; Thu, 01 Nov 2018 11:31:07 -0400 Received: by mail-pf1-f174.google.com with SMTP id j13-v6so6006492pff.11 for <33203@debbugs.gnu.org>; Thu, 01 Nov 2018 08:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=0qWMivnV6AN7cGdl42BTFXo1xFoqmiA5DLfza08i8ig=; b=sb6GraZyhGkEBo7UZgaMuEPJhMUOtfz9jbQlSHsr5uQXCgt8m7yA4eh4zoWP+bIlqs J9OvFisLTNgoNGktW8rYOBlEoEbuWW5zBZzuGZqlMYVqzh4NEy+f2fexMbOowUpZrSZZ AZkH5OiaTVCPfVxVlHPgPPptJUbaZv6eRV6460jxfkcAtAR/gBU35LG7qTC8ftI7Fa8Z 1lXsMbyecioTzu3ZKoanGBFTBo1kDnPLaGDhCe7kHpUDiBDE9n80X3505x6HjP9ddgIK Dxzf9//cxpbcycWfwS7ybPxYT6yD4CPVP4ZXdcIHxIZZDkYZAdNAYMfDwqZydA7rvGdT NULA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=0qWMivnV6AN7cGdl42BTFXo1xFoqmiA5DLfza08i8ig=; b=jvjqLY7n882m1GiuvxVvEyw63tKvMIIhT0Y8ZAeaHEzFMgHVofAtoTbJ2XYwNXp5h7 FPXBGUSTZBN1u9Q98iMrqCkESN6U3ZHykPONbLhodaLXzzml/h+lSvRZtcEI9D7VTdbV j6AwBq+EHvIjAskVJUBiC7N+fr1glRtuL8tf7fzq+IF83PPokFj2jGB9/xMrg/xAm1ZG L/zeg5A45wNETB46LoJrXKac+wSkPOUDDi2EglKPI+GNI847LP1seKY/q2Umsi1onA62 xom8UteghTkpDUiSVSWJ1gCd2CTQ4yGBsboLDqbvd6kbbM7sGM5dX5vPPVMJbQzI1vE0 5puA== X-Gm-Message-State: AGRZ1gJbMu53lcIgKyWrpGvw9ucGAtg7/pG+LINtm/CYP/i35AYzaAEV SQBWHi0hDP5S+S9502VevUZrxifs X-Google-Smtp-Source: AJdET5fPYxuAchwble4FLcK81XvpnreeeHbQ9fv6ioJ2WezQn+L+PbTEr7FJFFRzzHTCDdJTWmwy/A== X-Received: by 2002:a62:42dc:: with SMTP id h89-v6mr8451240pfd.0.1541086260293; Thu, 01 Nov 2018 08:31:00 -0700 (PDT) Received: from guix (110.242.201.35.bc.googleusercontent.com. [35.201.242.110]) by smtp.gmail.com with ESMTPSA id f193-v6sm37692441pfc.74.2018.11.01.08.30.12 for <33203@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Nov 2018 08:30:59 -0700 (PDT) From: Meiyo Peng References: <875zxispks.fsf@gmail.com> Date: Thu, 01 Nov 2018 23:29:59 +0800 In-Reply-To: <875zxispks.fsf@gmail.com> (Meiyo Peng's message of "Wed, 31 Oct 2018 12:33:07 +0800") Message-ID: <874ld0stmw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-Mailman-Approved-At: Thu, 01 Nov 2018 14:20:10 -0400 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 Hi, I have fixed the non-deterministic issue of rime-data and made some minor changes to other packages. Please use the patches attached to this email instead of the previous email. The previous version of rime-data contains both YAML format schema data and binary format schema data. Binary schema data are generated from YAML schema data. They are used to accelerate Rime's startup time. But this generation process is not reproducible. I contacted Rime's author on github but still have no feedback, so I removed binary schema data from rime-data package's output. This will make users first time startup a little longer, but it's bearable and happens only once. Patches are attached. You can also view my code on github: https://github.com/meiyopeng/guix/tree/rime --- Meiyo Peng From 6f4dff509ac17ce28709959876a9280a172296d4 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 11:46:03 +0800 Subject: [PATCH 6/6] gnu: Add ibus-rime. * gnu/packages/ibus.scm (ibus-rime): New variable. --- gnu/packages/ibus.scm | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index afb760293..8ad1e0985 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages cmake) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages freedesktop) @@ -593,3 +594,61 @@ traditional Chinese output.") (description "@dfn{rime-data} provides the schema data of Rime Input Method Engine.") (license lgpl3+))) + +(define-public ibus-rime + (package + (name "ibus-rime") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rime/" name + "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mfbz0vwky7n4wvxrwabnn1i9n9adnql0dd1rx57w1anaslr5amj")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Define RIME_DATA_DIR. It's required but not used by the code. + (substitute* "Makefile" + (("cmake") + (string-append "cmake -DRIME_DATA_DIR=" + (assoc-ref inputs "rime-data") + "/share/rime-data"))) + ;; rime_config.h defines the actual data directory. + (substitute* "rime_config.h" + (("^#define IBUS_RIME_INSTALL_PREFIX .*$") + (string-append "#define IBUS_RIME_INSTALL_PREFIX \"" + (assoc-ref outputs "out") + "\"\n")) + (("^#define IBUS_RIME_SHARED_DATA_DIR .*$") + (string-append "#define IBUS_RIME_SHARED_DATA_DIR \"" + (assoc-ref inputs "rime-data") + "/share/rime-data\"\n"))) + #t)) + (delete 'configure)))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) + ("ibus" ,ibus) + ("libnotify" ,libnotify) + ("librime" ,librime) + ("rime-data" ,rime-data))) + (native-inputs + `(("cmake" ,cmake) + ("pkg-config" ,pkg-config))) + (home-page "https://rime.im/") + (synopsis "Rime Input Method Engine for IBus") + (description "@dfn{ibus-rime} provides the Rime input method engine for +IBus. Rime is a lightweight, extensible input method engine supporting +various input schemas including glyph-based input methods, romanization-based +input methods as well as those for Chinese dialects. It has the ability to +compose phrases and sentences intelligently and provide very accurate +traditional Chinese output.") + (license gpl3+))) -- 2.19.1