commit: ad45f6c5cbdc1c79899a1e092aafaebd1641f841 Author: Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com> AuthorDate: Sun Jun 2 15:35:44 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 16 02:25:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad45f6c5
dev-libs/tre: fix building with gcc 14, remove nonexistent blockers Patch is a part of https://github.com/laurikari/tre/pull/49 Remove blockers for app-text/agrep and app-misc/glimpse that are no longer in the tree. Closes: https://bugs.gentoo.org/932740 Signed-off-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com> Closes: https://github.com/gentoo/gentoo/pull/36980 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/tre/files/tre-c99.patch | 23 ++++++ dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild | 108 +++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dev-libs/tre/files/tre-c99.patch b/dev-libs/tre/files/tre-c99.patch new file mode 100644 index 000000000000..75375139f6c8 --- /dev/null +++ b/dev-libs/tre/files/tre-c99.patch @@ -0,0 +1,23 @@ +https://github.com/laurikari/tre/pull/49/commits/9c049c8c50a50a4f101aa45dd34bd138af7ed3cf +https://bugs.gentoo.org/932740 + +--- a/python/tre-python.c ++++ b/python/tre-python.c +@@ -365,7 +365,7 @@ PyTrePattern_search(TrePatternObject *self, PyObject *args) + + if (PyUnicode_Check(pstring)) + { +- Py_ssize_t len = PyUnicode_GetSize(pstring); ++ Py_ssize_t len = PyUnicode_GET_LENGTH(pstring); + wchar_t *buf = calloc(sizeof(wchar_t), len); + if(!buf) + { +@@ -502,7 +502,7 @@ PyTre_ncompile(PyObject *self, PyObject *args) + + if (upattern != NULL) + { +- Py_ssize_t len = PyUnicode_GetSize(upattern); ++ Py_ssize_t len = PyUnicode_GET_LENGTH(upattern); + wchar_t *buf = calloc(sizeof(wchar_t), len); + if(!buf) + { diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild new file mode 100644 index 000000000000..fa489c2c58fb --- /dev/null +++ b/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +COMMIT="6092368aabdd0dbb0fbceb2766a37b98e0ff6911" +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 + +inherit autotools distutils-r1 + +DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library" +HOMEPAGE=" + https://laurikari.net/tre/ + https://github.com/laurikari/tre +" +SRC_URI="https://github.com/laurikari/tre/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="+agrep +alloca +approx debug nls profile python" + +RDEPEND=" + agrep? ( + !dev-ruby/amatch + ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) +" +BDEPEND=" + python? ( ${DISTUTILS_DEPS} ) + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE=" + agrep? ( approx ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +PATCHES=( + "${FILESDIR}/0.8.0-pkgcfg.patch" + "${FILESDIR}/0.8.0-CVE-2016-8559.patch" + "${FILESDIR}/${PN}-chicken.patch" + "${FILESDIR}/${PN}-issue37.patch" + "${FILESDIR}/${PN}-issue50.patch" + "${FILESDIR}/${PN}-issue55-part1.patch" + "${FILESDIR}/${PN}-issue55-part2.patch" + "${FILESDIR}/${PN}-python3.patch" + "${FILESDIR}/${PN}-tests.patch" + "${FILESDIR}/${PN}-c99.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --disable-system-abi + --enable-multibyte + --enable-wchar + $(use_enable agrep) + $(use_enable approx) + $(use_enable debug) + $(use_enable nls) + $(use_enable profile) + $(use_with alloca) + ) + econf "${myconf[@]}" +} + +src_test() { + if locale -a | grep -iq en_US.iso88591; then + emake -j1 check + else + ewarn "If you like to run the test," + ewarn "please make sure en_US.ISO-8859-1 is installed." + die "en_US.ISO-8859-1 locale is missing" + fi +} + +src_compile() { + default + + if use python; then + cd python || die + distutils-r1_src_compile + fi +} + +src_install() { + local HTML_DOCS=( doc/*.{css,html} ) + + default + + use python && distutils-r1_src_install + + find "${ED}" -type f -name '*.la' -delete || die +}
