summaryrefslogtreecommitdiff
path: root/packages/qte
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-17 21:40:24 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-17 21:40:24 +0000
commit8bc61c54fdac2884d23ae3802afe7f5f81c7aff2 (patch)
tree131c8ed3980b6aa897fcb471314cfa01ae2193dd /packages/qte
parent94d87cd53a89e085b09ca55c1bc05a7c313998e8 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/17 22:09:22+01:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/01/17 22:08:56+01:00 handhelds.org!zecke UICMOC use Qt2.3.9: -Use recent Qt2.3.9 for building uicmoc -Update patches to work with Qt2.3.9 version 2005/01/17 22:07:14+01:00 handhelds.org!zecke Qt 2.3.9: -Update to 14.01.2005 snapshot -TSlib patch is included but castrated, uncastrate it -The latest mouse release patch was fixed independently by Trolltech as well -Update other patches 2005/01/17 16:00:45-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/01/17 15:56:11-05:00 handhelds.org!kergoth Update the default event handler to clean things up a bit, and to mention the package version in the Pkg events, which people have requested in the past. 2005/01/17 20:49:43+00:00 rpsys.net!RP Add facility to pass parallel build option to make. Disable parallel build option for known broken packages. BKrev: 41ec30c8I5e1Ks5lsaghKSnrJo6cVg
Diffstat (limited to 'packages/qte')
-rw-r--r--packages/qte/qte-2.3.9-snapshot/beagle.patch32
-rw-r--r--packages/qte/qte-2.3.9-snapshot/c700-hardware.patch57
-rw-r--r--packages/qte/qte-2.3.9-snapshot/devfs.patch163
-rw-r--r--packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch23
-rw-r--r--packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch10
-rw-r--r--packages/qte/qte-2.3.9-snapshot/qt-visibility.patch93
-rw-r--r--packages/qte/qte-2.3.9-snapshot/tslib.patch18
-rw-r--r--packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb9
-rw-r--r--packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb (renamed from packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch)0
-rw-r--r--packages/qte/qte_2.3.9-snapshot.bb1
10 files changed, 301 insertions, 105 deletions
diff --git a/packages/qte/qte-2.3.9-snapshot/beagle.patch b/packages/qte/qte-2.3.9-snapshot/beagle.patch
index e69de29bb2..eeb31c3b98 100644
--- a/packages/qte/qte-2.3.9-snapshot/beagle.patch
+++ b/packages/qte/qte-2.3.9-snapshot/beagle.patch
@@ -0,0 +1,32 @@
+
+#
+# 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
index b9a1011c13..5527ab4a88 100644
--- a/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch
+++ b/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch
@@ -3,8 +3,8 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- qt-2.3.9-snapshot-20050101/src/kernel/qwindowsystem_qws.cpp~c700-hardware.patch
-+++ qt-2.3.9-snapshot-20050101/src/kernel/qwindowsystem_qws.cpp
+--- 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;
@@ -23,9 +23,9 @@
d->screensavertimer->stop();
#else
if ( screensaverinterval ) {
---- qt-2.3.9-snapshot-20050101/src/kernel/qwsmouse_qws.cpp~c700-hardware.patch
-+++ qt-2.3.9-snapshot-20050101/src/kernel/qwsmouse_qws.cpp
-@@ -95,6 +95,19 @@
+--- 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
@@ -45,7 +45,7 @@
#endif
#ifndef QT_QWS_TP_SAMPLE_SIZE
-@@ -600,7 +613,7 @@
+@@ -592,7 +605,7 @@
sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd);
notify(fd);
}
@@ -54,21 +54,16 @@
char fn[] = "/dev/ttyS?";
for (int ch='0'; ch<='3'; ch++) {
fn[9] = ch;
-@@ -1493,11 +1506,11 @@
-
-
- QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev )
-- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0),
-+ : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0),
+@@ -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) || 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) {
-@@ -1507,7 +1520,7 @@
+@@ -1284,7 +1297,7 @@
qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno));
return;
}
@@ -77,7 +72,7 @@
//# ifdef QT_QWS_SL5XXX_TSRAW
# if 0
if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) {
-@@ -1533,7 +1546,7 @@
+@@ -1310,7 +1323,7 @@
QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
{
@@ -86,7 +81,7 @@
if (mouseFD >= 0)
close(mouseFD);
#endif
-@@ -1541,7 +1554,7 @@
+@@ -1318,7 +1331,7 @@
void QTPanelHandlerPrivate::readMouseData()
{
@@ -95,7 +90,7 @@
if(!qt_screen)
return;
-@@ -1560,7 +1573,7 @@
+@@ -1337,7 +1350,7 @@
uchar *mb = mouseBuf+idx;
data = (TS_EVENT *) mb;
if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) {
@@ -104,32 +99,8 @@
samples[currSample] = QPoint( 1000 - data->x, data->y );
#else
samples[currSample] = QPoint( data->x, data->y );
-@@ -1574,12 +1587,12 @@
- mousePos = QPoint( 0, 0 );
- QPoint totalMousePos = oldTotalMousePos;
- totalMousePos += samples[currSample];
-- if(numSamples >= samples.count())
-+ if(numSamples >= samples.count())
- totalMousePos -= samples[lastSample];
-
- mousePos = totalMousePos / (sampleCount - 1);
-
--# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW)
-+# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) || defined(QT_QWS_SLC700_RAW)
- mousePos = transform( mousePos );
- # endif
- if(!waspressed)
-@@ -1604,7 +1617,7 @@
-
- // save recuring information
- currSample++;
-- if (numSamples >= samples.count())
-+ if (numSamples >= samples.count())
- lastSample++;
- oldTotalMousePos = totalMousePos;
- } else {
-@@ -1963,7 +1976,7 @@
- handler = new QTSLibHandler();
+@@ -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)
diff --git a/packages/qte/qte-2.3.9-snapshot/devfs.patch b/packages/qte/qte-2.3.9-snapshot/devfs.patch
index e69de29bb2..27ea4239c7 100644
--- a/packages/qte/qte-2.3.9-snapshot/devfs.patch
+++ b/packages/qte/qte-2.3.9-snapshot/devfs.patch
@@ -0,0 +1,163 @@
+
+#
+# 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
index e69de29bb2..0fabd78fac 100644
--- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch
+++ b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch
@@ -0,0 +1,23 @@
+
+#
+# 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
index 09cbcc4938..ca445f4d1d 100644
--- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch
+++ b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch
@@ -3,9 +3,9 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- qt-2.3.9-snapshot-20050101/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa.patch
-+++ qt-2.3.9-snapshot-20050101/src/kernel/qkeyboard_qws.cpp
-@@ -301,14 +301,24 @@
+--- 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
@@ -30,7 +30,7 @@
{ Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47
{ Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48
{ Qt::Key_Colon, ':' , ':' , 0xffff }, // 49
-@@ -518,6 +528,32 @@
+@@ -572,6 +582,32 @@
static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1;
static QIntDict<QWSServer::KeyMap> *overrideMap = 0;
@@ -63,7 +63,7 @@
/*!
Changes the mapping of the keyboard; adding the scancode to Unicode
mappings from \a map. The server takes over ownership of \a map
-@@ -828,6 +864,15 @@
+@@ -882,6 +918,15 @@
int keypad = 0;
#ifndef QT_QWS_USE_KEYCODES
diff --git a/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch b/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch
index 449b5ae9ca..ccdebb0c40 100644
--- a/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch
+++ b/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch
@@ -3,11 +3,11 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- qt-2.3.9-snapshot-20041212/configure~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/configure
+--- qt-2.3.9-snapshot-20050114/configure~qt-visibility
++++ qt-2.3.9-snapshot-20050114/configure
@@ -409,6 +409,9 @@
-tslib)
- TSLIB=YES
+ TSLIB=yes
;;
+ -visibility-hidden)
+ VISIBILITY=YES
@@ -16,8 +16,8 @@
GPLUSPLUS_EXCEPTIONS=no
;;
@@ -1296,6 +1299,9 @@
- -tslib ............. Use the TSLib (touchscreen access library) mouse handler
- by default, instead of the normal device default.
+ -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
@@ -25,21 +25,20 @@
-no-g++-exceptions . Disable exceptions on platforms using the GNU C++
compiler by using the -fno-exceptions flag.
-@@ -1366,6 +1372,11 @@
+@@ -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-20041212/src/tools/qglobal.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/tools/qglobal.h
-@@ -504,6 +504,12 @@
+--- 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
@@ -52,8 +51,8 @@
#ifndef Q_EXPORT
#define Q_EXPORT
#endif
---- qt-2.3.9-snapshot-20041212/src/widgets/qscrollview.cpp~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/widgets/qscrollview.cpp
+--- 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.
@@ -63,8 +62,8 @@
/*!
Updates scrollbars - all possibilities considered. You should never
---- qt-2.3.9-snapshot-20041212/src/Makefile.in~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/Makefile.in
+--- 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
@@ -74,8 +73,8 @@
$(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-20041212/src/kernel/qcopchannel_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qcopchannel_qws.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;
@@ -85,8 +84,8 @@
{
Q_OBJECT
public:
---- qt-2.3.9-snapshot-20041212/src/kernel/qfontmanager_qws.cpp~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qfontmanager_qws.cpp
+--- 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;
}
@@ -96,8 +95,8 @@
/*!
\class QFontManager qfontmanager_qws.h
---- qt-2.3.9-snapshot-20041212/src/kernel/qgfx_qws.cpp~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qgfx_qws.cpp
+--- 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>
@@ -112,8 +111,8 @@
extern bool qws_screen_is_interlaced; //### hack, from qapplication_qws.cpp
---- qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.cpp~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_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);
@@ -123,8 +122,8 @@
#define MOUSE 0
#define KEY 1
---- qt-2.3.9-snapshot-20041212/src/kernel/qwsdecoration_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsdecoration_qws.h
+--- 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
@@ -134,8 +133,8 @@
{
public:
QWSDecoration() {}
---- qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.h
+--- 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;
@@ -193,8 +192,8 @@
{
Q_OBJECT
public:
---- qt-2.3.9-snapshot-20041212/src/kernel/qwsdefaultdecoration_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsdefaultdecoration_qws.h
+--- 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 @@
@@ -204,8 +203,8 @@
{
public:
QWSDefaultDecoration();
---- qt-2.3.9-snapshot-20041212/src/kernel/qwscommand_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwscommand_qws.h
+--- 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 @@
*
*********************************************************************/
@@ -226,8 +225,8 @@
{
// ctor - dtor
QWSProtocolItem( int t, int len, char *ptr ) : type( t ),
---- qt-2.3.9-snapshot-20041212/src/kernel/qfont_qws.cpp~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qfont_qws.cpp
+--- 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
@@ -237,8 +236,8 @@
{
QFontDictIt it( *fontDict );
while ( it.current() ) {
---- qt-2.3.9-snapshot-20041212/src/kernel/qwscursor_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwscursor_qws.h
+--- 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
@@ -248,8 +247,8 @@
{
public:
QWSCursor() {}
---- qt-2.3.9-snapshot-20041212/src/kernel/qwsevent_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsevent_qws.h
+--- 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;
@@ -394,8 +393,8 @@
QWSIMEvent()
: QWSEvent( IMEvent, sizeof( simpleData ), (char*)&simpleData ) { }
---- qt-2.3.9-snapshot-20041212/src/kernel/qwsmanager_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsmanager_qws.h
+--- 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;
@@ -405,8 +404,8 @@
{
Q_OBJECT
---- qt-2.3.9-snapshot-20041212/src/kernel/qwsmouse_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsmouse_qws.h
+--- 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
@@ -425,8 +424,8 @@
Q_OBJECT
public:
QWSMouseHandler();
---- qt-2.3.9-snapshot-20041212/src/kernel/qwsproperty_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsproperty_qws.h
+--- 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;
@@ -436,8 +435,8 @@
{
public:
enum Mode {
---- qt-2.3.9-snapshot-20041212/src/kernel/qlayoutengine.cpp~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041212/src/kernel/qlayoutengine.cpp
+--- 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.)
*/
@@ -447,8 +446,8 @@
int space, int spacer )
{
typedef int fixed;
---- qt-2.3.9-snapshot-20041229/src/kernel/qfontmanager_qws.h~qt-visibility.patch
-+++ qt-2.3.9-snapshot-20041229/src/kernel/qfontmanager_qws.h
+--- 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
diff --git a/packages/qte/qte-2.3.9-snapshot/tslib.patch b/packages/qte/qte-2.3.9-snapshot/tslib.patch
index e69de29bb2..fdbb5d868f 100644
--- a/packages/qte/qte-2.3.9-snapshot/tslib.patch
+++ b/packages/qte/qte-2.3.9-snapshot/tslib.patch
@@ -0,0 +1,18 @@
+
+#
+# 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-for-opie_2.3.9-snapshot-20050103.bb b/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb
deleted file mode 100644
index bc6292b45c..0000000000
--- a/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "opie/base"
-include qte_2.3.9-snapshot.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-2.3.9-snapshot"
-
-DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}"
-
-SRC_URI += "file://opie.patch;patch=1 \
- file://qiconview-speed.patch;patch=1 "
diff --git a/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch b/packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch
+++ b/packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb
diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index cc02168b91..f40de2be37 100644
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -18,7 +18,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
file://encoding.patch;patch=1 \
file://fix-qgfxraster.patch;patch=1 \
file://qt-visibility.patch;patch=1 \
- file://fix-mouse-release.patch;patch=1 \
file://update-qtfontdir \
file://sharp_char.h \
file://switches.h "