From f61091e6ab6c15cde3a5934701cb47069ffbfdaa Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 9 Sep 2025 23:11:28 +0200 Subject: [PATCH] - dbm build fix from Fedora --- apr-util-configure-c99.patch | 18 ++++++++++++++++++ apr-util.spec | 12 +++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 apr-util-configure-c99.patch diff --git a/apr-util-configure-c99.patch b/apr-util-configure-c99.patch new file mode 100644 index 0000000..4e387be --- /dev/null +++ b/apr-util-configure-c99.patch @@ -0,0 +1,18 @@ +Add a missing implied int in the Berkeley DB configure probe. This +avoids build failures with future Fedora toolchain defaults. + +Submitted upstream: + +diff --git a/build/dbm.m4 b/build/dbm.m4 +index 57bd131fc3b74099..ffdbdbc0f43e04da 100644 +--- a/build/dbm.m4 ++++ b/build/dbm.m4 +@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB], + #include + #include + #include <$apu_try_berkeley_db_header> +-main () ++int main () + { + int major, minor, patch; + diff --git a/apr-util.spec b/apr-util.spec index 641e713..9910eb6 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -19,7 +19,7 @@ Summary: A companion library to Apache Portable Runtime Summary(pl.UTF-8): Biblioteka towarzysząca Apache Portable Runtime Name: apr-util Version: 1.6.3 -Release: 2 +Release: 3 Epoch: 1 License: Apache v2.0 Group: Libraries @@ -29,6 +29,7 @@ Patch0: %{name}-link.patch Patch1: %{name}-config-noldap.patch Patch3: %{name}-flags.patch Patch4: mysql8.patch +Patch5: %{name}-configure-c99.patch URL: http://apr.apache.org/ BuildRequires: apr-devel >= 1:1.6.0 BuildRequires: autoconf >= 2.59 @@ -221,10 +222,11 @@ Statyczna biblioteka apr-util. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch3 -p1 -%patch4 -p0 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P3 -p1 +%patch -P4 -p0 +%patch -P5 -p1 echo ' -- 2.49.0