pyqt4: make packaging more standard

diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch
index 02a4e80..032824e 100644 (file)
--- 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 e56d6b3..4a52e46 100644 (file)
--- 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"