From 77dff5267b15dde7b0b5b7bb22ee56f5f2d2d749 Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Wed, 7 Jul 2010 04:40:08 -0700
Subject: python-pygtk: upgrade from 2.10.4 to 2.17.0

Rebased this patch to the newer code
	nodocs.patch

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/packages/python/python-pygtk/nodocs.patch | 10 ++---
 meta/packages/python/python-pygtk_2.10.4.bb    | 51 --------------------------
 meta/packages/python/python-pygtk_2.17.0.bb    | 42 +++++++++++++++++++++
 3 files changed, 47 insertions(+), 56 deletions(-)
 delete mode 100644 meta/packages/python/python-pygtk_2.10.4.bb
 create mode 100644 meta/packages/python/python-pygtk_2.17.0.bb

(limited to 'meta')

diff --git a/meta/packages/python/python-pygtk/nodocs.patch b/meta/packages/python/python-pygtk/nodocs.patch
index 9b2387e959..c3581043c3 100644
--- a/meta/packages/python/python-pygtk/nodocs.patch
+++ b/meta/packages/python/python-pygtk/nodocs.patch
@@ -1,13 +1,13 @@
-Index: pygtk-2.10.4/Makefile.am
+Index: pygtk-2.17.0/Makefile.am
 ===================================================================
---- pygtk-2.10.4.orig/Makefile.am
-+++ pygtk-2.10.4/Makefile.am
+--- pygtk-2.17.0.orig/Makefile.am
++++ pygtk-2.17.0/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
+-SUBDIRS = . $(GTK_SUBDIR) examples tests docs
++SUBDIRS = . $(GTK_SUBDIR) examples tests
  
  PLATFORM_VERSION = 2.0
  
diff --git a/meta/packages/python/python-pygtk_2.10.4.bb b/meta/packages/python/python-pygtk_2.10.4.bb
deleted file mode 100644
index 00abd048e2..0000000000
--- a/meta/packages/python/python-pygtk_2.10.4.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Python GTK+ 2.10.x Bindings"
-SECTION = "devel/python"
-# needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
-RDEPENDS = "python-shell python-pycairo python-pygobject"
-PROVIDES = "python-pygtk2"
-SRCNAME = "pygtk"
-LICENSE = "LGPL"
-PR = "ml8.2"
-
-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 \
-  --with-python-includes=${STAGING_INCDIR}/../ \
-"
-
-inherit autotools pkgconfig distutils-base
-
-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
-
-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/packages/python/python-pygtk_2.17.0.bb b/meta/packages/python/python-pygtk_2.17.0.bb
new file mode 100644
index 0000000000..ef63b51038
--- /dev/null
+++ b/meta/packages/python/python-pygtk_2.17.0.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Python GTK+ 2.17.x Bindings"
+SECTION = "devel/python"
+# needs gtk+ 2.17.x
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+RDEPENDS = "python-shell python-pycairo python-pygobject"
+PROVIDES = "python-pygtk2"
+SRCNAME = "pygtk"
+LICENSE = "LGPL"
+PR = "ml8.2"
+
+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"
+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}/
+}
+
+# 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