Date: Mon, 8 Dec 2008 05:13:26 GMT From: Chess Griffin <chess@chessgriffin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/129493: [patch] - add two patches to deskutils/pypanel Message-ID: <200812080513.mB85DQCt075815@www.freebsd.org> Resent-Message-ID: <200812080520.mB85K0a6016615@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129493
>Category: ports
>Synopsis: [patch] - add two patches to deskutils/pypanel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 08 05:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Chess Griffin
>Release: 7.1-PRERELEASE
>Organization:
>Environment:
FreeBSD fbsd.localdomain 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sun Dec 7 12:53:38 EST 2008 root@fbsd.localdomain:/usr/obj/usr/src/sys/CNG i386
>Description:
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. Diff is attached. Tested here and works fine.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN pypanel.orig/Makefile pypanel/Makefile
--- pypanel.orig/Makefile 2008-12-07 23:26:52.000000000 -0500
+++ pypanel/Makefile 2008-12-07 23:38:39.000000000 -0500
@@ -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 -ruN pypanel.orig/files/patch-pypanel pypanel/files/patch-pypanel
--- pypanel.orig/files/patch-pypanel 1969-12-31 19:00:00.000000000 -0500
+++ pypanel/files/patch-pypanel 2008-12-08 00:07:16.000000000 -0500
@@ -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 -ruN pypanel.orig/files/patch-pypanelrc pypanel/files/patch-pypanelrc
--- pypanel.orig/files/patch-pypanelrc 1969-12-31 19:00:00.000000000 -0500
+++ pypanel/files/patch-pypanelrc 2008-12-08 00:07:23.000000000 -0500
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812080513.mB85DQCt075815>