From patchwork Fri Mar 12 11:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 27674 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 18CE727BC51; Fri, 12 Mar 2021 12:08:13 +0000 (GMT) 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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,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 DCD2827BC50 for ; Fri, 12 Mar 2021 12:08:10 +0000 (GMT) Received: from localhost ([::1]:46352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKgaQ-00033K-4R for patchwork@mira.cbaines.net; Fri, 12 Mar 2021 07:08:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKgaI-00032H-63 for guix-patches@gnu.org; Fri, 12 Mar 2021 07:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKgaH-0006or-Uv for guix-patches@gnu.org; Fri, 12 Mar 2021 07:08:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lKgaH-0003TZ-QL for guix-patches@gnu.org; Fri, 12 Mar 2021 07:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47098] [PATCH]: gnu: opencc: Update to 1.1.2 Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Mar 2021 12:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47098@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161555086613337 (code B ref -1); Fri, 12 Mar 2021 12:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Mar 2021 12:07:46 +0000 Received: from localhost ([127.0.0.1]:56192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKga1-0003T3-KQ for submit@debbugs.gnu.org; Fri, 12 Mar 2021 07:07:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:47944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKgZz-0003Sv-Mu for submit@debbugs.gnu.org; Fri, 12 Mar 2021 07:07:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKgZz-00030O-Gr for guix-patches@gnu.org; Fri, 12 Mar 2021 07:07:43 -0500 Received: from mail-m975.mail.163.com ([123.126.97.5]:57468) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKgZs-0006TU-Ql for guix-patches@gnu.org; Fri, 12 Mar 2021 07:07:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=rG3f/ E6ZQlxK8BKmhywSD7JtcF6EyT/8X9sWdembxJU=; b=VPeJicKQYlVHAfDlPedyF Vn1NZHj86cTpV4+tzvgqMGb2UYuUirkCNc6UA+oQG/Hxh6/5jOfCoE9Xqqh+eq3z kxgjNVo+usyu+NmXyyQ9sSvbX/BoRQxZVhpQkorEP8VVm4Rh90VQqRuNbBx2JB63 h7J5SMpBDbuhhbsC+h1jzg= Received: from asus-laptop (unknown [27.38.240.152]) by smtp5 (Coremail) with SMTP id HdxpCgDXle3lVUtgWSARAQ--.142S2; Fri, 12 Mar 2021 19:52:05 +0800 (CST) User-agent: mu4e 1.4.15; emacs 27.1 From: Zhu Zihao Date: Fri, 12 Mar 2021 19:52:04 +0800 Message-ID: <86lfasmvx7.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HdxpCgDXle3lVUtgWSARAQ--.142S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU3YhFDUUUU X-Originating-IP: [27.38.240.152] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiKQVTr1Xlztpq9wAAsp Received-SPF: pass client-ip=123.126.97.5; envelope-from=all_but_last@163.com; helo=mail-m975.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches From d8a41b46a36139bc59bcf9d95ed74b70e1d7c1ff Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 12 Mar 2021 19:38:53 +0800 Subject: [PATCH] gnu: opencc: Update to 1.1.2. * gnu/packages/textutils.scm(opencc): [source]: Remove more bundled libraries. [arguments]: configure to use system libraries. [inputs]: Add marisa and rapidjson. [native-inputs]: Remove rapidjson. --- gnu/packages/textutils.scm | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 34da04d0d8..eb2e0344cc 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,7 +51,9 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages datastructures) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) #:use-module (gnu packages gettext) @@ -1051,7 +1054,7 @@ OpenDocument presentations (*.odp).") (define-public opencc (package (name "opencc") - (version "1.0.5") + (version "1.1.2") (source (origin (method git-fetch) @@ -1061,26 +1064,31 @@ OpenDocument presentations (*.odp).") (file-name (git-file-name name version)) (sha256 (base32 - "1pv5md225qwhbn8ql932zdg6gh1qlx3paiajaks8gfsa07yzvhr4")) + "1a15p9idznh23b44r7rw2zjnirbxjs5pyq3k6xkz0k64cdh2zq6h")) (modules '((guix build utils))) (snippet '(begin - ;; TODO: Unbundle tclap, darts-clone, gtest - (delete-file-recursively "deps/rapidjson-0.11") #t)))) + ;; TODO: Unbundle tclap, darts-clone + (for-each + (lambda (dep) + (delete-file-recursively (string-append "deps/" dep))) + '("rapidjson-1.1.0" + "gtest-1.11.0" + "marisa-0.2.6" + "pybind11-2.5.0" + "google-benchmark")) + #t)))) (build-system cmake-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-3rd-party-references - (lambda* (#:key inputs #:allow-other-keys) - (let ((rapidjson (assoc-ref inputs "rapidjson"))) - (substitute* "src/CMakeLists.txt" - (("../deps/rapidjson-0.11") - (string-append rapidjson "/include/rapidjson"))) - #t)))))) - (native-inputs - `(("python" ,python-wrapper) + '(#:configure-flags + `("-DUSE_SYSTEM_RAPIDJSON=ON" + "-DUSE_SYSTEM_MARISA=ON" + "-DUSE_SYSTEM_GTEST=ON"))) + (inputs + `(("marisa" ,marisa) ("rapidjson" ,rapidjson))) + (native-inputs + `(("python" ,python-wrapper))) (home-page "https://github.com/BYVoid/OpenCC") (synopsis "Convert between Traditional Chinese and Simplified Chinese") (description "Open Chinese Convert (OpenCC) converts between Traditional -- 2.30.2