summaryrefslogtreecommitdiffstats
path: root/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5')
-rw-r--r--meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch160
-rw-r--r--meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch16
2 files changed, 0 insertions, 176 deletions
diff --git a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
deleted file mode 100644
index 0e5d3ff153..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
+++ /dev/null
@@ -1,160 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit-cleanup.patch
7+++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp
8@@ -40,6 +40,7 @@
9
10 #include <unistd.h>
11 #include <stdlib.h>
12+#include <stdint.h>
13 #include <sys/ioctl.h>
14 #include <sys/types.h>
15 #include <sys/stat.h>
16@@ -176,7 +177,7 @@
17 MAP_SHARED, fd, 0);
18 data += dataoffset;
19
20- if ((int)data == -1) {
21+ if ((intptr_t)data == -1) {
22 perror("mapping /dev/fb0");
23 qWarning("Error: failed to map framebuffer device to memory.");
24 return FALSE;
25@@ -737,7 +738,7 @@
26 psize += 8; // for alignment
27 psize &= ~0x7; // align
28
29- unsigned int pos=(unsigned int)data;
30+ uintptr_t pos=(uintptr_t)data;
31 pos += psize;
32 entryp = ((int *)pos);
33 lowest = ((unsigned int *)pos)+1;
34--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit-cleanup.patch
35+++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp
36@@ -31,6 +31,7 @@
37 **********************************************************************/
38
39 #include "qsharedmemory_p.h"
40+#include <stdint.h>
41
42 #if !defined(QT_QWS_NO_SHM)
43
44@@ -132,7 +133,7 @@
45 shmId = shmget (key, shmSize, 0);
46
47 shmBase = shmat (shmId, 0, 0);
48- if ((int) shmBase == -1 || shmBase == 0)
49+ if ((intptr_t) shmBase == -1 || shmBase == 0)
50 return FALSE;
51 else
52 return TRUE;
53--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit-cleanup.patch
54+++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp
55@@ -107,6 +107,7 @@
56 #include <locale.h>
57 #include <errno.h>
58 #include <sys/time.h>
59+#include <stdint.h>
60
61 #if defined(Q_OS_QNX)
62 #include <sys/select.h>
63@@ -1879,7 +1880,7 @@
64 w = widgetAt(*qt_last_x, *qt_last_y, FALSE);
65 if ( !w )
66 w = desktop();
67- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle());
68+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle());
69 }
70
71 void QApplication::restoreOverrideCursor()
72@@ -1898,11 +1899,11 @@
73 cursorStack = 0;
74 qws_overrideCursor = FALSE;
75 if ( w->testWState(WState_OwnCursor) )
76- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle());
77+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle());
78 else
79 QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor);
80 } else {
81- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle());
82+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle());
83 }
84 }
85 #endif// QT_NO_CURSOR
86@@ -2130,7 +2131,7 @@
87 }
88 if ( !qws_overrideCursor ) {
89 if (curs)
90- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle());
91+ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle());
92 else
93 QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor);
94 }
95--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit-cleanup.patch
96+++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp
97@@ -49,6 +49,7 @@
98 #include "qgfx_qws.h"
99 #include "qtextengine_p.h"
100 #include "qfontengine_p.h"
101+#include <stdint.h>
102
103 QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript;
104
105@@ -133,7 +134,7 @@
106 req.pointSize = req.pixelSize*10;
107
108 if ( ! engineData ) {
109- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice );
110+ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice );
111
112 // look for the requested font in the engine data cache
113 engineData = QFontCache::instance->findEngineData( key );
114--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit-cleanup.patch
115+++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp
116@@ -32,6 +32,7 @@
117 #include "qwsdisplay_qws.h"
118 #include "qwsregionmanager_qws.h"
119 #include <stdlib.h>
120+#include <stdint.h>
121
122 #ifndef QT_NO_QWS_MULTIPROCESS
123 #include <sys/types.h>
124@@ -288,7 +289,7 @@
125 data = (unsigned char *)shmat( shmId, 0, 0 );
126 }
127
128- return ( shmId != -1 && (int)data != -1 );
129+ return ( shmId != -1 && (intptr_t)data != -1 );
130 #else
131 int dataSize = sizeof(QWSRegionHeader) // header
132 + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index
133--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit-cleanup.patch
134+++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp
135@@ -53,6 +53,7 @@
136 #include "qwsmanager_qws.h"
137 #include "qwsregionmanager_qws.h"
138 #include "qinputcontext_p.h"
139+#include <stdint.h>
140
141 void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp
142 int qt_sip_count( QWidget* ); // --- "" ---
143@@ -631,7 +632,7 @@
144 qt_mouseGrb->releaseMouse();
145
146 qwsDisplay()->grabMouse(this,TRUE);
147- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle());
148+ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle());
149 qt_mouseGrb = this;
150 qt_pressGrab = 0;
151 }
152@@ -1845,7 +1846,7 @@
153 QSize s( qt_screen->width(), qt_screen->height() );
154 QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s);
155 if ( r.contains(pos) )
156- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle());
157+ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle());
158 }
159 }
160 #endif
diff --git a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch b/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch
deleted file mode 100644
index b0ee6374ef..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200
7+++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200
8@@ -11,7 +11,7 @@
9 install: FORCE
10 @$(MAKE) qt.install
11
12-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
13+all: symlinks src-qmake src-moc sub-src sub-tools
14 @echo
15 @echo "The Qt library is now built in ./lib"
16 @echo "The Qt examples are built in the directories in ./examples"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 11:31:19 +0000