Date: Fri, 25 Jun 2004 11:27:26 -0400 (EDT) From: michael johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mezz@FreeBSD.org Subject: ports/68333: [PATCH] deskutils/gdesklets-starterbar: update to 0.30 Message-ID: <20040625152726.1A4B55CD6@gentoo.ahze.net> Resent-Message-ID: <200406251530.i5PFUOTk078379@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68333 >Category: ports >Synopsis: [PATCH] deskutils/gdesklets-starterbar: update to 0.30 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 25 15:30:23 GMT 2004 >Closed-Date: >Last-Modified: >Originator: michael johnson >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #53: Fri Jun 11 22:50:16 EDT 2004 >Description: - Update to 0.30 pr-68332 needs to be commited first >How-To-Repeat: >Fix: --- gdesklets-starterbar-0.30.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/gdesklets-starterbar/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 2 May 2004 23:36:56 -0000 1.6 +++ Makefile 25 Jun 2004 15:20:09 -0000 @@ -6,8 +6,7 @@ # PORTNAME= starterbar -PORTVERSION= 0.22.1 -PORTREVISION= 2 +PORTVERSION= 0.30 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -16,7 +15,8 @@ MAINTAINER= mezz@FreeBSD.org COMMENT= An icon bar for GNOME 2.x where you can put starters into -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets \ + ${PYTHON_SITELIBDIR}/xdg/BaseDirectory.py:${PORTSDIR}/devel/py-xdg USE_BZIP2= yes USE_PYTHON= yes @@ -37,10 +37,7 @@ do-build: @${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC} @${PATCH} ${WRKSRC}/${NAME}/Icon.py < ${FILESDIR}/${NAME}::Icon.py - @${PATCH} ${WRKSRC}/${NAME}/IconTheme.py < ${FILESDIR}/${NAME}::IconTheme.py @${PATCH} ${WRKSRC}/${NAME}/__init__.py < ${FILESDIR}/${NAME}::__init__.py - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/${NAME}/IconTheme.py .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|uuidgen|uuid|g' \ ${WRKSRC}/${NAME}/IconSet.py Index: distinfo =================================================================== RCS file: /home/ncvs/ports/deskutils/gdesklets-starterbar/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 31 Jan 2004 09:47:57 -0000 1.3 +++ distinfo 25 Jun 2004 04:25:38 -0000 @@ -1,2 +1,2 @@ -MD5 (starterbar-desklet-0.22.1.tar.bz2) = 061f147e979dff9860025bfc6c48de9a -SIZE (starterbar-desklet-0.22.1.tar.bz2) = 67715 +MD5 (starterbar-desklet-0.30.tar.bz2) = 1e91b7096c8b04a70038fbc1b86e47e7 +SIZE (starterbar-desklet-0.30.tar.bz2) = 72519 Index: files/StarterBar::Icon.py =================================================================== RCS file: /home/ncvs/ports/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py,v retrieving revision 1.2 diff -u -r1.2 StarterBar::Icon.py --- files/StarterBar::Icon.py 10 Nov 2003 17:15:35 -0000 1.2 +++ files/StarterBar::Icon.py 25 Jun 2004 04:31:35 -0000 @@ -1,25 +1,11 @@ ---- StarterBar/Icon.py.orig Sun Nov 9 16:13:33 2003 -+++ StarterBar/Icon.py Sun Nov 9 16:14:28 2003 +--- StarterBar/Icon.py.orig Fri Jun 25 00:28:42 2004 ++++ StarterBar/Icon.py Fri Jun 25 00:29:44 2004 @@ -11,7 +11,7 @@ - __GNOME_PIXMAP_DIR = \ - os.path.join( - commands.getoutput("dirname `which gnome-desktop-item-edit`"), -- "..", "share", "pixmaps") -+ "..", "share", "gnome", "pixmaps") + "..", "share", "icons")) + IconTheme.icondirs.append(os.path.join( + commands.getoutput("dirname `which gnome-desktop-item-edit`"), +- "..", "share", "pixmaps")) ++ "..", "share", "gnome", "pixmaps")) - # the unknown icon - __UNKNOWN_ICON = "gnome-unknown.png" -@@ -34,9 +34,10 @@ - def __load_icon(self, desktopfile): - - reader = DesktopReader(desktopfile) -- iconname = reader.get_icon() -- self.__pixmap = self.__icon_theme.lookup_icon(iconname) -- if (not self.__pixmap): -+ try: -+ iconname = reader.get_icon() -+ self.__pixmap = self.__icon_theme.lookup_icon(iconname) -+ except: - self.__pixmap = self.__icon_theme.lookup_icon(self.__UNKNOWN_ICON) - try: + class Icon: Index: files/StarterBar::IconTheme.py =================================================================== RCS file: /home/ncvs/ports/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py,v retrieving revision 1.1 diff -u -r1.1 StarterBar::IconTheme.py --- files/StarterBar::IconTheme.py 10 Nov 2003 17:15:35 -0000 1.1 +++ files/StarterBar::IconTheme.py 25 Jun 2004 04:31:50 -0000 @@ -1,11 +1 @@ ---- StarterBar/IconTheme.py.orig Sun Nov 9 16:15:19 2003 -+++ StarterBar/IconTheme.py Sun Nov 9 16:15:54 2003 -@@ -145,7 +145,7 @@ - commands.getstatusoutput(self.__PREFIX) - if (fail): prefix = "/usr" - -- path = os.path.join(prefix, "share") -+ path = os.path.join("%%X11BASE%%", "share") - - - dirs = [os.path.join(os.path.expanduser("~"), ".icons"), + Index: files/StarterBar::__init__.py =================================================================== RCS file: /home/ncvs/ports/deskutils/gdesklets-starterbar/files/StarterBar::__init__.py,v retrieving revision 1.2 diff -u -r1.2 StarterBar::__init__.py --- files/StarterBar::__init__.py 10 Nov 2003 17:15:35 -0000 1.2 +++ files/StarterBar::__init__.py 25 Jun 2004 04:31:17 -0000 @@ -1,11 +1,11 @@ ---- StarterBar/__init__.py.orig Sun Nov 9 16:16:45 2003 -+++ StarterBar/__init__.py Sun Nov 9 16:16:59 2003 -@@ -413,7 +413,7 @@ +--- StarterBar/__init__.py.orig Fri Jun 25 00:28:11 2004 ++++ StarterBar/__init__.py Fri Jun 25 00:31:02 2004 +@@ -572,7 +572,7 @@ cmd = self.__icon_set.get_icon(index).get_command() cmd = cmd.replace("%U", file) -- os.system("cd ~ && " + cmd + " & disown") -+ os.system("cd ~ && " + cmd + " &") - self.__animator.unhilight() - if (self._get_config("animation")): - self.__animator.jump(index) +- os.system("cd ~ && exec " + cmd + " & disown") ++ os.system("cd ~ && exec " + cmd + " &") + + + # --- gdesklets-starterbar-0.30.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040625152726.1A4B55CD6>