diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-08-19 11:37:30 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-19 11:37:30 +0000 |
commit | 6c6ccd4ae6c5c0347bef1f78ecb4699bf1b95350 (patch) | |
tree | 2c4e6478d66d3c6e3b6025774aca3d6084bda044 /packages | |
parent | 9feb3c3ffe516efe8205d0f6c99af3a22d5c8115 (diff) |
sip/python-sip/python-pyqt: revamp naming, start to work on a current PyQt that builds against Qt-X11 4.3.0
Diffstat (limited to 'packages')
-rw-r--r-- | packages/python/python-pyqt_4.3.bb (renamed from packages/python/python-pyqt_4.2.bb) | 4 | ||||
-rw-r--r-- | packages/python/python24-pyqt2_3.13.bb | 2 | ||||
-rw-r--r-- | packages/python/python24-pyqwt2_3.10.bb | 2 | ||||
-rw-r--r-- | packages/sip/sip-native_4.7.bb (renamed from packages/sip/sip4-native_4.4.5.bb) | 4 | ||||
-rw-r--r-- | packages/sip/sip3-native_3.10.1 (renamed from packages/sip/sip-native_3.10.1.bb) | 0 | ||||
-rw-r--r-- | packages/sip/sip3-native_4.0.1.bb (renamed from packages/sip/sip-native_4.0.1.bb) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.3.bb index 64a9a71f68..aeb7cd9212 100644 --- a/packages/python/python-pyqt_4.2.bb +++ b/packages/python/python-pyqt_4.3.bb @@ -12,12 +12,12 @@ SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${ file://cross-compile.patch;patch=1" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake qt4x11 sip4 distutils-base +inherit qmake qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" 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/sip4-native_4.4.5.bb b/packages/sip/sip-native_4.7.bb index 3f83e6e792..08cdae4ead 100644 --- a/packages/sip/sip4-native_4.4.5.bb +++ b/packages/sip/sip-native_4.7.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SIP is a C++/Python Wrapper Generator" -SECTION = "base" +SECTION = "devel" HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" AUTHOR = "Phil Thompson" PRIORITY = "optional" @@ -8,7 +8,7 @@ LICENSE = "GPL" SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" S = "${WORKDIR}/sip-${PV}/sipgen" -inherit qmake native +inherit qmake qt4x11 native EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console" diff --git a/packages/sip/sip-native_3.10.1.bb b/packages/sip/sip3-native_3.10.1 index 3702799319..3702799319 100644 --- a/packages/sip/sip-native_3.10.1.bb +++ b/packages/sip/sip3-native_3.10.1 diff --git a/packages/sip/sip-native_4.0.1.bb b/packages/sip/sip3-native_4.0.1.bb index e833a31871..e833a31871 100644 --- a/packages/sip/sip-native_4.0.1.bb +++ b/packages/sip/sip3-native_4.0.1.bb |