[oe-commits] org.oe.dev sip/python-sip/python-pyqt: revamp naming, start to work on a current PyQt that builds against Qt-X11 4.3.0

[mickeyl commit]

sip/python-sip/python-pyqt: revamp naming, start to work on a current PyQt that builds against Qt-X11 4.3.0

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: b1cb3695d78a3de2d2f2ec33a9b88403e0db271b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b1cb3695d78a3de2d2f2ec33a9b88403e0db271b
Files:
1
classes/sip.bbclass
classes/sip3.bbclass
classes/sip4.bbclass
packages/python/python-pyqt_4.2.bb
packages/python/python-pyqt_4.3.bb
packages/sip/sip-native_3.10.1.bb
packages/sip/sip3-native_3.10.1
packages/sip/sip-native_4.0.1.bb
packages/sip/sip3-native_4.0.1.bb
packages/sip/sip4-native_4.4.5.bb
packages/sip/sip-native_4.7.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python24-pyqwt2_3.10.bb
Diffs:

#
# mt diff -r7dcfdc2af0ae972634d8a71244289786c34a446b -rb1cb3695d78a3de2d2f2ec33a9b88403e0db271b
#
# 
# 
# rename "classes/sip.bbclass"
#     to "classes/sip3.bbclass"
# 
# rename "classes/sip4.bbclass"
#     to "classes/sip.bbclass"
# 
# rename "packages/python/python-pyqt_4.2.bb"
#     to "packages/python/python-pyqt_4.3.bb"
# 
# rename "packages/sip/sip-native_3.10.1.bb"
#     to "packages/sip/sip3-native_3.10.1"
# 
# rename "packages/sip/sip-native_4.0.1.bb"
#     to "packages/sip/sip3-native_4.0.1.bb"
# 
# rename "packages/sip/sip4-native_4.4.5.bb"
#     to "packages/sip/sip-native_4.7.bb"
# 
# patch "classes/sip.bbclass"
#  from [80b361e9b97e13bf345538986f1b134f607db6ef]
#    to [4012d4828567e24b5d46a88b61b5f951b18ae7f3]
# 
# patch "classes/sip3.bbclass"
#  from [2303d673f36cf2626f007237b4be21bd26581cce]
#    to [73a1199d0cd0e38e5322e0047631d476afeb1f4b]
# 
# patch "packages/python/python-pyqt_4.3.bb"
#  from [1a1326664f9663662d7b770455cc8284beffd27a]
#    to [ce95b543c3462d9389e2f7e616a86e2dee61a615]
# 
# patch "packages/python/python24-pyqt2_3.13.bb"
#  from [8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e]
#    to [a86c25cf42602e66a89c20552b8800b315d44ab8]
# 
# patch "packages/python/python24-pyqwt2_3.10.bb"
#  from [8cad0caa1d225ddbc989c027cf055ef8e7165f0a]
#    to [d73c7873c5613b17078902a2de603a34cbb06184]
# 
# patch "packages/sip/sip-native_4.7.bb"
#  from [d6b14931a1957d3ac285ef26172a73a098ee96c3]
#    to [ffb9c2a06301e9a83d6937e2920959e47eda7f25]
# 
============================================================
--- classes/sip4.bbclass	80b361e9b97e13bf345538986f1b134f607db6ef
+++ classes/sip.bbclass	4012d4828567e24b5d46a88b61b5f951b18ae7f3
@@ -1,13 +1,13 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey at Vanille.de>
 #
-DEPENDS  =+ "sip4-native"
-RDEPENDS += "python-sip4"
+DEPENDS  =+ "sip-native"
+RDEPENDS += "python-sip"
 
 # default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1"
+# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
 
-sip4_do_generate() {
+sip_do_generate() {
 	if [ -z "${SIP_MODULES}" ]; then 
 		MODULES="`ls sip/*mod.sip`"
 	else
============================================================
--- classes/sip.bbclass	2303d673f36cf2626f007237b4be21bd26581cce
+++ classes/sip3.bbclass	73a1199d0cd0e38e5322e0047631d476afeb1f4b
@@ -7,7 +7,7 @@ DEPENDS =+ "sip-native python-sip"
 # default stuff, do not uncomment
 # EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
 
-sip_do_generate() {
+sip3_do_generate() {
 	if [ -z "${SIP_MODULES}" ]; then 
 		MODULES="`ls sip/*mod.sip`"
 	else
============================================================
--- packages/python/python-pyqt_4.2.bb	1a1326664f9663662d7b770455cc8284beffd27a
+++ packages/python/python-pyqt_4.3.bb	ce95b543c3462d9389e2f7e616a86e2dee61a615
@@ -12,12 +12,12 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
            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"
============================================================
--- packages/python/python24-pyqt2_3.13.bb	8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e
+++ packages/python/python24-pyqt2_3.13.bb	a86c25cf42602e66a89c20552b8800b315d44ab8
@@ -14,7 +14,7 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
            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"
============================================================
--- packages/python/python24-pyqwt2_3.10.bb	8cad0caa1d225ddbc989c027cf055ef8e7165f0a
+++ packages/python/python24-pyqwt2_3.10.bb	d73c7873c5613b17078902a2de603a34cbb06184
@@ -13,7 +13,7 @@ S = "${WORKDIR}/PyQwt-20040118"
            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"
============================================================
--- packages/sip/sip4-native_4.4.5.bb	d6b14931a1957d3ac285ef26172a73a098ee96c3
+++ packages/sip/sip-native_4.7.bb	ffb9c2a06301e9a83d6937e2920959e47eda7f25
@@ -1,5 +1,5 @@ DESCRIPTION = "SIP is a C++/Python Wrapp
 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 @@ S = "${WORKDIR}/sip-${PV}/sipgen"
 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"