From 8f3ca10fbd4d6634c7c8d25570e436847e777264 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:10:20 +0000 Subject: python-pyqt 4.3.1 update to 4.3.3 --- packages/python/python-pyqt_4.3.3.bb | 71 ++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 packages/python/python-pyqt_4.3.3.bb (limited to 'packages/python/python-pyqt_4.3.3.bb') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb new file mode 100644 index 0000000000..d9c45ec14c --- /dev/null +++ b/packages/python/python-pyqt_4.3.3.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "Python Qt4 Bindings" +HOMEPAGE = "http://riverbankcomputing.co.uk" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core" +SRCNAME = "pyqt" +PR = "ml0" + +SRC_URI = "\ + http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://01_configure.dpatch;patch=1 \ + file://02_htmllinks.dpatch;patch=1 \ + file://03_qreal.dpatch;patch=1 \ + file://04_qreal_api_fixes.dpatch;patch=1" +S = "${WORKDIR}/PyQt-x11-gpl-${PV}" + +inherit qt4x11 sip distutils-base + +PARALLEL_MAKE = "" + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_OEMAKE = " MAKEFLAGS= " + +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" +# SIP_MODULES += "QtAssistant" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + DEFINES+=QT_NO_FPU" + +FIX_QREAL = "\ + QtCore/qtimeline.sip \ + QtCore/qrect.sip \ + QtGui/qtransform.sip \ +" + +do_generate_prepend() { + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done +} + +do_configure_prepend() { + echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro +} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages + for module in ${SIP_MODULES} + do + install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so + done +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 + for module in ${SIP_MODULES} + do + 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 -pPR 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" -- cgit v1.2.3 From d090606e4961c3d1efcaec58cb1d162eb7b5b4a1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:12:08 +0000 Subject: python-pyqt 4.3.3 change sip tag --- packages/python/python-pyqt_4.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python/python-pyqt_4.3.3.bb') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index d9c45ec14c..2d30922408 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,7 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -- cgit v1.2.3 From 0a080ee0fd673cc529dda6e9f464de6b011e58ca Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:47:44 +0000 Subject: python-pyqt 4.3.3 set sip tag back to 4.3.2 until we actually have Qt 4.3.3 in OE --- packages/python/python-pyqt_4.3.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/python/python-pyqt_4.3.3.bb') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 2d30922408..74a16c4720 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +# NOTE: match with qt version we have in OE +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -- cgit v1.2.3 From 28923e28feb20034efc37bb64132ed07679cc272 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 24 Dec 2007 15:40:25 +0000 Subject: python-pyqt 4.3.3 properly create pyqt.pro qmake profile. christmas bugsquashing: should hopefully close #2468 for good... --- packages/python/python-pyqt_4.3.3.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/python/python-pyqt_4.3.3.bb') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 74a16c4720..0bb4b1e588 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ @@ -39,13 +39,13 @@ FIX_QREAL = "\ " do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done } do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { -- cgit v1.2.3 From d1631785248a72bb4d02cd55307b2a994fa5673a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 7 Jan 2008 18:01:44 +0000 Subject: packages/python/python-pyqt: We have Qt4.3.3 now, make use of it and enable the assistantclient --- packages/python/python-pyqt_4.3.3.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/python/python-pyqt_4.3.3.bb') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 0bb4b1e588..773f646788 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -14,7 +14,8 @@ SRC_URI = "\ file://01_configure.dpatch;patch=1 \ file://02_htmllinks.dpatch;patch=1 \ file://03_qreal.dpatch;patch=1 \ - file://04_qreal_api_fixes.dpatch;patch=1" + file://04_qreal_api_fixes.dpatch;patch=1 \ + file://assistantclient-fix.patch;patch=1" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" inherit qt4x11 sip distutils-base @@ -23,11 +24,10 @@ PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" # NOTE: match with qt version we have in OE -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " -SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -# SIP_MODULES += "QtAssistant" +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant" EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ DEFINES+=QT_NO_FPU" -- cgit v1.2.3 From 484aec6e78dd9624f20779130565d1774d5b9e9f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 7 Jan 2008 18:25:55 +0000 Subject: Bashism fix: echo -e is a bashism and doesn't work when /bin/sh points to dash Instead of using "echo -e" we simply use printf. printf doesn't add a newline by default. So some places needed an extra \n in their string. Most of the change was done by hand, so please carefully review. This bug was spotted when trying to compile python-pyqt on my ubuntu hardy system. --- packages/python/python-pyqt_4.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python/python-pyqt_4.3.3.bb') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 773f646788..2fd6fcc38b 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -45,7 +45,7 @@ do_generate_prepend() { } do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + printf "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { -- cgit v1.2.3