[packages/php4] - hack flex scanners to avoid colliding global symbol - enhanced qt patch to fix build with -fno-com

[qboosh]

commit 209de947526a942b1ab97c4458d9eea1b5d3fc79
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Oct 22 21:57:03 2020 +0200

    - hack flex scanners to avoid colliding global symbol
    - enhanced qt patch to fix build with -fno-common

 php4-qt.patch | 20 ++++++++++++++++++++
 php4.spec     |  3 +++
 2 files changed, 23 insertions(+)
---
diff --git a/php4.spec b/php4.spec
index 5321df6..dfbc9ab 100644
--- a/php4.spec
+++ b/php4.spec
@@ -1655,6 +1655,9 @@ zcat %{SOURCE8} | patch -p1
 
 cp -f Zend/LICENSE{,.Zend}
 
+# make colliding symbol static
+%{__sed} -i -e 's/^char \*yytext/static &/' Zend/zend_{ini,language}_scanner.c
+
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
 if [ $API != %{php_api_version} ]; then
diff --git a/php4-qt.patch b/php4-qt.patch
index aaf9471..4daa9da 100644
--- a/php4-qt.patch
+++ b/php4-qt.patch
@@ -19,3 +19,23 @@
    PHP_ADD_INCLUDE($QTDOM_INCDIR)
    PHP_NEW_EXTENSION(qtdom, qtdom.c qtdom_qt.cpp, $ext_shared)
    PHP_SUBST(QTDOM_SHARED_LIBADD)
+--- php-4.4.9/ext/qtdom/qtdom_qt.h.orig	2001-01-04 13:29:07.000000000 +0100
++++ php-4.4.9/ext/qtdom/qtdom_qt.h	2020-10-22 21:19:25.667779334 +0200
+@@ -62,6 +62,6 @@
+ struct qdom_doc *qdom_do_init( const char *arg );
+ void qdom_do_free( struct qdom_doc *doc );
+ 
+-struct qdom_message *g_qdom_message_log;
++extern struct qdom_message *g_qdom_message_log;
+ 
+ #endif // QDOM_QT_H
+--- php-4.4.9/ext/qtdom/qtdom_qt.cpp.orig	2001-01-04 13:30:19.000000000 +0100
++++ php-4.4.9/ext/qtdom/qtdom_qt.cpp	2020-10-22 21:20:56.769184131 +0200
+@@ -22,6 +22,7 @@
+ #include <qglobal.h>
+ 
+ struct qdom_node *qdom_to_node( QDomNode *node );
++struct qdom_message *g_qdom_message_log;
+ 
+ /*!
+   Initialises certain global variables, they are:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/209de947526a942b1ab97c4458d9eea1b5d3fc79