summaryrefslogtreecommitdiff
path: root/qt/qt-2.3.10.patch
Unidiff
Diffstat (limited to 'qt/qt-2.3.10.patch') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.10.patch/gcc4_amd64.patch180
1 files changed, 180 insertions, 0 deletions
diff --git a/qt/qt-2.3.10.patch/gcc4_amd64.patch b/qt/qt-2.3.10.patch/gcc4_amd64.patch
new file mode 100644
index 0000000..5897f59
--- a/dev/null
+++ b/qt/qt-2.3.10.patch/gcc4_amd64.patch
@@ -0,0 +1,180 @@
1--- qte/src/kernel/qmemorymanager_qws.h~gcc4
2+++ qte/src/kernel/qmemorymanager_qws.h
3@@ -126,8 +126,8 @@
4 // constructs from a memory ptr to where the data after the item starts
5 QSMCacheItemPtr(void *data) {
6 char *ptr = (char*)data;
7 -if ( (int)ptr != (((int)ptr+3)&~3) )
8 - qDebug("err, passed a non-aligned data ptr %x", (int)ptr);
9 +if ( (long)ptr != (((long)ptr+3)&~3) )
10 + qDebug("err, passed a non-aligned data ptr %x", (long)ptr);
11 d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem));
12 }
13 // returns a pointer to the data after the item
14--- qte/src/kernel/qgfxlinuxfb_qws.cpp~gcc4
15+++ qte/src/kernel/qgfxlinuxfb_qws.cpp
16@@ -164,7 +164,7 @@
17 MAP_SHARED, fd, 0);
18 data += dataoffset;
19
20- if ((int)data == -1) {
21+ if ((long)data == -1) {
22 perror("mapping /dev/fb0");
23 qWarning("Error: failed to map framebuffer device to memory.");
24 return FALSE;
25@@ -703,7 +703,7 @@
26 psize += 8; // for alignment
27 psize &= ~0x7; // align
28
29- unsigned int pos=(unsigned int)data;
30+ long pos=(long)data;
31 pos += psize;
32 entryp = ((int *)pos);
33 lowest = ((unsigned int *)pos)+1;
34--- qte/src/kernel/qgfxvfb_qws.cpp~gcc4
35+++ qte/src/kernel/qgfxvfb_qws.cpp
36@@ -277,7 +277,7 @@
37 else
38 return FALSE;
39
40- if ( (int)shmrgn == -1 || shmrgn == 0 )
41+ if ( (long)shmrgn == -1 || shmrgn == 0 )
42 return FALSE;
43
44 hdr = (QVFbHeader *) shmrgn;
45@@ -303,7 +303,7 @@
46
47 void QVFbScreen::disconnect()
48 {
49- if ( (int)shmrgn != -1 && shmrgn ) {
50+ if ( (long)shmrgn != -1 && shmrgn ) {
51 shmdt((char*)shmrgn );
52 shmrgn = 0;
53 }
54--- qte/src/kernel/qapplication_qws.cpp~gcc4
55+++ qte/src/kernel/qapplication_qws.cpp
56@@ -2041,7 +2041,7 @@
57 w = widgetAt(*qt_last_x, *qt_last_y, FALSE);
58 if ( !w )
59 w = desktop();
60- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle());
61+ QPaintDevice::qwsDisplay()->selectCursor(w, (long)app_cursor->handle());
62 }
63
64 void QApplication::restoreOverrideCursor()
65@@ -2060,11 +2060,11 @@
66 cursorStack = 0;
67 qws_overrideCursor = FALSE;
68 if ( w->testWState(WState_OwnCursor) )
69 - QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle());
70 + QPaintDevice::qwsDisplay()->selectCursor(w, (long)w->cursor().handle());
71 else
72 QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor);
73 } else {
74 -QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle());
75 +QPaintDevice::qwsDisplay()->selectCursor(w, (long)app_cursor->handle());
76 }
77 }
78 #endif// QT_NO_CURSOR
79@@ -2635,7 +2635,7 @@
80 }
81 if ( !qws_overrideCursor ) { // is override cursor active?
82 if (curs)
83 - QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle());
84 + QPaintDevice::qwsDisplay()->selectCursor(widget, (long)curs->handle());
85 else
86 QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor);
87 }
88--- qte/src/kernel/qwidget_qws.cpp~gcc4
89+++ qte/src/kernel/qwidget_qws.cpp
90@@ -633,7 +633,7 @@
91 qt_mouseGrb->releaseMouse();
92
93 qwsDisplay()->grabMouse(this,TRUE);
94- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle());
95+ qwsDisplay()->selectCursor(this, (long)cursor.handle());
96 qt_mouseGrb = this;
97 qt_pressGrab = 0;
98 }
99@@ -1840,11 +1840,11 @@
100 void QWidget::updateCursor( const QRegion &r ) const
101 {
102 if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) &&
103 - qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) {
104 + qt_last_cursor != (long)cursor().handle() && !qws_overrideCursor ) {
105 QSize s( qt_screen->width(), qt_screen->height() );
106 QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s);
107 if ( r.contains(pos) )
108 - qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle());
109 + qwsDisplay()->selectCursor((QWidget*)this, (long)cursor().handle());
110 }
111 }
112 #endif
113--- qte/src/kernel/qwidget_qws.h
114+++ /dev/null
115--- qte/src/kernel/qsharedmemory.cpp~gcc4
116+++ qte/src/kernel/qsharedmemory.cpp
117@@ -123,7 +123,7 @@
118 shmId = shmget (key, shmSize, 0);
119
120 shmBase = shmat (shmId, 0, 0);
121- if ((int) shmBase == -1 || shmBase == 0)
122+ if ((long) shmBase == -1 || shmBase == 0)
123 return FALSE;
124 else
125 return TRUE;
126--- qte/src/kernel/qwsregionmanager_qws.cpp~gcc4
127+++ qte/src/kernel/qwsregionmanager_qws.cpp
128@@ -286,7 +286,7 @@
129 data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY );
130 }
131
132- return ( shmId != -1 && (int)data != -1 );
133+ return ( shmId != -1 && (long)data != -1 );
134 #else
135 int dataSize = sizeof(QWSRegionHeader) // header
136 + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index
137--- qte/src/kernel/qpixmapcache.cpp~gcc4
138+++ qte/src/kernel/qpixmapcache.cpp
139@@ -519,7 +519,7 @@
140 #endif // DEBUG_SHARED_MEMORY_CACHE
141 }
142
143- if ( shmId == -1 || (int)shm == -1 )
144+ if ( shmId == -1 || (long)shm == -1 )
145 qFatal("Cannot attach to shared memory");
146
147 qt_sharedMemoryData = shm->data;
148@@ -536,8 +536,8 @@
149 shm->tail.setFree(false);
150 shm->tail.setNextFree(QSMemPtr());
151 #ifdef THROW_AWAY_UNUSED_PAGES
152 -int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode));
153 -int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart;
154 +int freePageStart = PAGE_ALIGN((long)&shm->first + sizeof(QSMemNode));
155 +int freePagesLength = PAGE_ALIGN((long)&shm->tail) - freePageStart;
156 if ( freePagesLength ) {
157 # ifdef DEBUG_SHARED_MEMORY_CACHE
158 qDebug("Initially marking free pages as not needed");
159@@ -770,8 +770,8 @@
160 node = newFreeNode->next();
161
162 #ifdef THROW_AWAY_UNUSED_PAGES
163- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode));
164- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart;
165+ int freePageStart = PAGE_ALIGN((long)newFreeNode+sizeof(QSMemNode));
166+ int freePagesLength = PAGE_ALIGN((long)node) - freePageStart;
167 if ( freePagesLength ) {
168 #ifdef DEBUG_SHARED_MEMORY_CACHE
169 qDebug("Marking pages not needed");
170--- qte/tools/qvfb/qvfbview.cpp~gcc4
171+++ qte/tools/qvfb/qvfbview.cpp
172@@ -136,7 +136,7 @@
173 data = (unsigned char *)shmat( shmId, 0, 0 );
174 }
175
176- if ( (int)data == -1 ){
177+ if ( (long)data == -1 ){
178 ::close(mouseFd);
179 ::close(keyboardFd);
180 qFatal( "Cannot attach to shared memory %d",shmId );