From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LnLt1-00089y-RI for garchives@archives.gentoo.org; Fri, 27 Mar 2009 23:54:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59FCBE0528; Fri, 27 Mar 2009 23:54:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1495FE0528 for ; Fri, 27 Mar 2009 23:54:55 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9863764C86 for ; Fri, 27 Mar 2009 23:54:54 +0000 (UTC) Received: from yngwin by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LnLt0-0000gq-4Z for gentoo-commits@lists.gentoo.org; Fri, 27 Mar 2009 23:54:54 +0000 From: "Ben de Groot (yngwin)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, yngwin@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-embedded/files: qt-embedded-3.3.8-castfix.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: qt-embedded-3.3.8-castfix.patch X-VCS-Directories: x11-libs/qt-embedded/files X-VCS-Committer: yngwin X-VCS-Committer-Name: Ben de Groot Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ben de Groot Date: Fri, 27 Mar 2009 23:54:54 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b329595a-daf1-453f-8409-67320d86704f X-Archives-Hash: b1391790758a003365311626911337a1 yngwin 09/03/27 23:54:54 Added: qt-embedded-3.3.8-castfix.patch Log: Add patch to fix bug 164113. Re-adding ~amd64 keyword. (Portage version: 2.2_rc27/cvs/Linux x86_64) Revision Changes Path 1.1 x11-libs/qt-embedded/files/qt-embedded-3.3.8-castfix= .patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-embedd= ed/files/qt-embedded-3.3.8-castfix.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-embedd= ed/files/qt-embedded-3.3.8-castfix.patch?rev=3D1.1&content-type=3Dtext/pl= ain Index: qt-embedded-3.3.8-castfix.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 --- qt-embedded-free-3.3.8.orig/src/embedded/qgfxlinuxfb_qws.cpp 2007-06-= 03 22:12:08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/embedded/qgfxlinuxfb_qws.cpp 2007-06-03 22= :51:39.000000000 +0200 @@ -176,7 +176,7 @@ MAP_SHARED, fd, 0); data +=3D dataoffset; =20 - if ((int)data =3D=3D -1) { + if ((long)data =3D=3D -1) { perror("mapping /dev/fb0"); qWarning("Error: failed to map framebuffer device to memory."); return FALSE; @@ -737,7 +737,7 @@ psize +=3D 8; // for alignment psize &=3D ~0x7; // align =20 - unsigned int pos=3D(unsigned int)data; + unsigned int pos=3D(unsigned long)data; pos +=3D psize; entryp =3D ((int *)pos); lowest =3D ((unsigned int *)pos)+1; diff -Nru qt-embedded-free-3.3.8.orig/src/embedded/qgfxvfb_qws.cpp qt-emb= edded-free-3.3.8/src/embedded/qgfxvfb_qws.cpp --- qt-embedded-free-3.3.8.orig/src/embedded/qgfxvfb_qws.cpp 2007-06-03 2= 2:12:08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/embedded/qgfxvfb_qws.cpp 2007-06-03 22:58:= 14.000000000 +0200 @@ -411,8 +411,8 @@ else return FALSE; =20 - if ( (int)shmrgn =3D=3D -1 || shmrgn =3D=3D 0 ) { - qDebug("No shmrgn %d", (int)shmrgn); + if ( (long)shmrgn =3D=3D -1 || shmrgn =3D=3D 0 ) { + qDebug("No shmrgn %d", (long)shmrgn); return FALSE; } =20 @@ -444,7 +444,7 @@ =20 void QVFbScreen::disconnect() { - if ( (int)shmrgn !=3D -1 && shmrgn ) + if ( (long)shmrgn !=3D -1 && shmrgn ) shmdt( (char*)shmrgn ); if ( qApp->type() =3D=3D QApplication::GuiServer ) { delete mouseHandler; 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 --- qt-embedded-free-3.3.8.orig/src/kernel/qapplication_qws.cpp 2007-06-0= 3 22:12:08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/kernel/qapplication_qws.cpp 2007-06-03 22:= 13:52.000000000 +0200 @@ -1879,7 +1879,7 @@ w =3D widgetAt(*qt_last_x, *qt_last_y, FALSE); if ( !w ) w =3D desktop(); - QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle(= )); + QPaintDevice::qwsDisplay()->selectCursor(w, (long)app_cursor->handle= ()); } =20 void QApplication::restoreOverrideCursor() @@ -1898,11 +1898,11 @@ cursorStack =3D 0; qws_overrideCursor =3D FALSE; if ( w->testWState(WState_OwnCursor) ) - QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle= ()); + QPaintDevice::qwsDisplay()->selectCursor(w, (long)w->cursor().handl= e()); else QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); } else { - QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); + QPaintDevice::qwsDisplay()->selectCursor(w, (long)app_cursor->handle())= ; } } #endif// QT_NO_CURSOR @@ -2130,7 +2130,7 @@ } if ( !qws_overrideCursor ) { if (curs) - QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handl= e()); + QPaintDevice::qwsDisplay()->selectCursor(widget, (long)curs->hand= le()); else QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); } diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qfont_qws.cpp qt-embedde= d-free-3.3.8/src/kernel/qfont_qws.cpp --- qt-embedded-free-3.3.8.orig/src/kernel/qfont_qws.cpp 2007-06-03 22:12= :08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/kernel/qfont_qws.cpp 2007-06-03 22:25:28.0= 00000000 +0200 @@ -133,7 +133,7 @@ req.pointSize =3D req.pixelSize*10; =20 if ( ! engineData ) { - QFontCache::Key key( req, QFont::NoScript, (int)paintdevice, paintdevic= e ); + QFontCache::Key key( req, QFont::NoScript, (long)paintdevice, paintdevi= ce ); =20 // look for the requested font in the engine data cache engineData =3D QFontCache::instance->findEngineData( key ); diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qsharedmemory_p.cpp qt-e= mbedded-free-3.3.8/src/kernel/qsharedmemory_p.cpp --- qt-embedded-free-3.3.8.orig/src/kernel/qsharedmemory_p.cpp 2007-06-03= 22:12:08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/kernel/qsharedmemory_p.cpp 2007-06-03 22:4= 5:21.000000000 +0200 @@ -132,7 +132,7 @@ shmId =3D shmget (key, shmSize, 0); =20 shmBase =3D shmat (shmId, 0, 0); - if ((int) shmBase =3D=3D -1 || shmBase =3D=3D 0) + if ((long) shmBase =3D=3D -1 || shmBase =3D=3D 0) return FALSE; else return TRUE; diff -Nru qt-embedded-free-3.3.8.orig/src/kernel/qwidget_qws.cpp qt-embed= ded-free-3.3.8/src/kernel/qwidget_qws.cpp --- qt-embedded-free-3.3.8.orig/src/kernel/qwidget_qws.cpp 2007-06-03 22:= 12:08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/kernel/qwidget_qws.cpp 2007-06-03 22:36:03= .000000000 +0200 @@ -631,7 +631,7 @@ qt_mouseGrb->releaseMouse(); =20 qwsDisplay()->grabMouse(this,TRUE); - qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); + qwsDisplay()->selectCursor(this, (unsigned long)cursor.handle()); qt_mouseGrb =3D this; qt_pressGrab =3D 0; } @@ -1845,7 +1845,7 @@ QSize s( qt_screen->width(), qt_screen->height() ); QPoint pos =3D qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s= ); if ( r.contains(pos) ) - qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().h= andle()); + qwsDisplay()->selectCursor((QWidget*)this, (unsigned long)cursor().= handle()); } } #endif 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 --- qt-embedded-free-3.3.8.orig/src/kernel/qwsregionmanager_qws.cpp 2007-= 06-03 22:12:08.000000000 +0200 +++ qt-embedded-free-3.3.8/src/kernel/qwsregionmanager_qws.cpp 2007-06-03= 22:40:42.000000000 +0200 @@ -288,7 +288,7 @@ data =3D (unsigned char *)shmat( shmId, 0, 0 ); } =20 - return ( shmId !=3D -1 && (int)data !=3D -1 ); + return ( shmId !=3D -1 && (long)data !=3D -1 ); #else int dataSize =3D sizeof(QWSRegionHeader) // header + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index