diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2021-09-01 18:39:59 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2021-09-02 08:59:54 +0200 |
| commit | 50cb4bf29437db95a1f034741d6bdc2b70f1550d (patch) | |
| tree | 4f4bb9ef5c97304c23a529357601f6a8b33de069 /source/l/glib2 | |
| parent | 3136d6fa091697dc59f2dac8c5f7b98420264aee (diff) | |
| download | current-50cb4bf29437db95a1f034741d6bdc2b70f1550d.tar.gz current-50cb4bf29437db95a1f034741d6bdc2b70f1550d.tar.xz | |
Wed Sep 1 18:39:59 UTC 202120210901183959
a/util-linux-2.37.2-x86_64-2.txz: Rebuilt.
Rebuild with --disable-raw since the raw driver has been removed from the
kernel. Thanks to nobodino and SeB.
ap/vim-8.2.3394-x86_64-1.txz: Upgraded.
l/glib2-2.68.4-x86_64-2.txz: Rebuilt.
Better detect UTF-8 locales in libglib2.sh and libglib2.csh.
Thanks to Didier Spaier.
l/tidy-html5-5.8.0-x86_64-2.txz: Rebuilt.
Fixed manpage installation. Thanks to kaott.
n/iproute2-5.14.0-x86_64-1.txz: Upgraded.
x/libwacom-1.12-x86_64-1.txz: Upgraded.
x/wayland-protocols-1.22-noarch-1.txz: Upgraded.
xap/vim-gvim-8.2.3394-x86_64-1.txz: Upgraded.
extra/sendmail/sendmail-8.17.1-x86_64-2.txz: Rebuilt.
Rebuilt with -DUSE_EAI and -licui18n -licuuc -licudata added to
site.config.m4 to support SMTPUTF8. Thanks to niksoggia.
extra/sendmail/sendmail-cf-8.17.1-noarch-2.txz: Rebuilt.
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 |