diff options
Diffstat (limited to 'source/l/glib2')
| -rwxr-xr-x | source/l/glib2/glib2.SlackBuild | 2 | ||||
| -rw-r--r-- | source/l/glib2/libglib2.csh | 5 | ||||
| -rw-r--r-- | source/l/glib2/libglib2.sh | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index f86924ff6..3f04afb5a 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/glib2/libglib2.csh b/source/l/glib2/libglib2.csh index a1b675615..c598e193a 100644 --- a/source/l/glib2/libglib2.csh +++ b/source/l/glib2/libglib2.csh @@ -14,9 +14,8 @@ # If this environment variable is set, GLib assumes that filenames are # in the locale encoding rather than in UTF-8. -# If the LANG you have set contains any form of "UTF", we will guess you are -# using a UTF-8 locale. Hopefully we're correct. -echo $LANG | grep -iq UTF +# Determine if the locale is UTF-8: +locale charmap 2> /dev/null | grep -q UTF-8 if ($status == 0) then setenv G_FILENAME_ENCODING "@locale" endif diff --git a/source/l/glib2/libglib2.sh b/source/l/glib2/libglib2.sh index 9b9fdc69f..449a752cc 100644 --- a/source/l/glib2/libglib2.sh +++ b/source/l/glib2/libglib2.sh @@ -14,9 +14,8 @@ # If this environment variable is set, GLib assumes that filenames are # in the locale encoding rather than in UTF-8. -# If the LANG you have set contains any form of "UTF", we will guess you are -# using a UTF-8 locale. Hopefully we're correct. -if echo $LANG | grep -iq UTF ; then +# Determine if the locale is UTF-8: +if locale charmap 2> /dev/null | grep -q UTF-8 ; then export G_FILENAME_ENCODING="@locale" fi |