* [gentoo-commits] repo/gentoo:master commit in: app-text/crf++/files/, app-text/crf++/
@ 2017-12-17 9:19 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-12-17 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 09850b77d12020800877835630199585567514b5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 09:17:21 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 09:18:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09850b77
app-text/crf++: drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-text/crf++/Manifest | 1 -
app-text/crf++/crf++-0.54.ebuild | 65 -----------------------------
app-text/crf++/files/crf++-0.54-c++11.patch | 37 ----------------
app-text/crf++/files/crf++-0.54-gcc46.patch | 10 -----
4 files changed, 113 deletions(-)
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index f21c3d3c0a6..8117b71c39e 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,2 +1 @@
-DIST CRF++-0.54.tar.gz 809008 BLAKE2B ed23b998ee5a37afc3f429ac04a8e6f57febb93dec469c68c7db1fbb3dfb1d1df7a2ddeb48ab758a6548f60bc920b8c7a3d6f418776a2a110812457245a3f6e9 SHA512 4198ad9423776a44d02db51a655a35f36db767ec623f55de426b3415179ac7187b91d23c6ef9a2cf3d1c38e14507fc7681006ff2ba50dcfc771a7d5e9d1c5760
DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
deleted file mode 100644
index cd0706716eb..00000000000
--- a/app-text/crf++/crf++-0.54.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-MY_P="${P^^[crf]}"
-
-DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="https://taku910.github.io/crfpp/"
-SRC_URI="mirror://sourceforge/crfpp/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-automake-1.13.patch
- "${FILESDIR}"/${P}-c++11.patch
- "${FILESDIR}"/${P}-gcc46.patch
-)
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- sed -i \
- -e "/CFLAGS/s/-O3/${CFLAGS}/" \
- -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
- configure.in
-
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_test() {
- local d
- for d in example/*; do
- cd "${d}"
- ./exec.sh || die "failed test in ${d}"
- cd - >/dev/null
- done
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/example
- insinto /usr/share/doc/${PF}
- doins -r example
- fi
-
- if ! use static-libs; then
- find "${ED}" -name "*.la" -type f -delete || die
- fi
-}
diff --git a/app-text/crf++/files/crf++-0.54-c++11.patch b/app-text/crf++/files/crf++-0.54-c++11.patch
deleted file mode 100644
index a71cd9071eb..00000000000
--- a/app-text/crf++/files/crf++-0.54-c++11.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/feature_index.cpp
-+++ b/feature_index.cpp
-@@ -34,8 +34,9 @@
- std::map <std::string, std::pair<int, unsigned int> >::iterator
- it = dic_.find(key);
- if (it == dic_.end()) {
-- dic_.insert(std::make_pair<std::string, std::pair<int, unsigned int> >
-- (key, std::make_pair<int, unsigned int>(maxid_, 1)));
-+ dic_.insert(std::make_pair
-+ (std::string(key),
-+ std::make_pair(maxid_, static_cast<unsigned int>(1))));
- int n = maxid_;
- maxid_ += (key[0] == 'U' ? y_.size() : y_.size() * y_.size());
- return n;
-@@ -171,7 +172,7 @@
- const std::string &key = it->first;
-
- if (it->second.second >= freq) {
-- old2new.insert(std::make_pair<int, int>(it->second.first, new_maxid));
-+ old2new.insert(std::make_pair(it->second.first, new_maxid));
- it->second.first = new_maxid;
- new_maxid += (key[0] == 'U' ? y_.size() : y_.size() * y_.size());
- ++it;
-@@ -264,9 +265,10 @@
- size_t size = tokenize(line, "\t ", column, 2);
- CHECK_FALSE(size == 2) << "format error: " << filename1;
-
-- dic_.insert(std::make_pair<std::string, std::pair<int, unsigned int> >
-- (column[1],
-- std::make_pair<int, unsigned int>(std::atoi(column[0]), 1)));
-+ dic_.insert(std::make_pair
-+ (std::string(column[1]),
-+ std::make_pair(std::atoi(column[0]),
-+ static_cast<unsigned int>(1))));
- }
-
- std::vector<double> alpha;
diff --git a/app-text/crf++/files/crf++-0.54-gcc46.patch b/app-text/crf++/files/crf++-0.54-gcc46.patch
deleted file mode 100644
index 748551769bf..00000000000
--- a/app-text/crf++/files/crf++-0.54-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/path.h
-+++ b/path.h
-@@ -8,6 +8,7 @@
- #ifndef CRFPP_PATH_H_
- #define CRFPP_PATH_H_
-
-+#include <cstddef>
- #include <vector>
- #include "node.h"
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/crf++/files/, app-text/crf++/
@ 2017-12-17 9:19 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-12-17 9:19 UTC (permalink / raw
To: gentoo-commits
commit: c6feadf5e72b3c9a901ba0953c7e3b7f7e17c4cc
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 09:06:53 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 09:18:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6feadf5
app-text/crf++: fix build with sys-devel/automake-1.13
Closes: https://bugs.gentoo.org/467604
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-text/crf++/crf++-0.54.ebuild | 1 +
app-text/crf++/crf++-0.58.ebuild | 4 +++-
app-text/crf++/files/crf++-automake-1.13.patch | 10 ++++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
index e282ca87c96..3a48217d279 100644
--- a/app-text/crf++/crf++-0.54.ebuild
+++ b/app-text/crf++/crf++-0.54.ebuild
@@ -22,6 +22,7 @@ src_prepare() {
-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
configure.in || die
+ epatch "${FILESDIR}"/${PN}-automake-1.13.patch
epatch "${FILESDIR}"/${P}-c++11.patch
# bug #365921
epatch "${FILESDIR}/${P}-gcc46.patch"
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 7518e894e2e..63fcdca38b6 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="3"
@@ -22,6 +22,8 @@ src_prepare() {
-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
configure.in || die
+ epatch "${FILESDIR}"/${PN}-automake-1.13.patch
+
eautoreconf
}
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
new file mode 100644
index 00000000000..afff7edc070
--- /dev/null
+++ b/app-text/crf++/files/crf++-automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,6 @@
+ AC_MSG_RESULT([yes])
+
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/crf++/files/, app-text/crf++/
@ 2024-05-09 1:13 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-09 1:13 UTC (permalink / raw
To: gentoo-commits
commit: 4c9c92f3f5803e331eed97d068ad644789513c4e
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue May 16 07:05:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 9 01:12:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9c92f3
app-text/crf++: Removing register keywords
The register keyword has been dropped since C++17.
Closes: https://bugs.gentoo.org/894642
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31053
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/crf++/crf++-0.58-r2.ebuild | 47 ++++++++++++++++++++
app-text/crf++/files/crf++-0.58-registers.patch | 57 +++++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/app-text/crf++/crf++-0.58-r2.ebuild b/app-text/crf++/crf++-0.58-r2.ebuild
new file mode 100644
index 000000000000..abab5dad11cd
--- /dev/null
+++ b/app-text/crf++/crf++-0.58-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
+HOMEPAGE="https://taku910.github.io/crfpp/"
+SRC_URI="mirror://gentoo/${P^^}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="|| ( BSD LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-registers.patch
+)
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_test() {
+ local d
+ for d in example/*; do
+ pushd "${d}" >/dev/null || die
+ ./exec.sh || die "failed test in ${d}"
+ popd >/dev/null || die
+ done
+}
+
+src_install() {
+ default
+
+ if use examples; then
+ dodoc -r example
+ docompress -x /usr/share/doc/${PF}/example
+ fi
+
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/crf++/files/crf++-0.58-registers.patch b/app-text/crf++/files/crf++-0.58-registers.patch
new file mode 100644
index 000000000000..960e7f923d6b
--- /dev/null
+++ b/app-text/crf++/files/crf++-0.58-registers.patch
@@ -0,0 +1,57 @@
+From 12204f40fdab494328931f12f45ad7d884ef6dac Mon Sep 17 00:00:00 2001
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Tue, 16 May 2023 12:29:40 +0530
+Subject: [PATCH] Removing register keywords
+
+The register keyword has been dropped since C++17.
+
+Bug: https://bugs.gentoo.org/894642
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/darts.h
++++ b/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<array_u_type_>(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;
+--
+2.40.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-09 1:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-17 9:19 [gentoo-commits] repo/gentoo:master commit in: app-text/crf++/files/, app-text/crf++/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2024-05-09 1:13 Sam James
2017-12-17 9:19 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox