From 457ca2bf9525f9b2fde7b67ecdd408b6418de5df Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 11 Jun 2006 21:15:42 +0000 Subject: python-pyqt4: upgrade to 4.0 final version --- .../python/python-pyqt4/optional-features.patch | 95 ---------------------- packages/python/python-pyqt4_0.9.2.bb | 71 ---------------- packages/python/python-pyqt4_4.0.bb | 70 ++++++++++++++++ 3 files changed, 70 insertions(+), 166 deletions(-) delete mode 100644 packages/python/python-pyqt4/optional-features.patch delete mode 100644 packages/python/python-pyqt4_0.9.2.bb create mode 100644 packages/python/python-pyqt4_4.0.bb (limited to 'packages/python') diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch deleted file mode 100644 index 032824e39d..0000000000 --- a/packages/python/python-pyqt4/optional-features.patch +++ /dev/null @@ -1,95 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch -+++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip -@@ -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. - -- -+%If (SessionManager) - class QSessionManager : QObject - { - %TypeHeaderCode -@@ -58,3 +58,4 @@ - bool isPhase2() const; - void requestPhase2(); - }; -+%End ---- PyQt4-gpl-4.0beta1/sip/QtGui/qapplication.sip~optional-features.patch -+++ PyQt4-gpl-4.0beta1/sip/QtGui/qapplication.sip -@@ -20,7 +20,7 @@ - // You should have received a copy of the GNU General Public License along with - // 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 - - // QApplication *qApp - QApplication *qApp; -@@ -101,7 +101,9 @@ - {sipName_QStandardItemModel, &sipClass_QStandardItemModel, -1, 8}, - {sipName_QLayout, &sipClass_QLayout, 27, 9}, - {sipName_QTextObject, &sipClass_QTextObject, 32, 10}, -+#ifndef QT_NO_SESSIONMANAGER - {sipName_QSessionManager, &sipClass_QSessionManager, -1, 11}, -+#endif - {sipName_QWidget, &sipClass_QWidget, 36, 12}, - {sipName_QMovie, &sipClass_QMovie, -1, 13}, - {sipName_QAbstractProxyModel, &sipClass_QAbstractProxyModel, 100, 14}, -@@ -357,11 +359,13 @@ - static bool isLeftToRight(); - static bool isEffectEnabled(Qt::UIEffect); - static void setEffectEnabled(Qt::UIEffect, bool enable = true); -+%If (SessionManager) - bool isSessionRestored() const; - QString sessionId() const; - QString sessionKey() const; - virtual void commitData(QSessionManager &sm); - virtual void saveState(QSessionManager &sm); -+%End - void setInputContext(QInputContext *); - QInputContext *inputContext() const; - static int exec() /PostHook=__pyQtPostEventLoopHook__, PreHook=__pyQtPreEventLoopHook__, PyName=exec_, ReleaseGIL/; ---- PyQt4-gpl-4.0beta1/sip/QtGui/qwidget.sip~optional-features.patch -+++ PyQt4-gpl-4.0beta1/sip/QtGui/qwidget.sip -@@ -20,7 +20,10 @@ - // You should have received a copy of the GNU General Public License along with - // 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 Accessibility -+%Feature ToolTips -+%Feature StatusTips -+%Feature WhatsThis - - class QWidget : QObject, QPaintDevice - { -@@ -128,16 +131,24 @@ - void setWindowOpacity(qreal level); - qreal windowOpacity() const; - bool isWindowModified() const; -+%If (ToolTips) - void setToolTip(const QString &); - QString toolTip() const; -+%End -+%If (StatusTips) - void setStatusTip(const QString &); - QString statusTip() const; -+%End -+%If (WhatsThis) - void setWhatsThis(const QString &); - QString whatsThis() const; -+%End -+%If (Accessibility) - QString accessibleName() const; - void setAccessibleName(const QString &name); - QString accessibleDescription() const; - void setAccessibleDescription(const QString &description); -+%End - void setLayoutDirection(Qt::LayoutDirection direction); - Qt::LayoutDirection layoutDirection() const; - void unsetLayoutDirection(); diff --git a/packages/python/python-pyqt4_0.9.2.bb b/packages/python/python-pyqt4_0.9.2.bb deleted file mode 100644 index 7af85af51c..0000000000 --- a/packages/python/python-pyqt4_0.9.2.bb +++ /dev/null @@ -1,71 +0,0 @@ -DESCRIPTION = "Python Qt4 Bindings" -HOMEPAGE = "http://riverbankcomputing.co.uk" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -RDEPENDS = "python-core" -SRCNAME = "pyqt" -PR = "ml2" - -SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://optional-features.patch;patch=1" -S = "${WORKDIR}/PyQt4-gpl-4.0beta1" - -inherit qmake qt4x11 sip4 distutils-base - -PARALLEL_MAKE = "" - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xSessionManager -xAccessibility" -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}" - -#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \ -# QMAKE_MOC=${STAGING_BINDIR}/moc \ -# QMAKE_RPATH=-Wl,-rpath-link, \ -# DESTDIR= \ -# VERSION=1.0.0 \ -# DEFINES+=SIP_MAKE_DLL \ -# DEFINES+=SIP_QT_SUPPORT \ -# INCLUDEPATH+=. \ -# INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ -# INCLUDEPATH+=${STAGING_INCDIR} \ -# LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro -} - -#do_configure() { -# echo "yes" | python configure.py -w -q ${OE_QMAKE_QMAKE} -#} - -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 -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/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb new file mode 100644 index 0000000000..6cd91e68ec --- /dev/null +++ b/packages/python/python-pyqt4_4.0.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "Python Qt4 Bindings" +HOMEPAGE = "http://riverbankcomputing.co.uk" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +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" +S = "${WORKDIR}/PyQt-x11-gpl-${PV}" + +inherit qmake qt4x11 sip4 distutils-base + +PARALLEL_MAKE = "" + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -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}" + +#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \ +# QMAKE_MOC=${STAGING_BINDIR}/moc \ +# QMAKE_RPATH=-Wl,-rpath-link, \ +# DESTDIR= \ +# VERSION=1.0.0 \ +# DEFINES+=SIP_MAKE_DLL \ +# DEFINES+=SIP_QT_SUPPORT \ +# INCLUDEPATH+=. \ +# INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ +# INCLUDEPATH+=${STAGING_INCDIR} \ +# LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" + +do_configure_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro +} + +#do_configure() { +# echo "yes" | python configure.py -w -q ${OE_QMAKE_QMAKE} +#} + +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 -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" -- cgit v1.2.3