Mon Aug 15 20:23:47 UTC 202220220815202347

a/etc-15.1-x86_64-2.txz:  Rebuilt.
  Added support for $HOME/.profile.d/*.{csh,sh} scripts.
  Thanks to Heinz Wiesinger.
a/mcelog-188-x86_64-1.txz:  Upgraded.
kde/fcitx5-configtool-5.0.14-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
kde/fcitx5-theme-breeze-2.0.0-noarch-1.txz:  Added.
  Thanks to Heinz Wiesinger.
kde/kcm-fcitx-0.5.6-x86_64-4.txz:  Removed.
l/fmt-9.0.0-x86_64-1.txz:  Added.
  Thanks to Steven Voges.
l/librsvg-2.54.4-x86_64-2.txz:  Rebuilt.
  Removed dangling symlink. Thanks to marav.
n/rsync-3.2.5-x86_64-1.txz:  Upgraded.
  Added some file-list safety checking that helps to ensure that a rogue
  sending rsync can't add unrequested top-level names and/or include recursive
  names that should have been excluded by the sender. These extra safety
  checks only require the receiver rsync to be updated. When dealing with an
  untrusted sending host, it is safest to copy into a dedicated destination
  directory for the remote content (i.e. don't copy into a destination
  directory that contains files that aren't from the remote host unless you
  trust the remote host).
  For more information, see:
   https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29154
  (* Security fix *)
x/anthy-9100h-x86_64-4.txz:  Removed.
x/anthy-unicode-1.0.0.20211224-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx-4.2.9.8-x86_64-3.txz:  Removed.
x/fcitx-anthy-0.2.4-x86_64-1.txz:  Removed.
x/fcitx-configtool-0.4.10-x86_64-3.txz:  Removed.
x/fcitx-hangul-0.3.1-x86_64-3.txz:  Removed.
x/fcitx-kkc-0.1.4-x86_64-3.txz:  Removed.
x/fcitx-libpinyin-0.5.4-x86_64-2.txz:  Removed.
x/fcitx-m17n-0.2.4-x86_64-3.txz:  Removed.
x/fcitx-qt5-1.2.7-x86_64-1.txz:  Removed.
x/fcitx-sayura-0.1.2-x86_64-3.txz:  Removed.
x/fcitx-table-extra-0.3.8-x86_64-3.txz:  Removed.
x/fcitx-table-other-0.2.4-x86_64-3.txz:  Removed.
x/fcitx-unikey-0.2.7-x86_64-3.txz:  Removed.
x/fcitx5-5.0.18-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-anthy-5.0.12-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-chinese-addons-5.0.14-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-gtk-5.0.17-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-hangul-5.0.10-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-kkc-5.0.10-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-m17n-5.0.10-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-qt-5.0.14-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-sayura-5.0.8-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-table-extra-5.0.11-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-table-other-5.0.10-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/fcitx5-unikey-5.0.11-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/ibus-1.5.26-x86_64-2.txz:  Rebuilt.
  Use correct path to kimpanel in ibus-autostart.
  Thanks to Lockywolf.
x/ibus-anthy-1.5.14-x86_64-2.txz:  Rebuilt.
  Recompiled against anthy-unicode-1.0.0.20211224.
  Thanks to Heinz Wiesinger.
x/libime-1.0.13-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.
x/m17n-lib-1.8.0-x86_64-5.txz:  Rebuilt.
  Rebuilt to drop the dependency on anthy-9100h.
  Thanks to Heinz Wiesinger.
x/skkdic-20210919-noarch-1.txz:  Upgraded.
  Thanks to Heinz Wiesinger.
x/x11-skel-7.7-x86_64-9.txz:  Rebuilt.
  Added imconfig script for selecting the input method.
  Thanks to Heinz Wiesinger.
x/xcb-imdkit-1.0.3-x86_64-1.txz:  Added.
  Thanks to Heinz Wiesinger.

3 files changed, 174 insertions, 1 deletions

diff --git a/source/x/x11-skel/manpages/imconfig.1 b/source/x/x11-skel/manpages/imconfig.1
new file mode 100644
index 000000000..7ca95108a
--- /dev/null
+++ b/source/x/x11-skel/manpages/imconfig.1
@@ -0,0 +1,25 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH IMCONFIG 1 "01 June 2022" "Slackware Version 15.1.0"
+.SH NAME
+imconfig \- choose a default input method for X/Wayland.
+.SH SYNOPSIS
+.B imconfig
+.SH DESCRIPTION
+.B imconfig
+provides a menu of the input methods available on the machine so that you
+may choose one of them to use within an XDG compliant desktop environment.
+
+imconfig writes out $HOME/.profile.d/input-method.{sh,csh} files, allowing
+the user to choose their own default input method (possibly overriding the
+one chosen as a system default).
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+Heinz Wiesinger <pprkut@slackware.com>
diff --git a/source/x/x11-skel/scripts/imconfig b/source/x/x11-skel/scripts/imconfig
new file mode 100644
index 000000000..a576b2732
--- /dev/null
+++ b/source/x/x11-skel/scripts/imconfig
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# Copyright 2022  Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2022  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+TMP=$HOME/.imconfig
+
+if [ ! -d $TMP ]; then
+ mkdir -p $TMP
+ chmod 700 $TMP
+fi
+
+# Set up some background information:
+BACKTITLE="--backtitle \"Setting default input method in $HOME/.profile.d/input-method.sh\""
+
+# This stops --backtitle from cluttering the initial install:
+if [ ! -r /proc/kcore ]; then
+  BACKTITLE=""
+fi
+
+# Do we already have an existing default?
+unset PRESELECT
+if [ -f "$HOME/.profile.d/input-method.sh" ]; then
+  CURRENT="$(grep QT_IM_MODULE "$HOME/.profile.d/input-method.sh" | cut -d '=' -f 2)"
+  if ! [ "$CURRENT" = "" ]; then
+    PRESELECT=" --default-item $CURRENT "
+  fi
+fi
+
+# Remove any previous script:
+rm -f $TMP/tmpscript.sh
+
+# Add the top of the script:
+cat << EOF > $TMP/tmpscript.sh
+dialog $BACKTITLE --title "SELECT DEFAULT INPUT METHOD FOR X/WAYLAND" $PRESELECT --menu \\
+"Please select the default input method to use. This will define the application that is \\
+being used to type non-latin characters in a desktop environment." 12 74 0 \\
+EOF
+
+# Add default "none" option to disable input methods:
+echo "\"none\" \"Do not use input methods\" \\" >> $TMP/tmpscript.sh
+
+# Add fcitx as the first and default entry:
+if [ -r /usr/bin/fcitx5-autostart ]; then
+  echo "\"fcitx\" \"Fcitx5: Flexible Context-aware Input Tool with eXtension support\" \\" >> $TMP/tmpscript.sh
+elif [ -r /usr/bin/fcitx-autostart ]; then
+  echo "\"fcitx\" \"Fcitx: Flexible Context-aware Input Tool with eXtension support\" \\" >> $TMP/tmpscript.sh
+fi
+
+# Add ibus:
+if [ -r /usr/bin/ibus-autostart ]; then
+  echo "\"ibus\" \"IBus: Intelligent Input Bus\" \\" >> $TMP/tmpscript.sh
+fi
+
+# Add uim:
+if [ -r /usr/bin/uim-autostart ]; then
+  echo "\"uim\" \"uim: Universal Input Method\" \\" >> $TMP/tmpscript.sh
+fi
+
+# Add scim:
+if [ -r /usr/bin/scim-autostart ]; then
+  echo "\"scim\" \"SCIM: Smart Common Input Method\" \\" >> $TMP/tmpscript.sh
+fi
+
+# Then, the tail end:
+cat << EOF >> $TMP/tmpscript.sh
+2> $TMP/output
+if [ ! \$? = 0 ]; then
+  rm -f $TMP/output
+  echo "Canceled."
+  exit
+fi
+
+dialog $BACKTITLE --title "SELECT DEFAULT INPUT METHOD FOR X/WAYLAND" --msgbox \\
+"Changes will take effect after a re-login." 0 0
+EOF
+
+sh $TMP/tmpscript.sh
+
+if [ ! -r $TMP/output ]; then
+  rm -f $TMP/tmpscript.sh
+  exit
+fi
+
+OUTPUT=$(cat $TMP/output)
+
+# Create $HOME/.profile.d if it doesn't exist yet
+if ! [ -e "$HOME/.profile.d" ]; then
+  mkdir "$HOME/.profile.d"
+fi
+
+if [ "$OUTPUT" = "none" ]; then
+
+# Create the bash profile script
+cat << EOF > "$HOME/.profile.d/input-method.sh"
+# File auto-generated by imconfig
+EOF
+
+cat << EOF > "$HOME/.profile.d/input-method.csh"
+# File auto-generated by imconfig
+EOF
+
+else
+
+# Create the bash profile script
+cat << EOF > "$HOME/.profile.d/input-method.sh"
+# File auto-generated by imconfig
+export XMODIFIERS="@im=$OUTPUT"
+export XIM=$OUTPUT
+export XIM_PROGRAM=$OUTPUT
+export GTK_IM_MODULE=$OUTPUT
+export QT_IM_MODULE=$OUTPUT
+EOF
+
+# Create the csh profile script
+cat << EOF > "$HOME/.profile.d/input-method.csh"
+# File auto-generated by imconfig
+setenv XMODIFIERS "@im=$OUTPUT"
+setenv XIM $OUTPUT
+setenv XIM_PROGRAM $OUTPUT
+setenv GTK_IM_MODULE $OUTPUT
+setenv QT_IM_MODULE $OUTPUT
+EOF
+
+fi
+
+rm -f $TMP/tmpscript.sh $TMP/output
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index 07451e767..18daa38fa 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=x11-skel
 VERSION=7.7
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -73,6 +73,7 @@ chown -R root:root etc/X11
 find etc/X11 -type f -exec chmod 644 {} \+
 cp -a $CWD/scripts/xorgsetup usr/bin
 cp -a $CWD/scripts/xwmconfig usr/bin
+cp -a $CWD/scripts/imconfig usr/bin
 chown root:root usr/bin/*
 chmod 755 usr/bin/*
 sed -i -e "s#lib/#lib${LIBDIRSUFFIX}/#g" usr/bin/*
@@ -80,6 +81,7 @@ cp -a $CWD/scripts/setup.xwmconfig var/log/setup
 chown root:root var/log/setup/setup.xwmconfig
 chmod 755 var/log/setup/setup.xwmconfig
 cat $CWD/manpages/xwmconfig.1 | gzip -9c > $PKG/usr/man/man1/xwmconfig.1.gz
+cat $CWD/manpages/imconfig.1 | gzip -9c > $PKG/usr/man/man1/imconfig.1.gz
 cp -a $CWD/scripts/xwmconfig.desktop usr/share/xsessions
 chown root:root usr/share/xsessions/xwmconfig.desktop
 chmod 644 usr/share/xsessions/xwmconfig.desktop