[oe-commits] org.oe.dev merge of '12044547859d68999d0a4712daf7bea26128696c'

[bluelightning commit]

merge of '12044547859d68999d0a4712daf7bea26128696c'
     and '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'

Author: bluelightning at openembedded.org
Branch: org.openembedded.dev
Revision: 779cae4a07162d76a1d0ec8366a1e35442716ab1
ViewMTN: http://monotone.openembedded.org/revision/info/779cae4a07162d76a1d0ec8366a1e35442716ab1
Files:
1
packages/libgpewidget/libgpewidget_0.115.bb
packages/libopie/libopie2/ipaq_rotate_fix.patch
Diffs:

#
# mt diff -r12044547859d68999d0a4712daf7bea26128696c -r779cae4a07162d76a1d0ec8366a1e35442716ab1
#
#
#
# patch "packages/libgpewidget/libgpewidget_0.115.bb"
#  from [b0c070d4f2cfa704c9379750ab366355e92563a2]
#    to [1d195450f8b46de66772810cb967c104965ee062]
#
============================================================
--- packages/libgpewidget/libgpewidget_0.115.bb	b0c070d4f2cfa704c9379750ab366355e92563a2
+++ packages/libgpewidget/libgpewidget_0.115.bb	1d195450f8b46de66772810cb967c104965ee062
@@ -2,8 +2,8 @@ PRIORITY    = "optional"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-PR          = "r0"
+DEPENDS     = "gtk+ cairo libxinerama libxrender gtk-doc"
+PR          = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpe pkgconfig autotools


#
# mt diff -r2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02 -r779cae4a07162d76a1d0ec8366a1e35442716ab1
#
#
#
# add_file "packages/libopie/libopie2/ipaq_rotate_fix.patch"
#  content [1129069abce417b89f7e1a975dd2f426736c6db5]
#
============================================================
--- packages/libopie/libopie2/ipaq_rotate_fix.patch	1129069abce417b89f7e1a975dd2f426736c6db5
+++ packages/libopie/libopie2/ipaq_rotate_fix.patch	1129069abce417b89f7e1a975dd2f426736c6db5
@@ -0,0 +1,23 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp	2008-05-26 16:33:01.000000000 +0100
++++ libopie2/opiecore/device/odevice_ipaq.cpp	2008-05-26 16:33:40.000000000 +0100
+@@ -331,16 +331,10 @@
+         case Key_Down : {
+             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;
+-            }
+-            if( d->m_model == Model_iPAQ_H22xx ) {
+-              // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+-              // added a temporary workaround for this here, but the bug should be fixed properly
+-              // later in the right place. - Paul Eggleton 25/07/2007
+-              quarters = 0;
++                case Rot0:   quarters = 0/*0deg*/; break;
++                case Rot90:  quarters = 1/*90deg*/; break;
++                case Rot180: quarters = 2/*180deg*/; break;
++                case Rot270: quarters = 3/*270deg*/; break;
+             }
+             newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+             break;