Date: Mon, 11 Jun 2018 22:57:26 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472215 - in head/comms/quisk: . files Message-ID: <201806112257.w5BMvQq7049909@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Mon Jun 11 22:57:26 2018 New Revision: 472215 URL: https://svnweb.freebsd.org/changeset/ports/472215 Log: Much better way to ensure a UTF-8 CODESET in the locale No longer force language or country codes, always call setlocale() Modified: head/comms/quisk/Makefile head/comms/quisk/files/patch-quisk.py Modified: head/comms/quisk/Makefile ============================================================================== --- head/comms/quisk/Makefile Mon Jun 11 22:57:11 2018 (r472214) +++ head/comms/quisk/Makefile Mon Jun 11 22:57:26 2018 (r472215) @@ -3,7 +3,7 @@ PORTNAME= quisk PORTVERSION= 4.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://james.ahlstrom.name/quisk/ \ LOCAL/db Modified: head/comms/quisk/files/patch-quisk.py ============================================================================== --- head/comms/quisk/files/patch-quisk.py Mon Jun 11 22:57:11 2018 (r472214) +++ head/comms/quisk/files/patch-quisk.py Mon Jun 11 22:57:26 2018 (r472215) @@ -1,13 +1,15 @@ ---- quisk.py.orig 2018-06-11 21:58:22 UTC +--- quisk.py.orig 2016-11-30 18:26:59 UTC +++ quisk.py -@@ -21,6 +21,11 @@ os.chdir(os.path.normpath(os.path.dirnam +@@ -21,6 +21,13 @@ os.chdir(os.path.normpath(os.path.dirnam if sys.path[0] != "'.'": # Make sure the current working directory is on path sys.path.insert(0, '.') +# Hack to ensure unicode is available. +import locale -+if locale.nl_langinfo(locale.CODESET) == 'US-ASCII': -+ locale.setlocale(locale.LC_ALL, 'en_US.UTF-8') ++locale.setlocal(locale.LC_ALL, '') ++cloc = locale.getdefaultlocale() ++if locale.nl_langinfo(locale.CODESET) != 'UTF-8': ++ locale.setlocale(locale.LC_ALL, (cloc[0], 'UTF-8')) + import wxversion # Thanks to Mario, DH5YM wxversion.ensureMinimal('2.8')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806112257.w5BMvQq7049909>