Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/01 00:58:57+02:00 uni-frankfurt.de!mickeyl
bump python packages basing on sip.oeclass per the recent sip.oeclass change

2004/10/01 00:58:01+02:00 uni-frankfurt.de!mickeyl
fix sip.oeclass no longer to add -lsip. libsip.so is no more, since python dlopens sip.so

BKrev: 415d2e06Tn2DdSxWzd3V5KcnI74fyQ

diff --git a/classes/sip.oeclass b/classes/sip.oeclass
index e69de29..7102980 100644 (file)
--- a/classes/sip.oeclass
+++ b/classes/sip.oeclass
@@ -0,0 +1,49 @@
+DEPENDS_prepend = "sip4-native python-sip "
+
+#EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+
+sip_do_generate() {
+       if [ -z "${SIP_MODULES}" ]; then 
+               MODULES="`ls sip/*mod.sip`"
+       else
+               MODULES="${SIP_MODULES}"
+       fi
+
+       if [ -z "$MODULES" ]; then
+               die "SIP_MODULES not set and no modules found in $PWD"
+        else
+               oenote "using modules '${SIP_MODULES}' and tags '${EXTRA_SIPTAGS}'"
+       fi
+
+       if [ -z "${EXTRA_SIPTAGS}" ]; then
+               die "EXTRA_SIPTAGS needs to be set!"
+       else
+               SIPTAGS="${EXTRA_SIPTAGS}"
+       fi
+
+       if [ ! -z "${SIP_FEATURES}" ]; then
+               FEATURES="-z ${SIP_FEATURES}"
+               oenote "sip feature file: ${SIP_FEATURES}"
+       fi
+
+       for module in $MODULES
+       do
+               install -d ${module}/
+               oenote "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
+               sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf sip/${module}/${module}mod.sip \
+               || die "Error calling sip on ${module}"
+               cat ${module}/${module}.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, >${module}/${module}.pro
+               echo "TEMPLATE=lib" >>${module}/${module}.pro
+               [ "${module}" = "qt" ]          && echo ""              >>${module}/${module}.pro
+               [ "${module}" = "qtcanvas" ]    && echo ""              >>${module}/${module}.pro
+               [ "${module}" = "qttable" ]     && echo ""              >>${module}/${module}.pro
+               [ "${module}" = "qwt" ]         && echo ""              >>${module}/${module}.pro
+               [ "${module}" = "qtpe" ]        && echo ""              >>${module}/${module}.pro
+               [ "${module}" = "qtpe" ]        && echo "LIBS+=-lqpe"   >>${module}/${module}.pro
+               true
+       done
+}
+
+EXPORT_FUNCTIONS do_generate
+
+addtask generate after do_unpack do_patch before do_configure

diff --git a/python/python-pyqt_3.12.oe b/python/python-pyqt_3.12.oe
index e74b683..a7c8561 100644 (file)
--- a/python/python-pyqt_3.12.oe
+++ b/python/python-pyqt_3.12.oe
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 RDEPENDS = "python-core python-sip"
 DEPENDS = "virtual/libqte2 virtual/libqpe"
 SRCNAME = "pyqt"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
            file://features"

diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index beaaf2a..5c4ecfd 100644 (file)
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -6,6 +6,7 @@ LICENSE = "GPL"
 RDEPENDS = "python-core python-pyqt (${PV}) python-numeric qwt"
 DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
            file://qt2.x-compat.patch;patch=1 \