From 8c48ba8044988f856a1f88f0158f352afc4bc3ac Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 15 Dec 2022 13:41:57 +0000
Subject: [PATCH] extra/php7 to 7.4.33-4

---
 extra/php7/PKGBUILD         |  5 ++---
 extra/php7/db6_compat.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 extra/php7/db6_compat.patch

diff --git a/extra/php7/PKGBUILD b/extra/php7/PKGBUILD
index 0a2393559..5a9ac7904 100644
--- a/extra/php7/PKGBUILD
+++ b/extra/php7/PKGBUILD
@@ -25,11 +25,11 @@ pkgname=('php7'
          'php7-tidy'
          'php7-xsl')
 pkgver=7.4.33
-pkgrel=2
+pkgrel=4
 arch=('x86_64')
 license=('PHP')
 url='https://www.php.net/'
-makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
+makedepends=('apache' 'aspell' 'c-client' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
              'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
              'oniguruma')
 checkdepends=('procps-ng')
@@ -111,7 +111,6 @@ build() {
 		--enable-sysvshm=shared \
 		--with-bz2=shared \
 		--with-curl=shared \
-		--with-db4=/usr \
 		--with-enchant=shared \
 		--with-external-gd \
 		--with-external-pcre \
diff --git a/extra/php7/db6_compat.patch b/extra/php7/db6_compat.patch
new file mode 100644
index 000000000..563ae4f85
--- /dev/null
+++ b/extra/php7/db6_compat.patch
@@ -0,0 +1,11 @@
+--- aaa/ext/dba/config.m4	2022-12-11 16:33:02.721079548 +0100
++++ bbb/ext/dba/config.m4	2022-12-11 16:33:59.821200682 +0100
+@@ -308,7 +308,7 @@
+         ]])],[
+           AC_EGREP_CPP(yes,[
+ #include "$THIS_INCLUDE"
+-#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5)
++#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5) || ($1 == 4 && DB_VERSION_MAJOR == 6)
+             yes
+ #endif
+           ],[