- add a patch (from homepage) to introduce a STARTUP_DELAY parameter
that makes pypanel load after an interval of time (this is useful in case the window manager hasn't loaded up completely; in which case, pypanel might not display correctly) - install egg-info file - regen patches and fix WANTLIB while here - take over maintainership
This commit is contained in:
ajacoutot
parent
e12c99d543
commit
48883af3f6
@ -1,21 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2007/10/08 08:22:44 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2008/01/15 14:07:39 ajacoutot Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= lightweight panel written in Python and C for X11
|
||||
|
||||
DISTNAME= PyPanel-2.4
|
||||
PKGNAME= ${DISTNAME:L}p2
|
||||
PKGNAME= ${DISTNAME:L}p3
|
||||
CATEGORIES= x11
|
||||
|
||||
HOMEPAGE= http://pypanel.sourceforge.net/
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= X11 Xext Xft freetype m
|
||||
|
||||
WANTLIB= X11 Xext Xft freetype m z
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pypanel/}
|
||||
|
||||
@ -32,7 +35,7 @@ PYTHONPATH= ${WRKINST}${MODPY_SITEPKG}
|
||||
|
||||
pre-configure:
|
||||
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g; \
|
||||
s,!!X11BASE!!,${X11BASE},g;' ${WRKSRC}/setup.py
|
||||
s,!!X11BASE!!,${X11BASE},g;' ${WRKSRC}/setup.py
|
||||
@perl -pi -e 's,/etc,${SYSCONFDIR},g' ${WRKSRC}/pypanel
|
||||
|
||||
post-install:
|
||||
|
||||
31
x11/pypanel/patches/patch-pypanel
Normal file
31
x11/pypanel/patches/patch-pypanel
Normal file
@ -0,0 +1,31 @@
|
||||
$OpenBSD: patch-pypanel,v 1.1 2008/01/15 14:07:39 ajacoutot Exp $
|
||||
--- pypanel.orig Tue Jan 15 14:53:21 2008
|
||||
+++ pypanel Tue Jan 15 14:55:11 2008
|
||||
@@ -95,6 +95,7 @@ class PyPanel(object):
|
||||
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 @@ if __name__ == "__main__":
|
||||
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 @@ if __name__ == "__main__":
|
||||
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())
|
||||
16
x11/pypanel/patches/patch-pypanelrc
Normal file
16
x11/pypanel/patches/patch-pypanelrc
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-pypanelrc,v 1.1 2008/01/15 14:07:39 ajacoutot Exp $
|
||||
--- pypanelrc.orig Tue Jan 15 14:55:24 2008
|
||||
+++ pypanelrc Tue Jan 15 14:56:33 2008
|
||||
@@ -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 = 0
|
||||
+
|
||||
+#------------------------------------------------------------------------------
|
||||
# Colors: Format is hex triplet - 0xrrggbb
|
||||
#------------------------------------------------------------------------------
|
||||
BG_COLOR = "0xd6d6d6" # Panel background and tinting color
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-setup_py,v 1.2 2006/12/28 22:36:16 jasper Exp $
|
||||
$OpenBSD: patch-setup_py,v 1.3 2008/01/15 14:07:39 ajacoutot Exp $
|
||||
--- setup.py.orig Thu Jun 23 03:48:49 2005
|
||||
+++ setup.py Thu Dec 28 20:38:37 2006
|
||||
@@ -3,10 +3,10 @@
|
||||
+++ setup.py Tue Jan 15 14:57:22 2008
|
||||
@@ -3,10 +3,10 @@ from distutils.core import Extension, setup
|
||||
from distutils import sysconfig
|
||||
|
||||
# Full paths to imlib2-config and freetype-config, adjust as needed -
|
||||
@ -14,7 +14,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/12/28 22:36:16 jasper Exp $
|
||||
|
||||
# Add any additional library directories here -
|
||||
ldirs = []
|
||||
@@ -15,7 +15,7 @@
|
||||
@@ -15,7 +15,7 @@ ldirs = []
|
||||
cargs = ["-Wall"]
|
||||
|
||||
# Full path to libImlib2 shared library
|
||||
@ -23,7 +23,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/12/28 22:36:16 jasper Exp $
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# The rest of this script should not need to be modified!
|
||||
@@ -117,7 +117,7 @@
|
||||
@@ -117,7 +117,7 @@ setup(name = "PyPanel",
|
||||
description = "Lightweight panel/taskbar for X11 Window Managers",
|
||||
long_description = "See README for more information",
|
||||
url = "http://pypanel.sourceforge.net",
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2006/12/28 22:36:16 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2008/01/15 14:07:39 ajacoutot Exp $
|
||||
bin/pypanel
|
||||
lib/python${MODPY_VERSION}/site-packages/PyPanel-2.4-py${MODPY_VERSION}.egg-info
|
||||
lib/python${MODPY_VERSION}/site-packages/ppmodule.so
|
||||
lib/python${MODPY_VERSION}/site-packages/pypanel/
|
||||
lib/python${MODPY_VERSION}/site-packages/pypanel/ppicon.png
|
||||
|
||||
Loading…
Reference in New Issue
Block a user