Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-embedded/files: qt-embedded-3.3.8-castfix.patch
Date: Fri, 27 Mar 2009 23:54:56
Message-Id: E1LnLt0-0000gq-4Z@stork.gentoo.org
1 yngwin 09/03/27 23:54:54
2
3 Added: qt-embedded-3.3.8-castfix.patch
4 Log:
5 Add patch to fix bug 164113. Re-adding ~amd64 keyword.
6 (Portage version: 2.2_rc27/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-libs/qt-embedded/files/qt-embedded-3.3.8-castfix.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-embedded/files/qt-embedded-3.3.8-castfix.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-embedded/files/qt-embedded-3.3.8-castfix.patch?rev=1.1&content-type=text/plain
13
14 Index: qt-embedded-3.3.8-castfix.patch
15 ===================================================================
16 diff -Nru qt-embedded-free-3.3.8.orig/src/embedded/qgfxlinuxfb_qws.cpp qt-embedded-free-3.3.8/src/embedded/qgfxlinuxfb_qws.cpp
17 --- qt-embedded-free-3.3.8.orig/src/embedded/qgfxlinuxfb_qws.cpp 2007-06-03 22:12:08.000000000 +0200
18 +++ qt-embedded-free-3.3.8/src/embedded/qgfxlinuxfb_qws.cpp 2007-06-03 22:51:39.000000000 +0200
19 @@ -176,7 +176,7 @@
20 MAP_SHARED, fd, 0);
21 data += dataoffset;
22
23 - if ((int)data == -1) {
24 + if ((long)data == -1) {
25 perror("mapping /dev/fb0");
26 qWarning("Error: failed to map framebuffer device to memory.");
27 return FALSE;
28 @@ -737,7 +737,7 @@
29 psize += 8; // for alignment
30 psize &= ~0x7; // align
31
32 - unsigned int pos=(unsigned int)data;
33 + unsigned int pos=(unsigned long)data;
34 pos += psize;
35 entryp = ((int *)pos);
36 lowest = ((unsigned int *)pos)+1;
37 diff -Nru qt-embedded-free-3.3.8.orig/src/embedded/qgfxvfb_qws.cpp qt-embedded-free-3.3.8/src/embedded/qgfxvfb_qws.cpp
38 --- qt-embedded-free-3.3.8.orig/src/embedded/qgfxvfb_qws.cpp 2007-06-03 22:12:08.000000000 +0200
39 +++ qt-embedded-free-3.3.8/src/embedded/qgfxvfb_qws.cpp 2007-06-03 22:58:14.000000000 +0200
40 @@ -411,8 +411,8 @@
41 else
42 return FALSE;
43
44 - if ( (int)shmrgn == -1 || shmrgn == 0 ) {
45 - qDebug("No shmrgn %d", (int)shmrgn);
46 + if ( (long)shmrgn == -1 || shmrgn == 0 ) {
47 + qDebug("No shmrgn %d", (long)shmrgn);
48 return FALSE;
49 }
50
51 @@ -444,7 +444,7 @@
52
53 void QVFbScreen::disconnect()
54 {
55 - if ( (int)shmrgn != -1 && shmrgn )
56 + if ( (long)shmrgn != -1 && shmrgn )
57 shmdt( (char*)shmrgn );
58 if ( qApp->type() == QApplication::GuiServer ) {
59 delete mouseHandler;
60 diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qapplication_qws.cpp qt-embedded-free-3.3.8/src/kernel/qapplication_qws.cpp
61 --- qt-embedded-free-3.3.8.orig/src/kernel/qapplication_qws.cpp 2007-06-03 22:12:08.000000000 +0200
62 +++ qt-embedded-free-3.3.8/src/kernel/qapplication_qws.cpp 2007-06-03 22:13:52.000000000 +0200
63 @@ -1879,7 +1879,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, (long)app_cursor->handle());
69 }
70
71 void QApplication::restoreOverrideCursor()
72 @@ -1898,11 +1898,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, (long)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, (long)app_cursor->handle());
83 }
84 }
85 #endif// QT_NO_CURSOR
86 @@ -2130,7 +2130,7 @@
87 }
88 if ( !qws_overrideCursor ) {
89 if (curs)
90 - QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle());
91 + QPaintDevice::qwsDisplay()->selectCursor(widget, (long)curs->handle());
92 else
93 QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor);
94 }
95 diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qfont_qws.cpp qt-embedded-free-3.3.8/src/kernel/qfont_qws.cpp
96 --- qt-embedded-free-3.3.8.orig/src/kernel/qfont_qws.cpp 2007-06-03 22:12:08.000000000 +0200
97 +++ qt-embedded-free-3.3.8/src/kernel/qfont_qws.cpp 2007-06-03 22:25:28.000000000 +0200
98 @@ -133,7 +133,7 @@
99 req.pointSize = req.pixelSize*10;
100
101 if ( ! engineData ) {
102 - QFontCache::Key key( req, QFont::NoScript, (int)paintdevice, paintdevice );
103 + QFontCache::Key key( req, QFont::NoScript, (long)paintdevice, paintdevice );
104
105 // look for the requested font in the engine data cache
106 engineData = QFontCache::instance->findEngineData( key );
107 diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qsharedmemory_p.cpp qt-embedded-free-3.3.8/src/kernel/qsharedmemory_p.cpp
108 --- qt-embedded-free-3.3.8.orig/src/kernel/qsharedmemory_p.cpp 2007-06-03 22:12:08.000000000 +0200
109 +++ qt-embedded-free-3.3.8/src/kernel/qsharedmemory_p.cpp 2007-06-03 22:45:21.000000000 +0200
110 @@ -132,7 +132,7 @@
111 shmId = shmget (key, shmSize, 0);
112
113 shmBase = shmat (shmId, 0, 0);
114 - if ((int) shmBase == -1 || shmBase == 0)
115 + if ((long) shmBase == -1 || shmBase == 0)
116 return FALSE;
117 else
118 return TRUE;
119 diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qwidget_qws.cpp qt-embedded-free-3.3.8/src/kernel/qwidget_qws.cpp
120 --- qt-embedded-free-3.3.8.orig/src/kernel/qwidget_qws.cpp 2007-06-03 22:12:08.000000000 +0200
121 +++ qt-embedded-free-3.3.8/src/kernel/qwidget_qws.cpp 2007-06-03 22:36:03.000000000 +0200
122 @@ -631,7 +631,7 @@
123 qt_mouseGrb->releaseMouse();
124
125 qwsDisplay()->grabMouse(this,TRUE);
126 - qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle());
127 + qwsDisplay()->selectCursor(this, (unsigned long)cursor.handle());
128 qt_mouseGrb = this;
129 qt_pressGrab = 0;
130 }
131 @@ -1845,7 +1845,7 @@
132 QSize s( qt_screen->width(), qt_screen->height() );
133 QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s);
134 if ( r.contains(pos) )
135 - qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle());
136 + qwsDisplay()->selectCursor((QWidget*)this, (unsigned long)cursor().handle());
137 }
138 }
139 #endif
140 diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qwsregionmanager_qws.cpp qt-embedded-free-3.3.8/src/kernel/qwsregionmanager_qws.cpp
141 --- qt-embedded-free-3.3.8.orig/src/kernel/qwsregionmanager_qws.cpp 2007-06-03 22:12:08.000000000 +0200
142 +++ qt-embedded-free-3.3.8/src/kernel/qwsregionmanager_qws.cpp 2007-06-03 22:40:42.000000000 +0200
143 @@ -288,7 +288,7 @@
144 data = (unsigned char *)shmat( shmId, 0, 0 );
145 }
146
147 - return ( shmId != -1 && (int)data != -1 );
148 + return ( shmId != -1 && (long)data != -1 );
149 #else
150 int dataSize = sizeof(QWSRegionHeader) // header
151 + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index
Report Message
Find on MARC Find on Google Groups