From 50f65106b5cd50f5005c1bbb26a21c99c6fd8477 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 25 Sep 2010 19:31:05 +0200 Subject: libopie : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- recipes/libopie/libopie2/exports.patch | 11 -- .../ipaq-2.6-sys-class-backlight-support.patch | 144 ----------------- .../libopie/libopie2/ipaq-lcd-rotate-cleanup.patch | 39 ----- .../libopie/libopie2/keyboardless-buttonmap.patch | 176 --------------------- .../libopie/libopie2/odevice.h-jornada-fixup.patch | 13 -- .../libopie2/odevice_jornada.cpp-fixup.patch | 57 ------- recipes/libopie/libopie2/wireless.patch | 12 -- recipes/obsolete/libopie/libopie2/exports.patch | 11 ++ .../ipaq-2.6-sys-class-backlight-support.patch | 144 +++++++++++++++++ .../libopie/libopie2/ipaq-lcd-rotate-cleanup.patch | 39 +++++ .../libopie/libopie2/keyboardless-buttonmap.patch | 176 +++++++++++++++++++++ .../libopie/libopie2/odevice.h-jornada-fixup.patch | 13 ++ .../libopie2/odevice_jornada.cpp-fixup.patch | 57 +++++++ recipes/obsolete/libopie/libopie2/wireless.patch | 12 ++ 14 files changed, 452 insertions(+), 452 deletions(-) delete mode 100644 recipes/libopie/libopie2/exports.patch delete mode 100644 recipes/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch delete mode 100644 recipes/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch delete mode 100644 recipes/libopie/libopie2/keyboardless-buttonmap.patch delete mode 100644 recipes/libopie/libopie2/odevice.h-jornada-fixup.patch delete mode 100644 recipes/libopie/libopie2/odevice_jornada.cpp-fixup.patch delete mode 100644 recipes/libopie/libopie2/wireless.patch create mode 100644 recipes/obsolete/libopie/libopie2/exports.patch create mode 100644 recipes/obsolete/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch create mode 100644 recipes/obsolete/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch create mode 100644 recipes/obsolete/libopie/libopie2/keyboardless-buttonmap.patch create mode 100644 recipes/obsolete/libopie/libopie2/odevice.h-jornada-fixup.patch create mode 100644 recipes/obsolete/libopie/libopie2/odevice_jornada.cpp-fixup.patch create mode 100644 recipes/obsolete/libopie/libopie2/wireless.patch diff --git a/recipes/libopie/libopie2/exports.patch b/recipes/libopie/libopie2/exports.patch deleted file mode 100644 index 2ff06287be..0000000000 --- a/recipes/libopie/libopie2/exports.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libopie2/opiecore/ostorageinfo.h.org 2007-03-09 11:20:17.000000000 +0000 -+++ libopie2/opiecore/ostorageinfo.h 2007-03-08 23:43:56.000000000 +0000 -@@ -35,7 +35,7 @@ - namespace Opie { - namespace Core { - --class OStorageInfo : public StorageInfo -+class Q_EXPORT OStorageInfo : public StorageInfo - { - Q_OBJECT - diff --git a/recipes/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch b/recipes/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch deleted file mode 100644 index 4095502c32..0000000000 --- a/recipes/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Index: libopie2/opiecore/device/odevice_ipaq.cpp -=================================================================== -RCS file: /cvs/opie/libopie2/opiecore/device/odevice_ipaq.cpp,v -retrieving revision 1.26 -diff -u -r1.26 odevice_ipaq.cpp ---- libopie2/opiecore/device/odevice_ipaq.cpp 2 Aug 2006 19:12:39 -0000 1.26 -+++ libopie2/opiecore/device/odevice_ipaq.cpp 11 Oct 2006 00:46:38 -0000 -@@ -408,45 +408,19 @@ - if ( bright < 0 ) - bright = 0; - -- QString cmdline; -- -- switch ( model()) { -- case Model_iPAQ_H191x: -- case Model_iPAQ_H4xxx: -- { -- QDir sysClass( "/sys/class/backlight/pxafb/" ); -- sysClass.setFilter(QDir::Dirs); -- int fd; -- if ( sysClass.exists() ) { -- QString sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/power" ); -- fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); -- if ( fd ) { -- char buf[10]; -- buf[0] = bright ? 0 : 4; -- buf[1] = '\0'; -- res = ( ::write( fd, &buf[0], 2 ) == 0 ); -- ::close( fd ); -- } -- sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/brightness" ); -- fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); -- if ( fd ) { -- char buf[100]; -- int len = ::snprintf( &buf[0], sizeof buf, "%d", bright ); -- res = ( ::write( fd, &buf[0], len ) == 0 ); -- ::close( fd ); -- } -- } -- } -- break; -- -- case Model_iPAQ_HX4700: -- cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/w100fb/brightness" ).arg( bright ); -- // No Global::shellQuote as we gurantee it to be sane -- res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); -- break; -- -- -- default: -+ QDir sysClass( "/sys/class/backlight/" ); -+ sysClass.setFilter(QDir::Dirs); -+ if ( sysClass.exists() && sysClass.count() > 2 ) { -+ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/brightness" ); -+ int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK ); -+ if ( fd ) { -+ char buf[100]; -+ int val = bright * displayBrightnessResolution() / 255; -+ int len = ::snprintf( &buf[0], sizeof buf, "%d", val ); -+ res = ( ::write( fd, &buf[0], len ) == 0 ); -+ ::close( fd ); -+ } -+ } else { - if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { - FLITE_IN bl; - bl. mode = 1; -@@ -456,11 +430,28 @@ - ::close ( fd ); - } - } -+ - return res; - } - - int iPAQ::displayBrightnessResolution() const - { -+ int res = 16; -+ -+ QDir sysClass( "/sys/class/backlight/" ); -+ sysClass.setFilter(QDir::Dirs); -+ if ( sysClass.exists() && sysClass.count() > 2 ) { -+ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/max_brightness" ); -+ int fd = ::open( sysClassPath, O_RDONLY|O_NONBLOCK ); -+ if ( fd ) { -+ char buf[100]; -+ if ( ::read( fd, &buf[0], sizeof buf ) ) -+ ::sscanf( &buf[0], "%d", &res ); -+ ::close( fd ); -+ } -+ return res; -+ } -+ - switch ( model()) { - case Model_iPAQ_H31xx: - case Model_iPAQ_H36xx: -@@ -489,27 +480,22 @@ - - QString cmdline; - -- if ( model() == Model_iPAQ_H191x ) { -- QDir sysClass( "/sys/class/lcd/pxafb/" ); -- sysClass.setFilter(QDir::Dirs); -- if ( sysClass.exists() ) { -- QString sysClassPath = sysClass.absFilePath( "/sys/class/lcd/pxafb/power" ); -- int fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); -- if ( fd ) { -- char buf[10]; -- buf[0] = on ? 0 : 4; -- buf[1] = '\0'; -- res = ( ::write( fd, &buf[0], 2 ) == 0 ); -- ::close( fd ); -- } -- } -- return res; -+ QDir sysClass( "/sys/class/lcd/" ); -+ sysClass.setFilter(QDir::Dirs); -+ if ( sysClass.exists() && sysClass.count() > 2 ) { -+ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/power" ); -+ int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK ); -+ if ( fd ) { -+ char buf[10]; -+ buf[0] = on ? 0 : 4; -+ buf[1] = '\0'; -+ res = ( ::write( fd, &buf[0], 2 ) == 0 ); -+ ::close( fd ); -+ } - } else { -- return OAbstractMobileDevice::setDisplayStatus(on); -+ res = OAbstractMobileDevice::setDisplayStatus(on); - } - -- res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); -- - return res; - } - -@@ -517,6 +503,7 @@ - { - switch (model()) { - case Model_iPAQ_H191x: -+ case Model_iPAQ_H22xx: - case Model_iPAQ_H4xxx: - return false; - default: diff --git a/recipes/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch b/recipes/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch deleted file mode 100644 index 735663f343..0000000000 --- a/recipes/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: libopie2/opiecore/device/odevice_ipaq.cpp -=================================================================== ---- libopie2.orig/opiecore/device/odevice_ipaq.cpp 2007-02-05 21:40:33.000000000 +0000 -+++ libopie2/opiecore/device/odevice_ipaq.cpp 2007-02-05 21:51:43.000000000 +0000 -@@ -317,24 +317,20 @@ - break; - } - -- // Rotate cursor keys 180 or 270 -+ // QT has strange screen coordinate system, so depending -+ // on native device screen orientation, we need to rotate cursor keys - case Key_Left : - case Key_Right: - case Key_Up : - case Key_Down : { -- if (( d->m_model == Model_iPAQ_H31xx ) || -- ( d->m_model == Model_iPAQ_H38xx )) { -- newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; -- } -- // Rotate the cursor keys by 270 -- // keycode - Key_Left = position of the button starting from left clockwise -- // add the rotation to it and modolo. No we've the original offset -- // add the offset to the Key_Left key -- if (( d->m_model == Model_iPAQ_H5xxx ) || -- ( d->m_model == Model_iPAQ_H191x ) || -- ( d->m_model == Model_iPAQ_H4xxx ) || -- ( d->m_model == Model_iPAQ_H1940 )) -- newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; -+ int quarters; -+ switch (d->m_rotation) { -+ case Rot0: quarters = 3/*270deg*/; break; -+ case Rot90: quarters = 2/*270deg*/; break; -+ case Rot180: quarters = 1/*270deg*/; break; -+ case Rot270: quarters = 0/*270deg*/; break; -+ } -+ newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; - break; - } - diff --git a/recipes/libopie/libopie2/keyboardless-buttonmap.patch b/recipes/libopie/libopie2/keyboardless-buttonmap.patch deleted file mode 100644 index 288f28a68a..0000000000 --- a/recipes/libopie/libopie2/keyboardless-buttonmap.patch +++ /dev/null @@ -1,176 +0,0 @@ -Index: libopie2/opiecore/device/odevice_ipaq.cpp -=================================================================== -RCS file: /cvs/opie/libopie2/opiecore/device/odevice_ipaq.cpp,v -retrieving revision 1.26 -diff -u -r1.26 odevice_ipaq.cpp ---- libopie2/opiecore/device/odevice_ipaq.cpp 2 Aug 2006 19:12:39 -0000 1.26 -+++ libopie2/opiecore/device/odevice_ipaq.cpp 10 Oct 2006 15:07:21 -0000 -@@ -84,76 +84,68 @@ - #define LED_ON OD_IOW( 'f', 5, LED_IN ) - #define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) - -+#define Model_Keyboardless_2_6 (Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx) -+ - struct i_button ipaq_buttons [] = { -- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, -+ -+ // Common button map for all keyboardless devices with 2.6 kernel -+ { Model_Keyboardless_2_6, - Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), - "devicebuttons/ipaq_calendar", - "datebook", "nextView()", - "today", "raise()" }, -- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, -+ { Model_Keyboardless_2_6, - Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), - "devicebuttons/ipaq_contact", - "addressbook", "raise()", - "addressbook", "beamBusinessCard()" }, -- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, -- Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), -- "devicebuttons/ipaq_menu", -- "QPE/TaskBar", "toggleMenu()", -- "QPE/TaskBar", "toggleStartMenu()" }, -- { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -- Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), -+ { Model_Keyboardless_2_6, -+ Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), - "devicebuttons/ipaq_mail", - "opiemail", "raise()", - "opiemail", "newMail()" }, -- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H4xxx, -+ { Model_Keyboardless_2_6, - Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), - "devicebuttons/ipaq_home", - "QPE/Launcher", "home()", - "buttonsettings", "raise()" }, -- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -+ { Model_Keyboardless_2_6, - Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), - "devicebuttons/ipaq_record", - "QPE/VMemo", "toggleRecord()", - "sound", "raise()" }, - -- { Model_iPAQ_H191x | Model_iPAQ_H4xxx, -- Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), -- "devicebuttons/ipaq_mail", -- "opiemail", "raise()", -- "opiemail", "newMail()" }, -- { Model_iPAQ_H191x | Model_iPAQ_H4xxx, -- Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), -- "devicebuttons/ipaq_record", -- "QPE/VMemo", "toggleRecord()", -- "sound", "raise()" }, -- -- //h2200 has different button mapping -- { Model_iPAQ_H22xx, -- Qt::Key_NumLock, QT_TRANSLATE_NOOP("Button", "Mail Button"), -- "devicebuttons/ipaq_mail", -- "opiemail", "raise()", -- "opiemail", "newMail()" }, -- { Model_iPAQ_H22xx, -- Qt::Key_ScrollLock, QT_TRANSLATE_NOOP("Button", "Menu Button"), -+ // Devices with 2.4 kernel -+ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -+ Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), -+ "devicebuttons/ipaq_calendar", -+ "datebook", "nextView()", -+ "today", "raise()" }, -+ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -+ Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), -+ "devicebuttons/ipaq_contact", -+ "addressbook", "raise()", -+ "addressbook", "beamBusinessCard()" }, -+ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, -+ Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), - "devicebuttons/ipaq_menu", - "QPE/TaskBar", "toggleMenu()", - "QPE/TaskBar", "toggleStartMenu()" }, -- // and hx4700 has different button mapping still -- { Model_iPAQ_HX4700, -- Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), -+ { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -+ Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), - "devicebuttons/ipaq_mail", - "opiemail", "raise()", - "opiemail", "newMail()" }, -- { Model_iPAQ_HX4700, -- Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"), -- "devicebuttons/ipaq_record", -- "QPE/VMemo", "toggleRecord()", -- "sound", "raise()" }, -- { Model_iPAQ_HX4700, -- Qt::Key_Home, QT_TRANSLATE_NOOP("Button", "Home Button"), -+ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -+ Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), - "devicebuttons/ipaq_home", - "QPE/Launcher", "home()", - "buttonsettings", "raise()" }, -+ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, -+ Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), -+ "devicebuttons/ipaq_record", -+ "QPE/VMemo", "toggleRecord()", -+ "sound", "raise()" }, - - }; - -@@ -346,11 +338,8 @@ - break; - } - -- // map Power Button short/long press to F6 for h191x -- case Key_F6: -- if ( d->m_model != Model_iPAQ_H191x && d->m_model != Model_iPAQ_H4xxx ) -- break; - // map Power Button short/long press to F34/F35 -+ case HardKey_Suspend: // Hope we don't have infinite recursion here - case Key_SysReq: { - if ( isPress ) { - if ( m_power_timer ) -Index: libopie2/opiecore/device/odevice_mypal.cpp -=================================================================== -RCS file: /cvs/opie/libopie2/opiecore/device/odevice_mypal.cpp,v -retrieving revision 1.4 -diff -u -r1.4 odevice_mypal.cpp ---- libopie2/opiecore/device/odevice_mypal.cpp 9 Jun 2006 08:27:01 -0000 1.4 -+++ libopie2/opiecore/device/odevice_mypal.cpp 10 Oct 2006 15:07:21 -0000 -@@ -60,29 +60,32 @@ - using namespace Opie::Core; - using namespace Opie::Core::Internal; - -+#define Model_Keyboardless_2_6 (Model_MyPal_716) -+ - struct m_button mypal_buttons [] = { -- { Model_MyPal_716, -+ // Common button map for all keyboardless devices with 2.6 kernel -+ { Model_Keyboardless_2_6, - Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), - "devicebuttons/ipaq_calendar", - "datebook", "nextView()", - "today", "raise()" }, -- { Model_MyPal_716, -+ { Model_Keyboardless_2_6, - Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), - "devicebuttons/ipaq_contact", - "addressbook", "raise()", - "addressbook", "beamBusinessCard()" }, -- { Model_MyPal_716, -- Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), -+ { Model_Keyboardless_2_6, -+ Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), - "devicebuttons/ipaq_mail", - "opiemail", "raise()", - "opiemail", "newMail()" }, -- { Model_MyPal_716, -+ { Model_Keyboardless_2_6, - Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), - "devicebuttons/ipaq_home", - "QPE/Launcher", "home()", - "buttonsettings", "raise()" }, -- { Model_MyPal_716, -- Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), -+ { Model_Keyboardless_2_6, -+ Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), - "devicebuttons/ipaq_record", - "QPE/VMemo", "toggleRecord()", - "sound", "raise()" }, diff --git a/recipes/libopie/libopie2/odevice.h-jornada-fixup.patch b/recipes/libopie/libopie2/odevice.h-jornada-fixup.patch deleted file mode 100644 index 6b50f5de79..0000000000 --- a/recipes/libopie/libopie2/odevice.h-jornada-fixup.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libopie2/opiecore/device/odevice.h_orig 2006-08-06 14:22:16.000000000 +0000 -+++ libopie2/opiecore/device/odevice.h 2006-08-06 14:22:58.000000000 +0000 -@@ -73,7 +73,9 @@ - Model_iPAQ_HX4700 = ( Model_iPAQ | 0x000A ), - Model_Jornada = ( 6 << 16 ), - Model_Jornada_56x = ( Model_Jornada | 0x0001 ), -- Model_Jornada_720 = ( Model_Jornada | 0x0002 ), -+ Model_Jornada_6xx = ( Model_Jornada | 0x0003 ), -+ Model_Jornada_7xx = ( Model_Jornada | 0x0002 ), -+ - - Model_Zaurus = ( 2 << 16 ), - diff --git a/recipes/libopie/libopie2/odevice_jornada.cpp-fixup.patch b/recipes/libopie/libopie2/odevice_jornada.cpp-fixup.patch deleted file mode 100644 index 8481f0f419..0000000000 --- a/recipes/libopie/libopie2/odevice_jornada.cpp-fixup.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- libopie2/opiecore/device/odevice_jornada.cpp_orig 2006-08-06 14:34:15.000000000 +0000 -+++ libopie2/opiecore/device/odevice_jornada.cpp 2006-08-06 14:34:53.000000000 +0000 -@@ -125,9 +125,12 @@ - if ( model == "HP Jornada 56x" ) { - d->m_modelstr = "Jornada 56x"; - d->m_model = Model_Jornada_56x; -- } else if ( model == "HP Jornada 720" ) { -- d->m_modelstr = "Jornada 720"; -- d->m_model = Model_Jornada_720; -+ } else if ( model == "HP Jornada 7xx" ) { -+ d->m_modelstr = "Jornada 7xx"; -+ d->m_model = Model_Jornada_7xx; -+ } else if ( model == "HP Jornada 6xx" ) { -+ d->m_modelstr = "Jornada 6xx"; -+ d->m_model = Model_Jornada_6xx; - } - - d->m_rotation = Rot0; //all Jornadas need this rotation -@@ -162,7 +165,9 @@ - { - if ( d->m_model == Model_Jornada_56x ) - return 190; -- else if (d->m_model == Model_Jornada_720 ) -+ else if (d->m_model == Model_Jornada_7xx ) -+ return 255; -+ else if (d->m_model == Model_Jornada_6xx ) - return 255; - else - return 0; -@@ -185,10 +190,11 @@ - cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power"); - else - cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright ); -- } else if ( d->m_model == Model_Jornada_720 ) { -+ } else if ( d->m_model == Model_Jornada_7xx ) { - cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/e1356fb/brightness" ).arg( bright ); -+ } else if ( d->m_model == Model_Jornada_6xx ) { -+ cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/hp680-bl/brightness" ).arg( bright ); - } -- - // No Global::shellQuote as we gurantee it to be sane - res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); - -@@ -204,9 +210,11 @@ - - if ( d->m_model == Model_Jornada_56x ) { - cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" ); -- } else if ( d->m_model == Model_Jornada_720 ) { -+ } else if ( d->m_model == Model_Jornada_7xx ) { - cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/e1356fb/power").arg( on ? "0" : "4" ); -- } -+ } else if ( d->m_model == Model_Jornada_6xx ) { -+ cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/hp680-bl/power").arg( on ? "0" : "4" ); -+ } - - res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); - diff --git a/recipes/libopie/libopie2/wireless.patch b/recipes/libopie/libopie2/wireless.patch deleted file mode 100644 index c0b2fa0f55..0000000000 --- a/recipes/libopie/libopie2/wireless.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/opienet/onetwork.h b/opienet/onetwork.h -index b13c7a3..370ad59 100644 ---- a/opienet/onetwork.h -+++ b/opienet/onetwork.h -@@ -45,6 +45,7 @@ - // hacky workarounds until we have a true user space wireless.h - #include - #define _LINUX_IF_H -+#include - #include - #ifndef IW_MAX_PRIV_DEF - #define IW_MAX_PRIV_DEF 128 diff --git a/recipes/obsolete/libopie/libopie2/exports.patch b/recipes/obsolete/libopie/libopie2/exports.patch new file mode 100644 index 0000000000..2ff06287be --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/exports.patch @@ -0,0 +1,11 @@ +--- libopie2/opiecore/ostorageinfo.h.org 2007-03-09 11:20:17.000000000 +0000 ++++ libopie2/opiecore/ostorageinfo.h 2007-03-08 23:43:56.000000000 +0000 +@@ -35,7 +35,7 @@ + namespace Opie { + namespace Core { + +-class OStorageInfo : public StorageInfo ++class Q_EXPORT OStorageInfo : public StorageInfo + { + Q_OBJECT + diff --git a/recipes/obsolete/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch b/recipes/obsolete/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch new file mode 100644 index 0000000000..4095502c32 --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/ipaq-2.6-sys-class-backlight-support.patch @@ -0,0 +1,144 @@ +Index: libopie2/opiecore/device/odevice_ipaq.cpp +=================================================================== +RCS file: /cvs/opie/libopie2/opiecore/device/odevice_ipaq.cpp,v +retrieving revision 1.26 +diff -u -r1.26 odevice_ipaq.cpp +--- libopie2/opiecore/device/odevice_ipaq.cpp 2 Aug 2006 19:12:39 -0000 1.26 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 11 Oct 2006 00:46:38 -0000 +@@ -408,45 +408,19 @@ + if ( bright < 0 ) + bright = 0; + +- QString cmdline; +- +- switch ( model()) { +- case Model_iPAQ_H191x: +- case Model_iPAQ_H4xxx: +- { +- QDir sysClass( "/sys/class/backlight/pxafb/" ); +- sysClass.setFilter(QDir::Dirs); +- int fd; +- if ( sysClass.exists() ) { +- QString sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/power" ); +- fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); +- if ( fd ) { +- char buf[10]; +- buf[0] = bright ? 0 : 4; +- buf[1] = '\0'; +- res = ( ::write( fd, &buf[0], 2 ) == 0 ); +- ::close( fd ); +- } +- sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/brightness" ); +- fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); +- if ( fd ) { +- char buf[100]; +- int len = ::snprintf( &buf[0], sizeof buf, "%d", bright ); +- res = ( ::write( fd, &buf[0], len ) == 0 ); +- ::close( fd ); +- } +- } +- } +- break; +- +- case Model_iPAQ_HX4700: +- cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/w100fb/brightness" ).arg( bright ); +- // No Global::shellQuote as we gurantee it to be sane +- res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); +- break; +- +- +- default: ++ QDir sysClass( "/sys/class/backlight/" ); ++ sysClass.setFilter(QDir::Dirs); ++ if ( sysClass.exists() && sysClass.count() > 2 ) { ++ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/brightness" ); ++ int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK ); ++ if ( fd ) { ++ char buf[100]; ++ int val = bright * displayBrightnessResolution() / 255; ++ int len = ::snprintf( &buf[0], sizeof buf, "%d", val ); ++ res = ( ::write( fd, &buf[0], len ) == 0 ); ++ ::close( fd ); ++ } ++ } else { + if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { + FLITE_IN bl; + bl. mode = 1; +@@ -456,11 +430,28 @@ + ::close ( fd ); + } + } ++ + return res; + } + + int iPAQ::displayBrightnessResolution() const + { ++ int res = 16; ++ ++ QDir sysClass( "/sys/class/backlight/" ); ++ sysClass.setFilter(QDir::Dirs); ++ if ( sysClass.exists() && sysClass.count() > 2 ) { ++ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/max_brightness" ); ++ int fd = ::open( sysClassPath, O_RDONLY|O_NONBLOCK ); ++ if ( fd ) { ++ char buf[100]; ++ if ( ::read( fd, &buf[0], sizeof buf ) ) ++ ::sscanf( &buf[0], "%d", &res ); ++ ::close( fd ); ++ } ++ return res; ++ } ++ + switch ( model()) { + case Model_iPAQ_H31xx: + case Model_iPAQ_H36xx: +@@ -489,27 +480,22 @@ + + QString cmdline; + +- if ( model() == Model_iPAQ_H191x ) { +- QDir sysClass( "/sys/class/lcd/pxafb/" ); +- sysClass.setFilter(QDir::Dirs); +- if ( sysClass.exists() ) { +- QString sysClassPath = sysClass.absFilePath( "/sys/class/lcd/pxafb/power" ); +- int fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); +- if ( fd ) { +- char buf[10]; +- buf[0] = on ? 0 : 4; +- buf[1] = '\0'; +- res = ( ::write( fd, &buf[0], 2 ) == 0 ); +- ::close( fd ); +- } +- } +- return res; ++ QDir sysClass( "/sys/class/lcd/" ); ++ sysClass.setFilter(QDir::Dirs); ++ if ( sysClass.exists() && sysClass.count() > 2 ) { ++ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/power" ); ++ int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK ); ++ if ( fd ) { ++ char buf[10]; ++ buf[0] = on ? 0 : 4; ++ buf[1] = '\0'; ++ res = ( ::write( fd, &buf[0], 2 ) == 0 ); ++ ::close( fd ); ++ } + } else { +- return OAbstractMobileDevice::setDisplayStatus(on); ++ res = OAbstractMobileDevice::setDisplayStatus(on); + } + +- res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); +- + return res; + } + +@@ -517,6 +503,7 @@ + { + switch (model()) { + case Model_iPAQ_H191x: ++ case Model_iPAQ_H22xx: + case Model_iPAQ_H4xxx: + return false; + default: diff --git a/recipes/obsolete/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch b/recipes/obsolete/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch new file mode 100644 index 0000000000..735663f343 --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch @@ -0,0 +1,39 @@ +Index: libopie2/opiecore/device/odevice_ipaq.cpp +=================================================================== +--- libopie2.orig/opiecore/device/odevice_ipaq.cpp 2007-02-05 21:40:33.000000000 +0000 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 2007-02-05 21:51:43.000000000 +0000 +@@ -317,24 +317,20 @@ + break; + } + +- // Rotate cursor keys 180 or 270 ++ // QT has strange screen coordinate system, so depending ++ // on native device screen orientation, we need to rotate cursor keys + case Key_Left : + case Key_Right: + case Key_Up : + case Key_Down : { +- if (( d->m_model == Model_iPAQ_H31xx ) || +- ( d->m_model == Model_iPAQ_H38xx )) { +- newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; +- } +- // Rotate the cursor keys by 270 +- // keycode - Key_Left = position of the button starting from left clockwise +- // add the rotation to it and modolo. No we've the original offset +- // add the offset to the Key_Left key +- if (( d->m_model == Model_iPAQ_H5xxx ) || +- ( d->m_model == Model_iPAQ_H191x ) || +- ( d->m_model == Model_iPAQ_H4xxx ) || +- ( d->m_model == Model_iPAQ_H1940 )) +- newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; ++ int quarters; ++ switch (d->m_rotation) { ++ case Rot0: quarters = 3/*270deg*/; break; ++ case Rot90: quarters = 2/*270deg*/; break; ++ case Rot180: quarters = 1/*270deg*/; break; ++ case Rot270: quarters = 0/*270deg*/; break; ++ } ++ newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; + break; + } + diff --git a/recipes/obsolete/libopie/libopie2/keyboardless-buttonmap.patch b/recipes/obsolete/libopie/libopie2/keyboardless-buttonmap.patch new file mode 100644 index 0000000000..288f28a68a --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/keyboardless-buttonmap.patch @@ -0,0 +1,176 @@ +Index: libopie2/opiecore/device/odevice_ipaq.cpp +=================================================================== +RCS file: /cvs/opie/libopie2/opiecore/device/odevice_ipaq.cpp,v +retrieving revision 1.26 +diff -u -r1.26 odevice_ipaq.cpp +--- libopie2/opiecore/device/odevice_ipaq.cpp 2 Aug 2006 19:12:39 -0000 1.26 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 10 Oct 2006 15:07:21 -0000 +@@ -84,76 +84,68 @@ + #define LED_ON OD_IOW( 'f', 5, LED_IN ) + #define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) + ++#define Model_Keyboardless_2_6 (Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx) ++ + struct i_button ipaq_buttons [] = { +- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, ++ ++ // Common button map for all keyboardless devices with 2.6 kernel ++ { Model_Keyboardless_2_6, + Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), + "devicebuttons/ipaq_calendar", + "datebook", "nextView()", + "today", "raise()" }, +- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, ++ { Model_Keyboardless_2_6, + Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), + "devicebuttons/ipaq_contact", + "addressbook", "raise()", + "addressbook", "beamBusinessCard()" }, +- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, +- Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), +- "devicebuttons/ipaq_menu", +- "QPE/TaskBar", "toggleMenu()", +- "QPE/TaskBar", "toggleStartMenu()" }, +- { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, +- Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), ++ { Model_Keyboardless_2_6, ++ Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), + "devicebuttons/ipaq_mail", + "opiemail", "raise()", + "opiemail", "newMail()" }, +- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H4xxx, ++ { Model_Keyboardless_2_6, + Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), + "devicebuttons/ipaq_home", + "QPE/Launcher", "home()", + "buttonsettings", "raise()" }, +- { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, ++ { Model_Keyboardless_2_6, + Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), + "devicebuttons/ipaq_record", + "QPE/VMemo", "toggleRecord()", + "sound", "raise()" }, + +- { Model_iPAQ_H191x | Model_iPAQ_H4xxx, +- Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), +- "devicebuttons/ipaq_mail", +- "opiemail", "raise()", +- "opiemail", "newMail()" }, +- { Model_iPAQ_H191x | Model_iPAQ_H4xxx, +- Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), +- "devicebuttons/ipaq_record", +- "QPE/VMemo", "toggleRecord()", +- "sound", "raise()" }, +- +- //h2200 has different button mapping +- { Model_iPAQ_H22xx, +- Qt::Key_NumLock, QT_TRANSLATE_NOOP("Button", "Mail Button"), +- "devicebuttons/ipaq_mail", +- "opiemail", "raise()", +- "opiemail", "newMail()" }, +- { Model_iPAQ_H22xx, +- Qt::Key_ScrollLock, QT_TRANSLATE_NOOP("Button", "Menu Button"), ++ // Devices with 2.4 kernel ++ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, ++ Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), ++ "devicebuttons/ipaq_calendar", ++ "datebook", "nextView()", ++ "today", "raise()" }, ++ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, ++ Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), ++ "devicebuttons/ipaq_contact", ++ "addressbook", "raise()", ++ "addressbook", "beamBusinessCard()" }, ++ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, ++ Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), + "devicebuttons/ipaq_menu", + "QPE/TaskBar", "toggleMenu()", + "QPE/TaskBar", "toggleStartMenu()" }, +- // and hx4700 has different button mapping still +- { Model_iPAQ_HX4700, +- Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), ++ { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, ++ Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), + "devicebuttons/ipaq_mail", + "opiemail", "raise()", + "opiemail", "newMail()" }, +- { Model_iPAQ_HX4700, +- Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"), +- "devicebuttons/ipaq_record", +- "QPE/VMemo", "toggleRecord()", +- "sound", "raise()" }, +- { Model_iPAQ_HX4700, +- Qt::Key_Home, QT_TRANSLATE_NOOP("Button", "Home Button"), ++ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, ++ Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), + "devicebuttons/ipaq_home", + "QPE/Launcher", "home()", + "buttonsettings", "raise()" }, ++ { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, ++ Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), ++ "devicebuttons/ipaq_record", ++ "QPE/VMemo", "toggleRecord()", ++ "sound", "raise()" }, + + }; + +@@ -346,11 +338,8 @@ + break; + } + +- // map Power Button short/long press to F6 for h191x +- case Key_F6: +- if ( d->m_model != Model_iPAQ_H191x && d->m_model != Model_iPAQ_H4xxx ) +- break; + // map Power Button short/long press to F34/F35 ++ case HardKey_Suspend: // Hope we don't have infinite recursion here + case Key_SysReq: { + if ( isPress ) { + if ( m_power_timer ) +Index: libopie2/opiecore/device/odevice_mypal.cpp +=================================================================== +RCS file: /cvs/opie/libopie2/opiecore/device/odevice_mypal.cpp,v +retrieving revision 1.4 +diff -u -r1.4 odevice_mypal.cpp +--- libopie2/opiecore/device/odevice_mypal.cpp 9 Jun 2006 08:27:01 -0000 1.4 ++++ libopie2/opiecore/device/odevice_mypal.cpp 10 Oct 2006 15:07:21 -0000 +@@ -60,29 +60,32 @@ + using namespace Opie::Core; + using namespace Opie::Core::Internal; + ++#define Model_Keyboardless_2_6 (Model_MyPal_716) ++ + struct m_button mypal_buttons [] = { +- { Model_MyPal_716, ++ // Common button map for all keyboardless devices with 2.6 kernel ++ { Model_Keyboardless_2_6, + Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), + "devicebuttons/ipaq_calendar", + "datebook", "nextView()", + "today", "raise()" }, +- { Model_MyPal_716, ++ { Model_Keyboardless_2_6, + Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), + "devicebuttons/ipaq_contact", + "addressbook", "raise()", + "addressbook", "beamBusinessCard()" }, +- { Model_MyPal_716, +- Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), ++ { Model_Keyboardless_2_6, ++ Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), + "devicebuttons/ipaq_mail", + "opiemail", "raise()", + "opiemail", "newMail()" }, +- { Model_MyPal_716, ++ { Model_Keyboardless_2_6, + Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), + "devicebuttons/ipaq_home", + "QPE/Launcher", "home()", + "buttonsettings", "raise()" }, +- { Model_MyPal_716, +- Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), ++ { Model_Keyboardless_2_6, ++ Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), + "devicebuttons/ipaq_record", + "QPE/VMemo", "toggleRecord()", + "sound", "raise()" }, diff --git a/recipes/obsolete/libopie/libopie2/odevice.h-jornada-fixup.patch b/recipes/obsolete/libopie/libopie2/odevice.h-jornada-fixup.patch new file mode 100644 index 0000000000..6b50f5de79 --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/odevice.h-jornada-fixup.patch @@ -0,0 +1,13 @@ +--- libopie2/opiecore/device/odevice.h_orig 2006-08-06 14:22:16.000000000 +0000 ++++ libopie2/opiecore/device/odevice.h 2006-08-06 14:22:58.000000000 +0000 +@@ -73,7 +73,9 @@ + Model_iPAQ_HX4700 = ( Model_iPAQ | 0x000A ), + Model_Jornada = ( 6 << 16 ), + Model_Jornada_56x = ( Model_Jornada | 0x0001 ), +- Model_Jornada_720 = ( Model_Jornada | 0x0002 ), ++ Model_Jornada_6xx = ( Model_Jornada | 0x0003 ), ++ Model_Jornada_7xx = ( Model_Jornada | 0x0002 ), ++ + + Model_Zaurus = ( 2 << 16 ), + diff --git a/recipes/obsolete/libopie/libopie2/odevice_jornada.cpp-fixup.patch b/recipes/obsolete/libopie/libopie2/odevice_jornada.cpp-fixup.patch new file mode 100644 index 0000000000..8481f0f419 --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/odevice_jornada.cpp-fixup.patch @@ -0,0 +1,57 @@ +--- libopie2/opiecore/device/odevice_jornada.cpp_orig 2006-08-06 14:34:15.000000000 +0000 ++++ libopie2/opiecore/device/odevice_jornada.cpp 2006-08-06 14:34:53.000000000 +0000 +@@ -125,9 +125,12 @@ + if ( model == "HP Jornada 56x" ) { + d->m_modelstr = "Jornada 56x"; + d->m_model = Model_Jornada_56x; +- } else if ( model == "HP Jornada 720" ) { +- d->m_modelstr = "Jornada 720"; +- d->m_model = Model_Jornada_720; ++ } else if ( model == "HP Jornada 7xx" ) { ++ d->m_modelstr = "Jornada 7xx"; ++ d->m_model = Model_Jornada_7xx; ++ } else if ( model == "HP Jornada 6xx" ) { ++ d->m_modelstr = "Jornada 6xx"; ++ d->m_model = Model_Jornada_6xx; + } + + d->m_rotation = Rot0; //all Jornadas need this rotation +@@ -162,7 +165,9 @@ + { + if ( d->m_model == Model_Jornada_56x ) + return 190; +- else if (d->m_model == Model_Jornada_720 ) ++ else if (d->m_model == Model_Jornada_7xx ) ++ return 255; ++ else if (d->m_model == Model_Jornada_6xx ) + return 255; + else + return 0; +@@ -185,10 +190,11 @@ + cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power"); + else + cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright ); +- } else if ( d->m_model == Model_Jornada_720 ) { ++ } else if ( d->m_model == Model_Jornada_7xx ) { + cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/e1356fb/brightness" ).arg( bright ); ++ } else if ( d->m_model == Model_Jornada_6xx ) { ++ cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/hp680-bl/brightness" ).arg( bright ); + } +- + // No Global::shellQuote as we gurantee it to be sane + res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); + +@@ -204,9 +210,11 @@ + + if ( d->m_model == Model_Jornada_56x ) { + cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" ); +- } else if ( d->m_model == Model_Jornada_720 ) { ++ } else if ( d->m_model == Model_Jornada_7xx ) { + cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/e1356fb/power").arg( on ? "0" : "4" ); +- } ++ } else if ( d->m_model == Model_Jornada_6xx ) { ++ cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/hp680-bl/power").arg( on ? "0" : "4" ); ++ } + + res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); + diff --git a/recipes/obsolete/libopie/libopie2/wireless.patch b/recipes/obsolete/libopie/libopie2/wireless.patch new file mode 100644 index 0000000000..c0b2fa0f55 --- /dev/null +++ b/recipes/obsolete/libopie/libopie2/wireless.patch @@ -0,0 +1,12 @@ +diff --git a/opienet/onetwork.h b/opienet/onetwork.h +index b13c7a3..370ad59 100644 +--- a/opienet/onetwork.h ++++ b/opienet/onetwork.h +@@ -45,6 +45,7 @@ + // hacky workarounds until we have a true user space wireless.h + #include + #define _LINUX_IF_H ++#include + #include + #ifndef IW_MAX_PRIV_DEF + #define IW_MAX_PRIV_DEF 128 -- cgit 1.2.3-korg