[oe-commits] org.oe.dev merge of '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'

[mickeyl commit]

merge of '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
     and '82ea7fb33a9e64c710458f33fd0c1649c08f7e01'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ec7f958d5bb872b764f0a92765c8597fb0093f1f
ViewMTN: http://monotone.openembedded.org/revision/info/ec7f958d5bb872b764f0a92765c8597fb0093f1f
Files:
1
packages/images/fso-image-light.bb
packages/libopie/libopie2/remove_h2200_rotate_fix.patch
packages/libgpewidget/libgpewidget_0.115.bb
packages/libopie/libopie2_1.2.3.bb
packages/qte/qte-2.3.10/disable-dup-rotation.patch
packages/qte/qte-mt_2.3.10.bb
Diffs:

#
# mt diff -r2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02 -rec7f958d5bb872b764f0a92765c8597fb0093f1f
#
#
#
# add_file "packages/images/fso-image-light.bb"
#  content [5b92297a61364ebbf08c76e0b94bd35e2e25358f]
#
============================================================
--- packages/images/fso-image-light.bb	5b92297a61364ebbf08c76e0b94bd35e2e25358f
+++ packages/images/fso-image-light.bb	5b92297a61364ebbf08c76e0b94bd35e2e25358f
@@ -0,0 +1,32 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe, Light Edition
+#------------------------------------------------------
+
+require fso-image.bb
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+  ${BASE_INSTALL} \
+  ${X_INSTALL} \
+  ${PYTHON_INSTALL} \
+  ${ZHONE_INSTALL} \
+"
+
+inherit image
+
+# perform some convenience tweaks to the rootfs
+mickey_rootfs_postprocess() {
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+    date "+%m%d%H%M%Y" >./etc/timestamp
+    echo "alias pico=nano" >>./etc/profile
+    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
+    mkdir -p ./local/pkg
+    echo >>./etc/fstab
+    echo "# NFS Host" >>./etc/fstab
+    echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
+    cd $curdir
+}
+
+ROOTFS_POSTPROCESS_COMMAND += "mickey_rootfs_postprocess"


#
# mt diff -r82ea7fb33a9e64c710458f33fd0c1649c08f7e01 -rec7f958d5bb872b764f0a92765c8597fb0093f1f
#
#
#
# delete "packages/libopie/libopie2/remove_h2200_rotate_fix.patch"
# 
# patch "packages/libgpewidget/libgpewidget_0.115.bb"
#  from [b0c070d4f2cfa704c9379750ab366355e92563a2]
#    to [1d195450f8b46de66772810cb967c104965ee062]
# 
# patch "packages/libopie/libopie2_1.2.3.bb"
#  from [60741c8fec6e800e5b344bbf504b3b86e331304b]
#    to [ab76d4807c92168cd29236fa394eacf56e680d98]
# 
# patch "packages/qte/qte-2.3.10/disable-dup-rotation.patch"
#  from [f90a467431d9bde1ffae27ccf563cfdeed54691e]
#    to [ae6639da1ec281b77ad87d3e1de4ba6b24151169]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [9de7ec362919755e02c79a584fd115bdf5a9f152]
#    to [0adece0207b2a6c54a24ad784c6746a5eecc792e]
#
============================================================
--- 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
============================================================
--- packages/libopie/libopie2_1.2.3.bb	60741c8fec6e800e5b344bbf504b3b86e331304b
+++ packages/libopie/libopie2_1.2.3.bb	ab76d4807c92168cd29236fa394eacf56e680d98
@@ -1,11 +1,11 @@ require ${PN}.inc
 require ${PN}.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
            file://gcc-syntax-fix.patch;patch=1 \
            file://h4000_and_default_rot.patch;patch=1 \
-           file://remove_h2200_rotate_fix.patch;patch=1"
+           file://ipaq_rotate_fix.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
============================================================
--- packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
+++ packages/qte/qte-2.3.10/disable-dup-rotation.patch	ae6639da1ec281b77ad87d3e1de4ba6b24151169
@@ -1,13 +1,13 @@
---- qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:42.000000000 +0100
-+++ qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:45.000000000 +0100
-@@ -627,8 +627,8 @@
+--- qte/src/kernel/kernelkeyboard.cpp	2008-05-26 16:25:23.000000000 +0100
++++ qte/src/kernel/kernelkeyboard.cpp	2008-05-26 16:27:52.000000000 +0100
+@@ -627,8 +627,10 @@
      case Qt::Key_Down:
          unicode = 0xffff;
          mod_key = false;
--        if (qt_screen->isTransformed())
--            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
-+//        if (qt_screen->isTransformed())
-+//            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+         if (qt_screen->isTransformed())
+             qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++#endif
          break;
      /*
       * handle lock, we don't handle scroll lock!
============================================================
--- packages/qte/qte-mt_2.3.10.bb	9de7ec362919755e02c79a584fd115bdf5a9f152
+++ packages/qte/qte-mt_2.3.10.bb	0adece0207b2a6c54a24ad784c6746a5eecc792e
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r26"
+PR = "r27"
 
 EXTRA_OECONF += "-thread"