- Add two patches from pypanel home page to introduce a

  STARTUP_DELAY configuration variable to allow pypanel
  to wait to start until after window manager. Some window
  managers start up too quickly and having just pypanel &
  in .xinitrc it sometimes fails to start. One patch is to
  pypanel and the other is to pypanelrc default configuration file.

PR:		129493
Submitted by:	Chess Griffin <chess@chessgriffin.com>
Approved by:	maintainer timeout

3 files changed, 47 insertions, 1 deletions

diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 22663b79327d..18a107843847 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pypanel
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pypanel
diff --git a/deskutils/pypanel/files/patch-pypanel b/deskutils/pypanel/files/patch-pypanel
new file mode 100644
index 000000000000..7f4b0830be93
--- /dev/null
+++ b/deskutils/pypanel/files/patch-pypanel
@@ -0,0 +1,31 @@
+--- pypanel.orig	2005-06-26 19:24:43.000000000 -0400
++++ pypanel	2008-12-08 00:06:37.000000000 -0500
+@@ -95,6 +95,7 @@
+         self.root.change_attributes(event_mask=(X.PropertyChangeMask)) 
+         self.window.map()
+         self.display.flush()
++        self.updatePanel(self.root, self.window, self.panel)
+         self.loop(self.display, self.root, self.window, self.panel)
+                 
+     #------------------------------------
+@@ -944,6 +945,9 @@
+     main   = 2.4
+     config = globals().get("VERSION", None)
+     
++    # Get the startup delay
++    delay  = globals().get("STARTUP_DELAY", None)
++    
+     # Set locale to user's default
+     locale.setlocale(locale.LC_ALL, "")
+     
+@@ -953,5 +957,9 @@
+         sys.stderr.write("\nA current pypanelrc example can be found here -\n")
+         sys.stderr.write("%s/pypanel/pypanelrc\n\n" % sysconfig.get_python_lib())
+     del main, config
+-
++    
++    # If delay is set, pause, and let windowmanager load
++    if delay:
++	    time.sleep(delay)
++	    
+     PyPanel(display.Display())
diff --git a/deskutils/pypanel/files/patch-pypanelrc b/deskutils/pypanel/files/patch-pypanelrc
new file mode 100644
index 000000000000..9d5f45572782
--- /dev/null
+++ b/deskutils/pypanel/files/patch-pypanelrc
@@ -0,0 +1,15 @@
+--- pypanelrc.orig	2005-06-26 19:27:37.000000000 -0400
++++ pypanelrc	2008-12-08 00:06:54.000000000 -0500
+@@ -9,6 +9,12 @@
+ VERSION         = 2.4           # Config file version
+ 
+ #------------------------------------------------------------------------------
++# Startup delay: The time to wait before painting the pypanel window. This lets
++# the background load up so that pypanel will be displayed correctly. 
++#------------------------------------------------------------------------------
++STARTUP_DELAY   = 2
++
++#------------------------------------------------------------------------------
+ # Colors: Format is hex triplet - 0xrrggbb
+ #------------------------------------------------------------------------------
+ BG_COLOR        = "0xd6d6d6"    # Panel background and tinting color