diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 423176ddf..5ea0b764c 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -24,11 +24,11 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=8.1.13 -pkgrel=1 +pkgrel=4 arch=('x86_64') license=('PHP') url='https://www.php.net/' -makedepends=('apache' 'aspell' 'c-client' 'db' 'gdbm' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp' +makedepends=('apache' 'aspell' 'c-client' 'gdbm' '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') @@ -93,7 +93,6 @@ build() { --enable-sysvshm=shared \ --with-bz2=shared \ --with-curl=shared \ - --with-db4=/usr \ --with-enchant=shared \ --with-external-gd \ --with-external-pcre \ @@ -183,7 +182,7 @@ check() { package_php() { pkgdesc='A general-purpose scripting language that is especially suited to web development' - depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma' 'db' 'gdbm') + depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma' 'gdbm') replaces=('php-ldap') conflicts=('php-ldap') provides=("php-interpreter=$_interpreter" "php-ldap=${pkgver}") diff --git a/extra/php/db6_compat.patch b/extra/php/db6_compat.patch new file mode 100644 index 000000000..563ae4f85 --- /dev/null +++ b/extra/php/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 + ],[