From 6c6ccd4ae6c5c0347bef1f78ecb4699bf1b95350 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 19 Aug 2007 11:37:30 +0000 Subject: sip/python-sip/python-pyqt: revamp naming, start to work on a current PyQt that builds against Qt-X11 4.3.0 --- packages/python/python-pyqt_4.2.bb | 69 --------------------------------- packages/python/python-pyqt_4.3.bb | 69 +++++++++++++++++++++++++++++++++ packages/python/python24-pyqt2_3.13.bb | 2 +- packages/python/python24-pyqwt2_3.10.bb | 2 +- packages/sip/sip-native_3.10.1.bb | 12 ------ packages/sip/sip-native_4.0.1.bb | 16 -------- packages/sip/sip-native_4.7.bb | 25 ++++++++++++ packages/sip/sip3-native_3.10.1 | 12 ++++++ packages/sip/sip3-native_4.0.1.bb | 16 ++++++++ packages/sip/sip4-native_4.4.5.bb | 25 ------------ 10 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 packages/python/python-pyqt_4.2.bb create mode 100644 packages/python/python-pyqt_4.3.bb delete mode 100644 packages/sip/sip-native_3.10.1.bb delete mode 100644 packages/sip/sip-native_4.0.1.bb create mode 100644 packages/sip/sip-native_4.7.bb create mode 100644 packages/sip/sip3-native_3.10.1 create mode 100644 packages/sip/sip3-native_4.0.1.bb delete mode 100644 packages/sip/sip4-native_4.4.5.bb (limited to 'packages') diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.2.bb deleted file mode 100644 index 64a9a71f68..0000000000 --- a/packages/python/python-pyqt_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_4.3.bb b/packages/python/python-pyqt_4.3.bb new file mode 100644 index 0000000000..aeb7cd9212 --- /dev/null +++ b/packages/python/python-pyqt_4.3.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 sip distutils-base + +PARALLEL_MAKE = "" + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -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/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb index 2c9916b366..04493857dc 100644 --- a/packages/python/python24-pyqt2_3.13.bb +++ b/packages/python/python24-pyqt2_3.13.bb @@ -14,7 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb index d78bba7e8a..28f4080c45 100644 --- a/packages/python/python24-pyqwt2_3.10.bb +++ b/packages/python/python24-pyqwt2_3.10.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/sip/sip-native_3.10.1.bb b/packages/sip/sip-native_3.10.1.bb deleted file mode 100644 index 3702799319..0000000000 --- a/packages/sip/sip-native_3.10.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "SIP - A Python Wrapper Generator" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/sipgen" - -inherit qmake native - -QMAKE_PROFILES = "sipgen.pro.in" -EXTRA_QMAKEVARS_POST += "DESTDIR=${STAGING_BINDIR}" diff --git a/packages/sip/sip-native_4.0.1.bb b/packages/sip/sip-native_4.0.1.bb deleted file mode 100644 index e833a31871..0000000000 --- a/packages/sip/sip-native_4.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "SIP - A Python Wrapper Generator" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/sipgen" - -inherit qmake native - -EXTRA_QMAKEVARS_POST += "DESTDIR=${STAGING_BINDIR} CONFIG=console" - -do_configure_prepend() { - cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro -} - diff --git a/packages/sip/sip-native_4.7.bb b/packages/sip/sip-native_4.7.bb new file mode 100644 index 0000000000..08cdae4ead --- /dev/null +++ b/packages/sip/sip-native_4.7.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "SIP is a C++/Python Wrapper Generator" +SECTION = "devel" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +AUTHOR = "Phil Thompson" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/sipgen" + +inherit qmake qt4x11 native + +EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console" + +do_configure_prepend() { + cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro +} + +do_stage() { + install -m 0755 sip ${STAGING_BINDIR}/sip4 + cd ${WORKDIR}/sip-${PV} && python configure.py + install -d ${STAGING_PYDIR}/site-packages + install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages +} + diff --git a/packages/sip/sip3-native_3.10.1 b/packages/sip/sip3-native_3.10.1 new file mode 100644 index 0000000000..3702799319 --- /dev/null +++ b/packages/sip/sip3-native_3.10.1 @@ -0,0 +1,12 @@ +DESCRIPTION = "SIP - A Python Wrapper Generator" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/sipgen" + +inherit qmake native + +QMAKE_PROFILES = "sipgen.pro.in" +EXTRA_QMAKEVARS_POST += "DESTDIR=${STAGING_BINDIR}" diff --git a/packages/sip/sip3-native_4.0.1.bb b/packages/sip/sip3-native_4.0.1.bb new file mode 100644 index 0000000000..e833a31871 --- /dev/null +++ b/packages/sip/sip3-native_4.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "SIP - A Python Wrapper Generator" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/sipgen" + +inherit qmake native + +EXTRA_QMAKEVARS_POST += "DESTDIR=${STAGING_BINDIR} CONFIG=console" + +do_configure_prepend() { + cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro +} + diff --git a/packages/sip/sip4-native_4.4.5.bb b/packages/sip/sip4-native_4.4.5.bb deleted file mode 100644 index 3f83e6e792..0000000000 --- a/packages/sip/sip4-native_4.4.5.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "SIP is a C++/Python Wrapper Generator" -SECTION = "base" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -AUTHOR = "Phil Thompson" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/sipgen" - -inherit qmake native - -EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console" - -do_configure_prepend() { - cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro -} - -do_stage() { - install -m 0755 sip ${STAGING_BINDIR}/sip4 - cd ${WORKDIR}/sip-${PV} && python configure.py - install -d ${STAGING_PYDIR}/site-packages - install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages -} - -- cgit v1.2.3