From unknown Sun Jun 22 04:16:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49840] [PATCH 0/3] Update librime, rime-data, ibus-rime Resent-From: pengmeiyu@riseup.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Aug 2021 01:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49840 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49840@debbugs.gnu.org Cc: Peng Mei Yu X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162795330215789 (code B ref -1); Tue, 03 Aug 2021 01:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2021 01:15:02 +0000 Received: from localhost ([127.0.0.1]:39522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAj1K-00046a-EW for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:15:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:54344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAj1J-00045v-4e for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:15:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAj1I-0002QM-QJ for guix-patches@gnu.org; Mon, 02 Aug 2021 21:15:00 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAj1G-0007gD-I7 for guix-patches@gnu.org; Mon, 02 Aug 2021 21:15:00 -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 4Gdxk82mVfzF3h5; Mon, 2 Aug 2021 18:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1627953296; bh=u8UvUgCNwKep8KzLUPOlMo9PMpcZypLxP+5KdToOL54=; h=From:To:Cc:Subject:Date:From; b=K8nnuARYBWGZqIiT16J0TP8XSU3TVRk5E/Y9md6qrD4VulkQLFpwgmKGtoBgQiQ4R hICnFR0PeMGASprO/Xs+kib3HE1nl0wOitZ/DzpYUsCDG2va7ul1tyOibexgaBT35D tx9mA5JVhFrY4tgDrsYJZ04YkUdWiAXa91pUiDi0= X-Riseup-User-ID: 9612611F7D56BB3633C4E952F598A018CDE7B99A3AF3A5D20FD741BAB6098335 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Gdxk7239kz5vhJ; Mon, 2 Aug 2021 18:14:55 -0700 (PDT) Received: from localhost.localdomain (localhost [::1]) by dinosaur (OpenSMTPD) with ESMTP id 535d0274; Tue, 3 Aug 2021 01:14:38 +0000 (UTC) From: pengmeiyu@riseup.net Date: Tue, 3 Aug 2021 09:13:56 +0800 Message-Id: <20210803011356.403219-1-pengmeiyu@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=pengmeiyu@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Peng Mei Yu This patch series updates librime, rime-data, and ibus-rime to their latest version. Peng Mei Yu (3): gnu: librime: Update to 1.7.3. gnu: rime-data: Update to 0.38.20210802. gnu: ibus-rime: Update to 1.5.0. gnu/packages/ibus.scm | 161 ++++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 76 deletions(-) -- 2.32.0 From unknown Sun Jun 22 04:16:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49840] [PATCH 1/3] gnu: librime: Update to 1.7.3. References: <20210803011356.403219-1-pengmeiyu@riseup.net> In-Reply-To: <20210803011356.403219-1-pengmeiyu@riseup.net> Resent-From: pengmeiyu@riseup.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Aug 2021 01:29:02 +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.162795413217073 (code B ref 49840); Tue, 03 Aug 2021 01:29:02 +0000 Received: (at 49840) by debbugs.gnu.org; 3 Aug 2021 01:28:52 +0000 Received: from localhost ([127.0.0.1]:39548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAjEh-0004RD-SX for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:28:52 -0400 Received: from mx1.riseup.net ([198.252.153.129]:52342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAjEf-0004Qr-25 for 49840@debbugs.gnu.org; Mon, 02 Aug 2021 21:28:50 -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 4Gdy233gMjzF55x for <49840@debbugs.gnu.org>; Mon, 2 Aug 2021 18:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1627954123; bh=oNhXdUcuzp8Oa5kxdYhiVyyjJdlCq2ssvdOqoRT5IzM=; h=From:To:Cc:Subject:Date:From; b=B9EHeQtWI5zDUZK8x4TfrblN3Cst4/gMZ+WcYM6bJl8N8nEOZfjm213HLfSnlKewR N0AkIpAmhT6zNDb823y2JcIgqrJlfZvCcPNBWq/ECvFAk31oxRKjkwvI+Pjl+soM2E nMijSPyubk0ChA1WWbog2TneJYxreoxouVO6YY1o= X-Riseup-User-ID: 0F0B289A72EC4CF9A5A430FCA45E45779A17820C6DB63DA1F35C719FAADD29AF Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Gdy221gqdz5vkJ; Mon, 2 Aug 2021 18:28:42 -0700 (PDT) Received: from localhost.localdomain (localhost [::1]) by dinosaur (OpenSMTPD) with ESMTP id a63d84be; Tue, 3 Aug 2021 01:28:19 +0000 (UTC) From: pengmeiyu@riseup.net Date: Tue, 3 Aug 2021 09:27:59 +0800 Message-Id: <20210803012801.405186-1-pengmeiyu@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Peng Mei Yu * gnu/packages/ibus.scm (librime): Update to 1.7.3. --- gnu/packages/ibus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index e6001efa7f..44deed2a4f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019, 2020 Peng Mei Yu +;;; Copyright © 2018, 2019, 2020, 2021 Peng Mei Yu ;;; Copyright © 2020 kanichos ;;; Copyright © 2020 Vincent Legoll ;;; @@ -306,7 +306,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.6.1") + (version "1.7.3") (source (origin (method git-fetch) @@ -316,7 +316,7 @@ Japanese language input in most graphical applications.") (file-name (git-file-name name version)) (sha256 (base32 - "1avmy2yyag22cl2j8085n5czsk93sxv440pdb3a2diwcxwwmzm9v")) + "0pqk0i3zcii3fx5laj9qzbgd58jvq6wn31j76w4zix2i4b1lqcqv")) (modules '((guix build utils))) (snippet '(begin -- 2.32.0 From unknown Sun Jun 22 04:16:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49840] [PATCH 2/3] gnu: rime-data: Update to 0.38.20210802. Resent-From: pengmeiyu@riseup.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Aug 2021 01:29:02 +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.162795413317080 (code B ref 49840); Tue, 03 Aug 2021 01:29:02 +0000 Received: (at 49840) by debbugs.gnu.org; 3 Aug 2021 01:28:53 +0000 Received: from localhost ([127.0.0.1]:39550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAjEi-0004RK-8c for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:28:52 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAjEf-0004Qt-QY for 49840@debbugs.gnu.org; Mon, 02 Aug 2021 21:28:50 -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 4Gdy243BpfzF56J for <49840@debbugs.gnu.org>; Mon, 2 Aug 2021 18:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1627954124; bh=mbkBNZu/hLrjuTQIJoSeU7b+Imo7ss446koWLqlLlJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pg+7wKzrAjLgMgKQTKp4fIrB7247SEz9lJpbyB40iZBQ8lksf72QEMPobpiIh11y9 CS6MLn+uZk9pHpiEIzahXy7mbb5aF0MSjEjGqvzm/WhMBjTfdNKkSwtR5M2Q9QzaQf BgtxE2ubgPTgqbJWajru009OsFWiOrJeeOfSlQQk= X-Riseup-User-ID: 8618997D466E73D7372574A47B71F97A25CA1955093ED2819A3E3AABB5725284 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Gdy235dnlz5vkJ; Mon, 2 Aug 2021 18:28:43 -0700 (PDT) Received: from localhost.localdomain (localhost [::1]) by dinosaur (OpenSMTPD) with ESMTP id b0989c50; Tue, 3 Aug 2021 01:28:42 +0000 (UTC) From: pengmeiyu@riseup.net Date: Tue, 3 Aug 2021 09:28:00 +0800 Message-Id: <20210803012801.405186-2-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-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Peng Mei Yu * gnu/packages/ibus.scm (rime-data): Update to 0.38.20210802. [arguments]: Delete "no_update=1" from #:make-flags. Adjust 'patch-source phase. Replace 'build phase. [license]: Clarify license for all subpackages. --- gnu/packages/ibus.scm | 113 ++++++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 43 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 44deed2a4f..9e6a66552f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -359,38 +359,29 @@ traditional Chinese output.") (define-public rime-data (package (name "rime-data") - (version "0.38.20200623") + (version "0.38.20210802") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/plum") - (commit "397d601dd22cfc857613973724724b8f44db9f9c"))) + (commit "0b835e347cad9c2d7038cfe82df5b5d1fe1c0327"))) (file-name "plum-checkout") (sha256 - (base32 "06ad5c4m7xsfr4if5ywshfj2aj5g5b5hwzh38dzccn7c1l2ibi0z")))) + (base32 "0mja4wyazxdc6fr7pzij5ah4rzwxv4s12s64vfn5ikx1ias1f8ib")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) ,@%gnu-build-system-modules) #:tests? #f ; no tests - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "no_update=1") + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ - ;; Don't build binary Rime schema. The binary Rime schema files - ;; are platform dependent and contains timestamp information. - ;; Thus they are not reproducible. - - ;; Change `.DEFAULT_GOAL' to `all'. - (substitute* "Makefile" - (("^\\.DEFAULT_GOAL := preset") - ".DEFAULT_GOAL := all")) ;; Disable git operations. (substitute* "scripts/install-packages.sh" - ((".*update-package\\.sh.*") "")) + (("^\\s*fetch_or_update_package\\s$") "")) #t)) ;; Copy Rime schemas into the "package/rime" directory. (add-after 'unpack 'copy-rime-schemas @@ -405,6 +396,12 @@ traditional Chinese output.") (symlink path (string-append dest-dir "/" schema)))))) inputs)) #t)) + (replace 'build + ;; NOTE: Don't build binary Rime schema. Binary Rime schema files + ;; are platform dependent and contain timestamp information. + ;; Therefore they are not reproducible. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "all" make-flags))) (delete 'configure)))) (inputs `(("rime-array" @@ -412,51 +409,51 @@ traditional Chinese output.") (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-array") - (commit "93cc99238f120606a076220ec4ddcad164f6396a"))) + (commit "7a7bfafae966e5f949a23a82ee8594cacf492593"))) (file-name "rime-array-checkout") (sha256 (base32 - "06yxrv3x702751jvx46rfw3ix34jk7jh183rz6bllznzi7lxz7sz")))) + "0kw0wyc5f77bv06fixkfvqnibmm80pyifvrhz8f1h411926ny37r")))) ("rime-bopomofo" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-bopomofo") - (commit "ed25098386f5efd3d70b08650f0d1b70c41c11a3"))) + (commit "c7618f4f5728e1634417e9d02ea50d82b71956ab"))) (file-name "rime-bopomofo-checkout") (sha256 (base32 - "1ip1pbfb1hadf2mcymr5939iagf25ywfl67d9198jahzyr6rdyvc")))) + "0g77nv0jrwqnbqqna0ib0kqcy6l5zl62kh49ny67d6bjwnwz9186")))) ("rime-cangjie" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-cangjie") - (commit "5fd8ce6f64039e505ca02655a621f2e830b97c19"))) + (commit "8dfad9e537f18821b71ba28773315d9c670ae245"))) (file-name "rime-cangjie-checkout") (sha256 (base32 - "1gf6r0q593ixar6v0jyvs56cik2gjp7pf9v799rfd2yydyia3bfg")))) + "029kw9nx6x0acg4f0m8wj1ziqffffhy9yyj51nlx17cnia0qcrby")))) ("rime-cantonese" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-cantonese") - (commit "e06fe8e79d7d64db2f2b6339aabc004d8cbc1f67"))) + (commit "fa7c8ad19d51143c1a470295d56feeb63e92113f"))) (file-name "rime-cantonese-checkout") (sha256 (base32 - "0j6kbhdfj7dx812yzykndzbk53s2v1rsaa2jlyma03hz7qlnnl0s")))) + "0vy5vv6h4r4b2msdvdrsj0zr6wmrv0fxm5zyyvxq8f1ix7ignm4c")))) ("rime-combo-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-combo-pinyin") - (commit "67b29cdc786928ea46b43a9c660dee3db8f1adff"))) + (commit "a84065a86b272c76215215bd6f03c506b6e7097c"))) (file-name "rime-combo-pinyin-checkout") (sha256 (base32 - "1v6ax51xll2aizbz1xzjyk6p3lmq8cyzbxkrwcffa723zaj0zz4l")))) + "1f0b4kakw0x26gmx7xi4f94nbjlb8lvi9bks4f92jswa045vnd87")))) ("rime-double-pinyin" ,(origin (method git-fetch) @@ -472,21 +469,21 @@ traditional Chinese output.") (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-emoji") - (commit "c99d34e4a837349e4679a110bb4b94f71fe015ae"))) + (commit "4c8c51f4a3bc7298c99376eda9bbd86070fc4fa1"))) (file-name "rime-emoji-checkout") (sha256 (base32 - "1wiwlxjjml9xfgg7z1wzaf4b1bsg81dkwvsfff2b61fwxq61zkgw")))) + "0175jqh210fncafqckr9zzaw55qpswmqjrykwms1apmc68l43122")))) ("rime-essay" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-essay") - (commit "88055afa3752e4582fa887765d962a30e02bb1fa"))) + (commit "9db2e77305e75798baf3ec8dcf1f82785b5e1be9"))) (file-name "rime-essay-checkout") (sha256 (base32 - "0ap7xqv6v0x6mdkw2cv93cbr6qhpla3803z04522wb8l9hr7iryg")))) + "03ypkkaadd5qmyg26n24a66cll90xvcimgbmiyv4d33jradiqg22")))) ("rime-ipa" ,(origin (method git-fetch) @@ -502,51 +499,51 @@ traditional Chinese output.") (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-jyutping") - (commit "6fe0d727b3178feabd0f01e6cd82599202764735"))) + (commit "1e24baa6998815c716c581effe8ec65ee87c4e8c"))) (file-name "rime-jyutping-checkout") (sha256 (base32 - "0wz6d3pmi72ysh2c0nml3rsz9hd2vazsyhnz34gq26yf4j85phfs")))) + "0s2rckpwlrm3n7w1csnqyi5p9mkpp3z87s7mrm2vc9sv06rpv7zl")))) ("rime-luna-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-luna-pinyin") - (commit "f1268e192ca88b9526467ce04ac3e47c837891ad"))) + (commit "623adb022b094d540218b287c2e601509eee3347"))) (file-name "rime-luna-pinyin-checkout") (sha256 (base32 - "0nxnjp1ybcrsan1mxnzwbkfhwl99kza6i9k1s7m9wzmhv7x7zahg")))) + "06pcwp09l5wkqv7792gbsl31xnlb3gr9q6bgbp94vvq6m2ycahqz")))) ("rime-middle-chinese" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-middle-chinese") - (commit "ed6d44f8d0bedf6e0c1c3183a270f8f01a211a40"))) + (commit "9fad7a7c0c26167d5e6e85db8df48a15c7f7d4f0"))) (file-name "rime-middle-chinese-checkout") (sha256 (base32 - "09mql88lsrxa99pyllby5z22kaiwwa037ha8gwaxjnnlsjgvz7zx")))) + "0a0bqrlzg0k692xblqnh1rh1fwwqqb205xwxlihgji85n8ibcgph")))) ("rime-pinyin-simp" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-pinyin-simp") - (commit "b73df7fc0994912ce785462b3be569ae81258ac2"))) + (commit "b0e84cda02c613ebdedc127a26131b3800f45a8e"))) (file-name "rime-pinyin-simp-checkout") (sha256 (base32 - "1m9hchnj1xf5s5185qm66ja0g1324drc98b2jjhnqgcp47bwz9fx")))) + "05v804qr3a9xvjzp9yid7231fi2l2yrl47ybbvql61z9k36ab094")))) ("rime-prelude" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-prelude") - (commit "8a52b4f86a59f3eb602f9a4cf6a680a67c15df8c"))) + (commit "3de303ffaa731dba07b0462ce59f4767e1219ad2"))) (file-name "rime-prelude-checkout") (sha256 (base32 - "039fr3996vfxzn2milaq1f5fw08f6zgjsxsql6cfhsc5b55fidm7")))) + "0g7a0bla58rh1v3md59k6adk185pilb4z8i2i0pqdl4nwqp40n2p")))) ("rime-quick" ,(origin (method git-fetch) @@ -602,21 +599,21 @@ traditional Chinese output.") (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-terra-pinyin") - (commit "492aaf914f9de37cc9d26b846dc693116de70ae8"))) + (commit "ce7b9249612f575d2f43d51fcacd31d1b4e0ef1b"))) (file-name "rime-terra-pinyin-checkout") (sha256 (base32 - "1l4l2w42mc3sf7jwbadx95gzrsq11ld9f6yj2hwaq9accainw3bf")))) + "0vm303f4lrdmdmif5klrp6w29vn9z2vzw33cw0y83pcnz39wiads")))) ("rime-wubi" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-wubi") - (commit "dd052ee158a38cb791755318b1aef9b4a3ed0316"))) + (commit "f1876f08f1d4a9696395be0070c0e8e4353c44cb"))) (file-name "rime-wubi-checkout") (sha256 (base32 - "00xzv3sbwqh2jz4i7s315h7rw17qa2dgj7kflyy3blxk0s2cqiqa")))) + "1d9y9rqssacria9d0hla96czsqv2wkfm6z926m1x269ryv96zxvk")))) ("rime-wugniu" ,(origin (method git-fetch) @@ -631,7 +628,37 @@ traditional Chinese output.") (synopsis "Schema data of Rime Input Method Engine") (description "@dfn{rime-data} provides the schema data of Rime Input Method Engine.") - (license lgpl3))) + (license (list + ;; rime-array + ;; rime-combo-pinyin + ;; rime-double-pinyin + ;; rime-middle-chinese + ;; rime-scj + ;; rime-soutzoe + ;; rime-stenotype + ;; rime-wugniu + gpl3 + + ;; plum + ;; rime-bopomofo + ;; rime-cangjie + ;; rime-emoji + ;; rime-essay + ;; rime-ipa + ;; rime-jyutping + ;; rime-luna-pinyin + ;; rime-prelude + ;; rime-quick + ;; rime-stroke + ;; rime-terra-pinyin + ;; rime-wubi + lgpl3 + + ;; rime-pinyin-simp + asl2.0 + + ;; rime-cantonese + cc-by4.0)))) (define-public ibus-rime (package -- 2.32.0 From unknown Sun Jun 22 04:16:12 2025 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-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 From unknown Sun Jun 22 04:16:12 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: pengmeiyu@riseup.net Subject: bug#49840: closed (Re: [bug#49840] [PATCH 0/3] Update librime, rime-data, ibus-rime) Message-ID: References: <20210803011356.403219-1-pengmeiyu@riseup.net> X-Gnu-PR-Message: they-closed 49840 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49840@debbugs.gnu.org Date: Thu, 05 Aug 2021 14:05:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1628172303-26659-1" This is a multi-part message in MIME format... ------------=_1628172303-26659-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49840: [PATCH 0/3] Update librime, rime-data, ibus-rime which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49840@debbugs.gnu.org. --=20 49840: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49840 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1628172303-26659-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49840-done) by debbugs.gnu.org; 5 Aug 2021 14:04:30 +0000 Received: from localhost ([127.0.0.1]:47959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBdz4-0006v7-Hg for submit@debbugs.gnu.org; Thu, 05 Aug 2021 10:04:30 -0400 Received: from flashner.co.il ([178.62.234.194]:42794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBdz3-0006uf-5W for 49840-done@debbugs.gnu.org; Thu, 05 Aug 2021 10:04:29 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 0A48F401F2; Thu, 5 Aug 2021 14:04:22 +0000 (UTC) Date: Thu, 5 Aug 2021 17:03:38 +0300 From: Efraim Flashner To: pengmeiyu@riseup.net Subject: Re: [bug#49840] [PATCH 0/3] Update librime, rime-data, ibus-rime Message-ID: Mail-Followup-To: Efraim Flashner , pengmeiyu@riseup.net, 49840-done@debbugs.gnu.org References: <20210803011356.403219-1-pengmeiyu@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="TdOyh9WfvT0id/LF" Content-Disposition: inline In-Reply-To: <20210803011356.403219-1-pengmeiyu@riseup.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49840-done Cc: 49840-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --TdOyh9WfvT0id/LF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks. Patches pushed! --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --TdOyh9WfvT0id/LF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmEL77oACgkQQarn3Mo9 g1GzTw//Tl91C1s4tgSWguFk2Ve9KDD31AyQeDIOPcgMNGiCTRwzwq9a6KbshYoA 97rUqLfslD3E4+OEKrRt3IY1K6mIqAzc/OUOfQG5BkUf6i4/k1DNQXy43Ks46j9R t+HeJ/4uxvxsEjTnrCl42TBGkxoM4va1m6SASWe9ZI58NG00MTIQphpw+sKTac+T 4S33k0il4DQk/I/xCOBGGvbcP9xf9xDYPj8XtPHlaL3ZMIq10aI+9nXNhN3tmT0b e2S4K9tpPjXrsoY5ypKkTaXCp7lD/UvKmEQ74h2ZKyskwz1hDSxmeS60fcFqrQeo rQmpnpF1CcepQDtg9aL5OggDpiKSp5tlj3UfpRublK+/nZh78GqqX53KZJCPZrd5 8lHRu4WJ+BuGzf0VEKhrP4vwTo3x32QKTpO0P5KXvG0qTB33RY6gCTqEwfBN/L6t dk+npv6VgdJjZcaT9wHhN8wGn/Fg7RCdckXws17BBBQTAR0zzE/5i3p8e+/idci7 0mB7n0WgQjtVE1lSXM1ozUl7C75PAJ6LvRVevm0/8DwE3kuHIc6C3wEXTggkwimv uCFofGWtsPKUpaT0z7E90S8JQvwZjoOVU3Q2DLtI6WJTJBs6ZhPBMgwTcAlarWfd TU+7ybu2CUx4e+j2o7DYup+YsXz+gV9b8FLVuhh85sJOIcrBeA4= =TQst -----END PGP SIGNATURE----- --TdOyh9WfvT0id/LF-- ------------=_1628172303-26659-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Aug 2021 01:15:02 +0000 Received: from localhost ([127.0.0.1]:39522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAj1K-00046a-EW for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:15:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:54344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAj1J-00045v-4e for submit@debbugs.gnu.org; Mon, 02 Aug 2021 21:15:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAj1I-0002QM-QJ for guix-patches@gnu.org; Mon, 02 Aug 2021 21:15:00 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAj1G-0007gD-I7 for guix-patches@gnu.org; Mon, 02 Aug 2021 21:15:00 -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 4Gdxk82mVfzF3h5; Mon, 2 Aug 2021 18:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1627953296; bh=u8UvUgCNwKep8KzLUPOlMo9PMpcZypLxP+5KdToOL54=; h=From:To:Cc:Subject:Date:From; b=K8nnuARYBWGZqIiT16J0TP8XSU3TVRk5E/Y9md6qrD4VulkQLFpwgmKGtoBgQiQ4R hICnFR0PeMGASprO/Xs+kib3HE1nl0wOitZ/DzpYUsCDG2va7ul1tyOibexgaBT35D tx9mA5JVhFrY4tgDrsYJZ04YkUdWiAXa91pUiDi0= X-Riseup-User-ID: 9612611F7D56BB3633C4E952F598A018CDE7B99A3AF3A5D20FD741BAB6098335 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Gdxk7239kz5vhJ; Mon, 2 Aug 2021 18:14:55 -0700 (PDT) Received: from localhost.localdomain (localhost [::1]) by dinosaur (OpenSMTPD) with ESMTP id 535d0274; Tue, 3 Aug 2021 01:14:38 +0000 (UTC) From: pengmeiyu@riseup.net To: guix-patches@gnu.org Subject: [PATCH 0/3] Update librime, rime-data, ibus-rime Date: Tue, 3 Aug 2021 09:13:56 +0800 Message-Id: <20210803011356.403219-1-pengmeiyu@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=pengmeiyu@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Peng Mei Yu X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Peng Mei Yu This patch series updates librime, rime-data, and ibus-rime to their latest version. Peng Mei Yu (3): gnu: librime: Update to 1.7.3. gnu: rime-data: Update to 0.38.20210802. gnu: ibus-rime: Update to 1.5.0. gnu/packages/ibus.scm | 161 ++++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 76 deletions(-) -- 2.32.0 ------------=_1628172303-26659-1--