From b32c50e016cb022f4700be2b81900beaa0e79f06 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 5 Sep 2012 10:00:17 -0700 Subject: python-pygtk: Upgrade to 2.24 This is needed for the build appliance and Hob also (From OE-Core rev: a0abfd60e8cb78b40278eec85a8d0c722f8ef1e4) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../python/python-pygtk/fix-gtkunixprint.patch | 14 +++--- .../recipes-devtools/python/python-pygtk_2.17.0.bb | 54 ---------------------- .../recipes-devtools/python/python-pygtk_2.24.0.bb | 54 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-pygtk_2.17.0.bb create mode 100644 meta/recipes-devtools/python/python-pygtk_2.24.0.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch index 6d2f64b414..16c0e8e770 100644 --- a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch +++ b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch @@ -1,17 +1,19 @@ Upstream-Status: Inappropriate [configuration] -Index: pygtk-2.10.0/gtk/gtkunixprint.override +Signed-off-by: Saul Wold + +Index: pygtk-2.24.0/gtk/gtkunixprint.override =================================================================== ---- pygtk-2.10.0.orig/gtk/gtkunixprint.override -+++ pygtk-2.10.0/gtk/gtkunixprint.override -@@ -105,11 +105,7 @@ _wrap_gtk_print_job_get_surface(PyGObjec +--- pygtk-2.24.0.orig/gtk/gtkunixprint.override ++++ pygtk-2.24.0/gtk/gtkunixprint.override +@@ -102,11 +102,6 @@ _wrap_gtk_print_job_get_surface(PyGObjec if (pyg_error_check(&error)) return NULL; -#if PYCAIRO_VERSION_HEX >= 0x1010600 - return PycairoSurface_FromSurface(surface, NULL); +- return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL); -#else -- return PycairoSurface_FromSurface(surface, NULL, NULL); +- return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL, NULL); -#endif } %% diff --git a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb deleted file mode 100644 index 603ec5b6fe..0000000000 --- a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "Python GTK+ 2.17.x Bindings" -SECTION = "devel/python" -# needs gtk+ 2.17.x -DEPENDS = "gtk+ libglade python-pycairo python-pygobject" -RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject" -PROVIDES = "python-pygtk2" -SRCNAME = "pygtk" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -PR = "ml10" - -SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/${SRCNAME}-${PV}.tar.bz2 \ - file://fix-gtkunixprint.patch \ - file://prevent_to_get_display_during_import.patch \ - file://nodocs.patch \ - file://acinclude.m4" - -SRC_URI[md5sum] = "43d704343d7ca04a6e4ddd4fa73a3c55" -SRC_URI[sha256sum] = "6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" - -inherit autotools pkgconfig distutils-base - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ - sed -i \ - -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \ - -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \ - -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \ - -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ - -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \ - ${S}/configure.ac - sed -i 's:tests docs:tests:' Makefile.am -} - -# 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 - -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" - diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb new file mode 100644 index 0000000000..20d54a33e1 --- /dev/null +++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Python GTK+ 2.17.x Bindings" +SECTION = "devel/python" +# needs gtk+ 2.17.x +DEPENDS = "gtk+ libglade python-pycairo python-pygobject" +RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject" +PROVIDES = "python-pygtk2" +SRCNAME = "pygtk" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \ + file://fix-gtkunixprint.patch \ + file://prevent_to_get_display_during_import.patch \ + file://nodocs.patch \ + file://acinclude.m4" + +SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49" +SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" + +inherit autotools pkgconfig distutils-base + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + sed -i \ + -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \ + -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \ + -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ + -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \ + ${S}/configure.ac + sed -i 's:tests docs:tests:' Makefile.am +} + +# 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 + +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" + -- cgit v1.2.3-54-g00ecf