diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-25 20:52:20 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-25 20:52:20 +0000 |
commit | 7c56a187a14bdfa93a8e99e775c279a2791c396f (patch) | |
tree | 2bd0568e97fe67f948843096286f6231eca37feb /deskutils/gdesklets | |
parent | Add a CONFLICTS on libaudiofile. (diff) |
Add a patch to properly obtain the character set on -STABLE.
PR: 58508
Submitted by: maintainer
Obtained from: Fredrick Nilsson <bender@impala.mine.nu>
Diffstat (limited to 'deskutils/gdesklets')
-rw-r--r-- | deskutils/gdesklets/files/patch-display::TargetLabel.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/deskutils/gdesklets/files/patch-display::TargetLabel.py b/deskutils/gdesklets/files/patch-display::TargetLabel.py new file mode 100644 index 000000000000..7832c4a6618e --- /dev/null +++ b/deskutils/gdesklets/files/patch-display::TargetLabel.py @@ -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" |