mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 05:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/libdbi-drivers: claim maintainership

Browse Source 
i'm already maintaining main/libdbi

also, fix build with gcc 14
This commit is contained in:
Celeste 2024-08-26 06:02:57 +00:00
parent 5f2519d1a2
commit d5cfff41f3
2 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
community/libdbi-drivers/APKBUILD
View File

@ -1,18 +1,21 @@
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer:
# Maintainer: Celeste <cielesti@protonmail.com>
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
"

56
community/libdbi-drivers/gcc14.patch Normal file
View File

@ -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 <stdarg.h>
#include <unistd.h>
#include <signal.h>
+#include <sys/wait.h>
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);
}