From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eIpoDcQV22VUGwEAqHPOHw:P1 (envelope-from ) for ; Sun, 25 Feb 2024 11:26:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eIpoDcQV22VUGwEAqHPOHw (envelope-from ) for ; Sun, 25 Feb 2024 11:26:12 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708856772; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G8kuVJMhnhXosU/bP1gniv1Nz0FGoP/cfkwcx6YjiD8=; b=dtnMhpEPGIhRKubZDqo6+Qt7Z3FRBOFHzjPM0gQFZv6PVEg8SPQd0OgQ6+LfDq477rnJ06 m0/6v5y/YrEGacgxaRz0oNT/Id6vKR1ibkZbJV7RPlUCpDaONb+OTEPYeA484qozJNNtyG dpLlfEJyx4hUbbHGcHKblotdbfXc8XY+COybEYQ6gFT6QSbmck9GdfyRBdvQj7WChCuR2w DF3bCA4qqNt+w4B28phKkYSmZV0Y9gqjRGkrGd9G9NPMJbucxoF7PbTD2Tnbw+UYb+lhZn /AIWvos1ezQG9CkNQ18reFMSF7QdXO72qNqwGddlx6zXA5L4mTQkSORHejGvzQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708856772; a=rsa-sha256; cv=none; b=HVOwH/ag9kOrKrk7+Ei3aeEL0F2jR/rbiXUmK1rwzvgMQQuNXxvjHO2ltP71ddC387haoI AC9biBT7VdrW57LyqJZGtHytrtQloL1vZNnxScOgPTutBQJVgNwpz3dwgjiyVEkmY4BKdo iItLYidjfe5b+vWb404yrvJT/VtpC9SmH6JdF7K9oa/AjYO4/1NxcOeaCJT/8rYWcpTkEE HIiUWGvMo1Z6TmmofLv1Ak5syyj6vlpJdsCqo3QlSLycC5M2pgJfDSENuczuECDUMuPh7F 1+JCM0Igj7eekVJbUmNaYmc9gGkii8CPauP+UdvYwZCgBvaNr92xvb60EVpjww== 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 1366E3AAB0 for ; Sun, 25 Feb 2024 11:26:11 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reBhW-0000Kb-Tb; Sun, 25 Feb 2024 05:25:42 -0500 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 1reBhT-0000Hd-W0 for guix-patches@gnu.org; Sun, 25 Feb 2024 05:25:40 -0500 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 1reBhT-0004gK-Nx for guix-patches@gnu.org; Sun, 25 Feb 2024 05:25:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1reBhp-0002wt-Qp; Sun, 25 Feb 2024 05:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69378] [PATCH] gnu: librime: Update to 1.10.0. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 25 Feb 2024 10:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69378 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69378@debbugs.gnu.org Cc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by submit@debbugs.gnu.org id=B.170885672911240 (code B ref -1); Sun, 25 Feb 2024 10:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Feb 2024 10:25:29 +0000 Received: from localhost ([127.0.0.1]:33255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reBhH-0002v8-4p for submit@debbugs.gnu.org; Sun, 25 Feb 2024 05:25:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:40854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reBVn-0002PR-5T for submit@debbugs.gnu.org; Sun, 25 Feb 2024 05:13:37 -0500 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 1reBBH-0006KX-6H for guix-patches@gnu.org; Sun, 25 Feb 2024 04:52:23 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1reBBE-0007vF-5j for guix-patches@gnu.org; Sun, 25 Feb 2024 04:52:22 -0500 Received: from m.taildaf0f.ts.net (unknown [111.0.51.199]) by APP-01 (Coremail) with SMTP id qwCowAAnLKjCDdtl3QMrAw--.12928S2; Sun, 25 Feb 2024 17:52:03 +0800 (CST) From: Zheng Junjie Date: Sun, 25 Feb 2024 17:51:59 +0800 Message-ID: <5955fce229e10021494f8d459aca952bd8687eb0.1708854719.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: qwCowAAnLKjCDdtl3QMrAw--.12928S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v2 0xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV WUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [111.0.51.199] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -5.67 X-Spam-Score: -5.67 X-Migadu-Queue-Id: 1366E3AAB0 X-Migadu-Scanner: mx11.migadu.com X-TUID: maSfXf4Biuz1 * gnu/packages/ibus.scm(librime): Update to 1.10.0. [source]: Remove snippet. Remove patch. [arguments]: Remove it. * gnu/packages/patches/librime-fix-build-with-gcc10.patch: Remove this. * gnu/local.mk(dist_patch_DATA): Unregister patch. Change-Id: Ifbf1cf92baa469e87c517958e5705dec085cc413 --- gnu/local.mk | 3 +- gnu/packages/ibus.scm | 22 ++-------- .../librime-fix-build-with-gcc10.patch | 41 ------------------- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/librime-fix-build-with-gcc10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 741c72a653..15352f68d4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -56,7 +56,7 @@ # Copyright © 2022 Alex Griffin # Copyright © 2022 ( # Copyright © 2022 jgart -# Copyright © 2023 Zheng Junjie <873216071@qq.com> +# Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic # Copyright © 2023 Andy Tai # Copyright © 2023 B. Wilson @@ -1514,7 +1514,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ - %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/lightdm-arguments-ordering.patch \ diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 1e01bb0ea3..c821279bd3 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Taiju HIGASHI ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 Luis Felipe López Acevedo +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -454,7 +455,7 @@ (define-public ibus-anthy (define-public librime (package (name "librime") - (version "1.7.3") + (version "1.10.0") (source (origin (method git-fetch) @@ -464,25 +465,8 @@ (define-public librime (file-name (git-file-name name version)) (sha256 (base32 - "0pqk0i3zcii3fx5laj9qzbgd58jvq6wn31j76w4zix2i4b1lqcqv")) - (patches (search-patches "librime-fix-build-with-gcc10.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "thirdparty/src") - (delete-file-recursively "thirdparty/bin") - (delete-file-recursively "thirdparty/include/X11") - #t)))) + "0p4ybmn2syhf30vwzrd6ms77xadhl2lh7d2apq2m1yzmy42mdydm")))) (build-system cmake-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "CMakeLists.txt" - (("include_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/include\\)") "") - (("link_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/lib\\)") "")) - #t))))) (inputs (list boost capnproto diff --git a/gnu/packages/patches/librime-fix-build-with-gcc10.patch b/gnu/packages/patches/librime-fix-build-with-gcc10.patch deleted file mode 100644 index 49ad011b57..0000000000 --- a/gnu/packages/patches/librime-fix-build-with-gcc10.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Felix Gruber -Date: Mon, 6 Sep 2021 19:38:17 +0200 -Subject: [PATCH] Add missing includes - -Fix a build failure with GCC 10 that manifests like this: - ------- -/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc: In member function ‘void rime::ScriptTranslation::PrepareCandidate()’: -/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc:490:23: error: ‘exp’ was not declared in this scope - 490 | cand->set_quality(exp(entry->weight) + - | ^~~ -/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc:504:23: error: ‘exp’ was not declared in this scope - 504 | cand->set_quality(exp(entry->weight) + - | ^~~ -make[2]: *** [src/CMakeFiles/rime.dir/build.make:1241: src/CMakeFiles/rime.dir/rime/gear/script_translator.cc.o] Error 1 ------- - -diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc -index 4a45f05..515c8db 100644 ---- a/src/rime/gear/script_translator.cc -+++ b/src/rime/gear/script_translator.cc -@@ -7,6 +7,7 @@ - // 2011-07-10 GONG Chen - // - #include -+#include - #include - #include - #include -diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc -index 162ac02..dbea76a 100644 ---- a/src/rime/gear/table_translator.cc -+++ b/src/rime/gear/table_translator.cc -@@ -4,6 +4,7 @@ - // - // 2011-07-10 GONG Chen - // -+#include - #include - #include - #include base-commit: 05bbe9993f687da1fd684a31474c621f2a1c37b2 -- 2.41.0