summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-07-07 04:40:08 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-16 16:25:16 +0100
commit77dff5267b15dde7b0b5b7bb22ee56f5f2d2d749 (patch)
treee250d37c410a667fc6a8306de28143bcd3ca12e4
parent1d1a559aa18a3af4c4b21ccffebc0bbcb5efcb19 (diff)
downloadopenembedded-core-77dff5267b15dde7b0b5b7bb22ee56f5f2d2d749.tar.gz
openembedded-core-77dff5267b15dde7b0b5b7bb22ee56f5f2d2d749.tar.bz2
openembedded-core-77dff5267b15dde7b0b5b7bb22ee56f5f2d2d749.tar.xz
openembedded-core-77dff5267b15dde7b0b5b7bb22ee56f5f2d2d749.zip
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>
-rw-r--r--meta/packages/python/python-pygtk/nodocs.patch10
-rw-r--r--meta/packages/python/python-pygtk_2.17.0.bb (renamed from meta/packages/python/python-pygtk_2.10.4.bb)27
2 files changed, 14 insertions, 23 deletions
diff --git a/meta/packages/python/python-pygtk/nodocs.patch b/meta/packages/python/python-pygtk/nodocs.patch
index 9b2387e95..c3581043c 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.17.0.bb
index 00abd048e..ef63b5103 100644
--- a/meta/packages/python/python-pygtk_2.10.4.bb
+++ b/meta/packages/python/python-pygtk_2.17.0.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Python GTK+ 2.10.x Bindings"
+DESCRIPTION = "Python GTK+ 2.17.x Bindings"
SECTION = "devel/python"
-# needs gtk+ 2.10.x
+# needs gtk+ 2.17.x
DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
RDEPENDS = "python-shell python-pycairo python-pygobject"
PROVIDES = "python-pygtk2"
@@ -8,17 +8,14 @@ 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 \
+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}/../ \
-"
+EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../"
inherit autotools pkgconfig distutils-base
@@ -37,15 +34,9 @@ do_install_append() {
require fix-path.inc
PACKAGES =+ "${PN}-demo"
-FILES_${PN}-demo = "\
- ${bindir}/pygtk-demo \
- ${libdir}/pygtk \
-"
+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"
+FILES_${PN}-dev += " ${libdir}/pygtk/2.0 ${bindir}/pygtk-* ${datadir}/pygtk/2.0"