From 99309be8eab45d5b4728a0f7550430e7cb7a5590 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Feb 2005 17:51:45 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/05 18:40:43+01:00 uni-frankfurt.de!mickeyl upgrade pyqt to 3.13 BKrev: 420507b18OZNyzuETO5MSx0UWnqqQQ --- packages/python/python-pyqt_3.13.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/python/python-pyqt_3.13.bb (limited to 'packages/python/python-pyqt_3.13.bb') diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 6579e8daf68dd520b702412208bfeae85af6fadc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 8 Feb 2005 18:05:47 +0000 Subject: make python 2.4 as default, move python-sip into python/, make sip4 as default BKrev: 4208ff7b-sgl7QbT_1xhYPmdi-Oy4g --- packages/python/python-pyqt_3.13.bb | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'packages/python/python-pyqt_3.13.bb') diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index e69de29bb2..0dcc3f32a4 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings" +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +RDEPENDS = "python-core python-sip" +DEPENDS = "virtual/libqte2 virtual/libqpe" +SRCNAME = "pyqt" +PR = "ml1" + +SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ + file://features" +S = "${WORKDIR}/PyQt-x11-gpl-${PV}" + +inherit qmake sip + +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}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \ + CONFIG=qt CONFIG+=warn_on CONFIG+=release \ + DESTDIR= VERSION=1.0.0 \ + DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \ + INCLUDEPATH=. \ + INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \ + INCLUDEPATH+=${STAGING_INCDIR} \ + LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \ + LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " + +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}/python2.3/site-packages/${module}.so + done +} + +do_install() { + install -d ${D}/${libdir}/python2.3/site-packages/ + for module in ${SIP_MODULES} + do + install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so + done +} + +FILES_${PN} = "${libdir}/python2.3/site-packages" -- cgit v1.2.3 From fb2fa1075ab82a84ead46c6d400755297bcc39f4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 9 Feb 2005 00:06:49 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 01:04:39+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 01:04:15+01:00 uni-frankfurt.de!mickeyl remove direct references to python2.3, instead compute PYTHON_DIR in distutils. Split distutils into distutils-base and distutils. BKrev: 42095419HYtcbp33LQCUNFdiLMXHog --- packages/python/python-pyqt_3.13.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/python/python-pyqt_3.13.bb') diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index 0dcc3f32a4..b264f67f72 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN DESTDIR= VERSION=1.0.0 \ DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \ INCLUDEPATH=. \ - INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \ + LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \ LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " do_configure_prepend() { @@ -40,16 +40,16 @@ do_stage() { 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}/python2.3/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so done } do_install() { - install -d ${D}/${libdir}/python2.3/site-packages/ + install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/ for module in ${SIP_MODULES} do - install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so done } -FILES_${PN} = "${libdir}/python2.3/site-packages" +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From 162167d945c624fb80da51089e65d198af7105a2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 9 Feb 2005 00:18:35 +0000 Subject: compute python version based on staging area, not on host python *cough*. inherit distutils-base for sip, pyqt, and pyqwt BKrev: 420956dbKk6Hb3R1N-CN8-KJ3liYdQ --- packages/python/python-pyqt_3.13.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python/python-pyqt_3.13.bb') diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index b264f67f72..633a0e5cdd 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -7,13 +7,13 @@ LICENSE = "GPL" RDEPENDS = "python-core python-sip" DEPENDS = "virtual/libqte2 virtual/libqpe" SRCNAME = "pyqt" -PR = "ml1" +PR = "ml2" SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake sip +inherit qmake sip distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -- cgit v1.2.3 From 5d7dc2d94e88f492539761b4909a69955a5142b0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 9 Feb 2005 11:01:56 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 02:42:08+01:00 uni-frankfurt.de!mickeyl update python-numeric to v23.7 2005/02/09 02:02:21+01:00 uni-frankfurt.de!mickeyl fix qwt 4.2 compilage against 2.3.10. Yes, QT_VERSION again (or still *sigh*) 2005/02/09 01:44:39+01:00 uni-frankfurt.de!mickeyl fix PyQt compilage against QtE 2.3.10 (QT_VERSION again *sigh*) BKrev: 4209eda4ikLKONxgarptvjIfCJ5yOA --- packages/python/python-pyqt_3.13.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/python/python-pyqt_3.13.bb') diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index 633a0e5cdd..a1cc6a6bfb 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -7,9 +7,10 @@ LICENSE = "GPL" RDEPENDS = "python-core python-sip" DEPENDS = "virtual/libqte2 virtual/libqpe" SRCNAME = "pyqt" -PR = "ml2" +PR = "ml3" 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}" -- cgit v1.2.3 From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/python/python-pyqt_3.13.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python/python-pyqt_3.13.bb') diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index a1cc6a6bfb..bddc1dca95 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -46,10 +46,10 @@ do_stage() { } do_install() { - install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/ + 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 + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so done } -- cgit v1.2.3