From 6813748b1a3de2b7affcc3c03b691b9d9f6fbfe8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 18 Jan 2004 17:52:10 +0000 Subject: [PATCH] - upgrade pyqt and sip to 3.10 - pyqt 3.10 builds now (sip 3.9 had a bug preventing this) BKrev: 400ac7ca_Mn4994NWaxtlCZD0p6irA --- .../features => libsip/libsip_3.10.oe | 0 libsip/libsip_3.9.oe | 38 ------------------- .../add-missing-feature-test.patch} | 0 python/{pyqt_3.9.oe => pyqt-3.10-r0/features} | 0 .../pyqt-3.10-r0/libqpe-opie.patch | 0 sip/sip_3.9.oe => python/pyqt_3.10.oe | 0 sip/sip-native_3.10.oe | 0 sip/sip_3.10.oe | 0 8 files changed, 38 deletions(-) rename python/pyqt-3.9-r0/features => libsip/libsip_3.10.oe (100%) delete mode 100644 libsip/libsip_3.9.oe rename python/{pyqt-3.9-r0/libqpe-opie.patch => pyqt-3.10-r0/add-missing-feature-test.patch} (100%) rename python/{pyqt_3.9.oe => pyqt-3.10-r0/features} (100%) rename sip/sip-native_3.9.oe => python/pyqt-3.10-r0/libqpe-opie.patch (100%) rename sip/sip_3.9.oe => python/pyqt_3.10.oe (100%) create mode 100644 sip/sip-native_3.10.oe create mode 100644 sip/sip_3.10.oe diff --git a/python/pyqt-3.9-r0/features b/libsip/libsip_3.10.oe similarity index 100% rename from python/pyqt-3.9-r0/features rename to libsip/libsip_3.10.oe diff --git a/libsip/libsip_3.9.oe b/libsip/libsip_3.9.oe deleted file mode 100644 index f5b4e85283..0000000000 --- a/libsip/libsip_3.9.oe +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="Runtime helper for sip-generated python wrapper libraries" -SECTION="base" -PRIORITY="optional" -MAINTAINER="Michael Lauer " -LICENSE="GPL" -DEPENDS="virtual/libc virtual/libqte2 python" - -SRC_URI := "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S := "${WORKDIR}/sip-${PV}/siplib" - -inherit qmake - -QMAKE_PROFILES = "siplib.pro.in" - -export QTDIR=${STAGING_DIR}/target - -# -# Warning: passing ' "FOO=BAR" results in double ""FOO=BAR"" which is then ignored by qmake -# - -EXTRA_QMAKEVARS_POST = ' CONFIG=qte \ - DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \ - TARGET=sip \ - DEFINES=SIP_MAKE_DLL \ - DEFINES+=SIP_QT_SUPPORT \ - INCLUDEPATH=. \ - INCLUDEPATH+=${STAGING_DIR}/build/include/python2.3 \ - INCLUDEPATH+=${STAGING_DIR}/target/include ' - - -# -# It would be nice if I could use spaces, e.g. CONFIG=qt warn_off release dll -# - -do_compile() { - oe_runmake LINK="${CC}" LIBS="" -} - diff --git a/python/pyqt-3.9-r0/libqpe-opie.patch b/python/pyqt-3.10-r0/add-missing-feature-test.patch similarity index 100% rename from python/pyqt-3.9-r0/libqpe-opie.patch rename to python/pyqt-3.10-r0/add-missing-feature-test.patch diff --git a/python/pyqt_3.9.oe b/python/pyqt-3.10-r0/features similarity index 100% rename from python/pyqt_3.9.oe rename to python/pyqt-3.10-r0/features diff --git a/sip/sip-native_3.9.oe b/python/pyqt-3.10-r0/libqpe-opie.patch similarity index 100% rename from sip/sip-native_3.9.oe rename to python/pyqt-3.10-r0/libqpe-opie.patch diff --git a/sip/sip_3.9.oe b/python/pyqt_3.10.oe similarity index 100% rename from sip/sip_3.9.oe rename to python/pyqt_3.10.oe diff --git a/sip/sip-native_3.10.oe b/sip/sip-native_3.10.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sip/sip_3.10.oe b/sip/sip_3.10.oe new file mode 100644 index 0000000000..e69de29bb2 -- 2.39.5