From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wGTYAuqbCGGtiwAAgWs5BA (envelope-from ) for ; Tue, 03 Aug 2021 03:29:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +AYhOumbCGGQCAAAB5/wlQ (envelope-from ) for ; Tue, 03 Aug 2021 01:29:13 +0000 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 C9DD4DAD2 for ; Tue, 3 Aug 2021 03:29:13 +0200 (CEST) Received: from localhost ([::1]:43590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAjF2-0006VY-M9 for larch@yhetil.org; Mon, 02 Aug 2021 21:29:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAjEu-0006Uo-3J for guix-patches@gnu.org; Mon, 02 Aug 2021 21:29:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAjEt-0000iD-BN for guix-patches@gnu.org; Mon, 02 Aug 2021 21:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAjEt-0004SA-9U for guix-patches@gnu.org; Mon, 02 Aug 2021 21:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49840] [PATCH 3/3] gnu: ibus-rime: Update to 1.5.0. Resent-From: pengmeiyu@riseup.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Aug 2021 01:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49840 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49840@debbugs.gnu.org Cc: Peng Mei Yu Received: via spool by 49840-submit@debbugs.gnu.org id=B49840.162795413517089 (code B ref 49840); Tue, 03 Aug 2021 01:29:03 +0000 Received: (at 49840) by debbugs.gnu.org; 3 Aug 2021 01:28:55 +0000 Received: from localhost ([127.0.0.1]:39552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAjEk-0004RZ-Uc for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:28:55 -0400 Received: from mx1.riseup.net ([198.252.153.129]:54946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAjEh-0004Qv-MQ for 49840@debbugs.gnu.org; Mon, 02 Aug 2021 21:28:52 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4Gdy262PSfzF56M for <49840@debbugs.gnu.org>; Mon, 2 Aug 2021 18:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1627954126; bh=/qVYYqr45cVfWWwyKUJJs+IlnexscPLZGXLz44vaMf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pD66T9zegYML+JFWhYXW9tvq6Qwy2G2o7FJhw3c6dw82RhJuvCYTNmNwP1oWpOzSk p4sLYTVsls8tXRjQ8GXN8LQqPDIxCWv+vu6OhIEEc4RC45aO1uhJVCedSq8Rkcrv/I YnfUsEyTcEzebV2XrsHLsV5R6zhLuIPywL/C7gRM= X-Riseup-User-ID: 41DEB7D138DA8089132541ED3738EE0320FEA21702562890DF39F504E85F673E Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Gdy2559zwz5vkJ; Mon, 2 Aug 2021 18:28:45 -0700 (PDT) Received: from localhost.localdomain (localhost [::1]) by dinosaur (OpenSMTPD) with ESMTP id c7d1617e; Tue, 3 Aug 2021 01:28:44 +0000 (UTC) From: pengmeiyu@riseup.net Date: Tue, 3 Aug 2021 09:28:01 +0800 Message-Id: <20210803012801.405186-3-pengmeiyu@riseup.net> In-Reply-To: <20210803012801.405186-1-pengmeiyu@riseup.net> References: <20210803012801.405186-1-pengmeiyu@riseup.net> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627954153; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=K88NSnyI/ou2Mg6KgiP/o91nAkvNlfGmTBWKKcwOQn8=; b=ufQTHkL0aAFqNcd8e3O1+gZkqpLW6p0hm4zCJlElsyREFqoV7cxfQJwQoAHIws56BmEvQ8 2NkPLE6sMXck3l/GQN6jL3PsOJtrf3h7Nlb7Olq5/PTmk7Qpp4wm9vEPDTEDsX6Nl8ur2z 3i1Dd501u+loFj4iWe/Ci+s/8lQ5RBV6nQMkITNUvcEh2A/NS9KpKQ298XIk7yPC4bDx9g G0VHXSSuDdJ6+bThWeEcKjJh8CfsKD3QDP5coE3QGgUSDfAjqIDwZXeXm6h7lOq6yxzoiK JmyVNk2JN8b31MQWrDuOm99RbSb6d0QmeXyCS3upPaKPypP3UybY/Wu+soOMNA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627954153; a=rsa-sha256; cv=none; b=INsKImqvNP1/2rCUuTF/unTZrUfF+0x2Dwr+S8fsK+GOul+v8SvumP/uP8oHaydijcKdvj KLWu82S186aTqVxarlH2flRQSQxiJjnkb4L/k+pU//ZGJ8FL/u5Vs8AI3LwUXkERn5U5iZ GMcdDAi9ipx3bLpYWy4YsPXsHObOEuqN+SLKGw2uJQkjl5romZjFW8iIwIdo2qQzej+FIp XxlWysev/UZNt23MXdRTWMq0+rNvznekg4VlRplkg2qlESgTwCKiqji6mcSlxYqpsK46cc I6DKPBg26N921Tbzhkuuovllcal+SwatSdCQ8wSBaoRq70N/Cy4nDITnvubQCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=pD66T9ze; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=pD66T9ze; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C9DD4DAD2 X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: nBQpY3eD+TOH From: Peng Mei Yu * gnu/packages/ibus.scm (ibus-rime): Update to 1.5.0. [build-system]: Change gnu-build-system to cmake-build-system. [arguments]: Delete #:make-flags. Add #:configure-flags. Update 'patch-source phase. Delete 'fix-file-names phase. Revert deletion of 'configure phase. --- gnu/packages/ibus.scm | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9e6a66552f..48a2445c7d 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -663,7 +663,7 @@ Method Engine.") (define-public ibus-rime (package (name "ibus-rime") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -672,40 +672,22 @@ Method Engine.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12y6jdz1amhgrnqa7zjim63dfsz6zyxyahbirfan37wmcfp6gp1d")))) - (build-system gnu-build-system) + (base32 "1vl3m6ydf7mvmalpdqqmrnnmqdi6l8yyac3bv19pp8a5q3qhkwlg")))) + (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:configure-flags + (list (string-append "-DRIME_DATA_DIR=" + (assoc-ref %build-inputs "rime-data") + "/share/rime-data")) #: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)) - (add-after 'unpack 'fix-file-names - (lambda* (#:key outputs #:allow-other-keys) - ;; IBus uses the component file rime.xml to start the Rime - ;; engine. It must be patched with appropriate file names. - (substitute* "rime.xml" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (delete 'configure)))) + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION....RIME_DATA_DIR..") + "DESTINATION \"${CMAKE_INSTALL_DATADIR}/rime-data\"")) + #t))))) (inputs `(("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) -- 2.32.0