]> git.pld-linux.org Git - packages/php4.git/blob - php4-qt.patch
- x32 fixes
[packages/php4.git] / php4-qt.patch
1 --- php-4.3.3RC3/ext/qtdom/config.m4~   2002-11-18 06:06:37.000000000 +0100
2 +++ php-4.3.3RC3/ext/qtdom/config.m4    2003-08-17 11:40:07.000000000 +0200
3 @@ -11,6 +11,9 @@
4        if test -f $QTDIR/include/qdom.h; then
5          QTDOM_LIBDIR=$QTDIR/lib
6          QTDOM_INCDIR=$QTDIR/include
7 +      elif test -f /usr/include/qt/qdom.h; then
8 +        QTDOM_LIBDIR=/usr/lib
9 +        QTDOM_INCDIR=/usr/include/qt
10        elif test -f /usr/lib/qt2/include/qdom.h; then
11          QTDOM_LIBDIR=/usr/lib
12          QTDOM_INCDIR=/usr/lib/qt2/include
13 @@ -28,7 +31,7 @@
14      AC_MSG_ERROR([qdom.h not found.])
15    fi
16  
17 -  PHP_ADD_LIBRARY_WITH_PATH(qt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
18 +  PHP_ADD_LIBRARY_WITH_PATH(qt-mt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
19    PHP_ADD_INCLUDE($QTDOM_INCDIR)
20    PHP_NEW_EXTENSION(qtdom, qtdom.c qtdom_qt.cpp, $ext_shared)
21    PHP_SUBST(QTDOM_SHARED_LIBADD)
22 --- php-4.4.9/ext/qtdom/qtdom_qt.h.orig 2001-01-04 13:29:07.000000000 +0100
23 +++ php-4.4.9/ext/qtdom/qtdom_qt.h      2020-10-22 21:19:25.667779334 +0200
24 @@ -62,6 +62,6 @@
25  struct qdom_doc *qdom_do_init( const char *arg );
26  void qdom_do_free( struct qdom_doc *doc );
27  
28 -struct qdom_message *g_qdom_message_log;
29 +extern struct qdom_message *g_qdom_message_log;
30  
31  #endif // QDOM_QT_H
32 --- php-4.4.9/ext/qtdom/qtdom_qt.cpp.orig       2001-01-04 13:30:19.000000000 +0100
33 +++ php-4.4.9/ext/qtdom/qtdom_qt.cpp    2020-10-22 21:20:56.769184131 +0200
34 @@ -22,6 +22,7 @@
35  #include <qglobal.h>
36  
37  struct qdom_node *qdom_to_node( QDomNode *node );
38 +struct qdom_message *g_qdom_message_log;
39  
40  /*!
41    Initialises certain global variables, they are:
This page took 0.039799 seconds and 3 git commands to generate.