python-pygtk: imported changes from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4156 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-04-03 03:48:53 +00:00
parent 6569da9da9
commit 46e13cec41
3 changed files with 54 additions and 8 deletions

View File

@@ -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

View File

@@ -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