From patchwork Mon Sep 6 17:42:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 32680 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 A25E427BBE3; Mon, 6 Sep 2021 18:44:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,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 2566127BBE1 for ; Mon, 6 Sep 2021 18:44:11 +0100 (BST) Received: from localhost ([::1]:57508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNIfC-0000C2-0t for patchwork@mira.cbaines.net; Mon, 06 Sep 2021 13:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNIf3-0000Av-W4 for guix-patches@gnu.org; Mon, 06 Sep 2021 13:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNIf3-0003Ji-PB for guix-patches@gnu.org; Mon, 06 Sep 2021 13:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNIf3-0001y7-NQ for guix-patches@gnu.org; Mon, 06 Sep 2021 13:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50434] [PATCH core-updates-frozen] gnu: librime: Fix build with GCC 10. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Sep 2021 17:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50434@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16309502027500 (code B ref -1); Mon, 06 Sep 2021 17:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Sep 2021 17:43:22 +0000 Received: from localhost ([127.0.0.1]:54398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNIeK-0001wp-Q4 for submit@debbugs.gnu.org; Mon, 06 Sep 2021 13:43:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:60904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNIeI-0001wf-Rx for submit@debbugs.gnu.org; Mon, 06 Sep 2021 13:43:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNIeI-000071-L3 for guix-patches@gnu.org; Mon, 06 Sep 2021 13:43:14 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNIeE-0002bI-PD for guix-patches@gnu.org; Mon, 06 Sep 2021 13:43:14 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id B1EAC240106 for ; Mon, 6 Sep 2021 19:43:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1630950187; bh=R1PkOmXGwyR3XHRt5NKdoGMo5eO67nOC97VMTF+/+b0=; h=From:To:Cc:Subject:Date:From; b=VQALuZlZKJUc6O8bxUwSlTd91ku2DfYIczZ1IfiTR6QAFCcKUGX0Fm1hOxL16D2/+ euxzSbsoESONF2Qb42QiCVcZZncIFRI2/pKPFVoHc5TlLVuUAocuy2JKy1ooExLkze Wu6S3HPdD/zr4uwQLDcIaBg2q54DsRnE3oTRrdimcilirWTvjrlq2ylVG/5J1tmfev ujtTmF4lcToKozrSExwD2V66V/vjTmW1RHkacoWDdR8M60q3scgeodUAjzyiVg0jQP LlRa+PzGcgp/Zx91nNmNH70LNgvT+uweN9kuJ/vFngYowELGDHV73TDRqw/cAznFTv jjm7n4PiDUVbw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H3G2W5SpTz9rxL; Mon, 6 Sep 2021 19:42:59 +0200 (CEST) From: Felix Gruber Date: Mon, 6 Sep 2021 17:42:44 +0000 Message-Id: <20210906174244.7686-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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 * gnu/packages/ibus.scm (librime)[source]: Add a patch that adds missing includes. * gnu/packages/patches/librime-add-missing-includes.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/ibus.scm | 2 ++ .../librime-add-missing-includes.patch | 28 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 gnu/packages/patches/librime-add-missing-includes.patch diff --git a/gnu/local.mk b/gnu/local.mk index eab40771b5..88869a8186 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1285,6 +1285,7 @@ dist_patch_DATA = \ %D%/packages/patches/libblockdev-glib-compat.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ + %D%/packages/patches/librime-add-missing-includes.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 4cec104bab..ac4efccf85 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Peng Mei Yu ;;; Copyright © 2020 kanichos ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -367,6 +368,7 @@ Japanese language input in most graphical applications.") (sha256 (base32 "0pqk0i3zcii3fx5laj9qzbgd58jvq6wn31j76w4zix2i4b1lqcqv")) + (patches (search-patches "librime-add-missing-includes.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/librime-add-missing-includes.patch b/gnu/packages/patches/librime-add-missing-includes.patch new file mode 100644 index 0000000000..a74c67c751 --- /dev/null +++ b/gnu/packages/patches/librime-add-missing-includes.patch @@ -0,0 +1,28 @@ +From: Felix Gruber +Date: Mon, 6 Sep 2021 19:38:17 +0200 +Subject: [PATCH] Add missing includes + +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