Added patch to try to fix bug #314653

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 29 insertions, 11 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index fa2bc5463744..56e9c26be823 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.122 2010/05/08 18:50:14 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.123 2010/05/08 19:04:24 nixphoeni Exp $
+
+*gdesklets-core-0.36.2-r2 (08 May 2010)
+
+  08 May 2010; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.36.2-r1.ebuild, +gdesklets-core-0.36.2-r2.ebuild,
+  files/gdesklets-control-getid, +files/gdesklets-core-getid-fix.patch:
+  Added patch to try to fix bug #314653
 
   08 May 2010; Joe Sapp <nixphoeni@gentoo.org>
   -gdesklets-core-0.36.1-r2.ebuild:
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
index f16771ad805b..9d55d0a5a542 100755
--- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid
+++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.4 2010/05/08 03:20:21 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.5 2010/05/08 19:04:24 nixphoeni Exp $
 # 
 # A simple script to get the name and id from a Control.
 # Pretty much copied from test-control.py
@@ -18,20 +18,16 @@ try:
     path = os.path.abspath(sys.argv[1])
     folder, base = os.path.split(path)
 except:
-    #sys.exit("Usage: gdesklets-control-getid <control-directory>")
-    print "ERROR_IN_CONTROL_INSTALLATION"
-    
+    sys.exit("ERROR IN CONTROL INSTALLATION")
+
 
 os.chdir(folder)
 try:
     module = __import__(base)
-    os.chdir(base)
     clss = module.get_class()
-    ctrl = clss()
-    
+
 except IOError:
-    #sys.exit("Could not load control %s." % (path))
-    print folder
+    sys.exit("Could not load control in %s!" % (folder))
 
 # Get the string in the form of "IMyControl:hash" and translate it to
 # "MyControl_hash"
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
new file mode 100644
index 000000000000..ae458a3bb2b1
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
@@ -0,0 +1,14 @@
+--- main/__init__.py  2009-09-20 20:02:48 +0000
++++ main/__init__.py  2010-05-08 15:41:26 +0000
+@@ -16,8 +16,11 @@
+     # case the DISPLAY variable doesn't contain the screen number)
+     DISPLAY = vfs.escape_path(gtk.gdk.Display(os.environ["DISPLAY"]).get_name()).replace("/", "_")
+ except:
+-    print "Error: could not open display", os.environ["DISPLAY"]
+-    sys.exit(1)
++    try:
++        print >> sys.stderr, "Error: could not open display", os.environ["DISPLAY"]
++    except:
++        print >> sys.stderr, "(could not get DISPLAY environment variable)"
++    DISPLAY = "0"
+
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild
index a08dab546d5f..f207a14a601d 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild,v 1.1 2010/05/08 03:20:20 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild,v 1.1 2010/05/08 19:04:24 nixphoeni Exp $
 
 EAPI=2
 # desklets don't run with USE=debug
@@ -54,6 +54,7 @@ pkg_setup() {
 
 src_prepare() {
 
+	epatch "${FILESDIR}/${PN}-getid-fix.patch"
 	gnome2_src_prepare
 
 	# Postpone pyc compiling until pkg_postinst