sys-cluster/genders: add a patch for gcc-14

Closes: https://bugs.gentoo.org/922090
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
This commit is contained in:
Takuya Wakazono
2024-01-22 22:00:54 +09:00
parent 979036c757
commit 371a33a077
2 changed files with 70 additions and 5 deletions

View File

@@ -0,0 +1,54 @@
https://bugs.gentoo.org/922090
https://github.com/chaos/genders/commit/e5920afb6ea994d86faf8055f598fe8cd77f1d11
--- a/src/libgenders/genders_util.c
+++ b/src/libgenders/genders_util.c
@@ -94,7 +94,7 @@ _genders_list_free_attrvallist(void *x)
{
genders_attrvals_container_t avc;
- avc = (List)x;
+ avc = (genders_attrvals_container_t)x;
__list_destroy(avc->attrvals);
free(avc);
}
--- a/src/testsuite/libgenders/genders_test_functionality.c
+++ b/src/testsuite/libgenders/genders_test_functionality.c
@@ -1009,7 +1009,7 @@ _genders_list_clear_functionality(GendersListCreateFunc funccreate,
{
genders_t handle;
char **list;
- int err, list_len, return_value, errnum, retval = 0;
+ int err, list_len, return_value, errnum;
assert(funccreate && funcclear && funcdestroy && funcname);
@@ -1044,7 +1044,7 @@ _genders_list_clear_functionality(GendersListCreateFunc funccreate,
if (genders_handle_destroy(handle) < 0)
genders_err_exit("genders_handle_destroy: %s", genders_errormsg(handle));
- return retval;
+ return err;
}
static int
@@ -3193,8 +3193,6 @@ genders_copy_functionality(int verbose)
err += errcount;
}
- cleanup_and_try_next_database:
-
if (genders_nodelist_destroy(handleorig, nodelistorig) < 0)
genders_err_exit("genders_nodelist_destroy: %s", genders_errormsg(handleorig));
--- a/src/testsuite/libgenders/genders_testlib.c
+++ b/src/testsuite/libgenders/genders_testlib.c
@@ -321,7 +321,7 @@ genders_pointer_exist_check(char *funcname,
assert(funcname && pointer_str);
if ((expected_null == GENDERS_POINTER_NULL && pointer != NULL)
- || (!expected_null == GENDERS_POINTER_NON_NULL && pointer == NULL))
+ || (expected_null == GENDERS_POINTER_NON_NULL && pointer == NULL))
{
if (verbose)
{

View File

@@ -1,12 +1,14 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_SETUPTOOLS=no
DISTUTILS_EXT=1
DISTUTILS_OPTIONAL=1
DISTUTILS_USE_PEP517=setuptools
MY_PV="$(ver_rs 1-2 -)"
MY_P="${PN}-${MY_PV}"
PYTHON_COMPAT=( python3_{10..11} pypy3 )
PYTHON_COMPAT=( python3_{10..12} pypy3 )
inherit distutils-r1 edo flag-o-matic java-pkg-opt-2 perl-module
@@ -32,14 +34,23 @@ RDEPEND="
${DEPEND}
java? ( virtual/jre:1.8 )
"
BDEPEND="
python? (
${PYTHON_DEPS}
${DISTUTILS_DEPS}
)
"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS=( README TUTORIAL NEWS )
PATCHES=( "${FILESDIR}/${PN}-1.28.1-gcc14.patch" )
src_prepare() {
default
sed -i "s|perl python||" src/extensions/Makefile.am || die
sed -i "s|\$(DESTDIR)\$(docdir)-\$(VERSION)-javadoc|\$(DESTDIR)\$(docdir)/html/javadoc|" src/extensions/java/Makefile.am || die
eapply_user
sed -i "s|\$(DESTDIR)\$(docdir)-\$(VERSION)-javadoc|\$(DESTDIR)\$(docdir)/html/javadoc|" \
src/extensions/java/Makefile.am || die
java-pkg_clean
edo ./autogen.sh
}