From 94317634ab575b7deae469f83038f770e35fb737 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 16 Aug 2007 08:40:59 +0000 Subject: python-pyqt: promote qt4 to being the default, rename other packages accordingly --- packages/python/python-pyqt-3.13/.mtn2git_empty | 0 packages/python/python-pyqt-3.13/features | 31 ------ packages/python/python-pyqt-3.13/qt2-fix.patch | 124 --------------------- packages/python/python-pyqt/.mtn2git_empty | 0 packages/python/python-pyqt/cross-compile.patch | 33 ++++++ packages/python/python-pyqt4/.mtn2git_empty | 0 packages/python/python-pyqt4/cross-compile.patch | 33 ------ packages/python/python-pyqt4_4.2.bb | 69 ------------ packages/python/python-pyqt_3.13.bb | 59 ---------- packages/python/python-pyqt_4.2.bb | 69 ++++++++++++ packages/python/python-pyqwt-3.10/.mtn2git_empty | 0 packages/python/python-pyqwt-3.10/features | 30 ----- .../python/python-pyqwt-3.10/qt2.x-compat.patch | 28 ----- packages/python/python-pyqwt_3.10.bb | 65 ----------- packages/python/python-sip4_4.4.5.bb | 42 ------- packages/python/python-sip_4.1.1.bb | 39 ------- packages/python/python-sip_4.7.bb | 44 ++++++++ packages/python/python24-pyqt2/.mtn2git_empty | 0 packages/python/python24-pyqt2/features | 31 ++++++ packages/python/python24-pyqt2/qt2-fix.patch | 124 +++++++++++++++++++++ packages/python/python24-pyqt2_3.13.bb | 59 ++++++++++ packages/python/python24-pyqwt2/.mtn2git_empty | 0 packages/python/python24-pyqwt2/features | 30 +++++ packages/python/python24-pyqwt2/qt2.x-compat.patch | 28 +++++ packages/python/python24-pyqwt2_3.10.bb | 65 +++++++++++ packages/python/python24-sip_4.1.1.bb | 39 +++++++ 26 files changed, 522 insertions(+), 520 deletions(-) delete mode 100644 packages/python/python-pyqt-3.13/.mtn2git_empty delete mode 100644 packages/python/python-pyqt-3.13/features delete mode 100644 packages/python/python-pyqt-3.13/qt2-fix.patch create mode 100644 packages/python/python-pyqt/.mtn2git_empty create mode 100644 packages/python/python-pyqt/cross-compile.patch delete mode 100644 packages/python/python-pyqt4/.mtn2git_empty delete mode 100644 packages/python/python-pyqt4/cross-compile.patch delete mode 100644 packages/python/python-pyqt4_4.2.bb delete mode 100644 packages/python/python-pyqt_3.13.bb create mode 100644 packages/python/python-pyqt_4.2.bb delete mode 100644 packages/python/python-pyqwt-3.10/.mtn2git_empty delete mode 100644 packages/python/python-pyqwt-3.10/features delete mode 100644 packages/python/python-pyqwt-3.10/qt2.x-compat.patch delete mode 100644 packages/python/python-pyqwt_3.10.bb delete mode 100644 packages/python/python-sip4_4.4.5.bb delete mode 100644 packages/python/python-sip_4.1.1.bb create mode 100644 packages/python/python-sip_4.7.bb create mode 100644 packages/python/python24-pyqt2/.mtn2git_empty create mode 100644 packages/python/python24-pyqt2/features create mode 100644 packages/python/python24-pyqt2/qt2-fix.patch create mode 100644 packages/python/python24-pyqt2_3.13.bb create mode 100644 packages/python/python24-pyqwt2/.mtn2git_empty create mode 100644 packages/python/python24-pyqwt2/features create mode 100644 packages/python/python24-pyqwt2/qt2.x-compat.patch create mode 100644 packages/python/python24-pyqwt2_3.10.bb create mode 100644 packages/python/python24-sip_4.1.1.bb (limited to 'packages/python') diff --git a/packages/python/python-pyqt-3.13/.mtn2git_empty b/packages/python/python-pyqt-3.13/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-pyqt-3.13/features b/packages/python/python-pyqt-3.13/features deleted file mode 100644 index 6fe74cafe4..0000000000 --- a/packages/python/python-pyqt-3.13/features +++ /dev/null @@ -1,31 +0,0 @@ --x Qt_THREAD_SUPPORT --x Qt_CODECS --x Qt_COLORDIALOG --x Qt_DIAL --x Qt_DOM --x Qt_DRAGANDDROP --x Qt_IMAGE_TEXT --x Qt_INPUTDIALOG --x Qt_FILEDIALOG --x Qt_FONTDIALOG --x Qt_MIMECLIPBOARD --x Qt_NETWORKPROTOCOL --x Qt_NETWORKPROTOCOL_FTP --x Qt_NETWORKPROTOCOL_HTTP --x Qt_PICTURE --x Qt_PRINTDIALOG --x Qt_PRINTER --x Qt_PROGRESSDIALOG --x Qt_PROPERTIES --x Qt_SEMIMODAL --x Qt_SIZEGRIP --x Qt_SPLITTER --x Qt_STYLE_CDE --x Qt_STYLE_INTERLACE --x Qt_STYLE_MOTIF --x Qt_STYLE_MOTIFPLUS --x Qt_STYLE_PLATINUM --x Qt_STYLE_SGI --x Qt_TRANSFORMATIONS --x Qt_WIZARD --x Qt_WORKSPACE diff --git a/packages/python/python-pyqt-3.13/qt2-fix.patch b/packages/python/python-pyqt-3.13/qt2-fix.patch deleted file mode 100644 index 5ee978e8f6..0000000000 --- a/packages/python/python-pyqt-3.13/qt2-fix.patch +++ /dev/null @@ -1,124 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip -@@ -235,7 +235,7 @@ - sipClass = sipClass_QCanvasLine; - break; - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - case 8: - sipClass = sipClass_QCanvasSpline; - break; ---- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip -@@ -114,7 +114,7 @@ - %ConvertToSubClassCode - Py_BEGIN_ALLOW_THREADS - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - int rtti = sipCpp -> rtti(); - - if (rtti == QCheckTableItem::RTTI) ---- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip -@@ -102,7 +102,7 @@ - #endif - {sipName_QComboBox, &sipClass_QComboBox}, - {sipName_QCommonStyle, &sipClass_QCommonStyle}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QDateEdit, &sipClass_QDateEdit}, - {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, - {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, -@@ -111,13 +111,13 @@ - {sipName_QDial, &sipClass_QDial}, - #endif - {sipName_QDialog, &sipClass_QDialog}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QDockArea, &sipClass_QDockArea}, - {sipName_QDockWindow, &sipClass_QDockWindow}, - #endif - {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, - {sipName_QDragObject, &sipClass_QDragObject}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QErrorMessage, &sipClass_QErrorMessage}, - #endif - #if QT_VERSION >= 0x030100 -@@ -133,7 +133,7 @@ - {sipName_QFrame, &sipClass_QFrame}, - {sipName_QGrid, &sipClass_QGrid}, - {sipName_QGridLayout, &sipClass_QGridLayout}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QGridView, &sipClass_QGridView}, - #endif - {sipName_QGroupBox, &sipClass_QGroupBox}, -@@ -175,7 +175,7 @@ - {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, - {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, - #endif --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, - #endif - #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) -@@ -185,7 +185,7 @@ - #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) - {sipName_QPrintDialog, &sipClass_QPrintDialog}, - #endif --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QProcess, &sipClass_QProcess}, - #endif - {sipName_QProgressBar, &sipClass_QProgressBar}, -@@ -194,7 +194,7 @@ - #endif - {sipName_QPushButton, &sipClass_QPushButton}, - {sipName_QRadioButton, &sipClass_QRadioButton}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, - #endif - #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) -@@ -229,11 +229,11 @@ - {sipName_QTabWidget, &sipClass_QTabWidget}, - {sipName_QTextBrowser, &sipClass_QTextBrowser}, - {sipName_QTextDrag, &sipClass_QTextDrag}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QTextEdit, &sipClass_QTextEdit}, - #endif - {sipName_QTextView, &sipClass_QTextView}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QTimeEdit, &sipClass_QTimeEdit}, - #endif - {sipName_QTimer, &sipClass_QTimer}, ---- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip -@@ -528,7 +528,7 @@ - sipClass = sipClass_QChildEvent; - break; - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - case QEvent::ContextMenu: - sipClass = sipClass_QContextMenuEvent; - break; -@@ -539,7 +539,7 @@ - break; - #endif - --#if QT_VERSION >= 300 && QT_VERSION < 0x030100 -+#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 - case QEvent::IMCompose: - sipClass = sipClass_QIMEvent; - break; diff --git a/packages/python/python-pyqt/.mtn2git_empty b/packages/python/python-pyqt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-pyqt/cross-compile.patch b/packages/python/python-pyqt/cross-compile.patch new file mode 100644 index 0000000000..fb1524c09d --- /dev/null +++ b/packages/python/python-pyqt/cross-compile.patch @@ -0,0 +1,33 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- PyQt4-gpl-4.0beta1/configure.py~cross-compile.patch ++++ PyQt4-gpl-4.0beta1/configure.py +@@ -471,7 +471,7 @@ + sipconfig.error("Unable to create the %s directory." % mname) + + # Build the SIP command line. +- argv = ['"' + sipcfg.sip_bin + '"'] ++ argv = ['"' + sipcfg.sip_bin + '4"'] + + argv.extend(qt_sip_flags) + +@@ -846,7 +846,15 @@ + """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir and qt_datadir globals + for the Qt installation. + """ +- sipconfig.inform("Determining the layout of your Qt installation...") ++ sipconfig.inform("Determining the layout of your Qt installation... - patched for OpenEmbedded by :M:") ++ ++ global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir ++ qt_dir = os.getenv( "QTDIR" ) ++ qt_incdir = "%s/include" % qt_dir ++ qt_libdir = "%s/lib" % qt_dir ++ qt_bindir = "%s/bin" % qt_dir ++ qt_datadir = "%s/share" % qt_dir ++ return + + if not opt_qmake: + sipconfig.error("Make sure you have a working Qt v4 qmake on your PATH or use the -q argument to explicitly specify a working Qt v4 qmake.") diff --git a/packages/python/python-pyqt4/.mtn2git_empty b/packages/python/python-pyqt4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-pyqt4/cross-compile.patch b/packages/python/python-pyqt4/cross-compile.patch deleted file mode 100644 index fb1524c09d..0000000000 --- a/packages/python/python-pyqt4/cross-compile.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- PyQt4-gpl-4.0beta1/configure.py~cross-compile.patch -+++ PyQt4-gpl-4.0beta1/configure.py -@@ -471,7 +471,7 @@ - sipconfig.error("Unable to create the %s directory." % mname) - - # Build the SIP command line. -- argv = ['"' + sipcfg.sip_bin + '"'] -+ argv = ['"' + sipcfg.sip_bin + '4"'] - - argv.extend(qt_sip_flags) - -@@ -846,7 +846,15 @@ - """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir and qt_datadir globals - for the Qt installation. - """ -- sipconfig.inform("Determining the layout of your Qt installation...") -+ sipconfig.inform("Determining the layout of your Qt installation... - patched for OpenEmbedded by :M:") -+ -+ global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir -+ qt_dir = os.getenv( "QTDIR" ) -+ qt_incdir = "%s/include" % qt_dir -+ qt_libdir = "%s/lib" % qt_dir -+ qt_bindir = "%s/bin" % qt_dir -+ qt_datadir = "%s/share" % qt_dir -+ return - - if not opt_qmake: - sipconfig.error("Make sure you have a working Qt v4 qmake on your PATH or use the -q argument to explicitly specify a working Qt v4 qmake.") diff --git a/packages/python/python-pyqt4_4.2.bb b/packages/python/python-pyqt4_4.2.bb deleted file mode 100644 index 64a9a71f68..0000000000 --- a/packages/python/python-pyqt4_4.2.bb +++ /dev/null @@ -1,69 +0,0 @@ -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" -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_NATIVE}/uic \ -# QMAKE_MOC=${STAGING_BINDIR_NATIVE}/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 -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" diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb deleted file mode 100644 index f9a8bb334d..0000000000 --- a/packages/python/python-pyqt_3.13.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings" -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqte2 virtual/libqpe1" -RDEPENDS = "python-core python-sip" -SRCNAME = "pyqt" -PR = "ml5" - -SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ - file://qt2-fix.patch;patch=1 \ - file://features" -S = "${WORKDIR}/PyQt-x11-gpl-${PV}" - -inherit palmtop sip distutils-base - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -SIP_MODULES = "qt qtcanvas qttable qtpe" -SIP_FEATURES = "${WORKDIR}/features" -EXTRA_OEMAKE = " MAKEFLAGS= " - -EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ - QMAKE_MOC=${STAGING_BINDIR_NATIVE}/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=qt qtcanvas qttable qtpe\n" >pyqt.pro -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - 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/ - for module in ${SIP_MODULES} - do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages" -FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/.debug" diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.2.bb new file mode 100644 index 0000000000..64a9a71f68 --- /dev/null +++ b/packages/python/python-pyqt_4.2.bb @@ -0,0 +1,69 @@ +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" +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_NATIVE}/uic \ +# QMAKE_MOC=${STAGING_BINDIR_NATIVE}/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 -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" diff --git a/packages/python/python-pyqwt-3.10/.mtn2git_empty b/packages/python/python-pyqwt-3.10/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-pyqwt-3.10/features b/packages/python/python-pyqwt-3.10/features deleted file mode 100644 index 56eab20b69..0000000000 --- a/packages/python/python-pyqwt-3.10/features +++ /dev/null @@ -1,30 +0,0 @@ --x Qt_THREAD_SUPPORT --x Qt_CODECS --x Qt_COLORDIALOG --x Qt_DIAL --x Qt_DOM --x Qt_DRAGANDDROP --x Qt_IMAGE_TEXT --x Qt_INPUTDIALOG --x Qt_FILEDIALOG --x Qt_FONTDIALOG --x Qt_MIMECLIPBOARD --x Qt_NETWORKPROTOCOL --x Qt_NETWORKPROTOCOL_FTP --x Qt_PICTURE --x Qt_PRINTDIALOG --x Qt_PRINTER --x Qt_PROGRESSDIALOG --x Qt_PROPERTIES --x Qt_SEMIMODAL --x Qt_SIZEGRIP --x Qt_SPLITTER --x Qt_STYLE_CDE --x Qt_STYLE_INTERLACE --x Qt_STYLE_MOTIF --x Qt_STYLE_MOTIFPLUS --x Qt_STYLE_PLATINUM --x Qt_STYLE_SGI --x Qt_TRANSFORMATIONS --x Qt_WIZARD --x Qt_WORKSPACE diff --git a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch b/packages/python/python-pyqwt-3.10/qt2.x-compat.patch deleted file mode 100644 index 249ff4a5ee..0000000000 --- a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- PyQwt-20040118/sip/qwtarray.sip~add-missing-feature-tests 2003-12-14 16:54:29.000000000 +0100 -+++ PyQwt-20040118/sip/qwtarray.sip 2004-01-29 18:31:21.000000000 +0100 -@@ -34,11 +34,10 @@ - // educational versions of Qt, PyQt and sip, PyQwt becomes a free plug-in - // for a non-free program. - -- - %MappedType QwtArray - { - %TypeHeaderCode --#include -+//#include - %End - - %ConvertFromTypeCode -@@ -339,7 +338,6 @@ - %End // ConvertToTypeCode - }; // QwtArray - -- - // Local Variables: - // mode: C++ - // c-file-style: "stroustrup" diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb deleted file mode 100644 index d78bba7e8a..0000000000 --- a/packages/python/python-pyqwt_3.10.bb +++ /dev/null @@ -1,65 +0,0 @@ -DESCRIPTION = "Python QWT Bindings, QtE edition" -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" -DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" -SRCNAME = "pyqwt" -PR = "ml4" - -SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ - file://qt2.x-compat.patch;patch=1 \ - file://features" -S = "${WORKDIR}/PyQwt-20040118" - -inherit palmtop sip distutils-base - -QMAKE_PROFILES = "pyqwt.pro" -EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -SIP_MODULES = "qwt" -SIP_FEATURES = "${WORKDIR}/features" -EXTRA_OEMAKE = " MAKEFLAGS= " - -EXTRA_QMAKEVARS_POST += "TARGET=qwt \ - DESTDIR= \ - VERSION=1.0.0 \ - DEFINES+=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \ - DEFINES+=HAS_NUMERIC DEFINES+=QWT_NO_MEMARRAY \ - INCLUDEPATH+=../numpy \ - INCLUDEPATH+=${S}/qwt-sources/include \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_generate_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro - - echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip - echo "TEMPLATE=lib" >>sip/qwtmod.sip - echo 'SOURCES = $B' >>sip/qwtmod.sip - echo 'HEADERS = $H' >>sip/qwtmod.sip - echo "%End" >>sip/qwtmod.sip - - mkdir -p sip/qwt/ - mv sip/*.* sip/qwt/ -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - 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/ - for module in ${SIP_MODULES} - do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python-sip4_4.4.5.bb b/packages/python/python-sip4_4.4.5.bb deleted file mode 100644 index 000aa8b86f..0000000000 --- a/packages/python/python-sip4_4.4.5.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -AUTHOR = "Phil Thompson" -LICENSE = "GPL" -DEPENDS = "python" -RDEPENDS = "python-core" -PR = "ml0" - -SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit qmake distutils-base - -EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ - CONFIG=console \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - - -do_configure_prepend() { - cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro -} - -do_stage() { - install -d ${STAGING_DIR}/${BUILD_SYS}/lib/${PYTHON_DIR}/site-packages/ - # sipconfig.py sipdistutils.py - install -m 0644 sip.h ${STAGING_INCDIR}/sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb deleted file mode 100644 index 8e118ea7de..0000000000 --- a/packages/python/python-sip_4.1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqte2 python" -RDEPENDS = "python-core" -PR = "ml4" - -SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit palmtop distutils-base - -EXTRA_QMAKEVARS_POST += "TEMPLATE=lib \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - -do_configure_prepend() { - cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro -} - -do_stage() { - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ - oe_libinstall -so libsip ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ - install -m 0644 sip.h ${STAGING_INCDIR}/sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/packages/python/python-sip_4.7.bb b/packages/python/python-sip_4.7.bb new file mode 100644 index 0000000000..7c022867d7 --- /dev/null +++ b/packages/python/python-sip_4.7.bb @@ -0,0 +1,44 @@ +BROKEN = "1" + +DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" +SECTION = "devel/python" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +AUTHOR = "Phil Thompson" +LICENSE = "GPL" +DEPENDS = "python" +RDEPENDS = "python-core" +PR = "ml0" + +SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/siplib" + +inherit qmake2 distutils-base + +EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ + CONFIG=console \ + DESTDIR= \ + VERSION=1.0.0 \ + TARGET=sip \ + DEFINES=SIP_QT_SUPPORT \ + INCLUDEPATH+=. \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + INCLUDEPATH+=${STAGING_INCDIR}" + + +do_configure_prepend() { + cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro +} + +do_stage() { + install -d ${STAGING_DIR}/${BUILD_SYS}/lib/${PYTHON_DIR}/site-packages/ + # sipconfig.py sipdistutils.py + install -m 0644 sip.h ${STAGING_INCDIR}/sip.h +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" + diff --git a/packages/python/python24-pyqt2/.mtn2git_empty b/packages/python/python24-pyqt2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python24-pyqt2/features b/packages/python/python24-pyqt2/features new file mode 100644 index 0000000000..6fe74cafe4 --- /dev/null +++ b/packages/python/python24-pyqt2/features @@ -0,0 +1,31 @@ +-x Qt_THREAD_SUPPORT +-x Qt_CODECS +-x Qt_COLORDIALOG +-x Qt_DIAL +-x Qt_DOM +-x Qt_DRAGANDDROP +-x Qt_IMAGE_TEXT +-x Qt_INPUTDIALOG +-x Qt_FILEDIALOG +-x Qt_FONTDIALOG +-x Qt_MIMECLIPBOARD +-x Qt_NETWORKPROTOCOL +-x Qt_NETWORKPROTOCOL_FTP +-x Qt_NETWORKPROTOCOL_HTTP +-x Qt_PICTURE +-x Qt_PRINTDIALOG +-x Qt_PRINTER +-x Qt_PROGRESSDIALOG +-x Qt_PROPERTIES +-x Qt_SEMIMODAL +-x Qt_SIZEGRIP +-x Qt_SPLITTER +-x Qt_STYLE_CDE +-x Qt_STYLE_INTERLACE +-x Qt_STYLE_MOTIF +-x Qt_STYLE_MOTIFPLUS +-x Qt_STYLE_PLATINUM +-x Qt_STYLE_SGI +-x Qt_TRANSFORMATIONS +-x Qt_WIZARD +-x Qt_WORKSPACE diff --git a/packages/python/python24-pyqt2/qt2-fix.patch b/packages/python/python24-pyqt2/qt2-fix.patch new file mode 100644 index 0000000000..5ee978e8f6 --- /dev/null +++ b/packages/python/python24-pyqt2/qt2-fix.patch @@ -0,0 +1,124 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip +@@ -235,7 +235,7 @@ + sipClass = sipClass_QCanvasLine; + break; + +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + case 8: + sipClass = sipClass_QCanvasSpline; + break; +--- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip +@@ -114,7 +114,7 @@ + %ConvertToSubClassCode + Py_BEGIN_ALLOW_THREADS + +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + int rtti = sipCpp -> rtti(); + + if (rtti == QCheckTableItem::RTTI) +--- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip +@@ -102,7 +102,7 @@ + #endif + {sipName_QComboBox, &sipClass_QComboBox}, + {sipName_QCommonStyle, &sipClass_QCommonStyle}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QDateEdit, &sipClass_QDateEdit}, + {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, + {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, +@@ -111,13 +111,13 @@ + {sipName_QDial, &sipClass_QDial}, + #endif + {sipName_QDialog, &sipClass_QDialog}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QDockArea, &sipClass_QDockArea}, + {sipName_QDockWindow, &sipClass_QDockWindow}, + #endif + {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, + {sipName_QDragObject, &sipClass_QDragObject}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QErrorMessage, &sipClass_QErrorMessage}, + #endif + #if QT_VERSION >= 0x030100 +@@ -133,7 +133,7 @@ + {sipName_QFrame, &sipClass_QFrame}, + {sipName_QGrid, &sipClass_QGrid}, + {sipName_QGridLayout, &sipClass_QGridLayout}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QGridView, &sipClass_QGridView}, + #endif + {sipName_QGroupBox, &sipClass_QGroupBox}, +@@ -175,7 +175,7 @@ + {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, + {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, + #endif +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, + #endif + #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) +@@ -185,7 +185,7 @@ + #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) + {sipName_QPrintDialog, &sipClass_QPrintDialog}, + #endif +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QProcess, &sipClass_QProcess}, + #endif + {sipName_QProgressBar, &sipClass_QProgressBar}, +@@ -194,7 +194,7 @@ + #endif + {sipName_QPushButton, &sipClass_QPushButton}, + {sipName_QRadioButton, &sipClass_QRadioButton}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, + #endif + #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) +@@ -229,11 +229,11 @@ + {sipName_QTabWidget, &sipClass_QTabWidget}, + {sipName_QTextBrowser, &sipClass_QTextBrowser}, + {sipName_QTextDrag, &sipClass_QTextDrag}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QTextEdit, &sipClass_QTextEdit}, + #endif + {sipName_QTextView, &sipClass_QTextView}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QTimeEdit, &sipClass_QTimeEdit}, + #endif + {sipName_QTimer, &sipClass_QTimer}, +--- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip +@@ -528,7 +528,7 @@ + sipClass = sipClass_QChildEvent; + break; + +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + case QEvent::ContextMenu: + sipClass = sipClass_QContextMenuEvent; + break; +@@ -539,7 +539,7 @@ + break; + #endif + +-#if QT_VERSION >= 300 && QT_VERSION < 0x030100 ++#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 + case QEvent::IMCompose: + sipClass = sipClass_QIMEvent; + break; diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb new file mode 100644 index 0000000000..2c9916b366 --- /dev/null +++ b/packages/python/python24-pyqt2_3.13.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings" +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libqte2 virtual/libqpe1" +RDEPENDS = "python-core python24-sip" +SRCNAME = "pyqt" +PR = "ml5" + +SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ + file://qt2-fix.patch;patch=1 \ + file://features" +S = "${WORKDIR}/PyQt-x11-gpl-${PV}" + +inherit palmtop sip distutils-base + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" +SIP_MODULES = "qt qtcanvas qttable qtpe" +SIP_FEATURES = "${WORKDIR}/features" +EXTRA_OEMAKE = " MAKEFLAGS= " + +EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ + QMAKE_MOC=${STAGING_BINDIR_NATIVE}/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=qt qtcanvas qttable qtpe\n" >pyqt.pro +} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + 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/ + for module in ${SIP_MODULES} + do + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so + done +} + +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/.debug" diff --git a/packages/python/python24-pyqwt2/.mtn2git_empty b/packages/python/python24-pyqwt2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python24-pyqwt2/features b/packages/python/python24-pyqwt2/features new file mode 100644 index 0000000000..56eab20b69 --- /dev/null +++ b/packages/python/python24-pyqwt2/features @@ -0,0 +1,30 @@ +-x Qt_THREAD_SUPPORT +-x Qt_CODECS +-x Qt_COLORDIALOG +-x Qt_DIAL +-x Qt_DOM +-x Qt_DRAGANDDROP +-x Qt_IMAGE_TEXT +-x Qt_INPUTDIALOG +-x Qt_FILEDIALOG +-x Qt_FONTDIALOG +-x Qt_MIMECLIPBOARD +-x Qt_NETWORKPROTOCOL +-x Qt_NETWORKPROTOCOL_FTP +-x Qt_PICTURE +-x Qt_PRINTDIALOG +-x Qt_PRINTER +-x Qt_PROGRESSDIALOG +-x Qt_PROPERTIES +-x Qt_SEMIMODAL +-x Qt_SIZEGRIP +-x Qt_SPLITTER +-x Qt_STYLE_CDE +-x Qt_STYLE_INTERLACE +-x Qt_STYLE_MOTIF +-x Qt_STYLE_MOTIFPLUS +-x Qt_STYLE_PLATINUM +-x Qt_STYLE_SGI +-x Qt_TRANSFORMATIONS +-x Qt_WIZARD +-x Qt_WORKSPACE diff --git a/packages/python/python24-pyqwt2/qt2.x-compat.patch b/packages/python/python24-pyqwt2/qt2.x-compat.patch new file mode 100644 index 0000000000..249ff4a5ee --- /dev/null +++ b/packages/python/python24-pyqwt2/qt2.x-compat.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- PyQwt-20040118/sip/qwtarray.sip~add-missing-feature-tests 2003-12-14 16:54:29.000000000 +0100 ++++ PyQwt-20040118/sip/qwtarray.sip 2004-01-29 18:31:21.000000000 +0100 +@@ -34,11 +34,10 @@ + // educational versions of Qt, PyQt and sip, PyQwt becomes a free plug-in + // for a non-free program. + +- + %MappedType QwtArray + { + %TypeHeaderCode +-#include ++//#include + %End + + %ConvertFromTypeCode +@@ -339,7 +338,6 @@ + %End // ConvertToTypeCode + }; // QwtArray + +- + // Local Variables: + // mode: C++ + // c-file-style: "stroustrup" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb new file mode 100644 index 0000000000..d78bba7e8a --- /dev/null +++ b/packages/python/python24-pyqwt2_3.10.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "Python QWT Bindings, QtE edition" +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" +DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" +SRCNAME = "pyqwt" +PR = "ml4" + +SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ + file://qt2.x-compat.patch;patch=1 \ + file://features" +S = "${WORKDIR}/PyQwt-20040118" + +inherit palmtop sip distutils-base + +QMAKE_PROFILES = "pyqwt.pro" +EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" +SIP_MODULES = "qwt" +SIP_FEATURES = "${WORKDIR}/features" +EXTRA_OEMAKE = " MAKEFLAGS= " + +EXTRA_QMAKEVARS_POST += "TARGET=qwt \ + DESTDIR= \ + VERSION=1.0.0 \ + DEFINES+=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \ + DEFINES+=HAS_NUMERIC DEFINES+=QWT_NO_MEMARRAY \ + INCLUDEPATH+=../numpy \ + INCLUDEPATH+=${S}/qwt-sources/include \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + INCLUDEPATH+=${STAGING_INCDIR} \ + LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" + +do_generate_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro + + echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip + echo "TEMPLATE=lib" >>sip/qwtmod.sip + echo 'SOURCES = $B' >>sip/qwtmod.sip + echo 'HEADERS = $H' >>sip/qwtmod.sip + echo "%End" >>sip/qwtmod.sip + + mkdir -p sip/qwt/ + mv sip/*.* sip/qwt/ +} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + 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/ + for module in ${SIP_MODULES} + do + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so + done +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python24-sip_4.1.1.bb b/packages/python/python24-sip_4.1.1.bb new file mode 100644 index 0000000000..8e118ea7de --- /dev/null +++ b/packages/python/python24-sip_4.1.1.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libqte2 python" +RDEPENDS = "python-core" +PR = "ml4" + +SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/siplib" + +inherit palmtop distutils-base + +EXTRA_QMAKEVARS_POST += "TEMPLATE=lib \ + DESTDIR= \ + VERSION=1.0.0 \ + TARGET=sip \ + DEFINES=SIP_QT_SUPPORT \ + INCLUDEPATH+=. \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + INCLUDEPATH+=${STAGING_INCDIR}" + +do_configure_prepend() { + cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro +} + +do_stage() { + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ + oe_libinstall -so libsip ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ + install -m 0644 sip.h ${STAGING_INCDIR}/sip.h +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" + -- cgit v1.2.3