From 41603de51b5a8f0ec408a994533fbf685f4f28fc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 2 May 2006 21:16:05 +0000 Subject: pyqt4: make packaging more standard --- packages/python/python-pyqt4/optional-features.patch | 5 ++--- packages/python/python-pyqt4_0.9.bb | 11 +++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch index 02a4e80848..032824e39d 100644 --- 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 e56d6b36ef..4a52e46f18 100644 --- 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" -- cgit v1.2.3 From 3e3e20e4a68fcc28363ae83987073ec8e9a296c9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 14:21:23 +0000 Subject: pyqt4: build against Qt 4.1.2 --- packages/python/python-pyqt4_0.9.2.bb | 72 +++++++++++++++++++++++++++++++++++ packages/python/python-pyqt4_0.9.bb | 72 ----------------------------------- 2 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 packages/python/python-pyqt4_0.9.2.bb delete mode 100644 packages/python/python-pyqt4_0.9.bb (limited to 'packages/python') diff --git a/packages/python/python-pyqt4_0.9.2.bb b/packages/python/python-pyqt4_0.9.2.bb new file mode 100644 index 0000000000..099dc103ef --- /dev/null +++ b/packages/python/python-pyqt4_0.9.2.bb @@ -0,0 +1,72 @@ +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" +DEPENDS = "qt4x11" +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_0.9.bb b/packages/python/python-pyqt4_0.9.bb deleted file mode 100644 index 4a52e46f18..0000000000 --- a/packages/python/python-pyqt4_0.9.bb +++ /dev/null @@ -1,72 +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" -DEPENDS = "qt4x11" -RDEPENDS = "python-core" -SRCNAME = "pyqt" -PR = "ml1" - -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_1 -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" -- cgit v1.2.3 From 11616e3588c8df8985418a759612fadb30cc0c3c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 14:24:56 +0000 Subject: python 2.4.3: add some hints to site.py about what built this version and who is maintaining it --- packages/python/python-2.4.3/sitebranding.patch | 19 +++++++++++++++++++ packages/python/python_2.4.3.bb | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 packages/python/python-2.4.3/sitebranding.patch (limited to 'packages/python') diff --git a/packages/python/python-2.4.3/sitebranding.patch b/packages/python/python-2.4.3/sitebranding.patch new file mode 100644 index 0000000000..85bb83a506 --- /dev/null +++ b/packages/python/python-2.4.3/sitebranding.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- Python-2.4.3/Lib/site.py~sitebranding ++++ Python-2.4.3/Lib/site.py +@@ -305,8 +305,9 @@ + "Jython is maintained by the Jython developers (www.jython.org).") + else: + __builtin__.credits = _Printer("credits", """\ +- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands +- for supporting Python development. See www.python.org for more information.""") ++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). ++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by ++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") + here = os.path.dirname(os.__file__) + __builtin__.license = _Printer( + "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 289de18a53..30ce73abe2 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -6,14 +6,15 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.4" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://bindir-libdir.patch;patch=1 \ file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1" + file://fix-tkinter-detection.patch;patch=1 \ + file://sitebranding.patch;patch=1" S = "${WORKDIR}/Python-${PV}" inherit autotools -- cgit v1.2.3