summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Lamskoy2023-11-23 17:30:42 +0200
committerEugene Lamskoy2023-11-23 17:30:42 +0200
commiteaa54619b2d3938cf189fd6f181fcc18a791b0aa (patch)
treef16bd326c19d8251bb2177b7489e418fa59ff7f4
parent8bf300f49f0f04a416b41aa3f185eceeea8ca8b3 (diff)
downloadaur-eaa54619b2d3938cf189fd6f181fcc18a791b0aa.tar.gz
libxml patch applied
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rw-r--r--php-libxml.patch23
3 files changed, 38 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5cbe84cc3a8b..0332507e6116 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
-# Wed Feb 22 15:26:52 UTC 2023
+# Thu Nov 23 15:29:35 UTC 2023
pkgbase = php73
pkgdesc = PHP 7.3.33 compiled as to not conflict with mainline php
pkgver = 7.3.33
@@ -70,6 +70,7 @@ pkgbase = php73
source = php-makefile-patcher.php
source = php-apache.conf
source = https://php.net/distributions/php-7.3.33.tar.xz
+ source = php-libxml.patch
source = php71-phar-names.patch
source = openssl-sslv3-consts.patch
source = fpm-numeric-uid-gid.patch
@@ -89,6 +90,7 @@ pkgbase = php73
sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
sha256sums = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc
+ sha256sums = e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba
sha256sums = ee6529d441b2446d784e80aba23aa956541e541bd73ad54aee480d4a1a6117ca
sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
sha256sums = d175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242
diff --git a/PKGBUILD b/PKGBUILD
index a3f4c240aca5..a76a8131c073 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
###############################################################################
# Generated by arch-phpbs: https://github.com/lamskoy/arch-phpbs
#
-# Maintaining/co-maintaining on AUR: php81 php80 php74 php73 php72 php71 php70 php55 php54 php53
+# Maintaining/co-maintaining on AUR: all packages from php53 up to php82
#
# Thanks to:
#
@@ -9,9 +9,12 @@
# AUR php70 and php71 Co-maintainer: William Gathoye <william@gathoye.be>
# AUR php74 Co-maintainer: Tomasz Gruszka <tompear79@gmail.com>
# AUR php73 Co-maintainer: Matt Harrison <matt@harrison.us.com>
-# AUR php73 Contirubutor: Pierre Schmitz <pierre@archlinux.de>
-# AUR php55 Original maintainer: Raphaël Doursenaud <rdoursenaud@gmail.com>
-# AUR php53 Original maintainer: Felix Yan <felixonmars@archlinux.org>
+# AUR php73 and php56 Contributor: Pierre Schmitz <pierre@archlinux.de>
+# AUR php56 Contributor: Chris Severance aur.severach aATt spamgourmet dott com
+# AUR php56 Contributor: Thore Bödecker <me@foxxx0.de>
+# AUR php56 Contributor: Jörg Schuck <joerg_schuck [at] web.de>
+# AUR php55 Contributor: Raphaël Doursenaud <rdoursenaud@gmail.com>
+# AUR php53 Contriburor: Felix Yan <felixonmars@archlinux.org>
###############################################################################
_phpbase="73"
_suffix=""
@@ -133,6 +136,7 @@ source=(
"php-makefile-patcher.php"
"php-apache.conf"
"https://php.net/distributions/php-${pkgver}.tar.xz"
+ "php-libxml.patch"
"php71-phar-names.patch"
"openssl-sslv3-consts.patch"
"fpm-numeric-uid-gid.patch"
@@ -210,6 +214,7 @@ makedepends=(
arch=(
)
_patches=(
+ "php-libxml.patch"
"php71-phar-names.patch"
"openssl-sslv3-consts.patch"
"fpm-numeric-uid-gid.patch"
@@ -691,6 +696,8 @@ build() {
}
check() {
+ export CFLAGS="${CFLAGS} -fPIC"
+ export CXXFLAGS="${CXXFLAGS} -fPIC"
pushd "build-cli"
# Check if sendmail was configured correctly (FS#47600)
export REPORT_EXIT_STATUS=1
@@ -1552,6 +1559,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
'6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
'166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc'
+ 'e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba'
'ee6529d441b2446d784e80aba23aa956541e541bd73ad54aee480d4a1a6117ca'
'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
'd175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242'
diff --git a/php-libxml.patch b/php-libxml.patch
new file mode 100644
index 000000000000..7a9c2fe20bdf
--- /dev/null
+++ b/php-libxml.patch
@@ -0,0 +1,23 @@
+diff --git a/ext/dom/document.c b/ext/dom/document.c
+index 64da4f051b..3c71f03ba3 100644
+--- a/ext/dom/document.c
++++ b/ext/dom/document.c
+@@ -26,6 +26,7 @@
+ #ifdef LIBXML_SCHEMAS_ENABLED
+ #include <libxml/relaxng.h>
+ #include <libxml/xmlschemas.h>
++#include <libxml/xmlsave.h>
+ #endif
+
+ typedef struct _idsIterator idsIterator;
+diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
+index af1cc7d6ac..b484568bb1 100644
+--- a/ext/libxml/php_libxml.h
++++ b/ext/libxml/php_libxml.h
+@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
+
+ #include "zend_smart_str.h"
+ #include <libxml/tree.h>
++#include <libxml/parser.h>
+
+ #define LIBXML_SAVE_NOEMPTYTAG 1<<2