From 0ce0b687d051a2b85ba3c73d1ec8d1577e9ec31f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 19 Jul 2007 07:45:16 +0000 Subject: qte 2.3.10: Move c700 2.4 patches to deprecated. --- packages/qte/qte-2.3.10/c700-hardware.patch | 27 ---------------------- .../qte/qte-2.3.10/deprecated/c700-hardware.patch | 27 ++++++++++++++++++++++ packages/qte/qte-common_2.3.10.inc | 7 +++--- 3 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 packages/qte/qte-2.3.10/c700-hardware.patch create mode 100644 packages/qte/qte-2.3.10/deprecated/c700-hardware.patch (limited to 'packages/qte') diff --git a/packages/qte/qte-2.3.10/c700-hardware.patch b/packages/qte/qte-2.3.10/c700-hardware.patch deleted file mode 100644 index fa4bd25f37..0000000000 --- a/packages/qte/qte-2.3.10/c700-hardware.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- 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 diff --git a/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch b/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch new file mode 100644 index 0000000000..fa4bd25f37 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch @@ -0,0 +1,27 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- 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 diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index bde927fbc0..b35449545b 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -25,7 +25,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://no-moc.patch;patch=1 \ file://gcc3.patch;patch=1 \ file://gcc4.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 \ @@ -116,9 +115,9 @@ EXTRA_DEFINES_palmt650 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_palmz72 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700" -EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" -EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" +EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -- cgit v1.2.3