summaryrefslogtreecommitdiff
authoreilers <eilers>2003-11-17 16:08:21 (UTC)
committer eilers <eilers>2003-11-17 16:08:21 (UTC)
commit67c7079929e4140da96eda8671650329eff5b61b (patch) (unidiff)
treef51a4b858b414117c774a1f2c1d541213e390c1d
parent2296f8ea6926e8de45bcb2d5f78f709557fac21a (diff)
downloadopie-67c7079929e4140da96eda8671650329eff5b61b.zip
opie-67c7079929e4140da96eda8671650329eff5b61b.tar.gz
opie-67c7079929e4140da96eda8671650329eff5b61b.tar.bz2
Patches to get this qt-2.3.2 stuff for X11 compiled..
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--development/macosx/qt232-X11.patch122
1 files changed, 122 insertions, 0 deletions
diff --git a/development/macosx/qt232-X11.patch b/development/macosx/qt232-X11.patch
new file mode 100644
index 0000000..2816956
--- a/dev/null
+++ b/development/macosx/qt232-X11.patch
@@ -0,0 +1,122 @@
1diff -ru qt-2.3.2/include/qconfig.h qt-2.3.2_changed/include/qconfig.h
2 --- qt-2.3.2/include/qconfig.hFri Jan 26 14:43:06 2001
3 +++ qt-2.3.2_changed/include/qconfig.hSun Nov 16 12:57:23 2003
4@@ -1,10 +1 @@
5-// Empty leaves all features enabled. See doc/html/features.html for choices.
6-
7-// Note that disabling some features will produce a libqt that is not
8-// compatible with other libqt builds. Such modifications are only
9-// supported on Qt/Embedded where reducing the library size is important
10-// and where the application-suite is often a fixed set.
11-
12-#ifndef QT_DLL
13-#define QT_DLL // Internal
14-#endif
15+// Everything
16diff -ru qt-2.3.2/include/qglobal.h qt-2.3.2_changed/include/qglobal.h
17 --- qt-2.3.2/include/qglobal.hMon Oct 29 15:21:15 2001
18 +++ qt-2.3.2_changed/include/qglobal.hSat Oct 25 13:08:27 2003
19@@ -73,6 +73,8 @@
20
21 #if defined(macintosh)
22 #define _OS_MAC_
23+#elif defined(__APPLE__)
24+#define _OS_MACX_
25 #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
26 #define _OS_MSDOS_
27 #elif defined(OS2) || defined(_OS2) || defined(__OS2__)
28diff -ru qt-2.3.2/include/qmodules.h qt-2.3.2_changed/include/qmodules.h
29 --- qt-2.3.2/include/qmodules.hFri Aug 31 17:00:56 2001
30 +++ qt-2.3.2_changed/include/qmodules.hSun Nov 16 12:57:23 2003
31@@ -1,14 +1,12 @@
32-#ifndef QT_H
33-#endif // QT_H
34-
35+// These modules are licensed to you
36 #define QT_MODULE_TOOLS
37 #define QT_MODULE_KERNEL
38 #define QT_MODULE_WIDGETS
39 #define QT_MODULE_DIALOGS
40-
41 #define QT_MODULE_ICONVIEW
42 #define QT_MODULE_WORKSPACE
43-#define QT_MODULE_TABLE
44+#define QT_MODULE_NETWORK
45 #define QT_MODULE_CANVAS
46+#define QT_MODULE_TABLE
47 #define QT_MODULE_XML
48-#define QT_MODULE_NETWORK
49+#define QT_MODULE_OPENGL
50diff -ru qt-2.3.2/src/network/qdns.cpp qt-2.3.2_changed/src/network/qdns.cpp
51 --- qt-2.3.2/src/network/qdns.cppMon Oct 29 15:21:14 2001
52 +++ qt-2.3.2_changed/src/network/qdns.cppSun Nov 16 13:11:41 2003
53@@ -1981,7 +1981,7 @@
54 domains = new QStrList( TRUE );
55 domains->setAutoDelete( TRUE );
56
57- res_init();
58+ //res_init(); (se)
59 int i;
60 // find the name servers to use
61 for( i=0; i < MAXNS && i < _res.nscount; i++ ) {
62diff -ru qt-2.3.2/src/network/qsocketdevice_unix.cpp qt-2.3.2_changed/src/network/qsocketdevice_unix.cpp
63 --- qt-2.3.2/src/network/qsocketdevice_unix.cppMon Oct 29 15:21:14 2001
64 +++ qt-2.3.2_changed/src/network/qsocketdevice_unix.cppSat Oct 25 13:08:27 2003
65@@ -112,7 +112,7 @@
66 #if defined(_OS_LINUX_) && defined(__GLIBC__) && ( __GLIBC__ >= 2 )
67 // new linux is Single Unix 1998, not old linux
68 # define SOCKLEN_T socklen_t
69-#elif defined(BSD4_4)
70+#elif defined(BSD4_4) && !defined(_OS_MACX_)
71 // BSD 4.4
72 # if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000
73 // FreeBSD 4.0 and higher
74diff -ru qt-2.3.2/src/tools/qconfig.h qt-2.3.2_changed/src/tools/qconfig.h
75 --- qt-2.3.2/src/tools/qconfig.hFri Jan 26 14:43:06 2001
76 +++ qt-2.3.2_changed/src/tools/qconfig.hSun Nov 16 12:57:23 2003
77@@ -1,10 +1 @@
78-// Empty leaves all features enabled. See doc/html/features.html for choices.
79-
80-// Note that disabling some features will produce a libqt that is not
81-// compatible with other libqt builds. Such modifications are only
82-// supported on Qt/Embedded where reducing the library size is important
83-// and where the application-suite is often a fixed set.
84-
85-#ifndef QT_DLL
86-#define QT_DLL // Internal
87-#endif
88+// Everything
89diff -ru qt-2.3.2/src/tools/qglobal.h qt-2.3.2_changed/src/tools/qglobal.h
90 --- qt-2.3.2/src/tools/qglobal.hMon Oct 29 15:21:15 2001
91 +++ qt-2.3.2_changed/src/tools/qglobal.hSat Oct 25 13:08:27 2003
92@@ -73,6 +73,8 @@
93
94 #if defined(macintosh)
95 #define _OS_MAC_
96+#elif defined(__APPLE__)
97+#define _OS_MACX_
98 #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
99 #define _OS_MSDOS_
100 #elif defined(OS2) || defined(_OS2) || defined(__OS2__)
101diff -ru qt-2.3.2/src/tools/qmodules.h qt-2.3.2_changed/src/tools/qmodules.h
102 --- qt-2.3.2/src/tools/qmodules.hFri Aug 31 17:00:56 2001
103 +++ qt-2.3.2_changed/src/tools/qmodules.hSun Nov 16 12:57:23 2003
104@@ -1,14 +1,12 @@
105-#ifndef QT_H
106-#endif // QT_H
107-
108+// These modules are licensed to you
109 #define QT_MODULE_TOOLS
110 #define QT_MODULE_KERNEL
111 #define QT_MODULE_WIDGETS
112 #define QT_MODULE_DIALOGS
113-
114 #define QT_MODULE_ICONVIEW
115 #define QT_MODULE_WORKSPACE
116-#define QT_MODULE_TABLE
117+#define QT_MODULE_NETWORK
118 #define QT_MODULE_CANVAS
119+#define QT_MODULE_TABLE
120 #define QT_MODULE_XML
121-#define QT_MODULE_NETWORK
122+#define QT_MODULE_OPENGL