[oe-commits] org.oe.dev merge of '2aa738d5c03b83a4132b153cc9c9d76b3b367651'

[Laibsch commit]

merge of '2aa738d5c03b83a4132b153cc9c9d76b3b367651'
     and 'c48f66ff9ccc3311bacc8bb4a4c4ed79893a63d4'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: b873786ee35b1f62b5c333fe362ee5964ac4b2db
ViewMTN: http://monotone.openembedded.org/revision/info/b873786ee35b1f62b5c333fe362ee5964ac4b2db
Files:
1
packages/xserver-common/xserver-common_1.22.bb
packages/python/python-pygtk/prevent_to_get_display_during_import.patch
Diffs:

#
# mt diff -r2aa738d5c03b83a4132b153cc9c9d76b3b367651 -rb873786ee35b1f62b5c333fe362ee5964ac4b2db
#
#
#
# patch "packages/xserver-common/xserver-common_1.22.bb"
#  from [6701d296bf34e8f9bb6391a368bc161e8d9f6c71]
#    to [a819a6f607a45c0852b0804afe5b7abb34ae4f1f]
#
============================================================
--- packages/xserver-common/xserver-common_1.22.bb	6701d296bf34e8f9bb6391a368bc161e8d9f6c71
+++ packages/xserver-common/xserver-common_1.22.bb	a819a6f607a45c0852b0804afe5b7abb34ae4f1f
@@ -2,7 +2,7 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 


#
# mt diff -rc48f66ff9ccc3311bacc8bb4a4c4ed79893a63d4 -rb873786ee35b1f62b5c333fe362ee5964ac4b2db
#
#
#
# patch "packages/python/python-pygtk/prevent_to_get_display_during_import.patch"
#  from [2e8b9609d347c70c06283d55746b650ab11d3c58]
#    to [f289906bed1582caaa1ffdfb1560e0ea761ba828]
#
============================================================
--- packages/python/python-pygtk/prevent_to_get_display_during_import.patch	2e8b9609d347c70c06283d55746b650ab11d3c58
+++ packages/python/python-pygtk/prevent_to_get_display_during_import.patch	f289906bed1582caaa1ffdfb1560e0ea761ba828
@@ -1,3 +1,7 @@
+upstream: http://bugzilla.gnome.org/show_bug.cgi?id=528758
+status: pending, reported on April 18th 2008
+comment: prevents a gtk window popping up, enabling the compilation on headless machines
+
 Index: pygtk-2.10.4/gtk/__init__.py
 ===================================================================
 --- pygtk-2.10.4.orig/gtk/__init__.py	2007-11-27 19:27:05.000000000 -0300