[oe-commits] org.oe.dev python-pygtk 2.10.4: fix dependencies and packaging. closes #2905

[mickeyl commit]

python-pygtk 2.10.4: fix dependencies and packaging. closes #2905

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 96d7870254b4856e54bb9917bf206a20c8a2143b
ViewMTN: http://monotone.openembedded.org/revision/info/96d7870254b4856e54bb9917bf206a20c8a2143b
Files:
1
packages/python/python-pygtk_2.10.4.bb
Diffs:

#
# mt diff -ra6bb9a36eb78d628e223e46dd0a63e4a1c7471c4 -r96d7870254b4856e54bb9917bf206a20c8a2143b
#
# 
# 
# patch "packages/python/python-pygtk_2.10.4.bb"
#  from [1fe07d72af509c3c4379bfd590276993274cdb1f]
#    to [20fd3e58d90f72b7479658ea3981372dfe01b9e5]
# 
============================================================
--- packages/python/python-pygtk_2.10.4.bb	1fe07d72af509c3c4379bfd590276993274cdb1f
+++ packages/python/python-pygtk_2.10.4.bb	20fd3e58d90f72b7479658ea3981372dfe01b9e5
@@ -1,12 +1,12 @@ SECTION = "devel/python"
 DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+DEPENDS = "gtk+ libglade"
 RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 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 \
@@ -19,16 +19,24 @@ do_configure_prepend() {
 inherit autotools pkgconfig distutils-base
 
 do_configure_prepend() {
-    install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+# dirty fix #1: remove dependency on python-pygobject-dev
+do_install_append() {
+	find ${D} -name "*.la"|xargs rm -f
+	rm -f ${D}/${bindir}/pygtk-codegen-2.0
+	rm -rf ${D}/${libdir}/pkgconfig
 }
 
+# dirty fix #2: fix build system paths leaking in
 require fix-path.inc
 
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+# todo: revamp packaging, package demo seperatly
+FILES_${PN}-dev += "\
+  ${libdir}/pygtk/2.0 \
+  ${bindir}/pygtk-* \
+  ${datadir}/pygtk/2.0"
 
 do_stage() {
 	autotools_stage_includes