From 94317634ab575b7deae469f83038f770e35fb737 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 16 Aug 2007 08:40:59 +0000 Subject: python-pyqt: promote qt4 to being the default, rename other packages accordingly --- packages/python/python-pyqt4/.mtn2git_empty | 0 packages/python/python-pyqt4/cross-compile.patch | 33 ------------------------ 2 files changed, 33 deletions(-) delete mode 100644 packages/python/python-pyqt4/.mtn2git_empty delete mode 100644 packages/python/python-pyqt4/cross-compile.patch (limited to 'packages/python/python-pyqt4') diff --git a/packages/python/python-pyqt4/.mtn2git_empty b/packages/python/python-pyqt4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-pyqt4/cross-compile.patch b/packages/python/python-pyqt4/cross-compile.patch deleted file mode 100644 index fb1524c09d..0000000000 --- a/packages/python/python-pyqt4/cross-compile.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- PyQt4-gpl-4.0beta1/configure.py~cross-compile.patch -+++ PyQt4-gpl-4.0beta1/configure.py -@@ -471,7 +471,7 @@ - sipconfig.error("Unable to create the %s directory." % mname) - - # Build the SIP command line. -- argv = ['"' + sipcfg.sip_bin + '"'] -+ argv = ['"' + sipcfg.sip_bin + '4"'] - - argv.extend(qt_sip_flags) - -@@ -846,7 +846,15 @@ - """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir and qt_datadir globals - for the Qt installation. - """ -- sipconfig.inform("Determining the layout of your Qt installation...") -+ sipconfig.inform("Determining the layout of your Qt installation... - patched for OpenEmbedded by :M:") -+ -+ global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir -+ qt_dir = os.getenv( "QTDIR" ) -+ qt_incdir = "%s/include" % qt_dir -+ qt_libdir = "%s/lib" % qt_dir -+ qt_bindir = "%s/bin" % qt_dir -+ qt_datadir = "%s/share" % qt_dir -+ return - - if not opt_qmake: - sipconfig.error("Make sure you have a working Qt v4 qmake on your PATH or use the -q argument to explicitly specify a working Qt v4 qmake.") -- cgit v1.2.3