diff --git a/community/libdbi-drivers/APKBUILD b/community/libdbi-drivers/APKBUILD index 2405ac163ab..1eb566a81a1 100644 --- a/community/libdbi-drivers/APKBUILD +++ b/community/libdbi-drivers/APKBUILD @@ -1,18 +1,21 @@ # Contributor: ScrumpyJack -# Maintainer: +# Maintainer: Celeste pkgname=libdbi-drivers pkgver=0.9.0 -pkgrel=2 -pkgdesc="Provides the database-specific drivers for the libdbi framework" -options="libtool" +pkgrel=3 +pkgdesc="Database-specific drivers for the libdbi framework" url="https://libdbi-drivers.sourceforge.net/" arch="all" -license="LGPL-2.0-or-later" +license="LGPL-2.1-or-later" makedepends="libdbi-dev freetds-dev mysql-dev libpq-dev sqlite-dev" -source="https://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers/libdbi-drivers-$pkgver/libdbi-drivers-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers/libdbi-drivers-$pkgver/libdbi-drivers-$pkgver.tar.gz + gcc14.patch + " +options="libtool !check" prepare() { default_prepare + update_config_guess update_config_sub } @@ -23,6 +26,8 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ --localstatedir=/usr \ --with-mysql \ --with-pgsql \ @@ -38,4 +43,5 @@ package() { sha512sums=" f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1 libdbi-drivers-0.9.0.tar.gz +c650177352cdbffa90fd0e2a47466f4b5df2fbc3418bd8b4d45e62e4dababa45ba3f2c703e5ac3e4c957f19dbfa91ffa0e39ee5615d3dc0aec8b0018948525a3 gcc14.patch " diff --git a/community/libdbi-drivers/gcc14.patch b/community/libdbi-drivers/gcc14.patch new file mode 100644 index 00000000000..f32a08638a1 --- /dev/null +++ b/community/libdbi-drivers/gcc14.patch @@ -0,0 +1,56 @@ +Patch-Source-1: https://sourceforge.net/p/libdbi-drivers/bugs/27/attachment/libdbi-drivers-sys-wait.patch +Patch-Source-2: https://sourceforge.net/p/libdbi-drivers/bugs/28/attachment/libdbi-drivers-c99.patch +-- +diff --git a/tests/cgreen/src/unit.c b/tests/cgreen/src/unit.c +index 4ced6f9..97ff6de 100644 +--- a/tests/cgreen/src/unit.c ++++ b/tests/cgreen/src/unit.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + enum {test_function, test_suite}; + +-- +Fix type errors in the cgreen with constraints facility. + +diff --git a/tests/cgreen/src/constraint.c b/tests/cgreen/src/constraint.c +index c19c0ddd41a7bfa7..95673dd3e222a3cf 100644 +--- a/tests/cgreen/src/constraint.c ++++ b/tests/cgreen/src/constraint.c +@@ -22,8 +22,7 @@ static double unbox_double(intptr_t box); + static double as_double(intptr_t box); + + static int compare_using_matcher(Constraint *constraint, intptr_t actual); +-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t actual, const char *test_file, int test_line, TestReporter *reporter); +- ++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter); + + void destroy_constraint(void *abstract) { + Constraint *constraint = (Constraint *)abstract; +@@ -164,11 +163,11 @@ static void test_want_double(Constraint *constraint, const char *function, intpt + } + + static int compare_using_matcher(Constraint *constraint, intptr_t actual) { +- int (*matches)(const void*) = constraint->expected; +- return matches(actual); ++ int (*matches)(const void*) = (int (*)(const void*)) constraint->expected; ++ return matches((const void *)actual); + } + +-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) { ++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) { + (*reporter->assert_true)( + reporter, + test_file, +@@ -176,7 +175,7 @@ static void test_with_matcher(Constraint *constraint, const char *function, cons + (*constraint->compare)(constraint, matcher_function), + "Wanted parameter [%s] to match [%s] in function [%s]", + constraint->parameter, +- matcher_name, ++ constraint->name, + function); + } +