diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-20 23:40:08 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-20 23:40:08 +0000 |
commit | 23c6c834da3e1f051c39b67765ba5f454a36a07f (patch) | |
tree | 9e9370571b83554687bc711cd5985fd1b0342fda /packages | |
parent | 6909f1470733d29a325829d077264d48ca824d8f (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/21 00:08:25+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded
2005/01/21 00:07:32+01:00 handhelds.org!zecke
Qt/E 2.3.x
-Switch uicmoc and QtE2 to 2.3.10 snapshot
-Rename files and directories to reflect 2.3.10 change
-Change Logic of TSLib::interpolateSample (untested but hopefully works)
BKrev: 41f041583k1V-B-xtXk-BPcwFaaomg
Diffstat (limited to 'packages')
38 files changed, 0 insertions, 1869 deletions
diff --git a/packages/qte/qte-2.3.9-snapshot/daemonize.patch b/packages/qte/qte-2.3.10-snapshot/beagle.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/daemonize.patch +++ b/packages/qte/qte-2.3.10-snapshot/beagle.patch diff --git a/packages/qte/qte-2.3.9-snapshot/encoding.patch b/packages/qte/qte-2.3.10-snapshot/c700-hardware.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/encoding.patch +++ b/packages/qte/qte-2.3.10-snapshot/c700-hardware.patch diff --git a/packages/qte/qte-2.3.9-snapshot/fix-qgfxraster.patch b/packages/qte/qte-2.3.10-snapshot/daemonize.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/fix-qgfxraster.patch +++ b/packages/qte/qte-2.3.10-snapshot/daemonize.patch diff --git a/packages/qte/qte-2.3.9-snapshot/gcc3.patch b/packages/qte/qte-2.3.10-snapshot/devfs.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/gcc3.patch +++ b/packages/qte/qte-2.3.10-snapshot/devfs.patch diff --git a/packages/qte/qte-2.3.9-snapshot/no-moc.patch b/packages/qte/qte-2.3.10-snapshot/encoding.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/no-moc.patch +++ b/packages/qte/qte-2.3.10-snapshot/encoding.patch diff --git a/packages/qte/qte-2.3.9-snapshot/qiconview-speed.patch b/packages/qte/qte-2.3.10-snapshot/fix-qgfxraster.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/qiconview-speed.patch +++ b/packages/qte/qte-2.3.10-snapshot/fix-qgfxraster.patch diff --git a/packages/qte/qte-2.3.9-snapshot/qpe.patch b/packages/qte/qte-2.3.10-snapshot/gcc3.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/qpe.patch +++ b/packages/qte/qte-2.3.10-snapshot/gcc3.patch diff --git a/packages/qte/qte-2.3.9-snapshot/sharp_char.h b/packages/qte/qte-2.3.10-snapshot/kernel-keymap-corgi.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/sharp_char.h +++ b/packages/qte/qte-2.3.10-snapshot/kernel-keymap-corgi.patch diff --git a/packages/qte/qte-2.3.9-snapshot/simpad.patch b/packages/qte/qte-2.3.10-snapshot/kernel-keymap-tosa.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/simpad.patch +++ b/packages/qte/qte-2.3.10-snapshot/kernel-keymap-tosa.patch diff --git a/packages/qte/qte-2.3.9-snapshot/switches.h b/packages/qte/qte-2.3.10-snapshot/kernel-keymap.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/switches.h +++ b/packages/qte/qte-2.3.10-snapshot/kernel-keymap.patch diff --git a/packages/qte/qte-2.3.9-snapshot/update-qtfontdir b/packages/qte/qte-2.3.10-snapshot/no-moc.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/update-qtfontdir +++ b/packages/qte/qte-2.3.10-snapshot/no-moc.patch diff --git a/packages/qte/qte-2.3.9-snapshot/use-kernel-keycodes.patch b/packages/qte/qte-2.3.10-snapshot/opie.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/use-kernel-keycodes.patch +++ b/packages/qte/qte-2.3.10-snapshot/opie.patch diff --git a/packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb b/packages/qte/qte-2.3.10-snapshot/qiconview-speed.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb +++ b/packages/qte/qte-2.3.10-snapshot/qiconview-speed.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/fix-makefile.patch b/packages/qte/qte-2.3.10-snapshot/qpe.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/fix-makefile.patch +++ b/packages/qte/qte-2.3.10-snapshot/qpe.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/gcc3_4.patch b/packages/qte/qte-2.3.10-snapshot/qt-visibility.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/gcc3_4.patch +++ b/packages/qte/qte-2.3.10-snapshot/qt-visibility.patch diff --git a/packages/uicmoc/uicmoc-native_2.3.9-snapshot-20050114.bb b/packages/qte/qte-2.3.10-snapshot/sharp_char.h index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc-native_2.3.9-snapshot-20050114.bb +++ b/packages/qte/qte-2.3.10-snapshot/sharp_char.h diff --git a/packages/qte/qte-2.3.10-snapshot/simpad.patch b/packages/qte/qte-2.3.10-snapshot/simpad.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10-snapshot/simpad.patch diff --git a/packages/qte/qte-2.3.10-snapshot/switches.h b/packages/qte/qte-2.3.10-snapshot/switches.h new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10-snapshot/switches.h diff --git a/packages/qte/qte-2.3.10-snapshot/tslib.patch b/packages/qte/qte-2.3.10-snapshot/tslib.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10-snapshot/tslib.patch diff --git a/packages/qte/qte-2.3.10-snapshot/update-qtfontdir b/packages/qte/qte-2.3.10-snapshot/update-qtfontdir new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10-snapshot/update-qtfontdir diff --git a/packages/qte/qte-2.3.10-snapshot/use-kernel-keycodes.patch b/packages/qte/qte-2.3.10-snapshot/use-kernel-keycodes.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10-snapshot/use-kernel-keycodes.patch diff --git a/packages/qte/qte-2.3.10-snapshot/vt-switch.patch b/packages/qte/qte-2.3.10-snapshot/vt-switch.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10-snapshot/vt-switch.patch diff --git a/packages/qte/qte-2.3.9-snapshot/beagle.patch b/packages/qte/qte-2.3.9-snapshot/beagle.patch deleted file mode 100644 index eeb31c3b98..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/beagle.patch +++ /dev/null @@ -1,32 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~beagle -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -138,7 +138,7 @@ - #include <asm/sharp_char.h> - #endif - --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_BEAGLE) - #define QT_QWS_AUTOREPEAT_MANUALLY - #endif - -@@ -492,9 +492,15 @@ - #endif - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90 -+#ifdef QT_QWS_BEAGLE -+ { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, // lightning -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // Wheel Up -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // Wheel Down -+#else - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, -+#endif - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Enter, 13 , 13 , 0xffff }, diff --git a/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch b/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch deleted file mode 100644 index 5527ab4a88..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch +++ /dev/null @@ -1,110 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~c700-hardware -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp -@@ -178,7 +178,7 @@ - static QRect maxwindow_rect; - extern Q_EXPORT QRect qt_maxWindowRect; - static const char *defaultMouse = --#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) -+#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) - "TPanel" - #elif defined(QT_KEYPAD_MODE) - "None" -@@ -3308,7 +3308,7 @@ - void QWSServer::screenSaverSleep() - { - qt_screen->blank(TRUE); --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - d->screensavertimer->stop(); - #else - if ( screensaverinterval ) { ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~c700-hardware -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp -@@ -87,6 +87,19 @@ - #define QT_QWS_TP_PRESSURE_THRESHOLD 500 - #define QT_QWS_TP_MOVE_LIMIT 50 - #define QT_QWS_TP_JITTER_LIMIT 2 -+#elif defined(QT_QWS_SLC700) -+#define QT_QWS_SLC700_RAW -+typedef struct { -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short millisecs; -+} TS_EVENT; -+#define QT_QWS_TP_SAMPLE_SIZE 10 -+#define QT_QWS_TP_MINIMUM_SAMPLES 4 -+#define QT_QWS_TP_PRESSURE_THRESHOLD 500 -+#define QT_QWS_TP_MOVE_LIMIT 50 -+#define QT_QWS_TP_JITTER_LIMIT 2 - #endif - - #ifndef QT_QWS_TP_SAMPLE_SIZE -@@ -592,7 +605,7 @@ - sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); - notify(fd); - } --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) && !defined(QT_QWS_SLC700) - char fn[] = "/dev/ttyS?"; - for (int ch='0'; ch<='3'; ch++) { - fn[9] = ch; -@@ -1274,7 +1287,7 @@ - numSamples(0), skipCount(0) - { - Q_UNUSED(dev); --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - #if defined(QT_QWS_IPAQ) - # ifdef QT_QWS_IPAQ_RAW - if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1284,7 +1297,7 @@ - qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); - return; - } --#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - //# ifdef QT_QWS_SL5XXX_TSRAW - # if 0 - if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1310,7 +1323,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1318,7 +1331,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - if(!qt_screen) - return; - -@@ -1337,7 +1350,7 @@ - uchar *mb = mouseBuf+idx; - data = (TS_EVENT *) mb; - if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { --#ifdef QT_QWS_SL5XXX -+#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - samples[currSample] = QPoint( 1000 - data->x, data->y ); - #else - samples[currSample] = QPoint( data->x, data->y ); -@@ -1997,7 +2010,7 @@ - handler = new QTSLibHandlerPrivate(); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/packages/qte/qte-2.3.9-snapshot/devfs.patch b/packages/qte/qte-2.3.9-snapshot/devfs.patch deleted file mode 100644 index 27ea4239c7..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/devfs.patch +++ /dev/null @@ -1,163 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/configure~devfs -+++ qt-2.3.9-snapshot-20050114/configure -@@ -412,6 +412,9 @@ - -visibility-hidden) - VISIBILITY=YES - ;; -+ -devfs) -+ DEVFS=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1302,6 +1305,8 @@ - -visibility-hidden . Use -fvisibility=hidden as default. This requires GCC 4.0 - or a special patched GCC to support the visibility attribute - -+ -devfs ............. Use devfs /dev paths. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1374,6 +1379,10 @@ - then - QT_CXX="${QT_CXX} -DGCC_SUPPORTS_VISIBILITY -fvisibility=hidden" - fi -+if [ "x$DEVFS" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQT_QWS_DEVFS" -+fi - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF ---- qt-2.3.9-snapshot-20050114/src/kernel/qgfxlinuxfb_qws.cpp~devfs -+++ qt-2.3.9-snapshot-20050114/src/kernel/qgfxlinuxfb_qws.cpp -@@ -101,11 +101,19 @@ - bool QLinuxFbScreen::connect( const QString &displaySpec ) - { - // Check for explicitly specified device -+#ifdef QT_QWS_DEVFS -+ QRegExp r( "/dev/fb/[0-9]+" ); -+#else - QRegExp r( "/dev/fb[0-9]+" ); -+#endif - int len; - int m = r.match( displaySpec, 0, &len ); - -+#ifdef QT_QWS_DEVFS -+ QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb/0"); -+#else - QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb0"); -+#endif - - fd=open( dev.latin1(), O_RDWR ); - if (fd<0) { -@@ -121,14 +129,22 @@ - - /* Get fixed screen information */ - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading fixed information"); - return FALSE; - } - - /* Get variable screen information */ - if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading variable information"); - return FALSE; - } -@@ -165,7 +181,11 @@ - data += dataoffset; - - if ((int)data == -1) { -- perror("mapping /dev/fb0"); -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else -+ perror("reading /dev/fb0"); -+#endif - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; - } -@@ -229,7 +249,11 @@ - - static void writeTerm(const char* termctl, int sizeof_termctl) - { -+#ifdef QT_QWS_DEVFS -+ const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; -+#else - const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; -+#endif - const char** dev=tt; - while (*dev) { - int tty=::open(*dev,O_WRONLY); -@@ -792,7 +816,11 @@ - fb_var_screeninfo vinfo; - - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qFatal("Error reading fixed information"); - } - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~devfs -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -1192,7 +1192,11 @@ - - QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) - { -+#ifdef QT_QWS_DEVFS -+ kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#else - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#endif - - if ( kbdFD >= 0 ) { - QSocketNotifier *notifier; ---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~devfs -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp -@@ -836,7 +836,11 @@ - void openDevice() - { - if ( !sn ) { -+#ifdef QT_QWS_DEVFS -+ int fd = ::open("/dev/sound/dsp",O_RDWR); -+#else - int fd = ::open("/dev/dsp",O_RDWR); -+#endif - if ( fd < 0 ) { - // For debugging purposes - defined QT_NO_SOUND if you - // don't have sound hardware! ---- qt-2.3.9-snapshot-20050114/src/kernel/qsoundqss_qws.cpp~devfs -+++ qt-2.3.9-snapshot-20050114/src/kernel/qsoundqss_qws.cpp -@@ -1088,7 +1088,12 @@ - // Don't block open right away. - // - bool openOkay = false; -- if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) { -+#ifdef QT_QWS_DEVFS -+ if ((fd = ::open("/dev/sound/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#else -+ if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#endif -+ { - int flags = fcntl(fd, F_GETFL); - flags &= ~O_NONBLOCK; - openOkay = (fcntl(fd, F_SETFL, flags) == 0); diff --git a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch deleted file mode 100644 index 0fabd78fac..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-corgi -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -410,6 +410,15 @@ - { 0x20ac, 0xffff , 0x20ac , 0x20ac }, // 73 Euro sign - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 74 - { Qt::Key_F32, 0xffff , 0xffff , 0xffff }, // 75 Sync -+ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 76 -+ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 77 -+ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 78 -+ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 79 -+ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 7a -+ { Qt::Key_Return, 0xffff , 0xffff , 0xffff }, // 7b -+ { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 7c -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 7d -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 7e - { 0, 0xffff , 0xffff , 0xffff } - }; - #else diff --git a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch deleted file mode 100644 index ca445f4d1d..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -355,14 +355,24 @@ - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Comma, ',' , ';' , 0xffff }, // 3f -+ { Qt::Key_Period, '.' , ':' , 0xffff }, // 40 -+#else - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 -+#endif - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Slash, '/' , '?' , 0xffff }, // 45 -+ { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 46 70 -+#else - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 -+#endif - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -572,6 +582,32 @@ - static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; - static QIntDict<QWSServer::KeyMap> *overrideMap = 0; - -+#if defined(QT_QWS_SL6000) -+/* Translation table to obtain a 'legacy' keycode corresponding to -+ Fn+key on tosa -+ Other devices obviously send different keycodes while Fn is down, tosa sends -+ the same keys as usual bracketed by Fn-down/Fn-up. -+ This table is used while Fn is down to obtain the key-code the SL-5xxx would -+ send, so the rest of keyboard processing does not need to be adjusted. */ -+static const uchar sl6kFnTrans[] = { 0x00, -+ 0x5e, 0x3a, 0x43, 0x4a, 0x2b, 0x4b, 0x4c, 0x4d, 0x30, 0x4e, 0x4f, 0x50, -+ // !, -, cpy, #, 3, $, %, _, 8, &, *, (, -+ 0x53, 0x3b, 0x31, 0x32, 0x29, 0x2c, 0x3d, 0x2d, 0x2f, 0x44, 0x2a, 0x42, -+ // =, +, 9, 0, 1, 4, @, 5, 7, pste, 2, cut, -+ // padding for keycodes which don't ever get directly sent on tosa -+ // except for y->6, ret->'>', BS->DEL -+ 0x2e, 0x00, 0x00, 0x57, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 6, _Z, shft, ret, F11, fn, BS?, F31, lght, cncl, lft, up, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // dn, rght, OK, home, 1, 2, 3, 4, 5, 6, 7, 8, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 9, 0, UNK, UNK, UNK, UNK, UNK, UNK, UNK, -, +, caps, -+ // here are a few translatable codes again... -+ 0x00, 0x00, 0x54, 0x56, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x55 }; -+ // @, ?, ,, ., tab, cut, cpy, pste, /, ' -+static const int sl6kFnSize = sizeof(sl6kFnTrans); -+#endif -+ - /*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map -@@ -882,6 +918,15 @@ - int keypad = 0; - - #ifndef QT_QWS_USE_KEYCODES -+#if defined(QT_QWS_SL6000) -+ qDebug("Key pressed: %x", code); -+ if (fn) -+ if (code < sl6kFnSize) { -+ code = sl6kFnTrans[code]; -+ qDebug("Translated Fn: %x", code); -+ } else -+ qDebug("Untranslatable Fn: %x", code); -+#endif - #if defined(QT_QWS_IPAQ) - // map ipaq 'action' key (0x60, 0xe0) - if ((code & 0x7f) == 0x60) { diff --git a/packages/qte/qte-2.3.9-snapshot/kernel-keymap.patch b/packages/qte/qte-2.3.9-snapshot/kernel-keymap.patch deleted file mode 100644 index 516b2a62f5..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap.patch +++ /dev/null @@ -1,309 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20041221/src/kernel/qkeyboard_qws.cpp~kernel-keymap.patch -+++ qt-2.3.9-snapshot-20041221/src/kernel/qkeyboard_qws.cpp -@@ -30,6 +30,34 @@ - ** - **********************************************************************/ - -+/**************************************************************************** -+** -+** Keyboard Handling Redesign -+** Copyright 2003, Chris Larson <kergoth@handhelds.org> -+** -+** TODO: (key: . = in progress, x = completed) -+** -+** [.] Tty driver should load its initial keymap from the kernel, -+** thereby ensuring keymap consistency between X, console, and qt/e -+** [x] Read kernel keymappings. -+** [x] Read kernel keycode -> unicode map. -+** [x] Use them, along with the existing keyM, to push events up. -+** [ ] Create a new table, from transformed keycode -> qt keycode, rather -+** than the existing raw keycode -> qt keycode. -+** [ ] Adapt handleKey to deal with keys that have no unicode value, such as -+** keypresses that are mapped to strings in the string table. (e.g. F keys) -+** [ ] Cursor orientation change based on display rotation should not -+** be bound to Ipaq or 5xxx, but instead as a runtime choice based -+** on whether or not we're using a Transformed display driver. -+** [ ] Double check that VT handling, particularly with regard to switching, -+** is handled properly. -+** [ ] Add a generic means of dealing with additional (outside the realm of -+** ctrl, alt, shift, altgr) modifiers. Also ensure a means of binding -+** a keypress/combination to a 'lock' of said additional modifiers. -+** -+**********************************************************************/ -+ -+ - #include "qwindowsystem_qws.h" - #include "qwsutils_qws.h" - #include "qgfx_qws.h" -@@ -46,6 +74,7 @@ - #include <unistd.h> - #ifdef _OS_LINUX_ - #include <linux/kd.h> -+#include <linux/keyboard.h> - #endif - #include <sys/ioctl.h> - #include <sys/types.h> -@@ -53,6 +82,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <signal.h> -+#include <termios.h> - - #ifdef QT_QWS_TIP2 - #include <qcopchannel_qws.h> -@@ -80,17 +110,6 @@ - #include <sys/vt.h> - #endif - --#ifdef QT_QWS_SL5XXX --#include <asm/sharp_char.h> --#endif -- --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) --#define QT_QWS_AUTOREPEAT_MANUALLY --#endif -- -- -- --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) - static int dir_keyrot = -1; - - static int xform_dirkey(int key) -@@ -114,7 +133,6 @@ - int xf = qt_screen->transformOrientation() + dir_keyrot; - return (key-Qt::Key_Left+xf)%4+Qt::Key_Left; - } --#endif - - #define VTSWITCHSIG SIGUSR2 - -@@ -245,11 +263,19 @@ - { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // 21 light - { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 22 - -+#ifdef QT_QWS_SL6000 - // Direction key code are for *UNROTATED* display. -- { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 -- { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 -- { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 -- { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 -+ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 23 -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 24 -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 25 -+ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 26 -+#else -+ // Direction key code are for *UNROTATED* display. -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 -+ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 -+ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 -+#endif - - { Qt::Key_F33, 0xffff , 0xffff , 0xffff }, // 27 OK - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, // 28 40 home -@@ -314,7 +340,7 @@ - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 -@@ -594,12 +620,18 @@ - public: - QWSTtyKeyboardHandler(const QString&); - virtual ~QWSTtyKeyboardHandler(); -+ void readKeyboardMap(); -+ void readUnicodeMap(); -+ void handleKey(unsigned char code); - - private slots: - void readKeyboardData(); - - private: - struct termios origTermData; -+ unsigned short acm[E_TABSZ]; -+ unsigned char kernel_map[(1<<KG_CAPSSHIFT)][NR_KEYS]; -+ int current_map; - }; - - -@@ -759,6 +791,7 @@ - fn = FALSE; - - numLock = FALSE; -+#if 0 - sharp_kbdctl_modifstat st; - int dev = ::open("/dev/sharp_kbdctl", O_RDWR); - if( dev >= 0 ) { -@@ -770,6 +803,7 @@ - ::close(dev); - } - #endif -+#endif - #if defined(QT_QWS_IPAQ) - // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! - ipaq_return_pressed = FALSE; -@@ -1190,7 +1224,7 @@ - // Tty keyboard - // - --QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) -+QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) : current_map(0) - { - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); - -@@ -1207,11 +1241,7 @@ - tcgetattr( kbdFD, &termdata ); - - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) --# ifdef QT_QWS_USE_KEYCODES -- ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); --# else -- ioctl(kbdFD, KDSKBMODE, K_RAW); --# endif -+ ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); - #endif - - termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); -@@ -1224,6 +1254,9 @@ - cfsetospeed(&termdata, 9600); - tcsetattr(kbdFD, TCSANOW, &termdata); - -+ readUnicodeMap(); -+ readKeyboardMap(); -+ - signal(VTSWITCHSIG, vtSwitchHandler); - - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -@@ -1273,13 +1306,123 @@ - kbdFD = -1; - } - } -+void QWSTtyKeyboardHandler::readUnicodeMap() -+{ -+ if (kbdFD < 0) -+ return; -+ if (ioctl(kbdFD,GIO_UNISCRNMAP,acm) != 0) -+ return; -+} -+ -+void QWSTtyKeyboardHandler::readKeyboardMap() -+{ -+ struct kbentry kbe; -+ if (kbdFD < 0) -+ return; - -+ for (int map = 0; map < (1<<KG_CAPSSHIFT); ++map) -+ { -+ unsigned short kval; -+ kbe.kb_table = map; -+ -+ for (int key = 0; key < NR_KEYS; ++key) -+ { -+ kbe.kb_index = key; -+ -+ if (ioctl(kbdFD, KDGKBENT, &kbe) != 0) continue; -+ -+ if ((kbe.kb_value == K_HOLE) || (kbe.kb_value == K_NOSUCHMAP)) continue; -+ -+ kval = KVAL(kbe.kb_value); -+ switch (KTYP(kbe.kb_value)) -+ { -+ case KT_LETTER: -+ case KT_LATIN: -+ case KT_ASCII: -+ case KT_PAD: -+ case KT_SHIFT: -+ kernel_map[map][key] = kbe.kb_value; -+ //qWarning("keycode %d, map %d, type %d, val %d, acm %c\n", key, map, KTYP(kbe.kb_value), kval, acm[kval]); -+ break; -+ } -+ } -+ } -+} -+static inline int map_to_modif(int current_map) -+{ -+ int modifiers = 0; -+ -+ if (current_map & KG_ALT) -+ modifiers |= Qt::ALT; -+ else if (current_map & KG_CTRL) -+ modifiers |= Qt::CTRL; -+ else if (current_map & KG_SHIFT) -+ modifiers |= Qt::SHIFT; -+ -+ return modifiers; -+} -+void QWSTtyKeyboardHandler::handleKey(unsigned char code) -+{ -+ struct kbentry kbe; -+ -+ bool release = false; -+ if (code & 0x80) -+ { -+ release = true; -+ code &= 0x7f; -+ } -+ -+ unsigned short mCode = KVAL(kernel_map[current_map][code]); -+ unsigned short unicode = acm[mCode]; -+ -+ const QWSServer::KeyMap *currentKey = 0; -+ int qtKeyCode = Qt::Key_unknown; -+ -+ currentKey = &QWSServer::keyMap()[code]; -+ if ( currentKey ) qtKeyCode = currentKey->key_code; -+ -+ qDebug("code %d, mCode %d, uni %c, qtKeyCode %d\n", code, mCode, unicode, qtKeyCode); -+ -+ // Handle map changes based on press/release of modifiers -+ // hardcoded for now -+ int modif = -1; -+ switch (qtKeyCode) -+ { -+ case Qt::Key_Alt: -+ case Qt::Key_F22: -+ modif = (1<<KG_ALT); -+ break; -+ case Qt::Key_Control: -+ modif = (1<<KG_CTRL); -+ break; -+ case Qt::Key_Shift: -+ modif = (1<<KG_SHIFT); -+ break; -+ case Qt::Key_Left: -+ case Qt::Key_Right: -+ case Qt::Key_Up: -+ case Qt::Key_Down: -+ if (qt_screen->isTransformed()) -+ qtKeyCode = xform_dirkey(qtKeyCode); -+ break; -+ } -+ -+ if (modif != -1) { -+ if (release) -+ current_map &= ~modif; -+ else -+ current_map |= modif; -+ } -+ -+ unsigned int uni = unicode; -+ processKeyEvent(uni & 0xff, qtKeyCode, map_to_modif(current_map), !release, 0); -+} - void QWSTtyKeyboardHandler::readKeyboardData() - { - unsigned char buf[81]; - int n = ::read(kbdFD, buf, 80 ); - for ( int loop = 0; loop < n; loop++ ) -- doKey(buf[loop]); -+ handleKey(buf[loop]); - } - - typedef struct { diff --git a/packages/qte/qte-2.3.9-snapshot/opie.patch b/packages/qte/qte-2.3.9-snapshot/opie.patch deleted file mode 100644 index 9a9df99aa3..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/opie.patch +++ /dev/null @@ -1,302 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050101/src/kernel/qapplication.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qapplication.cpp -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qobjectlist.h" - #include "qobjectdict.h" - #include "qapplication.h" -@@ -937,11 +939,16 @@ - #ifndef QT_NO_STYLE - void QApplication::setStyle( QStyle *style ) - { -+ setStyle_NonWeak ( style ); -+} -+ -+void QApplication::setStyle_NonWeak( QStyle *style ) -+{ - QStyle* old = app_style; -- app_style = style; - - if ( startingUp() ) { - delete old; -+ app_style = style; - return; - } - -@@ -962,6 +969,8 @@ - old->unPolish( qApp ); - } - -+ app_style = style; -+ - // take care of possible palette requirements of certain gui - // styles. Do it before polishing the application since the style - // might call QApplication::setStyle() itself -@@ -1188,13 +1197,30 @@ - \sa QWidget::setPalette(), palette(), QStyle::polish() - */ - --void QApplication::setPalette( const QPalette &palette, bool informWidgets, -+void QApplication::setPalette ( const QPalette &palette, bool informWidgets, -+ const char* className ) -+{ -+ setPalette_NonWeak ( palette, informWidgets, className ); -+} -+ -+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets, - const char* className ) - { - QPalette pal = palette; - #ifndef QT_NO_STYLE -- if ( !startingUp() ) -+ if ( !startingUp() ) { - qApp->style().polish( pal ); // NB: non-const reference -+ if ( className ) { -+ // if we just polished a class specific palette (this normally -+ // only called by qt_fix_tooltips - see below), we better re- -+ // polish the global palette. Some styles like liquid can get -+ // confused, because they can not detect if the polished palette -+ // is the global one or only a class specific one. -+ // (liquid uses this palette to calculate blending pixmaps) -+ QPalette p = qApp-> palette ( ); -+ qApp->style().polish ( p ); -+ } -+ } - #endif - bool all = FALSE; - if ( !className ) { -@@ -1279,6 +1305,12 @@ - void QApplication::setFont( const QFont &font, bool informWidgets, - const char* className ) - { -+ setFont_NonWeak ( font, informWidgets, className ); -+} -+ -+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, -+ const char* className ) -+{ - bool all = FALSE; - if ( !className ) { - if ( !app_font ) { ---- qt-2.3.9-snapshot-20050101/src/kernel/qapplication.h~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qapplication.h -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - ---- qt-2.3.9-snapshot-20050101/src/kernel/qapplication_qws.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qapplication_qws.cpp -@@ -3076,6 +3076,11 @@ - */ - void QApplication::qwsSetDecoration( QWSDecoration *d ) - { -+ qwsSetDecoration_NonWeak ( d ); -+} -+ -+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) -+{ - if ( d ) { - delete qws_decoration; - qws_decoration = d; ---- qt-2.3.9-snapshot-20050101/src/kernel/qfontdatabase.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qfontdatabase.cpp -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qfontdatabase.h" - - #ifndef QT_NO_FONTDATABASE -@@ -2424,6 +2426,13 @@ - const QString &style, - const QString &charSet ) - { -+ return pointSizes_NonWeak ( family, style, charSet ); -+} -+ -+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, -+ const QString &style, -+ const QString &charSet ) -+{ - QString cs( charSet ); - if ( charSet.isEmpty() ) { - QStringList lst = charSets( family ); ---- qt-2.3.9-snapshot-20050101/src/kernel/qfontdatabase.h~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qfontdatabase.h -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, ---- qt-2.3.9-snapshot-20050101/src/kernel/qgfxraster_qws.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qgfxraster_qws.cpp -@@ -4409,7 +4409,7 @@ - setAlphaType(IgnoreAlpha); - if ( w <= 0 || h <= 0 || !ncliprect ) return; - GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) --#ifdef QWS_EXPERIMENTAL_FASTPATH -+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! - // ### fix for 8bpp - // This seems to be reliable now, at least for 16bpp - ---- qt-2.3.9-snapshot-20050101/src/widgets/qcommonstyle.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/widgets/qcommonstyle.cpp -@@ -572,7 +572,7 @@ - bool enabled, bool active ) - { - #ifndef QT_NO_MENUBAR --#ifndef QT_NO_STYLE_SGI -+#if 1 // #ifndef QT_NO_STYLE_SGI - if (draw_menu_bar_impl != 0) { - QDrawMenuBarItemImpl impl = draw_menu_bar_impl; - (this->*impl)(p, x, y, w, h, mi, g, enabled, active); ---- qt-2.3.9-snapshot-20050101/src/widgets/qlistview.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/widgets/qlistview.cpp -@@ -5051,9 +5051,9 @@ - l = l->childItem ? l->childItem : l->siblingItem; - - if ( l && l->height() ) -- s.setHeight( s.height() + 10 * l->height() ); -- else -- s.setHeight( s.height() + 140 ); -+ s.setHeight( s.height() + 4 /*10*/ * l->height() ); -+ else // ^v much too big for handhelds -+ s.setHeight( s.height() + 30 /*140*/ ); - - if ( s.width() > s.height() * 3 ) - s.setHeight( s.width() / 3 ); ---- qt-2.3.9-snapshot-20050101/src/kernel/qwindowsystem_qws.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qwindowsystem_qws.cpp -@@ -918,6 +918,18 @@ - { - } - -+static void catchSegvSignal( int ) -+{ -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+ fprintf(stderr, "Segmentation fault.\n"); -+ exit(1); -+} -+ -+ - /*! - \class QWSServer qwindowsystem_qws.h - \brief Server-specific functionality in Qt/Embedded -@@ -1043,6 +1055,7 @@ - } - - signal(SIGPIPE, ignoreSignal); //we get it when we read -+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash - #endif - focusw = 0; - mouseGrabber = 0; ---- qt-2.3.9-snapshot-20050101/src/widgets/qtoolbutton.cpp~opie.patch -+++ qt-2.3.9-snapshot-20050101/src/widgets/qtoolbutton.cpp -@@ -332,12 +332,12 @@ - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); - w = pm.width(); - h = pm.height(); -- if ( w < 32 ) -- w = 32; -- if ( h < 32 ) -- h = 32; -+ if ( w < 24 ) -+ w = 24; -+ if ( h < 24 ) -+ h = 24; - } else { -- w = h = 16; -+ w = h = 14; - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); - w = pm.width(); - h = pm.height(); diff --git a/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch b/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch deleted file mode 100644 index ccdebb0c40..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch +++ /dev/null @@ -1,459 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/configure~qt-visibility -+++ qt-2.3.9-snapshot-20050114/configure -@@ -409,6 +409,9 @@ - -tslib) - TSLIB=yes - ;; -+ -visibility-hidden) -+ VISIBILITY=YES -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1296,6 +1299,9 @@ - -tslib ............. Enable TSlib (touchscreen library) mouse handler. - See http://arm.linux.org.uk - -+ -visibility-hidden . Use -fvisibility=hidden as default. This requires GCC 4.0 -+ or a special patched GCC to support the visibility attribute -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1364,6 +1370,10 @@ - QT_CXX="${QT_CXX} -DQT_QWS_TSLIB" - QT_LIBS="${QT_LIBS} -lts" - fi -+if [ "x$VISIBILITY=" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DGCC_SUPPORTS_VISIBILITY -fvisibility=hidden" -+fi - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF ---- qt-2.3.9-snapshot-20050114/src/tools/qglobal.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/tools/qglobal.h -@@ -503,6 +503,12 @@ - #undef QT_DLL - #endif - -+#ifdef GCC_SUPPORTS_VISIBILITY -+#ifndef Q_EXPORT -+ #define Q_EXPORT __attribute__((visibility("default"))) -+#endif -+#endif -+ - #ifndef Q_EXPORT - #define Q_EXPORT - #endif ---- qt-2.3.9-snapshot-20050114/src/widgets/qscrollview.cpp~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/widgets/qscrollview.cpp -@@ -696,7 +696,7 @@ - The surrounding environment (or application, if there is no - environment, may set this. Requires Qt >= 2.3.8. - */ --bool qt_left_hand_scrollbars = FALSE; -+bool Q_EXPORT qt_left_hand_scrollbars = FALSE; - - /*! - Updates scrollbars - all possibilities considered. You should never ---- qt-2.3.9-snapshot-20050114/src/Makefile.in~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/Makefile.in -@@ -641,7 +641,7 @@ - network/qsocket.h \ - network/qsocketdevice.h - echo '#include "kernel/qt.h"' >allmoc.cpp -- $(CXX) -E -DQT_MOC_CPP $(CXXFLAGS) $(INCPATH) >allmoc.h allmoc.cpp -+ $(CXX) -E -DQT_MOC_CPP -DQ_EXPORT="" $(CXXFLAGS) $(INCPATH) >allmoc.h allmoc.cpp - $(MOC) -o allmoc.cpp allmoc.h - perl -pi -e 's{"allmoc.h"}{"kernel/qt.h"}' allmoc.cpp - rm allmoc.h ---- qt-2.3.9-snapshot-20050114/src/kernel/qcopchannel_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qcopchannel_qws.h -@@ -42,7 +42,7 @@ - class QCopChannelPrivate; - class QWSClient; - --class QCopChannel : public QObject -+class Q_EXPORT QCopChannel : public QObject - { - Q_OBJECT - public: ---- qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.cpp~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.cpp -@@ -68,7 +68,7 @@ - return r; - } - --QFontManager * qt_fontmanager=0; -+QFontManager Q_EXPORT *qt_fontmanager=0; - - /*! - \class QFontManager qfontmanager_qws.h ---- qt-2.3.9-snapshot-20050114/src/kernel/qgfx_qws.cpp~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qgfx_qws.cpp -@@ -38,10 +38,10 @@ - #include <stdlib.h> - - #ifndef QT_NO_QWS_CURSOR --bool qt_sw_cursor=false; --QScreenCursor * qt_screencursor=0; -+bool Q_EXPORT qt_sw_cursor=false; -+QScreenCursor Q_EXPORT * qt_screencursor=0; - #endif --QScreen * qt_screen=0; -+QScreen Q_EXPORT * qt_screen=0; - - extern bool qws_screen_is_interlaced; //### hack, from qapplication_qws.cpp - ---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp -@@ -89,7 +89,7 @@ - - extern void qt_setMaxWindowRect(const QRect& r); - --QWSServer *qwsServer=0; -+QWSServer Q_EXPORT *qwsServer=0; - - #define MOUSE 0 - #define KEY 1 ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsdecoration_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsdecoration_qws.h -@@ -41,7 +41,7 @@ - /* - Implements decoration styles - */ --class QWSDecoration -+class Q_EXPORT QWSDecoration - { - public: - QWSDecoration() {} ---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.h -@@ -67,7 +67,7 @@ - - struct QWSWindowData; - --class QWSScreenSaver -+class Q_EXPORT QWSScreenSaver - { - public: - virtual ~QWSScreenSaver(); -@@ -75,7 +75,7 @@ - virtual bool save(int level)=0; - }; - --class QWSWindow -+class Q_EXPORT QWSWindow - { - friend class QWSServer; - public: -@@ -169,9 +169,9 @@ - struct QWSCommandStruct; - - #ifndef QT_NO_QWS_MULTIPROCESS --class QWSServer : public QWSServerSocket -+class Q_EXPORT QWSServer : public QWSServerSocket - #else --class QWSServer : public QObject -+class Q_EXPORT QWSServer : public QObject - #endif - { - friend class QCopChannel; -@@ -501,7 +501,7 @@ - - - #ifndef QT_NO_QWS_IM --class QWSInputMethod : public QObject -+class Q_EXPORT QWSInputMethod : public QObject - { - public: - QWSInputMethod(); -@@ -525,7 +525,7 @@ - #endif - - #ifndef QT_NO_QWS_FSIM --class QWSGestureMethod : public QObject -+class Q_EXPORT QWSGestureMethod : public QObject - { - public: - QWSGestureMethod(); -@@ -573,7 +573,7 @@ - - typedef QMap<int, QWSCursor*> QWSCursorMap; - --class QWSClient : public QObject -+class Q_EXPORT QWSClient : public QObject - { - Q_OBJECT - public: ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsdefaultdecoration_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsdefaultdecoration_qws.h -@@ -44,7 +44,7 @@ - - - --class QWSDefaultDecoration : public QWSDecoration -+class Q_EXPORT QWSDefaultDecoration : public QWSDecoration - { - public: - QWSDefaultDecoration(); ---- qt-2.3.9-snapshot-20050114/src/kernel/qwscommand_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwscommand_qws.h -@@ -47,8 +47,8 @@ - * - *********************************************************************/ - #ifndef QT_NO_QWS_MULTIPROCESS --void qws_write_command( QWSSocket *socket, int type, char *simpleData, int simpleLen, char *rawData, int rawLen ); --bool qws_read_command( QWSSocket *socket, char *&simpleData, int &simpleLen, char *&rawData, int &rawLen, int &bytesRead ); -+void Q_EXPORT qws_write_command( QWSSocket *socket, int type, char *simpleData, int simpleLen, char *rawData, int rawLen ); -+bool Q_EXPORT qws_read_command( QWSSocket *socket, char *&simpleData, int &simpleLen, char *&rawData, int &rawLen, int &bytesRead ); - #endif - /********************************************************************* - * -@@ -57,7 +57,7 @@ - *********************************************************************/ - - --struct QWSProtocolItem -+struct Q_EXPORT QWSProtocolItem - { - // ctor - dtor - QWSProtocolItem( int t, int len, char *ptr ) : type( t ), ---- qt-2.3.9-snapshot-20050114/src/kernel/qfont_qws.cpp~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qfont_qws.cpp -@@ -152,7 +152,7 @@ - static QFontCache *fontCache = 0; // cache of loaded fonts - static QFontDict *fontDict = 0; // dict of all loaded fonts - --void qws_clearLoadedFonts() -+void Q_EXPORT qws_clearLoadedFonts() - { - QFontDictIt it( *fontDict ); - while ( it.current() ) { ---- qt-2.3.9-snapshot-20050114/src/kernel/qwscursor_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwscursor_qws.h -@@ -37,7 +37,7 @@ - #include <qimage.h> - #endif // QT_H - --class QWSCursor : public Qt -+class Q_EXPORT QWSCursor : public Qt - { - public: - QWSCursor() {} ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsevent_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsevent_qws.h -@@ -40,7 +40,7 @@ - - struct QWSMouseEvent; - --struct QWSEvent : QWSProtocolItem { -+struct Q_EXPORT QWSEvent : QWSProtocolItem { - - QWSEvent( int t, int len, char *ptr ) : QWSProtocolItem(t,len,ptr) {} - -@@ -71,7 +71,7 @@ - - //All events must start with windowID - --struct QWSConnectedEvent : QWSEvent { -+struct Q_EXPORT QWSConnectedEvent : QWSEvent { - QWSConnectedEvent() - : QWSEvent( QWSEvent::Connected, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -90,7 +90,7 @@ - char *display; - }; - --struct QWSMaxWindowRectEvent : QWSEvent { -+struct Q_EXPORT QWSMaxWindowRectEvent : QWSEvent { - QWSMaxWindowRectEvent() - : QWSEvent( MaxWindowRect, sizeof( simpleData ), (char*)&simpleData ) { } - struct SimpleData { -@@ -99,7 +99,7 @@ - } simpleData; - }; - --struct QWSMouseEvent : QWSEvent { -+struct Q_EXPORT QWSMouseEvent : QWSEvent { - QWSMouseEvent() - : QWSEvent( QWSEvent::Mouse, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -110,7 +110,7 @@ - } simpleData; - }; - --struct QWSFocusEvent : QWSEvent { -+struct Q_EXPORT QWSFocusEvent : QWSEvent { - QWSFocusEvent() - : QWSEvent( QWSEvent::Focus, sizeof( simpleData ), (char*)&simpleData ) - { memset((char*)&simpleData,0,sizeof(simpleData)); } -@@ -120,7 +120,7 @@ - } simpleData; - }; - --struct QWSKeyEvent: QWSEvent { -+struct Q_EXPORT QWSKeyEvent: QWSEvent { - QWSKeyEvent() - : QWSEvent( QWSEvent::Key, sizeof( simpleData ), - (char*)&simpleData ) -@@ -136,7 +136,7 @@ - }; - - --struct QWSCreationEvent : QWSEvent { -+struct Q_EXPORT QWSCreationEvent : QWSEvent { - QWSCreationEvent() - : QWSEvent( QWSEvent::Creation, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -146,7 +146,7 @@ - }; - - #ifndef QT_NO_QWS_PROPERTIES --struct QWSPropertyNotifyEvent : QWSEvent { -+struct Q_EXPORT QWSPropertyNotifyEvent : QWSEvent { - QWSPropertyNotifyEvent() - : QWSEvent( QWSEvent::PropertyNotify, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -162,7 +162,7 @@ - }; - #endif - --struct QWSSelectionClearEvent : QWSEvent { -+struct Q_EXPORT QWSSelectionClearEvent : QWSEvent { - QWSSelectionClearEvent() - : QWSEvent( QWSEvent::SelectionClear, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -171,7 +171,7 @@ - } simpleData; - }; - --struct QWSSelectionRequestEvent : QWSEvent { -+struct Q_EXPORT QWSSelectionRequestEvent : QWSEvent { - QWSSelectionRequestEvent() - : QWSEvent( QWSEvent::SelectionRequest, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -184,7 +184,7 @@ - } simpleData; - }; - --struct QWSSelectionNotifyEvent : QWSEvent { -+struct Q_EXPORT QWSSelectionNotifyEvent : QWSEvent { - QWSSelectionNotifyEvent() - : QWSEvent( QWSEvent::SelectionNotify, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -198,7 +198,7 @@ - - //complex events: - --struct QWSRegionModifiedEvent : QWSEvent { -+struct Q_EXPORT QWSRegionModifiedEvent : QWSEvent { - QWSRegionModifiedEvent() - : QWSEvent( QWSEvent::RegionModified, sizeof( simpleData ), - (char*)&simpleData ) -@@ -218,7 +218,7 @@ - QRect *rectangles; - }; - #ifndef QT_NO_QWS_PROPERTIES --struct QWSPropertyReplyEvent : QWSEvent { -+struct Q_EXPORT QWSPropertyReplyEvent : QWSEvent { - QWSPropertyReplyEvent() - : QWSEvent( QWSEvent::PropertyReply, sizeof( simpleData ), - (char*)&simpleData ) {} -@@ -238,7 +238,7 @@ - #endif //QT_NO_QWS_PROPERTIES - - #ifndef QT_NO_COP --struct QWSQCopMessageEvent : QWSEvent { -+struct Q_EXPORT QWSQCopMessageEvent : QWSEvent { - QWSQCopMessageEvent() - : QWSEvent( QWSEvent::QCopMessage, sizeof( simpleData ), - (char*)&simpleData ) -@@ -268,7 +268,7 @@ - - #endif - --struct QWSWindowOperationEvent : QWSEvent { -+struct Q_EXPORT QWSWindowOperationEvent : QWSEvent { - QWSWindowOperationEvent() - : QWSEvent( WindowOperation, sizeof( simpleData ), (char*)&simpleData ) { } - -@@ -280,7 +280,7 @@ - }; - - #ifndef QT_NO_QWS_IM --struct QWSIMEvent : QWSEvent { -+struct Q_EXPORT QWSIMEvent : QWSEvent { - QWSIMEvent() - : QWSEvent( IMEvent, sizeof( simpleData ), (char*)&simpleData ) { } - ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsmanager_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmanager_qws.h -@@ -48,7 +48,7 @@ - class QWSButton; - class QWSManager; - --class QWSManager : public QObject -+class Q_EXPORT QWSManager : public QObject - { - Q_OBJECT - ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.h -@@ -38,7 +38,7 @@ - #include <qpointarray.h> - #endif // QT_H - --class QWSPointerCalibrationData -+class Q_EXPORT QWSPointerCalibrationData - { - public: - enum Location { TopLeft = 0, BottomLeft = 1, BottomRight = 2, TopRight = 3, -@@ -47,7 +47,7 @@ - QPoint screenPoints[5]; - }; - --class QWSMouseHandler : public QObject { -+class Q_EXPORT QWSMouseHandler : public QObject { - Q_OBJECT - public: - QWSMouseHandler(); ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsproperty_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsproperty_qws.h -@@ -47,7 +47,7 @@ - - class QWSPropertyManagerData; - --class QWSPropertyManager -+class Q_EXPORT QWSPropertyManager - { - public: - enum Mode { ---- qt-2.3.9-snapshot-20050114/src/kernel/qlayoutengine.cpp~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qlayoutengine.cpp -@@ -70,7 +70,7 @@ - pos and space give the interval (relative to parentWidget topLeft.) - */ - --void qGeomCalc( QArray<QLayoutStruct> &chain, int start, int count, int pos, -+void Q_EXPORT qGeomCalc( QArray<QLayoutStruct> &chain, int start, int count, int pos, - int space, int spacer ) - { - typedef int fixed; ---- qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.h~qt-visibility -+++ qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.h -@@ -84,7 +84,7 @@ - // e.g. Truetype Times, 10 point. There's only one of these though; - // we want to share generated glyphs - --class QRenderedFont { -+class Q_EXPORT QRenderedFont { - - public: - diff --git a/packages/qte/qte-2.3.9-snapshot/tslib.patch b/packages/qte/qte-2.3.9-snapshot/tslib.patch deleted file mode 100644 index fdbb5d868f..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/tslib.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~tslib -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp -@@ -1836,8 +1836,8 @@ - * we're in raw mode and do some easy median - * search. - */ -- // if ( m_raw ) -- // return interpolateSample(); -+ if ( m_raw ) -+ return interpolateSample(); - - static struct ts_sample sample; - static int ret; diff --git a/packages/qte/qte-2.3.9-snapshot/vt-switch.patch b/packages/qte/qte-2.3.9-snapshot/vt-switch.patch deleted file mode 100644 index 4007a5d9f6..0000000000 --- a/packages/qte/qte-2.3.9-snapshot/vt-switch.patch +++ /dev/null @@ -1,178 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20041221/src/kernel/qapplication_qws.cpp~vt-switch.patch -+++ qt-2.3.9-snapshot-20041221/src/kernel/qapplication_qws.cpp -@@ -124,6 +124,12 @@ - static int qt_thread_pipe[2]; - #endif - -+#if defined(_OS_LINUX_) -+#include <sys/ioctl.h> -+#include <linux/vt.h> -+#include <linux/kd.h> -+#endif -+ - const int qwsSharedRamSize = 32 * 1024; //Small amount to fit on small devices. - - // These are in qapplication.cpp in qt/main -@@ -164,6 +170,8 @@ - bool qws_accel = TRUE; // ### never set - const char *qws_display_spec = ":0"; - int qws_display_id = 0; -+int qws_terminal_id = 0; -+int qws_terminal_old = 0; - int qws_client_id = 0; - QWidget *qt_pressGrab = 0; - QWidget *qt_mouseGrb = 0; -@@ -1700,6 +1708,15 @@ - type = QApplication::GuiServer; - } else if ( arg == "-interlaced" ) { - qws_screen_is_interlaced = TRUE; -+ } else if ( arg == "-terminal" ) { -+ if ( ++i < argc ) -+ { -+ if ( ( qws_terminal_id = atoi( argv[i] ) ) < 1 ) -+ { -+ qWarning( "Ignoring Invalid Terminal Specification." ); -+ qws_terminal_id = 0; -+ } -+ } - } else if ( arg == "-display" ) { - if ( ++i < argc ) - qws_display_spec = argv[i]; -@@ -1724,6 +1741,53 @@ - if ( type == QApplication::GuiServer ) { - qt_appType = type; - qws_single_process = TRUE; -+ -+ /* Allocate a dedicated virtual terminal -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ * Added a new command line option which only is relevant if the application is created as a GuiServer. -+ * The option is -terminal <num>, where <num> specifies the virtual terminal to be occupied by the server. -+ * As default in Linux, 0 means the current virtual terminal. -+ */ -+ #if defined(_OS_LINUX_) -+ if ( qws_terminal_id ) -+ { -+ qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id ); -+ struct vt_stat console_stat; -+ int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR ); -+ if ( console_fd == -1) -+ { -+ qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, VT_GETSTATE, &console_stat ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_GETSTATE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ qws_terminal_old = console_stat.v_active; -+ qDebug( "qt_init() - active vt is #%d, switching to #%d as requested...", qws_terminal_old, qws_terminal_id ); -+ -+ if ( ioctl( console_fd, VT_ACTIVATE, qws_terminal_id ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_ACTIVATE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, VT_WAITACTIVE, qws_terminal_id ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_WAITACTIVE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, KDSETMODE, KD_GRAPHICS ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(KDSETMODE:KD_GRAPHICS): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ ::close( console_fd ); -+ } -+ else -+ { -+ qDebug( "QWSApplication::qt_init() - current terminal specified." ); -+ } -+ #endif - QWSServer::startup(flags); - setenv("QWS_DISPLAY", qws_display_spec, 0); - } -@@ -1774,7 +1838,36 @@ - QFontManager::cleanup(); - - if ( qws_single_process ) { -- QWSServer::closedown(); -+ qDebug( "qt_cleanup() - shutting down QWSServer..." ); -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+#if defined(_OS_LINUX_) -+ if ( qws_terminal_old > 0 ) -+ { -+ qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old ); -+ -+ int console_fd = ::open( "/dev/tty0", O_RDWR ); -+ if ( console_fd == -1) -+ { -+ qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -+ } -+ else -+ { -+ if ( ioctl( console_fd, KDSETMODE, KD_TEXT ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(KDSETMODE:KD_TEXT): %s", strerror( errno ) ); -+ } -+ if ( ioctl( console_fd, VT_ACTIVATE, qws_terminal_old ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_ACTIVATE): %s", strerror( errno ) ); -+ } -+ ::close( console_fd ); -+ } -+ } -+#endif - } - if ( qt_is_gui_used ) { - delete qt_fbdpy; ---- qt-2.3.9-snapshot-20041221/src/kernel/qkeyboard_qws.cpp~vt-switch.patch -+++ qt-2.3.9-snapshot-20041221/src/kernel/qkeyboard_qws.cpp -@@ -1247,6 +1247,24 @@ - { - if (kbdFD >= 0) - { -+ -+#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -+ struct vt_mode vtMode; -+ ioctl(kbdFD, VT_GETMODE, &vtMode); -+ -+ /* Mickey says: "Better give up control of VT switching. -+ * Hey, I really hate that OS-will-reacquire-resources on process-death -+ * kind of thinking! -+ */ -+ vtMode.mode = VT_AUTO; -+ vtMode.relsig = 0; -+ vtMode.acqsig = 0; -+ ioctl(kbdFD, VT_SETMODE, &vtMode); -+ -+ signal(VTSWITCHSIG, 0); -+ qDebug( "~QWSTtyKeyboardHandler() - released VT." ); -+#endif -+ - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) - ioctl(kbdFD, KDSKBMODE, K_XLATE); - #endif ---- qt-2.3.9-snapshot-20041221/src/kernel/qgfxlinuxfb_qws.cpp~vt-switch.patch -+++ qt-2.3.9-snapshot-20041221/src/kernel/qgfxlinuxfb_qws.cpp -@@ -251,9 +251,9 @@ - - bool QLinuxFbScreen::initDevice() - { -- // No blankin' screen, no blinkin' cursor!, no cursor! -+ /* Setting up the VT parameters is done in qapplication_qws.cpp - const char termctl[]="\033[9;0]\033[?33l\033[?25l"; -- writeTerm(termctl,sizeof(termctl)); -+ writeTerm(termctl,sizeof(termctl)); */ - - // Grab current mode so we can reset it - fb_var_screeninfo vinfo; diff --git a/packages/qte/qte-for-opie_2.3.10-snapshot-20050120.bb b/packages/qte/qte-for-opie_2.3.10-snapshot-20050120.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-for-opie_2.3.10-snapshot-20050120.bb diff --git a/packages/qte/qte_2.3.10-snapshot.bb b/packages/qte/qte_2.3.10-snapshot.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte_2.3.10-snapshot.bb diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb deleted file mode 100644 index cdc00444b0..0000000000 --- a/packages/qte/qte_2.3.9-snapshot.bb +++ /dev/null @@ -1,194 +0,0 @@ -DESCRIPTION = "Qt/Embedded Version ${PV}" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL QPL" -DEPENDS = "zlib libpng jpeg tslib uicmoc-native" -PROVIDES = "virtual/qte virtual/libqte2" -PR = "r4" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \ - file://qpe.patch;patch=1 \ - file://vt-switch.patch;patch=1 \ - file://daemonize.patch;patch=1 \ - file://no-moc.patch;patch=1 \ - file://gcc3.patch;patch=1 \ - file://tslib.patch;patch=1 \ - file://c700-hardware.patch;patch=1 \ - file://encoding.patch;patch=1 \ - file://fix-qgfxraster.patch;patch=1 \ - file://qt-visibility.patch;patch=1 \ - file://update-qtfontdir \ - file://sharp_char.h \ - file://switches.h " - -SRC_URI_append_simpad = "file://devfs.patch;patch=1 file://simpad.patch;patch=1 " -SRC_URI_append_corgi = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " -SRC_URI_append_shepherd = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " -SRC_URI_append_husky = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_beagle = "file://beagle.patch;patch=1 " - -SRC_URI_append_openzaurus-pxa-2.6 = "file://use-kernel-keycodes.patch;patch=1 " - -S = "${WORKDIR}/qt-${PV}" - -export QTDIR = "${S}" - -def qte_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - -QTE_ARCH := "${@qte_arch(d)}" - -EXTRA_OECONF_CONFIG = "-qconfig qpe" -EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" -EXTRA_OEMAKE = "-e" -PARALLEL_MAKE = "" - -# -# FIXME: Add more here -# -EXTRA_DEFINES = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_collie = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_poodle = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" -EXTRA_DEFINES_h3600 = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h3900 = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada56x = "-DQWS_TSLIB -DQT_QWS_IPAQ" -EXTRA_DEFINES_simpad = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" -EXTRA_DEFINES_corgi = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_shepherd = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_husky = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_beagle = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_BEAGLE" -EXTRA_DEFINES_openzaurus-pxa-2.6= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700" - -export SYSCONF_CC = "${CC}" -export SYSCONF_CXX = "${CXX}" -export SYSCONF_LINK = "${CCLD}" -export SYSCONF_SHLIB = "${CCLD}" -export SYSCONF_CFLAGS = "${CFLAGS}" -export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES}" -#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES}" -export SYSCONF_LFLAGS = "${LDFLAGS} -lts" -export SYSCONF_MOC = "${STAGING_BINDIR}/moc" -export SYSCONF_UIC = "${STAGING_BINDIR}/uic" - -do_configure() { - for f in ${S}/configs/linux-*-g++-shared; do - sed -e 's,-linux-,-linux-uclibc-,g' < $f \ - > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` - done - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS - install -d include/asm/ - install -m 0644 ${WORKDIR}/sharp_char.h include/asm/ - install -d include/linux/ - install -m 0644 ${WORKDIR}/switches.h include/linux/ - oe_runmake -} - -do_stage() { - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib - rm -f include/qxt.h - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include -} - -do_install() { - install -d ${D}/${sbindir}/ - install -m 0755 ${WORKDIR}/update-qtfontdir ${D}/${sbindir}/ - install -d ${D}${palmtopdir}/lib/fonts/ - oe_libinstall -so -C lib libqte ${D}/${palmtopdir}/lib - cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/ -} - -pkg_postinst() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - -pkg_postinst_qte-font-unicode() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - -pkg_postinst_qte-font-lcd () { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - -pkg_postinst_qte-font-japanese() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - -pkg_postinst_qte-font-micro() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - -pkg_postinst_qte-font-courier() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - -PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica-small qte-font-helvetica-large \ - qte-font-smoothtimes qte-font-smallsmooth qte-font-unicode qte-font-lcd \ - qte-font-japanese qte-font-micro qte-font-courier" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -FILES_${PN} = "" -FILES_libqte2 = "${palmtopdir}/lib/libqte.so* /usr/sbin/update-qtfontdir" -FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*" -PACKAGE_ARCH_qte-font-fixed = "all" -FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \ - ${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf" -PACKAGE_ARCH_qte-font-helvetica-small = "all" -FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \ - ${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf" -PACKAGE_ARCH_qte-font-helvetica-large = "all" -FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*" -PACKAGE_ARCH_qte-font-smoothtimes = "all" -FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*" -PACKAGE_ARCH_qte-font-smallsmooth = "all" -FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf" -PACKAGE_ARCH_qte-font-unicode = "all" -FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*" -PACKAGE_ARCH_qte-font-lcd = "all" -FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/japanese*" -PACKAGE_ARCH_qte-font-japanese = "all" -FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf" -PACKAGE_ARCH_qte-font-micro = "all" -FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*" -PACKAGE_ARCH_qte-font-courier = "all" diff --git a/packages/uicmoc/uicmoc-native-2.3.10-snapshot-20050120/fix-makefile.patch b/packages/uicmoc/uicmoc-native-2.3.10-snapshot-20050120/fix-makefile.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10-snapshot-20050120/fix-makefile.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.10-snapshot-20050120/gcc3_4.patch b/packages/uicmoc/uicmoc-native-2.3.10-snapshot-20050120/gcc3_4.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10-snapshot-20050120/gcc3_4.patch diff --git a/packages/uicmoc/uicmoc-native_2.3.10-snapshot-20050120.bb b/packages/uicmoc/uicmoc-native_2.3.10-snapshot-20050120.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uicmoc/uicmoc-native_2.3.10-snapshot-20050120.bb |