diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-25 23:29:36 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-01 00:36:01 +0200 |
commit | 39366733c3fe943363566756e2e152c45a1b3cb2 (patch) | |
tree | 228b0735896af90ca78151c9a69aa3efd12c8cae /patches/source/gtk+2/update-gtk-immodules | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-14.2.tar.gz current-14.2.tar.xz |
Fri May 25 23:29:36 UTC 201814.2
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.2.txz: Rebuilt.
Handle removal of US/Pacific-New timezone. If we see that the machine is
using this, it will be automatically switched to US/Pacific.
Diffstat (limited to '')
-rw-r--r-- | patches/source/gtk+2/update-gtk-immodules | 12 | ||||
-rw-r--r-- | patches/source/gtk+2/update-gtk-immodules-2.0 | 48 |
2 files changed, 60 insertions, 0 deletions
diff --git a/patches/source/gtk+2/update-gtk-immodules b/patches/source/gtk+2/update-gtk-immodules new file mode 100644 index 000000000..a56b3fdcb --- /dev/null +++ b/patches/source/gtk+2/update-gtk-immodules @@ -0,0 +1,12 @@ +#! /bin/sh +# +# This is a wrapper script that calls update-gtk-immodules-2.0 (GTK+2) +# and/or update-gtk-immodules-3.0 (GTK+3) to do the actual updating. + +if [ -x /usr/bin/update-gtk-immodules-2.0 ]; then + /usr/bin/update-gtk-immodules-2.0 $* +fi +if [ -x /usr/bin/update-gtk-immodules-3.0 ]; then + /usr/bin/update-gtk-immodules-3.0 $* +fi + diff --git a/patches/source/gtk+2/update-gtk-immodules-2.0 b/patches/source/gtk+2/update-gtk-immodules-2.0 new file mode 100644 index 000000000..f12353fb8 --- /dev/null +++ b/patches/source/gtk+2/update-gtk-immodules-2.0 @@ -0,0 +1,48 @@ +#! /bin/sh +# Updates the immodules cache at /usr/lib(64)/gtk-2.0/2.10.0/immodules.cache + +umask 022 + +# Get the machine type from uname: +host=$(uname -m)-slackware-linux + +# Fix $host for arm arch: +case "$host" in + arm*) host=arm-slackware-linux-gnueabi ;; +esac + +case "$host" in + s390x*|x86_64*) + if [ -x /usr/bin/gtk-query-immodules-2.0-64 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-2.0-64 --update-cache" + fi + /usr/bin/gtk-query-immodules-2.0-64 --update-cache 2>/dev/null + # Check for multilib + if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating 32bit gtk.immodules: " + echo " /usr/bin/gtk-query-immodules-2.0-32 --update-cache" + fi + /usr/bin/gtk-query-immodules-2.0-32 --update-cache 2>/dev/null + fi + fi + ;; + *) + if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-2.0-32 --update-cache" + fi + /usr/bin/gtk-query-immodules-2.0-32 --update-cache 2>/dev/null + else + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-2.0 --update-cache" + fi + /usr/bin/gtk-query-immodules-2.0 --update-cache 2>/dev/null + fi + ;; +esac + |