merge of 1e5d155bb4785e9650d4b05e4bae0c7c8a3ff11f

     and d4fc38fb08cc643983acea4a5d23706a1aa08636

5 files changed, 40 insertions, 10 deletions

diff --git a/packages/nonworking/imkit/.mtn2git_empty b/packages/nonworking/imkit/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/imkit/.mtn2git_empty
diff --git a/packages/nonworking/imkit/imkit_0.4.0-pre2.bb b/packages/nonworking/imkit/imkit_0.4.0-pre2.bb
new file mode 100644
index 0000000000..2e809b11c1
--- /dev/null
+++ b/packages/nonworking/imkit/imkit_0.4.0-pre2.bb
@@ -0,0 +1,20 @@
+#
+# nonworking, because the c++ template syntax no longer compiles with modern compilers
+#
+DESCRIPTION = "An Inputmethod for Opie - frontend to the japanese anthy engine"
+HOMEPAGE = "http://zaurus-ja.sourceforge.jp/imkit-anthy.html.en"
+SECTION = "opie/inputmethods"
+LICENSE = "GPL"
+RDEPENDS = "anthy"
+
+SRC_URI = "http://downloads.sourceforge.jp/zaurus-ja/2195/imkit-${PV}.tar.gz"
+S = "${WORKDIR}/imkit-${PV}"
+
+inherit palmtop
+
+PARALLEL_MAKE = ""
+QMAKE_PROFILES = "imkit.pro"
+
+do_configure_prepend() {
+	echo -e "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro
+}
diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch
index 02a4e80848..032824e39d 100644
--- a/packages/python/python-pyqt4/optional-features.patch
+++ b/packages/python/python-pyqt4/optional-features.patch
@@ -5,17 +5,16 @@
 
 --- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch
 +++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip
-@@ -21,7 +21,8 @@
+@@ -21,7 +21,7 @@
  // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
  // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
 -
-+//%Feature SessionManager
 +%If (SessionManager)
  class QSessionManager : QObject
  {
  %TypeHeaderCode
-@@ -58,3 +59,4 @@
+@@ -58,3 +58,4 @@
      bool isPhase2() const;
      void requestPhase2();
  };
diff --git a/packages/python/python-pyqt4_0.9.bb b/packages/python/python-pyqt4_0.9.bb
index e56d6b36ef..4a52e46f18 100644
--- a/packages/python/python-pyqt4_0.9.bb
+++ b/packages/python/python-pyqt4_0.9.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 DEPENDS = "qt4x11"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \
            file://cross-compile.patch;patch=1 \
@@ -50,7 +50,7 @@ do_configure_prepend() {
 
 do_stage() {
     install -d ${STAGING_SIPDIR}/qt/
-    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/
+    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
     for module in ${SIP_MODULES}
     do
         install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
@@ -59,11 +59,14 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
     for module in ${SIP_MODULES}
     do
-	install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so
+		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
+		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
     done
+	cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb
index 1d365c3b01..7a4874c83a 100644
--- a/packages/qt/qt4-x11-free_4.1.1.bb
+++ b/packages/qt/qt4-x11-free_4.1.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://cross-compile.patch;patch=1 \
@@ -30,7 +30,6 @@ EXTRA_OEMAKE = "-e"
 
 # FIXME:
 # * add missing options
-# * auto stl detection is broken, so we disable it
 QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \
                    -no-tablet -no-xkb -no-nis -no-cups -no-opengl \
                    -nosse \
@@ -76,6 +75,7 @@ do_stage() {
 }
 
 # FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well...
+# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing...
 do_install() {
 	install -d ${D}${libdir}
 	install -d ${D}${bindir}
@@ -101,10 +101,14 @@ do_install() {
 }
 
 PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \
-             libqtdesigner4 libqtdesignercomponents4 \
+             libqtdesigner4 libqtdesignercomponents4 libqt3support4 \
              qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \
              qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers"
 
+ALLOW_EMPTY = "1"
+FILES_${PN} = ""
+RDEPENDS_${PN} = "${PACKAGES}"
+
 FILES_libqtcore4               = "${libdir}/libQtCore.so*"
 FILES_libqtgui4                = "${libdir}/libQtGui.so*"
 FILES_libqtnetwork4            = "${libdir}/libQtNetwork.so*"
@@ -114,6 +118,7 @@ FILES_libqttest4               = "${libdir}/libQtTest.so*"
 FILES_libqtxml4                = "${libdir}/libQtXml.so*"
 FILES_libqtdesigner4           = "${libdir}/libQtDesigner.so*"
 FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*"
+FILES_libqt3support4           = "${libdir}/libQt3Support.so*"
 
 FILES_qt4-plugins-accessible   = "${libdir}/plugins/accessible/*.so"
 FILES_qt4-plugins-codecs       = "${libdir}/plugins/codecs/*.so"
@@ -128,3 +133,6 @@ FILES_qt4-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bind
 FILES_qt4-common               = "${bindir}/qtconfig"
 FILES_qt4-examples             = "${bindir}/qt4-examples/*"
 FILES_qt4-demos                = "${bindir}/qtdemo ${bindir}/qt4-demos/*"
+
+FILES_${PN}-dev               += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \
+                                  ${bindir}/qt3to4 ${bindir}/findtr"