[packages/php/PHP_7_4] add missing includes to fix build with libxml2 >= 2.12

atler atler at pld-linux.org
Sun Nov 26 21:14:05 CET 2023


commit 0db379d6e795cdaed8cc619d1ce763e7232f2170
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Nov 23 22:02:54 2023 +0100

    add missing includes to fix build with libxml2 >= 2.12

 missing-includes.patch | 22 ++++++++++++++++++++++
 php.spec               |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/php.spec b/php.spec
index 4a11865..c86e0e5 100644
--- a/php.spec
+++ b/php.spec
@@ -203,6 +203,7 @@ Patch67:	mysql-lib-ver-mismatch.patch
 Patch68:	php-mysql-ssl-context.patch
 Patch71:	libdb-info.patch
 Patch72:	openssl.patch
+Patch73:	missing-includes.patch
 URL:		https://www.php.net/
 %{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1919,6 +1920,7 @@ cp -p php.ini-production php.ini
 #%patch68 -p1 DROP or update to 7.0 APIs
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
       ext/ext_skel.php \
diff --git a/missing-includes.patch b/missing-includes.patch
new file mode 100644
index 0000000..1ffb854
--- /dev/null
+++ b/missing-includes.patch
@@ -0,0 +1,22 @@
+diff -ur php-8.2.12.orig/ext/dom/document.c php-8.2.12/ext/dom/document.c
+--- php-8.2.12.orig/ext/dom/document.c	2023-10-24 21:22:16.000000000 +0200
++++ php-8.2.12/ext/dom/document.c	2023-11-23 21:35:57.407063192 +0100
+@@ -23,6 +23,7 @@
+ #if HAVE_LIBXML && HAVE_DOM
+ #include "php_dom.h"
+ #include <libxml/SAX.h>
++#include <libxml/xmlsave.h>
+ #ifdef LIBXML_SCHEMAS_ENABLED
+ #include <libxml/relaxng.h>
+ #include <libxml/xmlschemas.h>
+diff -ur php-8.2.12.orig/ext/libxml/php_libxml.h php-8.2.12/ext/libxml/php_libxml.h
+--- php-8.2.12.orig/ext/libxml/php_libxml.h	2023-10-24 21:22:16.000000000 +0200
++++ php-8.2.12/ext/libxml/php_libxml.h	2023-11-23 21:35:57.407063192 +0100
+@@ -34,6 +34,7 @@
+ #endif
+ 
+ #include "zend_smart_str.h"
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ 
+ #define LIBXML_SAVE_NOEMPTYTAG 1<<2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/0db379d6e795cdaed8cc619d1ce763e7232f2170



More information about the pld-cvs-commit mailing list