From 1b9a1e67b3311f95c7cd4c21e630372c8f444838 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 13 Dec 2011 20:23:59 +0400 Subject: uicmoc: do also provide nativesdk variant Opie SDK needs nativesdk version of uicmoc package. To achieve this, replace uicmoc-native with uicmoc recipe, which can be built both as virtclass-native and virtclass-nativesdk. Signed-off-by: Dmitry Eremin-Solenikov --- .../uicmoc/uicmoc-2.3.10/64bit-cleanup.patch | 226 +++++++++++++++++++++ recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch | 16 ++ recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch | 27 +++ recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch | 12 ++ recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch | 16 ++ .../uicmoc/uicmoc-2.3.10/kernel-asm-page.patch | 20 ++ .../uicmoc-native-2.3.10/64bit-cleanup.patch | 226 --------------------- .../uicmoc/uicmoc-native-2.3.10/fix-makefile.patch | 16 -- .../uicmoc/uicmoc-native-2.3.10/gcc3_4.patch | 27 --- recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch | 12 -- .../uicmoc/uicmoc-native-2.3.10/gcc4_1.patch | 16 -- .../uicmoc-native-2.3.10/kernel-asm-page.patch | 20 -- recipes-qt/uicmoc/uicmoc-native_2.3.10.bb | 59 ------ recipes-qt/uicmoc/uicmoc_2.3.10.bb | 64 ++++++ 14 files changed, 381 insertions(+), 376 deletions(-) create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch delete mode 100644 recipes-qt/uicmoc/uicmoc-native_2.3.10.bb create mode 100644 recipes-qt/uicmoc/uicmoc_2.3.10.bb (limited to 'recipes-qt') diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch new file mode 100644 index 0000000..3cca3e0 --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch @@ -0,0 +1,226 @@ +--- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 ++++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + #if defined(QT_POSIX_QSHM) + #include +@@ -122,8 +123,8 @@ + if (shmId == -1) + shmId = shmget (key, shmSize, 0); + +- shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); ++ if (shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 +@@ -87,6 +87,7 @@ + #include + #include + #include ++#include + #endif + + #include +@@ -2041,7 +2042,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -2060,11 +2061,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2635,7 +2636,7 @@ + } + if ( !qws_overrideCursor ) { // is override cursor active? + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "qgfxlinuxfb_qws.h" + #include "qwindowsystem_qws.h" +@@ -164,7 +165,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -703,7 +704,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 +@@ -33,6 +33,9 @@ + #ifndef QMEMORYMANAGER_H + #define QMEMORYMANAGER_H + ++/* Needed for uintptr_t to allow 64bit clean pointer handling */ ++#include ++ + #ifndef QT_H + #include + #include +@@ -126,8 +129,8 @@ + // constructs from a memory ptr to where the data after the item starts + QSMCacheItemPtr(void *data) { + char *ptr = (char*)data; +- if ( (int)ptr != (((int)ptr+3)&~3) ) +- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); ++ if (intptr_t(data)&3!=0) ++ qDebug("err, passed a non-aligned data ptr %p", ptr); + d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); + } + // returns a pointer to the data after the item +--- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -286,7 +287,7 @@ + data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 ++++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "qpixmapcache.h" + #include "qcache.h" + #include "qobject.h" ++#include + + + // REVISED: paul +@@ -519,7 +520,7 @@ + #endif // DEBUG_SHARED_MEMORY_CACHE + } + +- if ( shmId == -1 || (int)shm == -1 ) ++ if ( shmId == -1 || (intptr_t)shm == -1 ) + qFatal("Cannot attach to shared memory"); + + qt_sharedMemoryData = shm->data; +@@ -536,8 +537,8 @@ + shm->tail.setFree(false); + shm->tail.setNextFree(QSMemPtr()); + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; + if ( freePagesLength ) { + # ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Initially marking free pages as not needed"); +@@ -770,8 +771,8 @@ + node = newFreeNode->next(); + + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; + if ( freePagesLength ) { + #ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Marking pages not needed"); +--- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 +@@ -50,6 +50,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -633,7 +634,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1840,11 +1841,11 @@ + void QWidget::updateCursor( const QRegion &r ) const + { + if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && +- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { ++ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif +--- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 ++++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + + QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, +@@ -136,7 +137,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- if ( (int)data == -1 ){ ++ if ( (intptr_t)data == -1 ){ + ::close(mouseFd); + ::close(keyboardFd); + qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch new file mode 100644 index 0000000..5943f0f --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qt-2.3.7/Makefile~fix-makefile 2003-07-17 03:23:11.000000000 +0200 ++++ qt-2.3.7/Makefile 2004-04-23 15:36:25.000000000 +0200 +@@ -29,7 +29,7 @@ + cd tools; $(MAKE) + + symlinks: .buildopts +- @cd include; rm -f q*.h; for i in ../src/*/q*.h ../src/3rdparty/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h ++ @cd include; rm -f q*.h; for i in ../src/*/q*.h ../src/3rdparty/*/*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h + + sub-src: src-moc src-mt .buildopts FORCE + cd src; $(MAKE) diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch new file mode 100644 index 0000000..fc1656a --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch @@ -0,0 +1,27 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.9-snapshot-20041211/src/tools/qcstring.h~gcc3 ++++ qt-2.3.9-snapshot-20041211/src/tools/qcstring.h +@@ -119,7 +119,7 @@ + // We want to keep source compatibility for 2.x + // ### TODO for 4.0: completely remove these and the cstr* functions + +-#if !defined(QT_GENUINE_STR) ++#if 0 + + #undef strlen + #define strlen qstrlen +--- qt-2.3.9-snapshot-20041211/src/kernel/qwsdecoration_qws.h~gcc3 ++++ qt-2.3.9-snapshot-20041211/src/kernel/qwsdecoration_qws.h +@@ -50,7 +50,7 @@ + enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6, + TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10, + Close=11, Minimize=12, Maximize=13, Normalize=14, +- Menu=15, LastRegion=Menu }; ++ Menu=15, LastRegion=Menu, UserDefined = 100 }; + + virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; + virtual void close( QWidget * ); diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch new file mode 100644 index 0000000..633fe86 --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch @@ -0,0 +1,12 @@ +--- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-07-13 20:23:30.061728456 +0100 ++++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-07-13 20:37:57.183905848 +0100 +@@ -168,6 +168,9 @@ + class QWSMouseHandler; + struct QWSCommandStruct; + ++class QWSInputMethod; ++class QWSGestureMethod; ++ + #ifndef QT_NO_QWS_MULTIPROCESS + class QWSServer : public QWSServerSocket + #else diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch new file mode 100644 index 0000000..550effd --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qt-2.3.10/src/tools/qvaluestack.h~gcc4 2005-01-23 15:00:47.000000000 +0100 ++++ qt-2.3.10/src/tools/qvaluestack.h 2006-03-19 02:32:56.000000000 +0100 +@@ -54,7 +54,7 @@ + { + T elem( this->last() ); + if ( !this->isEmpty() ) +- remove( this->fromLast() ); ++ this->remove( this->fromLast() ); + return elem; + } + T& top() { return this->last(); } diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch new file mode 100644 index 0000000..0d31874 --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch @@ -0,0 +1,20 @@ +diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp +index c2e7d9b..8d39585 100644 +--- a/src/kernel/qpixmapcache.cpp ++++ b/src/kernel/qpixmapcache.cpp +@@ -123,9 +123,12 @@ void cleanup_pixmap_cache(); + #ifdef THROW_AWAY_UNUSED_PAGES + # include // madvise +-# include // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN ++# include // getpagesize() ++# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) ++# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) ++# endif + # ifndef PAGE_ALIGN +-# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +-# endif // PAGE_ALIGN ++# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1)) ++# endif + #endif // THROW_AWAY_UNUSED_PAGES + + diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch b/recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch deleted file mode 100644 index 3cca3e0..0000000 --- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch +++ /dev/null @@ -1,226 +0,0 @@ ---- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 -+++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 -@@ -36,6 +36,7 @@ - - #include - #include -+#include - - #if defined(QT_POSIX_QSHM) - #include -@@ -122,8 +123,8 @@ - if (shmId == -1) - shmId = shmget (key, shmSize, 0); - -- shmBase = shmat (shmId, 0, 0); -- if ((int) shmBase == -1 || shmBase == 0) -+ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); -+ if (shmBase == -1 || shmBase == 0) - return FALSE; - else - return TRUE; ---- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 -+++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 -@@ -87,6 +87,7 @@ - #include - #include - #include -+#include - #endif - - #include -@@ -2041,7 +2042,7 @@ - w = widgetAt(*qt_last_x, *qt_last_y, FALSE); - if ( !w ) - w = desktop(); -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - - void QApplication::restoreOverrideCursor() -@@ -2060,11 +2061,11 @@ - cursorStack = 0; - qws_overrideCursor = FALSE; - if ( w->testWState(WState_OwnCursor) ) -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); - } else { -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - } - #endif// QT_NO_CURSOR -@@ -2635,7 +2636,7 @@ - } - if ( !qws_overrideCursor ) { // is override cursor active? - if (curs) -- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); - } ---- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include "qgfxlinuxfb_qws.h" - #include "qwindowsystem_qws.h" -@@ -164,7 +165,7 @@ - MAP_SHARED, fd, 0); - data += dataoffset; - -- if ((int)data == -1) { -+ if ((intptr_t)data == -1) { - perror("mapping /dev/fb0"); - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; -@@ -703,7 +704,7 @@ - psize += 8; // for alignment - psize &= ~0x7; // align - -- unsigned int pos=(unsigned int)data; -+ uintptr_t pos=(uintptr_t)data; - pos += psize; - entryp = ((int *)pos); - lowest = ((unsigned int *)pos)+1; ---- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 -@@ -33,6 +33,9 @@ - #ifndef QMEMORYMANAGER_H - #define QMEMORYMANAGER_H - -+/* Needed for uintptr_t to allow 64bit clean pointer handling */ -+#include -+ - #ifndef QT_H - #include - #include -@@ -126,8 +129,8 @@ - // constructs from a memory ptr to where the data after the item starts - QSMCacheItemPtr(void *data) { - char *ptr = (char*)data; -- if ( (int)ptr != (((int)ptr+3)&~3) ) -- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); -+ if (intptr_t(data)&3!=0) -+ qDebug("err, passed a non-aligned data ptr %p", ptr); - d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); - } - // returns a pointer to the data after the item ---- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 -+++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 -@@ -32,6 +32,7 @@ - #include "qwsdisplay_qws.h" - #include "qwsregionmanager_qws.h" - #include -+#include - - #ifndef QT_NO_QWS_MULTIPROCESS - #include -@@ -286,7 +287,7 @@ - data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); - } - -- return ( shmId != -1 && (int)data != -1 ); -+ return ( shmId != -1 && (intptr_t)data != -1 ); - #else - int dataSize = sizeof(QWSRegionHeader) // header - + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index ---- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 -+++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 -@@ -38,6 +38,7 @@ - #include "qpixmapcache.h" - #include "qcache.h" - #include "qobject.h" -+#include - - - // REVISED: paul -@@ -519,7 +520,7 @@ - #endif // DEBUG_SHARED_MEMORY_CACHE - } - -- if ( shmId == -1 || (int)shm == -1 ) -+ if ( shmId == -1 || (intptr_t)shm == -1 ) - qFatal("Cannot attach to shared memory"); - - qt_sharedMemoryData = shm->data; -@@ -536,8 +537,8 @@ - shm->tail.setFree(false); - shm->tail.setNextFree(QSMemPtr()); - #ifdef THROW_AWAY_UNUSED_PAGES -- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); -- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; -+ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); -+ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; - if ( freePagesLength ) { - # ifdef DEBUG_SHARED_MEMORY_CACHE - qDebug("Initially marking free pages as not needed"); -@@ -770,8 +771,8 @@ - node = newFreeNode->next(); - - #ifdef THROW_AWAY_UNUSED_PAGES -- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); -- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; -+ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); -+ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; - if ( freePagesLength ) { - #ifdef DEBUG_SHARED_MEMORY_CACHE - qDebug("Marking pages not needed"); ---- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 -@@ -50,6 +50,7 @@ - #include "qwsmanager_qws.h" - #include "qwsregionmanager_qws.h" - #include "qinputcontext_p.h" -+#include - - void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp - int qt_sip_count( QWidget* ); // --- "" --- -@@ -633,7 +634,7 @@ - qt_mouseGrb->releaseMouse(); - - qwsDisplay()->grabMouse(this,TRUE); -- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); -+ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); - qt_mouseGrb = this; - qt_pressGrab = 0; - } -@@ -1840,11 +1841,11 @@ - void QWidget::updateCursor( const QRegion &r ) const - { - if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && -- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { -+ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { - QSize s( qt_screen->width(), qt_screen->height() ); - QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); - if ( r.contains(pos) ) -- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); -+ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); - } - } - #endif ---- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 -+++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - - QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, -@@ -136,7 +137,7 @@ - data = (unsigned char *)shmat( shmId, 0, 0 ); - } - -- if ( (int)data == -1 ){ -+ if ( (intptr_t)data == -1 ){ - ::close(mouseFd); - ::close(keyboardFd); - qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch b/recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch deleted file mode 100644 index 5943f0f..0000000 --- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/Makefile~fix-makefile 2003-07-17 03:23:11.000000000 +0200 -+++ qt-2.3.7/Makefile 2004-04-23 15:36:25.000000000 +0200 -@@ -29,7 +29,7 @@ - cd tools; $(MAKE) - - symlinks: .buildopts -- @cd include; rm -f q*.h; for i in ../src/*/q*.h ../src/3rdparty/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h -+ @cd include; rm -f q*.h; for i in ../src/*/q*.h ../src/3rdparty/*/*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h - - sub-src: src-moc src-mt .buildopts FORCE - cd src; $(MAKE) diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch b/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch deleted file mode 100644 index fc1656a..0000000 --- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20041211/src/tools/qcstring.h~gcc3 -+++ qt-2.3.9-snapshot-20041211/src/tools/qcstring.h -@@ -119,7 +119,7 @@ - // We want to keep source compatibility for 2.x - // ### TODO for 4.0: completely remove these and the cstr* functions - --#if !defined(QT_GENUINE_STR) -+#if 0 - - #undef strlen - #define strlen qstrlen ---- qt-2.3.9-snapshot-20041211/src/kernel/qwsdecoration_qws.h~gcc3 -+++ qt-2.3.9-snapshot-20041211/src/kernel/qwsdecoration_qws.h -@@ -50,7 +50,7 @@ - enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6, - TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10, - Close=11, Minimize=12, Maximize=13, Normalize=14, -- Menu=15, LastRegion=Menu }; -+ Menu=15, LastRegion=Menu, UserDefined = 100 }; - - virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; - virtual void close( QWidget * ); diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch b/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch deleted file mode 100644 index 633fe86..0000000 --- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-07-13 20:23:30.061728456 +0100 -+++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-07-13 20:37:57.183905848 +0100 -@@ -168,6 +168,9 @@ - class QWSMouseHandler; - struct QWSCommandStruct; - -+class QWSInputMethod; -+class QWSGestureMethod; -+ - #ifndef QT_NO_QWS_MULTIPROCESS - class QWSServer : public QWSServerSocket - #else diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch b/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch deleted file mode 100644 index 550effd..0000000 --- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.10/src/tools/qvaluestack.h~gcc4 2005-01-23 15:00:47.000000000 +0100 -+++ qt-2.3.10/src/tools/qvaluestack.h 2006-03-19 02:32:56.000000000 +0100 -@@ -54,7 +54,7 @@ - { - T elem( this->last() ); - if ( !this->isEmpty() ) -- remove( this->fromLast() ); -+ this->remove( this->fromLast() ); - return elem; - } - T& top() { return this->last(); } diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch b/recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch deleted file mode 100644 index 0d31874..0000000 --- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp -index c2e7d9b..8d39585 100644 ---- a/src/kernel/qpixmapcache.cpp -+++ b/src/kernel/qpixmapcache.cpp -@@ -123,9 +123,12 @@ void cleanup_pixmap_cache(); - #ifdef THROW_AWAY_UNUSED_PAGES - # include // madvise --# include // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN -+# include // getpagesize() -+# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) -+# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -+# endif - # ifndef PAGE_ALIGN --# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) --# endif // PAGE_ALIGN -+# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1)) -+# endif - #endif // THROW_AWAY_UNUSED_PAGES - - diff --git a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb b/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb deleted file mode 100644 index 57f61d4..0000000 --- a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x" -HOMEPAGE = "http://www.trolltech.com" -SECTION = "devel" -LICENSE = "GPLv2 | QPL" -PR = "r6" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ - file://fix-makefile.patch \ - file://gcc3_4.patch \ - file://gcc4.patch \ - file://gcc4_1.patch \ - file://64bit-cleanup.patch \ - file://kernel-asm-page.patch" -S = "${WORKDIR}/qt-${PV}" - -LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=aea7d119b7f7d798464fa2b1aae005f8 \ - file://README;beginline=1;endline=7;md5=d3e237af71522cc2a3c89dbaf48b345d" - -inherit native qmake_base - -export QTDIR = "${S}" -EXTRA_OEMAKE = 'SYSCONF_CXX="${CXX}" SYSCONF_LINK="${CXX}"' -CXXFLAGS += " -DQWS" - -QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \ - -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm \ - -no-opengl -static -qconfig oe" - -do_configure() { - touch src/tools/qconfig-oe.h - echo "#define QT_NO_FREETYPE" >> src/tools/qconfig-oe.h - echo yes | ./configure ${QT_CONFIG_FLAGS} || die "Configuring qt failed" -} - -do_compile() { - oe_runmake symlinks || die "Can't symlink include files" - oe_runmake -C src/moc || die "Building moc failed" - - cp src/moc/moc bin/ - - oe_runmake -C src || die "Building libqt.a failed" - oe_runmake -C tools/designer/util || die "Building libqutil.a failed" - oe_runmake -C tools/designer/uic || die "Building uic failed" - oe_runmake -C tools/qvfb || die "Building qvfb failed" - oe_runmake -C tools/makeqpf || die "Building makeqpf failed" -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 bin/moc ${D}${bindir}/moc2 - install -m 0755 bin/uic ${D}${bindir}/uic2 - install -m 0755 tools/qvfb/qvfb ${D}${bindir}/qvfb2 - install -m 0755 tools/makeqpf/makeqpf ${D}${bindir} -} - -SRC_URI[md5sum] = "1f7ad30113afc500cab7f5b2f4dec0d7" -SRC_URI[sha256sum] = "883363eb0c94de3d1e36f3ab9e09a8f127418d497213cc1a0ed1a1588ecd66b8" - -NATIVE_INSTALL_WORKS = "1" diff --git a/recipes-qt/uicmoc/uicmoc_2.3.10.bb b/recipes-qt/uicmoc/uicmoc_2.3.10.bb new file mode 100644 index 0000000..e72a454 --- /dev/null +++ b/recipes-qt/uicmoc/uicmoc_2.3.10.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPLv2 | QPL" +PR = "r6" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ + file://fix-makefile.patch \ + file://gcc3_4.patch \ + file://gcc4.patch \ + file://gcc4_1.patch \ + file://64bit-cleanup.patch \ + file://kernel-asm-page.patch" +S = "${WORKDIR}/qt-${PV}" + +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=aea7d119b7f7d798464fa2b1aae005f8 \ + file://README;beginline=1;endline=7;md5=d3e237af71522cc2a3c89dbaf48b345d" + +inherit qmake_base +BBCLASSEXTEND = "native nativesdk" +UICMOCNATIVE = "uicmoc-native" +UICMOCNATIVE_virtclass-native = "" +DEPENDS_prepend = "${UICMOCNATIVE}" + +export QTDIR = "${S}" +SYSUICMOC = 'SYSCONF_MOC="${STAGING_BINDIR_NATIVE}/moc2" SYSCONF_UIC="${STAGING_BINDIR_NATIVE}/uic2"' +SYSUICMOC_virtclass-native = "" +EXTRA_OEMAKE = 'SYSCONF_CC="${CC}" SYSCONF_CXX="${CXX}" SYSCONF_CFLAGS="${CFLAGS}" SYSCONF_CXXFLAGS="${CXXFLAGS} -DQWS" SYSCONF_LINK="${CXX}" ${SYSUICMOC}' + +QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \ + -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm \ + -no-opengl -static -qconfig oe" + +do_configure() { + touch src/tools/qconfig-oe.h + echo "#define QT_NO_FREETYPE" >> src/tools/qconfig-oe.h + echo yes | ./configure ${QT_CONFIG_FLAGS} || die "Configuring qt failed" +} + +do_compile() { + oe_runmake symlinks || die "Can't symlink include files" + oe_runmake -C src/moc || die "Building moc failed" + + cp src/moc/moc bin/ + + oe_runmake -C src || die "Building libqt.a failed" + oe_runmake -C tools/designer/util || die "Building libqutil.a failed" + oe_runmake -C tools/designer/uic || die "Building uic failed" + oe_runmake -C tools/qvfb || die "Building qvfb failed" + oe_runmake -C tools/makeqpf || die "Building makeqpf failed" +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 bin/moc ${D}${bindir}/moc2 + install -m 0755 bin/uic ${D}${bindir}/uic2 + install -m 0755 tools/qvfb/qvfb ${D}${bindir}/qvfb2 + install -m 0755 tools/makeqpf/makeqpf ${D}${bindir} +} + +SRC_URI[md5sum] = "1f7ad30113afc500cab7f5b2f4dec0d7" +SRC_URI[sha256sum] = "883363eb0c94de3d1e36f3ab9e09a8f127418d497213cc1a0ed1a1588ecd66b8" + +NATIVE_INSTALL_WORKS = "1" -- cgit 1.2.3-korg