From a36d4624c3e3fae02c9890029d8b2c16c296e4ef Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 18:05:57 +0000 Subject: python-pygtk 2.10.4: fix dependencies and packaging. closes #2905 --- packages/python/python-pygtk_2.10.4.bb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'packages/python/python-pygtk_2.10.4.bb') diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 0584d119c9..4471cf515d 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,12 +1,12 @@ 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 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" 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 -- cgit v1.2.3 From 646c0d7855f581c315a7d6e192fa87b43ce8449d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 21:01:11 +0000 Subject: python-pygtk 2.10.4 package demo seperately and fix demo dependencies --- packages/python/python-pygtk_2.10.4.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'packages/python/python-pygtk_2.10.4.bb') diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 4471cf515d..09cf2d224b 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -6,7 +6,7 @@ RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml4" +PR = "ml5" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -32,6 +32,13 @@ do_install_append() { # dirty fix #2: fix build system paths leaking in require fix-path.inc +PACKAGES =+ "${PN}-demo" +FILES_${PN}-demo = "\ + ${bindir}/pygtk-demo \ + ${libdir}/pygtk \ +" +RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-tokenize" + # todo: revamp packaging, package demo seperatly FILES_${PN}-dev += "\ ${libdir}/pygtk/2.0 \ -- cgit v1.2.3 From e9298140e0a9ad9202f0c678ad1d0c7ac0201784 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 23:44:18 +0000 Subject: python-pygtk 2.10.4 python-tokenize is included in python-lang --- packages/python/python-pygtk_2.10.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python/python-pygtk_2.10.4.bb') diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 09cf2d224b..d53e3d5105 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -37,7 +37,7 @@ FILES_${PN}-demo = "\ ${bindir}/pygtk-demo \ ${libdir}/pygtk \ " -RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-tokenize" +RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" # todo: revamp packaging, package demo seperatly FILES_${PN}-dev += "\ -- cgit v1.2.3 From 2e66df82e8d11701041c0f35f8551718023f66d1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 10 Dec 2007 20:52:22 +0000 Subject: python-pygtk 2.10.4 python-pycairo is actually a build time dependency --- packages/python/python-pygtk_2.10.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python/python-pygtk_2.10.4.bb') diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index d53e3d5105..9b4a034ffa 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade" +DEPENDS = "gtk+ libglade python-pycairo" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" -- cgit v1.2.3 From d8ae3350e9da832950fc5f8566f6635e10262d60 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Dec 2007 17:09:23 +0000 Subject: python-pygtk 2.10.4 add missing dependency to python-pygobject (again, it _really_ needs it at build time as well). closes #3450 --- packages/python/python-pygtk_2.10.4.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/python/python-pygtk_2.10.4.bb') diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 9b4a034ffa..1af2093556 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade python-pycairo" +DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" @@ -13,8 +13,10 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" -EXTRA_OECONF = "--disable-docs" -EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +EXTRA_OECONF = "\ + --disable-docs \ + --with-python-includes=${STAGING_INCDIR}/../ \ +" inherit autotools pkgconfig distutils-base -- cgit v1.2.3