From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E54F715800F for ; Tue, 14 Feb 2023 23:04:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF8DEE07E1; Tue, 14 Feb 2023 23:04:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3A98E07E1 for ; Tue, 14 Feb 2023 23:04:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9396340D23 for ; Tue, 14 Feb 2023 23:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6506A8AE for ; Tue, 14 Feb 2023 23:04:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1676415834.f9a9748f86abc864e6b23b2526b0e66dd9e30899.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mecab/files/, app-text/mecab/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mecab/files/mecab-0.996-clang-16-register.patch app-text/mecab/mecab-0.996-r1.ebuild X-VCS-Directories: app-text/mecab/files/ app-text/mecab/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f9a9748f86abc864e6b23b2526b0e66dd9e30899 X-VCS-Branch: master Date: Tue, 14 Feb 2023 23:04:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 990bdee1-c02c-4356-bd06-78157e75c0b6 X-Archives-Hash: 3637be18c0edbdcc72cf4214c4d2a94f commit: f9a9748f86abc864e6b23b2526b0e66dd9e30899 Author: Sam James gentoo org> AuthorDate: Tue Feb 14 22:54:02 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 14 23:03:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a9748f app-text/mecab: fix build w/ clang 16 Closes: https://bugs.gentoo.org/894362 Signed-off-by: Sam James gentoo.org> .../files/mecab-0.996-clang-16-register.patch | 89 ++++++++++++++++++++++ app-text/mecab/mecab-0.996-r1.ebuild | 24 ++++-- 2 files changed, 105 insertions(+), 8 deletions(-) diff --git a/app-text/mecab/files/mecab-0.996-clang-16-register.patch b/app-text/mecab/files/mecab-0.996-clang-16-register.patch new file mode 100644 index 000000000000..5e782e61fb0c --- /dev/null +++ b/app-text/mecab/files/mecab-0.996-clang-16-register.patch @@ -0,0 +1,89 @@ +https://bugs.gentoo.org/894362 +https://github.com/taku910/mecab/pull/66 + +From 731d738f33dcf62dc9da93104ca1dd6f4c7c9c5f Mon Sep 17 00:00:00 2001 +From: Yuriy Chernyshov +Date: Fri, 11 Feb 2022 12:31:33 +0300 +Subject: [PATCH 1/2] Remove register storage specifier + +register does not work in modern C / C++. +--- a/src/char_property.h ++++ b/src/char_property.h +@@ -37,7 +37,7 @@ class CharProperty { + inline const char *seekToOtherType(const char *begin, const char *end, + CharInfo c, CharInfo *fail, + size_t *mblen, size_t *clen) const { +- register const char *p = begin; ++ const char *p = begin; + *clen = 0; + while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) { + p += *mblen; + +From 82fd6424fde64c77f49695883a18f368ba96850e Mon Sep 17 00:00:00 2001 +From: Yuriy Chernyshov +Date: Sat, 12 Feb 2022 14:31:03 +0300 +Subject: [PATCH 2/2] More fixes + +--- a/src/darts.h ++++ b/src/darts.h +@@ -404,10 +404,10 @@ class DoubleArrayImpl { + T result; + set_result(result, -1, 0); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b +(node_u_type_)(key[i]) + 1; + if (static_cast(b) == array_[p].check) + b = array_[p].base; +@@ -431,12 +431,12 @@ class DoubleArrayImpl { + size_t node_pos = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register size_t num = 0; +- register array_type_ n; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ size_t num = 0; ++ array_type_ n; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b; // + 0; + n = array_[p].base; + if ((array_u_type_) b == array_[p].check && n < 0) { +@@ -469,8 +469,8 @@ class DoubleArrayImpl { + size_t len = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + + for (; key_pos < len; ++key_pos) { + p = b +(node_u_type_)(key[key_pos]) + 1; +--- a/src/viterbi.cpp ++++ b/src/viterbi.cpp +@@ -318,11 +318,11 @@ template bool connect(size_t pos, Node *rnode, + const Connector *connector, + Allocator *allocator) { + for (;rnode; rnode = rnode->bnext) { +- register long best_cost = 2147483647; ++ long best_cost = 2147483647; + Node* best_node = 0; + for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) { +- register int lcost = connector->cost(lnode, rnode); // local cost +- register long cost = lnode->cost + lcost; ++ int lcost = connector->cost(lnode, rnode); // local cost ++ long cost = lnode->cost + lcost; + + if (cost < best_cost) { + best_node = lnode; + diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild index cc47b0f8bc48..9eb02cee3b92 100644 --- a/app-text/mecab/mecab-0.996-r1.ebuild +++ b/app-text/mecab/mecab-0.996-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit autotools @@ -14,16 +14,24 @@ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" SLOT="0" IUSE="static-libs unicode" -DEPEND="dev-lang/perl +BDEPEND=" + dev-lang/perl sys-devel/gettext - virtual/libiconv" -RDEPEND="" -PDEPEND="|| ( +" +DEPEND="virtual/libiconv" +RDEPEND="${DEPEND}" +PDEPEND=" + || ( app-dicts/mecab-ipadic[unicode=] app-dicts/mecab-naist-jdic[unicode=] - )" + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.98-iconv.patch + "${FILESDIR}"/${PN}-0.996-clang-16-register.patch +) -PATCHES=( "${FILESDIR}"/${PN}-0.98-iconv.patch ) HTML_DOCS=( doc/. ) src_prepare() {