Date: Sat, 25 Oct 2003 02:33:38 -0500 (CDT) From: Jeremy Messenger <mezz7@cox.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58508: Maintainer update: deskutils/gdesklets, add a patch to fix the locale Message-ID: <200310250733.h9P7XcWp010624@ns1.mezzweb.com> Resent-Message-ID: <200310250800.h9P80agn027576@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58508
>Category: ports
>Synopsis: Maintainer update: deskutils/gdesklets, add a patch to fix the locale
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 25 01:00:36 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Mezz
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13
22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386
>Description:
Add a patch to fix the locale, so bump the version (PORTREVISION).
Submitted by: Fredrick Nilsson <bender@impala.mine.nu>
>How-To-Repeat:
n/a
>Fix:
--- gdesklets.diff begins here ---
diff -urN gdesklets.orig/Makefile gdesklets/Makefile
--- gdesklets.orig/Makefile Sat Oct 18 00:51:26 2003
+++ gdesklets/Makefile Sat Oct 25 02:21:15 2003
@@ -7,6 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.23
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/
DISTNAME= gDesklets-${PORTVERSION}
diff -urN gdesklets.orig/files/patch-display::TargetLabel.py gdesklets/files/patch-display::TargetLabel.py
--- gdesklets.orig/files/patch-display::TargetLabel.py Wed Dec 31 18:00:00 1969
+++ gdesklets/files/patch-display::TargetLabel.py Sat Oct 25 02:21:15 2003
@@ -0,0 +1,17 @@
+--- display/TargetLabel.py.orig Sat Oct 25 02:15:56 2003
++++ display/TargetLabel.py Sat Oct 25 02:21:05 2003
+@@ -76,7 +76,14 @@
+
+ # determine the locale
+ import commands
++import string
+ fail, CHARMAP = commands.getstatusoutput("locale charmap")
++if (fail or not CHARMAP):
++ fail, CHARMAP = commands.getstatusoutput("echo $MM_CHARSET")
++ if (fail or not CHARMAP):
++ fail, CHARMAP = commands.getstatusoutput("echo $LANG")
++ CHARMAP = CHARMAP[string.find(CHARMAP, ".")+1:len(CHARMAP)]
++
+ if (fail or not CHARMAP):
+ print "Could not detect character encoding."
+ CHARMAP = "ASCII"
--- gdesklets.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310250733.h9P7XcWp010624>