summaryrefslogtreecommitdiff
path: root/packages/python
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-06-08 22:11:20 +0000
committerRod Whitby <rod@whitby.id.au>2007-06-08 22:11:20 +0000
commitd6db07724347d98a16670844ad3111628a7b9e4d (patch)
tree3d7361515eef1d3b06258facbdc06c1ae8cb4cf5 /packages/python
parentac3162bab2a58e1102f20025e7c57cdabbc596bc (diff)
parent1d2bddcda3df064b686809ac1033ecc7d582e7a9 (diff)
merge of '63f976f7eeeabc5489e45b1df04c88319cd77447'
and 'f20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3'
Diffstat (limited to 'packages/python')
-rw-r--r--packages/python/fix-path.inc22
-rw-r--r--packages/python/python-pygtk2_2.10.3.bb4
-rw-r--r--packages/python/python-pyqt4_4.2.bb (renamed from packages/python/python-pyqt4_4.0.bb)0
3 files changed, 25 insertions, 1 deletions
diff --git a/packages/python/fix-path.inc b/packages/python/fix-path.inc
new file mode 100644
index 0000000000..0738c59ada
--- /dev/null
+++ b/packages/python/fix-path.inc
@@ -0,0 +1,22 @@
+do_install_append() {
+ for i in `find ${D} -name "*.py"` ; do \
+ sed -i -e s:${D}::g $i
+ done
+
+ for i in `find ${D} -name "*.la"` ; do \
+ sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+ done
+
+ if test -e ${D}${bindir} ; then
+ for i in ${D}${bindir}/* ; do \
+ sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+ done
+ fi
+
+ if test -e ${D}${sbindir} ; then
+ for i in ${D}${sbindir}/* ; do \
+ sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+ done
+ fi
+}
+
diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb
index a71765dfbc..d3811ddddd 100644
--- a/packages/python/python-pygtk2_2.10.3.bb
+++ b/packages/python/python-pygtk2_2.10.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
RDEPENDS = "python-shell"
SRCNAME = "pygtk"
LICENSE = "LGPL"
-PR = "ml3"
+PR = "ml4"
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
file://fix-gtkunixprint.patch;patch=1 \
@@ -21,6 +21,8 @@ do_configure_prepend() {
install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
}
+require fix-path.inc
+
FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.2.bb
index 64a9a71f68..64a9a71f68 100644
--- a/packages/python/python-pyqt4_4.0.bb
+++ b/packages/python/python-pyqt4_4.2.bb