diff options
-rw-r--r-- | packages/libopie/libopie2/odevice.h-jornada-fixup.patch | 13 | ||||
-rw-r--r-- | packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch | 11 | ||||
-rw-r--r-- | packages/libopie/libopie2_1.2.2.bb | 4 | ||||
-rw-r--r-- | packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch | 13 | ||||
-rw-r--r-- | packages/opie-sysinfo/opie-sysinfo_1.2.2.bb | 3 |
6 files changed, 30 insertions, 14 deletions
diff --git a/packages/libopie/libopie2/odevice.h-jornada-fixup.patch b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch index d2e26a0b36..6b50f5de79 100644 --- a/packages/libopie/libopie2/odevice.h-jornada-fixup.patch +++ b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch @@ -1,12 +1,13 @@ ---- libopie2/opiecore/device/odevice.h 2006-08-06 12:44:20.000000000 +0000 -+++ libopie2/opiecore/device/odevice.h_orig 2006-08-06 12:42:46.000000000 +0000 -@@ -73,8 +73,7 @@ +--- 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_6xx = ( Model_Jornada | 0x0002 ), -- Model_Jornada_7xx = ( Model_Jornada | 0x0003 ), -+ Model_Jornada_720 = ( Model_Jornada | 0x0002 ), +- 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/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch index f3eff64b85..8481f0f419 100644 --- a/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch +++ b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch @@ -1,5 +1,5 @@ ---- libopie2/opiecore/device/odevice_jornada.cpp_orig 2006-08-06 12:36:55.000000000 +0000 -+++ libopie2/opiecore/device/odevice_jornada.cpp 2006-08-06 12:53:45.000000000 +0000 +--- 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"; @@ -27,19 +27,20 @@ return 255; else return 0; -@@ -185,9 +190,10 @@ +@@ -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 ) { diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 220edc215b..6ae22316c5 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -3,7 +3,7 @@ require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ - file://odevice.h-jornada-fixup.patch;patch=0 \ - file://odevice_jornada.cpp-fixup.patch;patch=0" + file://odevice.h-jornada-fixup.patch;patch=1 \ + file://odevice_jornada.cpp-fixup.patch;patch=1" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty b/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty diff --git a/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch b/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch new file mode 100644 index 0000000000..f214057e0c --- /dev/null +++ b/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch @@ -0,0 +1,13 @@ +--- sysinfo/versioninfo.cpp_orig 2006-08-06 15:16:55.000000000 +0000 ++++ sysinfo/versioninfo.cpp 2006-08-06 15:17:31.000000000 +0000 +@@ -136,8 +136,8 @@ + modelPixmap += "simpad"; + else if ( model == Model_Jornada_56x ) + modelPixmap += "jornada56x"; +- else if ( model == Model_Jornada_720 ) +- modelPixmap += "jornada720"; ++ else if ( model == Model_Jornada_7xx ) ++ modelPixmap += "jornada7xx"; + else + modelPixmap += "pda"; + diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb index 780559ab57..6517203c8e 100644 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -5,4 +5,5 @@ require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share" + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + file://jornada-6xx-7xx.patch;patch=1" |