diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-03 03:48:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-03 03:48:53 +0000 |
| commit | 46e13cec412dda538fb74b7a013e7abd5f6c79c7 (patch) | |
| tree | acd32fd9b3d3ebfd77cf49eeb2cb0331119c0081 /meta-extras | |
| parent | 6569da9da91f16411175110a69a9611d774fdc21 (diff) | |
| download | openembedded-core-46e13cec412dda538fb74b7a013e7abd5f6c79c7.tar.gz openembedded-core-46e13cec412dda538fb74b7a013e7abd5f6c79c7.tar.bz2 openembedded-core-46e13cec412dda538fb74b7a013e7abd5f6c79c7.zip | |
python-pygtk: imported changes from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4156 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras')
3 files changed, 53 insertions, 7 deletions
diff --git a/meta-extras/packages/python/python-pygtk/nodocs.patch b/meta-extras/packages/python/python-pygtk/nodocs.patch new file mode 100644 index 0000000000..9b2387e959 --- /dev/null +++ b/meta-extras/packages/python/python-pygtk/nodocs.patch @@ -0,0 +1,13 @@ +Index: pygtk-2.10.4/Makefile.am +=================================================================== +--- pygtk-2.10.4.orig/Makefile.am ++++ pygtk-2.10.4/Makefile.am +@@ -4,7 +4,7 @@ if BUILD_GTK + GTK_SUBDIR = gtk + endif + +-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs ++SUBDIRS = codegen . $(GTK_SUBDIR) examples tests + + PLATFORM_VERSION = 2.0 + diff --git a/meta-extras/packages/python/python-pygtk/prevent_to_get_display_during_import.patch b/meta-extras/packages/python/python-pygtk/prevent_to_get_display_during_import.patch new file mode 100644 index 0000000000..db3469ef57 --- /dev/null +++ b/meta-extras/packages/python/python-pygtk/prevent_to_get_display_during_import.patch @@ -0,0 +1,14 @@ +Index: pygtk-2.10.4/gtk/__init__.py +=================================================================== +--- pygtk-2.10.4.orig/gtk/__init__.py 2007-11-27 19:27:05.000000000 -0300 ++++ pygtk-2.10.4/gtk/__init__.py 2007-11-27 19:28:22.000000000 -0300 +@@ -78,7 +78,8 @@ + + keysyms = LazyModule('keysyms', locals()) + +-_init() ++if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'): ++ init() + + # CAPI + _PyGtk_API = _gtk._PyGtk_API diff --git a/meta-extras/packages/python/python-pygtk_2.10.4.bb b/meta-extras/packages/python/python-pygtk_2.10.4.bb index 0584d119c9..645aad11e0 100644 --- a/meta-extras/packages/python/python-pygtk_2.10.4.bb +++ b/meta-extras/packages/python/python-pygtk_2.10.4.bb @@ -6,29 +6,48 @@ RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml3" +PR = "ml7" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ + file://prevent_to_get_display_during_import.patch;patch=1 \ + file://nodocs.patch;patch=1 \ 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 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-*" +PACKAGES =+ "${PN}-demo" +FILES_${PN}-demo = "\ + ${bindir}/pygtk-demo \ + ${libdir}/pygtk \ +" +RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" + +# todo: revamp packaging, package demo seperatly +FILES_${PN}-dev += "\ + ${libdir}/pygtk/2.0 \ + ${bindir}/pygtk-* \ + ${datadir}/pygtk/2.0" do_stage() { autotools_stage_includes |