168 files changed, 139 insertions, 2205 deletions

diff --git a/testing/source/vtown/input-methods/OpenCC/OpenCC.SlackBuild b/source/x/OpenCC/OpenCC.SlackBuild
index 27ee8187a..98272cfad 100755
--- a/testing/source/vtown/input-methods/OpenCC/OpenCC.SlackBuild
+++ b/source/x/OpenCC/OpenCC.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=OpenCC
 VERSION=${VERSION:-$(echo OpenCC-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | cut -f 2- -d .)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/OpenCC/OpenCC.url b/source/x/OpenCC/OpenCC.url
index 4e89094c4..4e89094c4 100644
--- a/testing/source/vtown/input-methods/OpenCC/OpenCC.url
+++ b/source/x/OpenCC/OpenCC.url
diff --git a/testing/source/vtown/input-methods/OpenCC/slack-desc b/source/x/OpenCC/slack-desc
index 385efb74b..385efb74b 100644
--- a/testing/source/vtown/input-methods/OpenCC/slack-desc
+++ b/source/x/OpenCC/slack-desc
diff --git a/testing/source/vtown/input-methods/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
index 20253172f..fb640a7a2 100755
--- a/testing/source/vtown/input-methods/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
+++ b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cldr-emoji-annotation
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/cldr-emoji-annotation/slack-desc b/source/x/cldr-emoji-annotation/slack-desc
index aec79d993..aec79d993 100644
--- a/testing/source/vtown/input-methods/cldr-emoji-annotation/slack-desc
+++ b/source/x/cldr-emoji-annotation/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-anthy/fcitx-anthy.SlackBuild b/source/x/fcitx-anthy/fcitx-anthy.SlackBuild
index f161b00f2..6c60c2043 100755
--- a/testing/source/vtown/input-methods/fcitx-anthy/fcitx-anthy.SlackBuild
+++ b/source/x/fcitx-anthy/fcitx-anthy.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-anthy
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-anthy/slack-desc b/source/x/fcitx-anthy/slack-desc
index 3bce31908..3bce31908 100644
--- a/testing/source/vtown/input-methods/fcitx-anthy/slack-desc
+++ b/source/x/fcitx-anthy/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-configtool/fcitx-configtool.SlackBuild b/source/x/fcitx-configtool/fcitx-configtool.SlackBuild
index 16d3ec5c1..666542b5f 100755
--- a/testing/source/vtown/input-methods/fcitx-configtool/fcitx-configtool.SlackBuild
+++ b/source/x/fcitx-configtool/fcitx-configtool.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-configtool
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-configtool/slack-desc b/source/x/fcitx-configtool/slack-desc
index 88e431f67..88e431f67 100644
--- a/testing/source/vtown/input-methods/fcitx-configtool/slack-desc
+++ b/source/x/fcitx-configtool/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-hangul/fcitx-hangul.SlackBuild b/source/x/fcitx-hangul/fcitx-hangul.SlackBuild
index 014cecfff..8a7c44449 100755
--- a/testing/source/vtown/input-methods/fcitx-hangul/fcitx-hangul.SlackBuild
+++ b/source/x/fcitx-hangul/fcitx-hangul.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-hangul
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-hangul/slack-desc b/source/x/fcitx-hangul/slack-desc
index 8ad9742b3..8ad9742b3 100644
--- a/testing/source/vtown/input-methods/fcitx-hangul/slack-desc
+++ b/source/x/fcitx-hangul/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-kkc/fcitx-kkc.SlackBuild b/source/x/fcitx-kkc/fcitx-kkc.SlackBuild
index 55a542599..bf9b746bb 100755
--- a/testing/source/vtown/input-methods/fcitx-kkc/fcitx-kkc.SlackBuild
+++ b/source/x/fcitx-kkc/fcitx-kkc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-kkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-kkc/slack-desc b/source/x/fcitx-kkc/slack-desc
index 3121c890c..3121c890c 100644
--- a/testing/source/vtown/input-methods/fcitx-kkc/slack-desc
+++ b/source/x/fcitx-kkc/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-libpinyin/fcitx-libpinyin.SlackBuild b/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild
index efb01b4b9..7b802cf4b 100755
--- a/testing/source/vtown/input-methods/fcitx-libpinyin/fcitx-libpinyin.SlackBuild
+++ b/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=fcitx-libpinyin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 MODEL_VERSION=${MODEL_VERSION:-20161206}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-libpinyin/slack-desc b/source/x/fcitx-libpinyin/slack-desc
index 6f55e6dec..6f55e6dec 100644
--- a/testing/source/vtown/input-methods/fcitx-libpinyin/slack-desc
+++ b/source/x/fcitx-libpinyin/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-m17n/fcitx-m17n.SlackBuild b/source/x/fcitx-m17n/fcitx-m17n.SlackBuild
index 3cabaefa0..309a30779 100755
--- a/testing/source/vtown/input-methods/fcitx-m17n/fcitx-m17n.SlackBuild
+++ b/source/x/fcitx-m17n/fcitx-m17n.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-m17n
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-m17n/slack-desc b/source/x/fcitx-m17n/slack-desc
index 0a362c7fc..0a362c7fc 100644
--- a/testing/source/vtown/input-methods/fcitx-m17n/slack-desc
+++ b/source/x/fcitx-m17n/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-qt5/fcitx-qt5.SlackBuild b/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
index 0c7a53bdb..90aa739a2 100755
--- a/testing/source/vtown/input-methods/fcitx-qt5/fcitx-qt5.SlackBuild
+++ b/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-qt5
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-qt5/slack-desc b/source/x/fcitx-qt5/slack-desc
index 0b4a02036..0b4a02036 100644
--- a/testing/source/vtown/input-methods/fcitx-qt5/slack-desc
+++ b/source/x/fcitx-qt5/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-sayura/fcitx-sayura.SlackBuild b/source/x/fcitx-sayura/fcitx-sayura.SlackBuild
index c962c0386..ab6bfd330 100755
--- a/testing/source/vtown/input-methods/fcitx-sayura/fcitx-sayura.SlackBuild
+++ b/source/x/fcitx-sayura/fcitx-sayura.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-sayura
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-sayura/slack-desc b/source/x/fcitx-sayura/slack-desc
index 5a277c9a6..5a277c9a6 100644
--- a/testing/source/vtown/input-methods/fcitx-sayura/slack-desc
+++ b/source/x/fcitx-sayura/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-table-extra/fcitx-table-extra.SlackBuild b/source/x/fcitx-table-extra/fcitx-table-extra.SlackBuild
index 7868f74e1..9a349d161 100755
--- a/testing/source/vtown/input-methods/fcitx-table-extra/fcitx-table-extra.SlackBuild
+++ b/source/x/fcitx-table-extra/fcitx-table-extra.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-table-extra
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-table-extra/slack-desc b/source/x/fcitx-table-extra/slack-desc
index a7dcf89f2..a7dcf89f2 100644
--- a/testing/source/vtown/input-methods/fcitx-table-extra/slack-desc
+++ b/source/x/fcitx-table-extra/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-table-other/fcitx-table-other.SlackBuild b/source/x/fcitx-table-other/fcitx-table-other.SlackBuild
index d5edc3549..2a55517e2 100755
--- a/testing/source/vtown/input-methods/fcitx-table-other/fcitx-table-other.SlackBuild
+++ b/source/x/fcitx-table-other/fcitx-table-other.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-table-other
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-table-other/slack-desc b/source/x/fcitx-table-other/slack-desc
index 3c50ceab1..3c50ceab1 100644
--- a/testing/source/vtown/input-methods/fcitx-table-other/slack-desc
+++ b/source/x/fcitx-table-other/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-unikey/fcitx-unikey.SlackBuild b/source/x/fcitx-unikey/fcitx-unikey.SlackBuild
index a688e1e56..09fa001d1 100755
--- a/testing/source/vtown/input-methods/fcitx-unikey/fcitx-unikey.SlackBuild
+++ b/source/x/fcitx-unikey/fcitx-unikey.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-unikey
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-unikey/slack-desc b/source/x/fcitx-unikey/slack-desc
index 9a805566e..9a805566e 100644
--- a/testing/source/vtown/input-methods/fcitx-unikey/slack-desc
+++ b/source/x/fcitx-unikey/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx/doinst.sh b/source/x/fcitx/doinst.sh
index c9d0cf4d7..c9d0cf4d7 100644
--- a/testing/source/vtown/input-methods/fcitx/doinst.sh
+++ b/source/x/fcitx/doinst.sh
diff --git a/testing/source/vtown/input-methods/fcitx/fcitx-autostart.patch b/source/x/fcitx/fcitx-autostart.patch
index 10924fbeb..10924fbeb 100644
--- a/testing/source/vtown/input-methods/fcitx/fcitx-autostart.patch
+++ b/source/x/fcitx/fcitx-autostart.patch
diff --git a/testing/source/vtown/input-methods/fcitx/fcitx.SlackBuild b/source/x/fcitx/fcitx.SlackBuild
index 63ad00846..8c6f2116f 100755
--- a/testing/source/vtown/input-methods/fcitx/fcitx.SlackBuild
+++ b/source/x/fcitx/fcitx.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -103,7 +103,9 @@ cd build
     -DSYSCONFDIR=/etc \
     -DENABLE_GTK2_IM_MODULE=On \
     -DENABLE_GTK3_IM_MODULE=On \
-    -DENABLE_QT_IM_MODULE=On \
+    -DENABLE_QT=Off \
+    -DENABLE_QT_IM_MODULE=Off \
+    -DENABLE_QT_GUI=Off \
     -DENABLE_OPENCC=On \
     ..
   make $NUMJOBS || make || exit 1
diff --git a/testing/source/vtown/input-methods/fcitx/slack-desc b/source/x/fcitx/slack-desc
index c64bd1b50..c64bd1b50 100644
--- a/testing/source/vtown/input-methods/fcitx/slack-desc
+++ b/source/x/fcitx/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-anthy/doinst.sh b/source/x/ibus-anthy/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-anthy/doinst.sh
+++ b/source/x/ibus-anthy/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-anthy/ibus-anthy.SlackBuild b/source/x/ibus-anthy/ibus-anthy.SlackBuild
index 1ac8aa215..a414c40eb 100755
--- a/testing/source/vtown/input-methods/ibus-anthy/ibus-anthy.SlackBuild
+++ b/source/x/ibus-anthy/ibus-anthy.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-anthy
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-anthy/slack-desc b/source/x/ibus-anthy/slack-desc
index 9e99a4e7e..9e99a4e7e 100644
--- a/testing/source/vtown/input-methods/ibus-anthy/slack-desc
+++ b/source/x/ibus-anthy/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-hangul/doinst.sh b/source/x/ibus-hangul/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-hangul/doinst.sh
+++ b/source/x/ibus-hangul/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-hangul/ibus-hangul.SlackBuild b/source/x/ibus-hangul/ibus-hangul.SlackBuild
index 12f4067c2..a2bd60b58 100755
--- a/testing/source/vtown/input-methods/ibus-hangul/ibus-hangul.SlackBuild
+++ b/source/x/ibus-hangul/ibus-hangul.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-hangul
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-hangul/slack-desc b/source/x/ibus-hangul/slack-desc
index ed2969e17..ed2969e17 100644
--- a/testing/source/vtown/input-methods/ibus-hangul/slack-desc
+++ b/source/x/ibus-hangul/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-kkc/doinst.sh b/source/x/ibus-kkc/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-kkc/doinst.sh
+++ b/source/x/ibus-kkc/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-kkc/ibus-kkc.SlackBuild b/source/x/ibus-kkc/ibus-kkc.SlackBuild
index 9b9911fb4..4da48c498 100755
--- a/testing/source/vtown/input-methods/ibus-kkc/ibus-kkc.SlackBuild
+++ b/source/x/ibus-kkc/ibus-kkc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-kkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-kkc/slack-desc b/source/x/ibus-kkc/slack-desc
index b3492eba5..b3492eba5 100644
--- a/testing/source/vtown/input-methods/ibus-kkc/slack-desc
+++ b/source/x/ibus-kkc/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-libpinyin/doinst.sh b/source/x/ibus-libpinyin/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-libpinyin/doinst.sh
+++ b/source/x/ibus-libpinyin/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-libpinyin/ibus-libpinyin.SlackBuild b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
index ec73dbd74..2e9446ba2 100755
--- a/testing/source/vtown/input-methods/ibus-libpinyin/ibus-libpinyin.SlackBuild
+++ b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-libpinyin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-libpinyin/slack-desc b/source/x/ibus-libpinyin/slack-desc
index 8b6870601..8b6870601 100644
--- a/testing/source/vtown/input-methods/ibus-libpinyin/slack-desc
+++ b/source/x/ibus-libpinyin/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-m17n/ibus-m17n.SlackBuild b/source/x/ibus-m17n/ibus-m17n.SlackBuild
index 26168cd72..e904c416c 100755
--- a/testing/source/vtown/input-methods/ibus-m17n/ibus-m17n.SlackBuild
+++ b/source/x/ibus-m17n/ibus-m17n.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-m17n
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-m17n/slack-desc b/source/x/ibus-m17n/slack-desc
index 4ddaf242b..4ddaf242b 100644
--- a/testing/source/vtown/input-methods/ibus-m17n/slack-desc
+++ b/source/x/ibus-m17n/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-table/doinst.sh b/source/x/ibus-table/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-table/doinst.sh
+++ b/source/x/ibus-table/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-table/ibus-table.SlackBuild b/source/x/ibus-table/ibus-table.SlackBuild
index ba5060100..08ca1dc1d 100755
--- a/testing/source/vtown/input-methods/ibus-table/ibus-table.SlackBuild
+++ b/source/x/ibus-table/ibus-table.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-table
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-table/slack-desc b/source/x/ibus-table/slack-desc
index 74fc53553..74fc53553 100644
--- a/testing/source/vtown/input-methods/ibus-table/slack-desc
+++ b/source/x/ibus-table/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-unikey/gcc-6.diff b/source/x/ibus-unikey/gcc-6.diff
index 424bd74fb..424bd74fb 100644
--- a/testing/source/vtown/input-methods/ibus-unikey/gcc-6.diff
+++ b/source/x/ibus-unikey/gcc-6.diff
diff --git a/testing/source/vtown/input-methods/ibus-unikey/ibus-unikey.SlackBuild b/source/x/ibus-unikey/ibus-unikey.SlackBuild
index 90ffb17ee..6da27fdb5 100755
--- a/testing/source/vtown/input-methods/ibus-unikey/ibus-unikey.SlackBuild
+++ b/source/x/ibus-unikey/ibus-unikey.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-unikey
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-unikey/slack-desc b/source/x/ibus-unikey/slack-desc
index 36d347a7d..36d347a7d 100644
--- a/testing/source/vtown/input-methods/ibus-unikey/slack-desc
+++ b/source/x/ibus-unikey/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus/Blocks.txt b/source/x/ibus/Blocks.txt
index a4f851b14..a4f851b14 100644
--- a/testing/source/vtown/input-methods/ibus/Blocks.txt
+++ b/source/x/ibus/Blocks.txt
diff --git a/testing/source/vtown/input-methods/ibus/NamesList.txt b/source/x/ibus/NamesList.txt
index ebfd93919..ebfd93919 100644
--- a/testing/source/vtown/input-methods/ibus/NamesList.txt
+++ b/source/x/ibus/NamesList.txt
diff --git a/testing/source/vtown/input-methods/ibus/doinst.sh b/source/x/ibus/doinst.sh
index 23c5addd6..23c5addd6 100644
--- a/testing/source/vtown/input-methods/ibus/doinst.sh
+++ b/source/x/ibus/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus/emoji-test.txt b/source/x/ibus/emoji-test.txt
index ed3541dc2..ed3541dc2 100644
--- a/testing/source/vtown/input-methods/ibus/emoji-test.txt
+++ b/source/x/ibus/emoji-test.txt
diff --git a/testing/source/vtown/input-methods/ibus/ibus-autostart b/source/x/ibus/ibus-autostart
index 4f274335a..4f274335a 100644
--- a/testing/source/vtown/input-methods/ibus/ibus-autostart
+++ b/source/x/ibus/ibus-autostart
diff --git a/testing/source/vtown/input-methods/ibus/ibus-autostart-plasma.desktop b/source/x/ibus/ibus-autostart-plasma.desktop
index 981418619..981418619 100644
--- a/testing/source/vtown/input-methods/ibus/ibus-autostart-plasma.desktop
+++ b/source/x/ibus/ibus-autostart-plasma.desktop
diff --git a/testing/source/vtown/input-methods/ibus/ibus-autostart.desktop b/source/x/ibus/ibus-autostart.desktop
index e77a639bb..e77a639bb 100644
--- a/testing/source/vtown/input-methods/ibus/ibus-autostart.desktop
+++ b/source/x/ibus/ibus-autostart.desktop
diff --git a/testing/source/vtown/input-methods/ibus/ibus.SlackBuild b/source/x/ibus/ibus.SlackBuild
index 2df202c35..77457f354 100755
--- a/testing/source/vtown/input-methods/ibus/ibus.SlackBuild
+++ b/source/x/ibus/ibus.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus/ibus.url b/source/x/ibus/ibus.url
index 05ed7824f..05ed7824f 100644
--- a/testing/source/vtown/input-methods/ibus/ibus.url
+++ b/source/x/ibus/ibus.url
diff --git a/testing/source/vtown/input-methods/ibus/slack-desc b/source/x/ibus/slack-desc
index eb1862c0e..eb1862c0e 100644
--- a/testing/source/vtown/input-methods/ibus/slack-desc
+++ b/source/x/ibus/slack-desc
diff --git a/testing/source/vtown/input-methods/libgee/libgee.SlackBuild b/source/x/libgee/libgee.SlackBuild
index 6c9806dc0..832fa2233 100755
--- a/testing/source/vtown/input-methods/libgee/libgee.SlackBuild
+++ b/source/x/libgee/libgee.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libgee
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libgee/slack-desc b/source/x/libgee/slack-desc
index 50a1a339e..50a1a339e 100644
--- a/testing/source/vtown/input-methods/libgee/slack-desc
+++ b/source/x/libgee/slack-desc
diff --git a/testing/source/vtown/input-methods/libkkc-data/libkkc-data.SlackBuild b/source/x/libkkc-data/libkkc-data.SlackBuild
index accbb406b..c7d79fc24 100755
--- a/testing/source/vtown/input-methods/libkkc-data/libkkc-data.SlackBuild
+++ b/source/x/libkkc-data/libkkc-data.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libkkc-data
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libkkc-data/slack-desc b/source/x/libkkc-data/slack-desc
index 45f13c9c0..45f13c9c0 100644
--- a/testing/source/vtown/input-methods/libkkc-data/slack-desc
+++ b/source/x/libkkc-data/slack-desc
diff --git a/testing/source/vtown/input-methods/libkkc/libkkc.SlackBuild b/source/x/libkkc/libkkc.SlackBuild
index 27d69c4aa..47713ebbc 100755
--- a/testing/source/vtown/input-methods/libkkc/libkkc.SlackBuild
+++ b/source/x/libkkc/libkkc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libkkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libkkc/slack-desc b/source/x/libkkc/slack-desc
index 402328e58..402328e58 100644
--- a/testing/source/vtown/input-methods/libkkc/slack-desc
+++ b/source/x/libkkc/slack-desc
diff --git a/testing/source/vtown/input-methods/libpinyin/libpinyin.SlackBuild b/source/x/libpinyin/libpinyin.SlackBuild
index 5abd7eaea..3ca1ddf25 100755
--- a/testing/source/vtown/input-methods/libpinyin/libpinyin.SlackBuild
+++ b/source/x/libpinyin/libpinyin.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=libpinyin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 MODEL_VERSION=${MODEL_VERSION:-17}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libpinyin/modelxx.text.url b/source/x/libpinyin/modelxx.text.url
index 4225c3858..4225c3858 100644
--- a/testing/source/vtown/input-methods/libpinyin/modelxx.text.url
+++ b/source/x/libpinyin/modelxx.text.url
diff --git a/testing/source/vtown/input-methods/libpinyin/slack-desc b/source/x/libpinyin/slack-desc
index 118619fe2..118619fe2 100644
--- a/testing/source/vtown/input-methods/libpinyin/slack-desc
+++ b/source/x/libpinyin/slack-desc
diff --git a/testing/source/vtown/input-methods/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild
index 071802646..e2c19ff98 100755
--- a/testing/source/vtown/input-methods/marisa/marisa.SlackBuild
+++ b/source/x/marisa/marisa.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=marisa
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/marisa/slack-desc b/source/x/marisa/slack-desc
index 09d41ac2b..09d41ac2b 100644
--- a/testing/source/vtown/input-methods/marisa/slack-desc
+++ b/source/x/marisa/slack-desc
diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild
index 99ab20a3a..e7f6f0052 100755
--- a/source/x/motif/motif.SlackBuild
+++ b/source/x/motif/motif.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=motif
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d - | cut -f 1-3 -d .)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -127,6 +127,11 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Include mwm xinitrc
+mkdir -p $PKG/etc/X11/xinit
+zcat $CWD/xinitrc.mwm.gz > $PKG/etc/X11/xinit/xinitrc.mwm
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.mwm
+
 # This conflicts with a perl manpage:
 mv $PKG/usr/man/man3/Shell.3 $PKG/usr/man/man3/omShell.3
 
diff --git a/source/kde/post-install/kde-workspace/xinit/xinitrc.kde b/source/x/motif/xinitrc.mwm
index a33eb06cf..00de7396b 100644
--- a/source/kde/post-install/kde-workspace/xinit/xinitrc.kde
+++ b/source/x/motif/xinitrc.mwm
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -24,9 +23,11 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
-# Start the window manager:
-if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-    ck-launch-session startkde
-else
-    startkde
+# Start DBUS session bus:
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+   eval $(dbus-launch --sh-syntax --exit-with-session)
 fi
+
+# Start the window manager:
+exec /usr/bin/mwm
+
diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild
deleted file mode 100755
index c8d0e28bf..000000000
--- a/source/x/scim-anthy/scim-anthy.SlackBuild
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        scim-anthy
-# Descr:      a SCIM IMEngine module for anthy
-# URL:        http://scim-imengine.sourceforge.jp/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-anthy
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-zcat $CWD/scim-anthy.gcc43.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \+
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-anthy/scim-anthy.gcc43.diff b/source/x/scim-anthy/scim-anthy.gcc43.diff
deleted file mode 100644
index 14606dd7d..000000000
--- a/source/x/scim-anthy/scim-anthy.gcc43.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp scim-anthy-1.2.4/src/scim_anthy_kana.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp	2006-07-13 02:41:51.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_kana.cpp	2009-06-09 20:40:41.000000000 -0500
-@@ -23,6 +23,8 @@
- #include "scim_anthy_default_tables.h"
- #include "scim_anthy_utils.h"
- 
-+#include <cstring>
-+
- using namespace scim_anthy;
- 
- static bool
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp scim-anthy-1.2.4/src/scim_anthy_preedit.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp	2006-07-23 20:56:00.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_preedit.cpp	2009-06-09 20:41:03.000000000 -0500
-@@ -26,6 +26,8 @@
- #include "scim_anthy_preedit.h"
- #include "scim_anthy_utils.h"
- 
-+#include <cstring>
-+
- using namespace scim_anthy;
- 
- static ConvRule *get_period_rule              (TypingMethod method,
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp scim-anthy-1.2.4/src/scim_anthy_prefs.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp	2006-07-23 20:56:00.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_prefs.cpp	2009-06-09 20:41:40.000000000 -0500
-@@ -23,6 +23,8 @@
- #include "scim_anthy_prefs.h"
- #include "scim_anthy_intl.h"
- 
-+#include <cstring>
-+
- namespace scim_anthy {
- 
- BoolConfigData config_bool_common [] =
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp scim-anthy-1.2.4/src/scim_anthy_setup.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp	2007-05-21 03:22:20.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_setup.cpp	2009-06-09 20:42:01.000000000 -0500
-@@ -30,6 +30,8 @@
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-+#include <cstring>
-+
- #define Uses_SCIM_CONFIG_BASE
- #define Uses_SCIM_EVENT
- #define SCIM_ANTHY_USE_GTK
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp scim-anthy-1.2.4/src/scim_anthy_utils.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp	2007-03-28 02:42:10.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_utils.cpp	2009-06-09 20:41:22.000000000 -0500
-@@ -24,6 +24,8 @@
- #include "scim_anthy_utils.h"
- #include "scim_anthy_default_tables.h"
- 
-+#include <cstring>
-+
- namespace scim_anthy {
- 
- bool
diff --git a/source/x/scim-anthy/slack-desc b/source/x/scim-anthy/slack-desc
deleted file mode 100644
index 996d185f2..000000000
--- a/source/x/scim-anthy/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-scim-anthy: scim-anthy (a SCIM IMEngine module for anthy)
-scim-anthy:
-scim-anthy: SCIM is Smart Common Input Method platform, it provides a user
-scim-anthy: friendly and full featured user interface and development platform to
-scim-anthy: make input method developer's lives easier. Anthy is a system for
-scim-anthy: Japanese input method. It converts Hiragana text to Kana Kanji
-scim-anthy: mixed text.
-scim-anthy:
-scim-anthy: Homepage: http://scim-imengine.sourceforge.jp/
-scim-anthy:
-scim-anthy:
diff --git a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch
deleted file mode 100644
index b7698793a..000000000
--- a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
---- scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~	2008-01-13 08:01:34.000000000 +0000
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2008-01-13 08:01:34.000000000 +0000
-@@ -29,6 +29,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- #define Uses_SCIM_CONFIG_BASE
- 
-+#include <cstring>
- #ifdef HAVE_CONFIG_H
-   #include <config.h>
- #endif
-diff -up scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp
---- scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~	2008-01-13 08:01:37.000000000 +0000
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp	2008-01-13 08:01:37.000000000 +0000
-@@ -28,7 +28,8 @@
- 
- #define Uses_SCIM_CONFIG_BASE
- 
-+#include <cstring>
- #include <gtk/gtk.h>
- 
- #ifdef HAVE_CONFIG_H
- 
diff --git a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch
deleted file mode 100644
index 918de9e11..000000000
--- a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/scim_hangul_imengine.cpp b/src/scim_hangul_imengine.cpp
-index 7d70654..d678902 100644
---- a/src/scim_hangul_imengine.cpp
-+++ b/src/scim_hangul_imengine.cpp
-@@ -30,6 +30,7 @@
- #define Uses_SCIM_CONFIG_BASE
- 
- #include <cstring>
-+#include <unistd.h>
- #ifdef HAVE_CONFIG_H
-   #include <config.h>
- #endif
diff --git a/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch b/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch
deleted file mode 100644
index bc1fd4b67..000000000
--- a/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
-+++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
-@@ -346,7 +346,7 @@
-     for (i = 0; i < n; i++) {
- 	const char* name = hangul_ic_get_keyboard_name(i);
- #if GTK_CHECK_VERSION(2, 24, 0)
--	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name);
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name);
- #else
- 	gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name);
- #endif
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
deleted file mode 100755
index 42edf85b2..000000000
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        scim-hangul
-# Descr:      SCIM IMengine for Hangul
-# URL:        http://www.scim-im.org/projects/imengines
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-hangul
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-zcat $CWD/scim-hangul-0.3.2+gcc-4.3.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/scim-hangul-0.3.2+gcc-4.7.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/scim-hangul-0.4.0+gtk.patch.gz | patch -p0 --verbose || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README ChangeLog \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \+
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-hangul/slack-desc b/source/x/scim-hangul/slack-desc
deleted file mode 100644
index 51350382c..000000000
--- a/source/x/scim-hangul/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-scim-hangul: scim-hangul (SCIM IMengine for Hangul)
-scim-hangul:
-scim-hangul: Scim-hangul is a SCIM IMEngine module for inputing korean scripts.
-scim-hangul: Scim-hangul is for native speakers, not for foreigners. If you don't
-scim-hangul: want to learn Korean keyboard layout, use scim-tables. This engine
-scim-hangul: supports 2 beolsik, 3 beolsik final, 3 beolsik 390, 3 beolsik,
-scim-hangul: no-shift and etc. You can input Chinese characters (hanja) with F9 key
-scim-hangul: when you a have preedit string.
-scim-hangul:
-scim-hangul: Homepage: http://sourceforge.net/projects/scim
-scim-hangul:
diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild
deleted file mode 100755
index af8a31b82..000000000
--- a/source/x/scim-input-pad/scim-input-pad.SlackBuild
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-# Copyright 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-input-pad
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# Fix location of scim-helper-launcher:
-sed -i -e "s#/usr/lib${LIBDIRSUFFIX}/scim-.*/scim-helper-launcher#$(ls /usr/lib${LIBDIRSUFFIX}/scim-*/scim-helper-launcher)#" $PKG/usr/bin/scim-input-pad
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Strip binaries:
-cd $PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-input-pad/slack-desc b/source/x/scim-input-pad/slack-desc
deleted file mode 100644
index cc178761a..000000000
--- a/source/x/scim-input-pad/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-scim-input-pad: scim-input-pad (on-screen input pad for scim)
-scim-input-pad:
-scim-input-pad: This is scim-input-pad, which provides an on-screen input pad to enter
-scim-input-pad: symbols and Chinese characters.
-scim-input-pad:
-scim-input-pad: Homepage: http://sourceforge.net/projects/scim
-scim-input-pad:
-scim-input-pad:
-scim-input-pad:
-scim-input-pad:
-scim-input-pad:
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
deleted file mode 100755
index f37a76e45..000000000
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script 
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        scim-m17n
-# Descr:      bridge IMengine to support m17n input methods in SCIM
-# URL:        http://scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-m17n
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \+
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Compress info pages and remove the package's dir file:
-if [ -d $PKG/usr/info ]; then
-  rm -rf $PKG/usr/info/dir
-  gzip -9f $PKG/usr/info/*.info*
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-m17n/slack-desc b/source/x/scim-m17n/slack-desc
deleted file mode 100644
index 96b9d5188..000000000
--- a/source/x/scim-m17n/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-scim-m17n: scim-m17n (bridge IMengine to support m17n input methods in SCIM)
-scim-m17n:
-scim-m17n: SCIM is a developing platform to significantly reduce the difficulty
-scim-m17n: of input method development. scim-m17n is a SCIM IMEngine module
-scim-m17n: which uses the m17n library as the backend.
-scim-m17n:
-scim-m17n: Homepage: http://sourceforge.net/projects/scim
-scim-m17n:
-scim-m17n:
-scim-m17n:
-scim-m17n:
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild
deleted file mode 100755
index c7b897a58..000000000
--- a/source/x/scim-pinyin/scim-pinyin.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       scim-pinyin
-# Descr:     smart pinyin IM engine for scim
-# URL:       http://www.scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-pinyin
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix="" \
-  --program-suffix="" \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-pinyin/slack-desc b/source/x/scim-pinyin/slack-desc
deleted file mode 100644
index 32dc733d7..000000000
--- a/source/x/scim-pinyin/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-scim-pinyin: scim-pinyin (smart pinyin IM engine)
-scim-pinyin:
-scim-pinyin: This package provides a smart pinyin IM engine for SCIM. It includes
-scim-pinyin: the plugin modules and the data files to use the smart pinyin input
-scim-pinyin: input method for Chinese.
-scim-pinyin:
-scim-pinyin: Homepage: http://sourceforge.net/projects/scim
-scim-pinyin:
-scim-pinyin:
-scim-pinyin:
-scim-pinyin:
diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild
deleted file mode 100755
index 5d97b3c6a..000000000
--- a/source/x/scim-tables/scim-tables.SlackBuild
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       scim-tables
-# Descr:     tables IMEngine for scim
-# URL:       http://www.scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-tables
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-
-./bootstrap
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-cd $PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-tables/slack-desc b/source/x/scim-tables/slack-desc
deleted file mode 100644
index 963b509a9..000000000
--- a/source/x/scim-tables/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-scim-tables: scim-tables (tables IMEngine for scim)
-scim-tables:
-scim-tables: This is scim-tables IMEngine, which provides many CJK input methods.
-scim-tables:
-scim-tables: Homepage: http://sourceforge.net/projects/scim
-scim-tables:
-scim-tables:
-scim-tables:
-scim-tables:
-scim-tables:
-scim-tables:
diff --git a/source/x/scim/scim-setup.desktop b/source/x/scim/scim-setup.desktop
deleted file mode 100644
index a236ef291..000000000
--- a/source/x/scim/scim-setup.desktop
+++ /dev/null
@@ -1,28 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=SCIM Input Method Setup
-Name[cs]=Nastavení vstupní metody SCIM
-Name[de]=Einstellungen der SCIM-Eingabemethoden
-Name[fr]=Configuration de la Méthode de Saisie SCIM
-Name[it]=Configurazione del metodo di inserimento SCIM
-Name[ja]=SCIM入力メソッドの設定
-Name[ko]=SCIM 입력기 설정
-Name[pa]=SCIM ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਅੱਪ
-Name[zh_CN]=SCIM 输入法设置
-Name[zh_TW]=SCIM 輸入法設定
-Comment=Setup utility for Smart Common Input Method platform
-Comment[cs]=Nástroj pro nastavení Smart Common Input Method platformy
-Comment[de]=Einrichtungswerkzeug für die Smart Common Input Method-Plattform
-Comment[fr]=Utilitaire de configuration de la plateforme "Smart Common Input Method"
-Comment[it]=Programma di configurazione per il metodo inserimento comune intelligente
-Comment[ja]=Smart Common Input Method platform セットアップユーティリティ
-Comment[ko]=똑똑한 공통 입력 방법 (SCIM)을 위한 설정 프로그램
-Comment[pa]=ਸਮਾਰਟ ਕਾਮਨ ਇੰਪੁੱਟ ਮੈਂਥਸਡ ਪਲੇਟਫਾਰਮ ਲਈ ਸੈਟਅੱਪ ਸਹੂਲਤ
-Comment[zh_CN]=智能通用输入法平台的设置工具
-Comment[zh_TW]=泛用智慧型輸入法平台的設定工具
-Exec=scim-setup
-Icon=/usr/share/pixmaps/scim-setup.png
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Applications;Settings;
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
deleted file mode 100755
index 5a44795d7..000000000
--- a/source/x/scim/scim.SlackBuild
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/bash
-
-# Copyright 2006, 2007, 2008  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2018  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.
-#
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       scim
-# Descr:     Smart Common Input Method platform
-# URL:       http://www.scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-./bootstrap
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \
-./configure --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --with-gtk-version=2 \
-  --with-qt4-im-module-dir=/usr/lib${LIBDIRSUFFIX}/qt/plugins/inputmethods \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# Add a profile script that sets up the environment:
-mkdir -p $PKG/etc/profile.d
-
-cat <<EOT > $PKG/etc/profile.d/scim.sh.new
-#!/bin/bash
-
-# SCIM (Smart Common Input Method platform).  This is used to support the
-# entering of text in non-US-English languages.
-
-# For SCIM to work, you need to use a UTF-8 locale.  Make sure it ends on
-# ".UTF-8", not "utf-8"!  As an example, you would need to use en_US.UTF-8
-# for a US locale (export LANG=en_US.UTF-8), not en_US.
-#
-# The locale (LANG variable) is set in /etc/profile.d/lang.sh.
-
-if [ -x /usr/bin/scim ]; then
-  # Enable legacy X applications to use scim:
-  export XMODIFIERS="@im=SCIM"
-  # Let GTK applications like Firefox/Thunderbird use scim as
-  # default immodule:
-  export GTK_IM_MODULE="scim"
-  # Enable Qt/KDE applications to use scim:
-  export QT_IM_MODULE="scim"
-  # Make scim start automatically if the "magic key" Ctrl-Space is pressed:
-  export XIM_PROGRAM="/usr/bin/scim -d"
-fi
-
-# This ensures scim starts when you logon.
-# This will only work if you login through runlevel 4 (graphical login)!!!
-# Better is to have it start through Ctrl-Space like configured higher up ^^.
-#if [ ! \`ls /tmp/scim-socket*\` ]; then
-#  /usr/bin/scim -d
-#fi
-
-EOT
-
-cat <<EOT > $PKG/etc/profile.d/scim.csh.new
-#!/bin/csh
-
-# SCIM (Smart Common Input Method platform).  This is used to support the
-# entering of text in non-US-English languages.
-
-# For SCIM to work, you need to use a UTF-8 locale.  Make sure it ends on
-# ".UTF-8", not "utf-8"!  As an example, you would need to use en_US.UTF-8
-# for a US locale (setenv LANG en_US.UTF-8), not en_US.
-#
-# The locale (LANG variable) is set in /etc/profile.d/lang.csh.
-
-[ -x /usr/bin/scim ]
-if (\$status == 0) then
-  # Enable legacy X applications to use scim:
-  setenv XMODIFIERS "@im=SCIM"
-  # Let GTK applications like Firefox/Thunderbird use scim as
-  # default immodule:
-  setenv GTK_IM_MODULE "scim"
-  # Enable Qt/KDE applications to use scim (does not work for kde4):
-  setenv QT_IM_MODULE "scim"
-  # Make scim start automatically if the "magic key" Ctrl-Space is pressed:
-  setenv XIM_PROGRAM "/usr/bin/scim -d"
-endif
-
-# This ensures scim starts when you logon.
-# This will only work if you login through runlevel 4 (graphical login)!!!
-# Better is to have it start through Ctrl-Space like configured higher up ^^.
-#[ ! \`ls /tmp/scim-socket*\` ]
-#if (\$status == 0) then
-#  /usr/bin/scim -d
-#endif
-
-EOT
-
-chmod 755 $PKG/etc/profile.d/scim.sh.new
-chmod 755 $PKG/etc/profile.d/scim.csh.new
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/scim.desktop > $PKG/usr/share/applications/scim.desktop
-cat $CWD/scim-setup.desktop > $PKG/usr/share/applications/scim-setup.desktop
-
-# Protect config files from being overwritten:
-mv $PKG/etc/scim/config{,.new}
-mv $PKG/etc/scim/global{,.new}
-
-# Add this to the doinst.sh
-mkdir -p $PKG/install
-cat <<EOINS >> $PKG/install/doinst.sh
-
-# Handle the incoming configuration files:
-config() {
-  for infile in \$1; do
-    NEW="\$infile"
-    OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r \$OLD ]; then
-      mv \$NEW \$OLD
-    elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
-      # toss the redundant copy
-      rm \$NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-  done
-}
-
-# Prepare the new configuration files
-for file in etc/scim/config.new etc/scim/global.new etc/profile.d/scim.sh.new etc/profile.d/scim.csh.new ; do
-  if [ -e \$(dirname \$file)/\$(basename \$file .new) -a -x \$(dirname \$file)/\$(basename \$file .new) ]; then
-    chmod 755 \$file
-  else
-    chmod 644 \$file
-  fi
-  config \$file
-done
-
-# Run gtk-query-immodules so that "scim" will appear under Imput Method
-# when you right- click your mouse in a text box.
-if [ -x /usr/bin/update-gtk-immodules ]; then
-  /usr/bin/update-gtk-immodules
-fi
-
-EOINS
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-# Install documentation and user manual
-cp -a docs/manual/zh_CN/user-manual.html \
-  $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/
-cp -a docs/manual/zh_CN/figures/*.png \
-   $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures/
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim/scim.desktop b/source/x/scim/scim.desktop
deleted file mode 100644
index 7aacbcc05..000000000
--- a/source/x/scim/scim.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Comment=Start the Smart Common Input Method platform
-Comment[zh_CN]=
-Encoding=UTF-8
-Exec=scim -d
-GenericName=
-GenericName[zh_CN]=
-Icon=/usr/share/pixmaps/scim-setup.png
-MimeType=
-Name=SCIM (Smart Common Input Method) startup
-Name[zh_CN]=
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
-Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-Categories=Applications;Utility;
diff --git a/source/x/scim/scim.url b/source/x/scim/scim.url
deleted file mode 100644
index 53c5f816d..000000000
--- a/source/x/scim/scim.url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/scim-im/scim
diff --git a/source/x/scim/slack-desc b/source/x/scim/slack-desc
deleted file mode 100644
index 931c9a30b..000000000
--- a/source/x/scim/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-scim: scim (Smart Common Input Method platform)
-scim:
-scim: SCIM is an input platform for CJK and other languages. It aims to
-scim: significantly reduce the difficulty of input method development.
-scim:
-scim: See the scim scripts in /etc/profile.d/ for setup info.
-scim:
-scim: Homepage: http://sourceforge.net/projects/scim
-scim:
-scim:
-scim:
diff --git a/testing/source/vtown/input-methods/skkdic/README-skkdic.rh.ja b/source/x/skkdic/README-skkdic.rh.ja
index 843d45fc8..843d45fc8 100644
--- a/testing/source/vtown/input-methods/skkdic/README-skkdic.rh.ja
+++ b/source/x/skkdic/README-skkdic.rh.ja
diff --git a/testing/source/vtown/input-methods/skkdic/skkdic.SlackBuild b/source/x/skkdic/skkdic.SlackBuild
index ef64f436f..9c219ba5f 100755
--- a/testing/source/vtown/input-methods/skkdic/skkdic.SlackBuild
+++ b/source/x/skkdic/skkdic.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=skkdic
 SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 VERSION=${VERSION:-$(echo $SRCVER | cut -f 1 -d 'T')}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 ARCH=noarch
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/testing/source/vtown/input-methods/skkdic/skkdic.url b/source/x/skkdic/skkdic.url
index c22ca5604..c22ca5604 100644
--- a/testing/source/vtown/input-methods/skkdic/skkdic.url
+++ b/source/x/skkdic/skkdic.url
diff --git a/testing/source/vtown/input-methods/skkdic/slack-desc b/source/x/skkdic/slack-desc
index 4b951f669..4b951f669 100644
--- a/testing/source/vtown/input-methods/skkdic/slack-desc
+++ b/source/x/skkdic/slack-desc
diff --git a/testing/source/vtown/input-methods/skkdic/unannotation.awk b/source/x/skkdic/unannotation.awk
index 221660640..221660640 100644
--- a/testing/source/vtown/input-methods/skkdic/unannotation.awk
+++ b/source/x/skkdic/unannotation.awk
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index f599e28b8..b4de39476 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-10
+11
diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch
index 37be22286..936bf1ca4 100644
--- a/source/x/x11/patch/xdm.patch
+++ b/source/x/x11/patch/xdm.patch
@@ -4,5 +4,3 @@ zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose
   { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \
   { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xdm/xdm-consolekit.patch.gz | patch -p1 --verbose || \
-  { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xdm/xdm-consolekit.patch b/source/x/x11/patch/xdm/xdm-consolekit.patch
deleted file mode 100644
index fbacd36fc..000000000
--- a/source/x/x11/patch/xdm/xdm-consolekit.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-http://bugs.gentoo.org/360987
-http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
-http://lists.x.org/archives/xorg-devel/2011-February/019615.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
-
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
-
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- #  XDM
- #
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -66,6 +66,11 @@
- #endif
- #endif /* USE_PAM */
-
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef __SCO__
- #include <prot.h>
- #endif
-@@ -472,6 +477,97 @@
-     }
- }
-
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 0;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -486,6 +580,8 @@
-     }
- #endif
-
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
-	kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
-	CleanUpChild ();
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -325,6 +325,9 @@
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
-
- extern char	*greeterLib;
- extern char	*willing;
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -68,6 +68,9 @@
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
-
- char	*greeterLib;
- char	*willing;
-@@ -258,6 +261,10 @@
-				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
-				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
-
- # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -440,7 +447,11 @@
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
-
- static int	originalArgc;
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -51,6 +51,8 @@
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -218,6 +220,10 @@
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
diff --git a/source/x/x11/post-install/xdm/xdm.pamd b/source/x/x11/post-install/xdm/xdm.pamd
index a3b9decf7..6223e3e95 100644
--- a/source/x/x11/post-install/xdm/xdm.pamd
+++ b/source/x/x11/post-install/xdm/xdm.pamd
@@ -5,5 +5,6 @@ account		include		system-auth
 password	include		system-auth
 session		include		system-auth
 session		required	pam_loginuid.so
-session		optional	pam_ck_connector.so
+-session	optional	pam_ck_connector.so
+-session	optional	pam_elogind.so
 session		include		postlogin
diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index 1358688a6..ba0b79360 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -26,13 +26,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xine-lib
 # Version on the tarball
-VERSION=1.2.10
+VERSION=1.2.11
 # Version used in the source directory to cd into
-DIRVER=1.2.10
+DIRVER=1.2.11
 # Version used for the Slackware package
-PKGVER=1.2.10
+PKGVER=1.2.11
 
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/FTBFSlog b/source/xfce/FTBFSlog
index 522490bf7..50cdd0dbe 100644
--- a/source/xfce/FTBFSlog
+++ b/source/xfce/FTBFSlog
@@ -1,2 +1,2 @@
-Thu Feb  1 01:00:13 UTC 2018
+Sat Dec  5 23:01:14 UTC 2020
   All packages tested and found to compile properly.
diff --git a/testing/source/vtown/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
index 631d059d3..631d059d3 100644
--- a/testing/source/vtown/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
+++ b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
diff --git a/testing/source/vtown/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
index fbf091c9e..fbf091c9e 100644
--- a/testing/source/vtown/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
+++ b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
diff --git a/testing/source/vtown/xfce/Greybird/Greybird.SlackBuild b/source/xfce/Greybird/Greybird.SlackBuild
index e6638c03b..1383c1bcf 100755
--- a/testing/source/vtown/xfce/Greybird/Greybird.SlackBuild
+++ b/source/xfce/Greybird/Greybird.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=Greybird
 VERSION=${VERSION:-3.22.12}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/xfce/Greybird/slack-desc b/source/xfce/Greybird/slack-desc
index 8e400d271..8e400d271 100644
--- a/testing/source/vtown/xfce/Greybird/slack-desc
+++ b/source/xfce/Greybird/slack-desc
diff --git a/testing/source/vtown/xfce/elementary-xfce/README b/source/xfce/elementary-xfce/README
index b92d43f3b..b92d43f3b 100644
--- a/testing/source/vtown/xfce/elementary-xfce/README
+++ b/source/xfce/elementary-xfce/README
diff --git a/testing/source/vtown/xfce/elementary-xfce/doinst.sh b/source/xfce/elementary-xfce/doinst.sh
index 320b5363d..320b5363d 100644
--- a/testing/source/vtown/xfce/elementary-xfce/doinst.sh
+++ b/source/xfce/elementary-xfce/doinst.sh
diff --git a/testing/source/vtown/xfce/elementary-xfce/elementary-xfce.SlackBuild b/source/xfce/elementary-xfce/elementary-xfce.SlackBuild
index 6e4203430..b998b3600 100755
--- a/testing/source/vtown/xfce/elementary-xfce/elementary-xfce.SlackBuild
+++ b/source/xfce/elementary-xfce/elementary-xfce.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elementary-xfce
 VERSION=${VERSION:-0.15.1}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/xfce/elementary-xfce/slack-desc b/source/xfce/elementary-xfce/slack-desc
index db787e611..db787e611 100644
--- a/testing/source/vtown/xfce/elementary-xfce/slack-desc
+++ b/source/xfce/elementary-xfce/slack-desc
diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild
index 00f254a87..f87ce2bbf 100755
--- a/source/xfce/exo/exo.SlackBuild
+++ b/source/xfce/exo/exo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=exo
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -73,7 +73,7 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-find . -exec touch {} \+
+#find . -exec touch {} \;
 
 chown -R root:root .
 find . \
@@ -123,7 +123,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url
index 174a28eff..63b021c28 100644
--- a/source/xfce/exo/exo.url
+++ b/source/xfce/exo/exo.url
@@ -1 +1 @@
-http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.11.tar.bz2
+http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.5.tar.bz2
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
index ff9503882..39ea7ce6e 100755
--- a/source/xfce/garcon/garcon.SlackBuild
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=garcon
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -125,7 +125,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url
index 369d7a860..9980ede87 100644
--- a/source/xfce/garcon/garcon.url
+++ b/source/xfce/garcon/garcon.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2
+https://github.com/xfce-mirror/garcon/releases
diff --git a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
deleted file mode 100755
index 979c88b66..000000000
--- a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, 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.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=gtk-xfce-engine
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-static \
-  --disable-debug \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
-
-# Add a documentation directory.  Not all of these files are expected to be
-# present, but listing them ensures that documentation that might appear and
-# disappear from version to version will not be missed.
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-cp -a \
-  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
-  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/gtk-xfce-engine/slack-desc b/source/xfce/gtk-xfce-engine/slack-desc
deleted file mode 100644
index 74b8d7918..000000000
--- a/source/xfce/gtk-xfce-engine/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines)
-gtk-xfce-engine:
-gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the
-gtk-xfce-engine: applications and libraries needed to display them. This is useful for
-gtk-xfce-engine: customizing the appearance of your Xfce desktop.
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
index 45a1833d9..8626f95ae 100755
--- a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
+++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxfce4ui
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -126,7 +126,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild
index eb6951c4c..1feb12f5d 100755
--- a/source/xfce/libxfce4util/libxfce4util.SlackBuild
+++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxfce4util
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -124,7 +124,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/testing/source/vtown/xfce/mousepad/doinst.sh b/source/xfce/mousepad/doinst.sh
index 6fb128315..6fb128315 100644
--- a/testing/source/vtown/xfce/mousepad/doinst.sh
+++ b/source/xfce/mousepad/doinst.sh
diff --git a/testing/source/vtown/xfce/mousepad/mousepad.SlackBuild b/source/xfce/mousepad/mousepad.SlackBuild
index 4d4155fe7..a12c17b18 100755
--- a/testing/source/vtown/xfce/mousepad/mousepad.SlackBuild
+++ b/source/xfce/mousepad/mousepad.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mousepad
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/xfce/mousepad/mousepad.url b/source/xfce/mousepad/mousepad.url
index 797da6cce..797da6cce 100644
--- a/testing/source/vtown/xfce/mousepad/mousepad.url
+++ b/source/xfce/mousepad/mousepad.url
diff --git a/testing/source/vtown/xfce/mousepad/slack-desc b/source/xfce/mousepad/slack-desc
index c4d5db24b..c4d5db24b 100644
--- a/testing/source/vtown/xfce/mousepad/slack-desc
+++ b/source/xfce/mousepad/slack-desc
diff --git a/source/xfce/orage/orage.SlackBuild b/source/xfce/orage/orage.SlackBuild
deleted file mode 100755
index 530d269eb..000000000
--- a/source/xfce/orage/orage.SlackBuild
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for orage
-
-# Copyright 2010-2014  Robby Workman, Northport, Alabama, 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.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=orage
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-zcat $CWD/orage.libical3.diff.gz | patch -p1 --verbose || exit 1
-
-# Yes, libical's pkgconfig file is incomplete, it seems
-CFLAGS="$SLKCFLAGS -I/usr/include/libical" \
-CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-debug \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL NEWS README* TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/orage/orage.libical3.diff b/source/xfce/orage/orage.libical3.diff
deleted file mode 100644
index af962b367..000000000
--- a/source/xfce/orage/orage.libical3.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c
---- orage-4.12.1/src/ical-code.c.libical-3.0	2017-11-14 08:41:30.917375493 +0100
-+++ orage-4.12.1/src/ical-code.c	2017-11-14 08:41:56.823375135 +0100
-@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
-         &&   (strcmp(g_par.local_timezone, "floating") != 0))
-         ctime = icaltime_current_time_with_zone(local_icaltimezone);
-     else { / * use floating time * /
--        ctime.is_utc      = 0;
-         ctime.is_date     = 0;
-         ctime.is_daylight = 0;
-         ctime.zone        = NULL;
-@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a
-  * when counting alarm time. */
-         if (rel == ICAL_RELATED_START) {
-             per.stime.is_date       = 0;
--            per.stime.is_utc        = 1;
-             per.stime.is_daylight   = 0;
-             per.stime.zone          = utc_icaltimezone;
-             per.stime.hour          = 0;
-@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a
-         }
-         else {
-             per.etime.is_date       = 0;
--            per.etime.is_utc        = 1;
-             per.etime.is_daylight   = 0;
-             per.etime.zone          = utc_icaltimezone;
-             per.etime.hour          = 0;
-@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al
- /* HACK: convert to UTC time so that we can use time arithmetic
-  * when counting alarm time. */
-         start_time.is_date       = 0;
--        start_time.is_utc        = 1;
-         start_time.is_daylight   = 0;
-         start_time.zone          = utc_icaltimezone;
-         start_time.hour          = 0;
-@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg
-      */
-     if (icaltime_is_date(per.stime)) {
-         if (local_icaltimezone != utc_icaltimezone) {
--            next_alarm_time.is_utc        = 0;
-             next_alarm_time.is_daylight   = 0;
-             next_alarm_time.zone          = local_icaltimezone;
-         }
-@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n
-          */
-         if (icaltime_is_date(per.stime)) {
-             if (local_icaltimezone != utc_icaltimezone) {
--                next_alarm_time.is_utc        = 0;
-                 next_alarm_time.is_daylight   = 0;
-                 next_alarm_time.zone          = local_icaltimezone;
-             }
-@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop
-          */
-         if (icaltime_is_date(per.stime)) {
-             if (local_icaltimezone != utc_icaltimezone) {
--                next_alarm_time.is_utc        = 0;
-                 next_alarm_time.is_daylight   = 0;
-                 next_alarm_time.zone          = local_icaltimezone;
-             }
diff --git a/source/xfce/orage/slack-desc b/source/xfce/orage/slack-desc
deleted file mode 100644
index 5023eae5b..000000000
--- a/source/xfce/orage/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-orage: orage (Xfce's calendar)
-orage:
-orage: Orage is a time-managing application for the Xfce desktop environment.
-orage:
-orage:
-orage:
-orage:
-orage:
-orage:
-orage:
-orage:
diff --git a/source/xfce/thunar-volman/slack-desc b/source/xfce/thunar-volman/slack-desc
index 1b8871397..4cfee665b 100644
--- a/source/xfce/thunar-volman/slack-desc
+++ b/source/xfce/thunar-volman/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-             |-----handy-ruler------------------------------------------------|
+             |-----handy-ruler------------------------------------------------------|
 thunar-volman: thunar-volman (Thunar Volume Manager Plugin)
-thunar-volman: 
-thunar-volman: thunar-volman is an extension for the Thunar File Manager, 
-thunar-volman: which enables automatic management of removable drives and 
-thunar-volman: media. 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
+thunar-volman:
+thunar-volman: thunar-volman is an extension for the Thunar File Manager, which
+thunar-volman: enables automatic management of removable drives and media. 
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild
index b00f2bf68..dc0734658 100755
--- a/source/xfce/thunar-volman/thunar-volman.SlackBuild
+++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=thunar-volman
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/xfce/thunar-volman/thunar-volman.url b/source/xfce/thunar-volman/thunar-volman.url
deleted file mode 100644
index 51224d39c..000000000
--- a/source/xfce/thunar-volman/thunar-volman.url
+++ /dev/null
@@ -1 +0,0 @@
-http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-0.9.5.tar.bz2
diff --git a/source/xfce/thunar/thunar.SlackBuild b/source/xfce/thunar/thunar.SlackBuild
index 7d46bc4fe..a0d457936 100755
--- a/source/xfce/thunar/thunar.SlackBuild
+++ b/source/xfce/thunar/thunar.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=thunar
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
diff --git a/source/xfce/thunar/thunar.url b/source/xfce/thunar/thunar.url
index cbc5614ff..4cc136db0 100644
--- a/source/xfce/thunar/thunar.url
+++ b/source/xfce/thunar/thunar.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.16.tar.bz2
+https://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.13.tar.bz2
diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild
index e717911e7..7659fb893 100755
--- a/source/xfce/tumbler/tumbler.SlackBuild
+++ b/source/xfce/tumbler/tumbler.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2015, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tumbler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -125,7 +125,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/tumbler/tumbler.url b/source/xfce/tumbler/tumbler.url
index e4acc3764..8cc2fe2bb 100644
--- a/source/xfce/tumbler/tumbler.url
+++ b/source/xfce/tumbler/tumbler.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-0.2.9.tar.bz2
+http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.3.tar.bz2
diff --git a/source/xfce/xfce-build-all.sh b/source/xfce/xfce-build-all.sh
deleted file mode 100755
index 4db2edf96..000000000
--- a/source/xfce/xfce-build-all.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012, 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, 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.
-
-# Set to 1 if you'd like to install/upgrade package as they are built.
-# This is recommended.
-INST=1
-
-TMP=${TMP:-/tmp}
-
-for package in \
-  xfce4-dev-tools \
-  libxfce4util \
-  xfconf \
-  libxfce4ui \
-  exo \
-  garcon \
-  gtk-xfce-engine \
-  xfce4-panel \
-  thunar \
-  thunar-volman \
-  tumbler \
-  xfce4-appfinder \
-  xfce4-power-manager \
-  xfce4-settings \
-  xfdesktop \
-  xfwm4 \
-  xfce4-session \
-  xfce4-terminal \
-  xfce4-notifyd \
-  orage \
-  xfce4-pulseaudio-plugin \
-  xfce4-clipman-plugin \
-  xfce4-screenshooter \
-  xfce4-systemload-plugin \
-  xfce4-taskmanager \
-  xfce4-weather-plugin \
-  ; do
-  cd $package || exit 1
-  ./${package}.SlackBuild || ( touch /tmp/${package}.failed ; exit 1 ) || exit 1
-  if [ "$INST" = "1" ]; then
-    PACKAGE="$(ls -t $TMP/$(ls ${package}*.xz | rev | cut -f2- -d - | rev)-*txz | head -n 1)"
-    if [ -f $PACKAGE ]; then
-      upgradepkg --install-new --reinstall $PACKAGE
-    else
-      echo "Error:  package to upgrade "$PACKAGE" not found in $TMP"
-      exit 1
-    fi
-  fi
-  cd ..
-done
diff --git a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
index 47af2d4ec..26ffc4e4f 100755
--- a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
+++ b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-appfinder
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
index 4a57e00c8..e2f0f2d31 100755
--- a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
+++ b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-dev-tools
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
index a70a52a7e..df8dda2d8 100755
--- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Xfce4-notifyd
 
 # Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -83,7 +83,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/xfce \
+  --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-debug=no \
diff --git a/testing/source/vtown/xfce/xfce4-panel-profiles/doinst.sh b/source/xfce/xfce4-panel-profiles/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/xfce/xfce4-panel-profiles/doinst.sh
+++ b/source/xfce/xfce4-panel-profiles/doinst.sh
diff --git a/testing/source/vtown/xfce/xfce4-panel-profiles/slack-desc b/source/xfce/xfce4-panel-profiles/slack-desc
index 15d98b284..15d98b284 100644
--- a/testing/source/vtown/xfce/xfce4-panel-profiles/slack-desc
+++ b/source/xfce/xfce4-panel-profiles/slack-desc
diff --git a/testing/source/vtown/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
index e33f2e341..d2326d423 100755
--- a/testing/source/vtown/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
+++ b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-panel-profiles
 VERSION=${VERSION:-$(echo xfce4-panel-profiles-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -84,6 +84,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Relocate man pages:
+mv $PKG/usr/share/man $PKG/usr
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
index da610a9bf..e737f273a 100755
--- a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
+++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-panel
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -93,7 +93,6 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
   --disable-debug \
-  --enable-gtk3 \
   --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
@@ -125,7 +124,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-power-manager/slack-desc b/source/xfce/xfce4-power-manager/slack-desc
index 1d3144dc9..0d33da790 100644
--- a/source/xfce/xfce4-power-manager/slack-desc
+++ b/source/xfce/xfce4-power-manager/slack-desc
@@ -5,11 +5,11 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-                   |-----handy-ruler------------------------------------------------|
+                   |-----handy-ruler------------------------------------------------------|
 xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce)
 xfce4-power-manager:
-xfce4-power-manager: xfce4-power-manager makes power management functions (such as
-xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment.
+xfce4-power-manager: xfce4-power-manager makes power management functions (such as suspend
+xfce4-power-manager: and hibernate) easy inside the Xfce Desktop Environment.
 xfce4-power-manager:
 xfce4-power-manager:
 xfce4-power-manager:
diff --git a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
index 12b55a2a6..b2a764548 100755
--- a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
+++ b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for xfce4-power-manager
 
 # Copyright 2006-2012  Robby Workman  Northport, Alabama, USA
-# Copyright 2009, 2010, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-power-manager
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url
index b5524c521..4376b0a53 100644
--- a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url
+++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url
@@ -1 +1 @@
-http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.2.tar.bz2
+http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.0.tar.bz2
diff --git a/testing/source/vtown/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
index 8db50475b..8db50475b 100644
--- a/testing/source/vtown/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
+++ b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
diff --git a/testing/source/vtown/xfce/xfce4-screensaver/slack-desc b/source/xfce/xfce4-screensaver/slack-desc
index 4c5817e73..4c5817e73 100644
--- a/testing/source/vtown/xfce/xfce4-screensaver/slack-desc
+++ b/source/xfce/xfce4-screensaver/slack-desc
diff --git a/testing/source/vtown/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index 62966e6d3..22165e39f 100755
--- a/testing/source/vtown/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-screensaver
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
index fedac3cb4..4ac1f3abb 100644
--- a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
+++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.5.tar.bz2
+http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.3.tar.bz2
diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild
index 30e951f8b..51578b8e4 100755
--- a/source/xfce/xfce4-session/xfce4-session.SlackBuild
+++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-session
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -121,7 +121,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
index 540c178f7..290916b5f 100755
--- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
+++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -80,7 +80,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Set Greybird (GTK theme) and elementary-xfce (icon theme) as system defaults
 zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1
+
 zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure:
@@ -123,7 +125,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-settings/xfce4-settings.theme.diff b/source/xfce/xfce4-settings/xfce4-settings.theme.diff
index 7b18303bd..898887846 100644
--- a/source/xfce/xfce4-settings/xfce4-settings.theme.diff
+++ b/source/xfce/xfce4-settings/xfce4-settings.theme.diff
@@ -7,8 +7,8 @@ diff -Nur xfce4-settings-4.11.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.
    <property name="Net" type="empty">
 -    <property name="ThemeName" type="empty"/>
 -    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Adwaita"/>
-+    <property name="IconThemeName" type="string" value="Adwaita"/>
++    <property name="ThemeName" type="string" value="Greybird"/>
++    <property name="IconThemeName" type="string" value="elementary-xfce-dark"/>
      <property name="DoubleClickTime" type="int" value="400"/>
      <property name="DoubleClickDistance" type="int" value="5"/>
      <property name="DndDragThreshold" type="int" value="8"/>
diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
index 224c0846e..d960ba4fe 100755
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -27,8 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-systemload-plugin
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.lz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
index 021b4b02c..61bc620fe 100755
--- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
+++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for xfce4-terminal
 
 # Copyright 2010-2014  Robby Workman, Northport, Alabama, USA
-# Copyright 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.url b/source/xfce/xfce4-terminal/xfce4-terminal.url
index 400bafb0c..25ecf17de 100644
--- a/source/xfce/xfce4-terminal/xfce4-terminal.url
+++ b/source/xfce/xfce4-terminal/xfce4-terminal.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.8.tar.bz2
+http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.7.4.tar.bz2
diff --git a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch b/source/xfce/xfce4-weather-plugin/update-met_no-API.patch
deleted file mode 100644
index 3cfe31215..000000000
--- a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 139545eeda3cff72dc7148cd8765a5650575e661 Mon Sep 17 00:00:00 2001
-From: Olivier Duchateau <duchateau.olivier@gmail.com>
-Date: Sun, 22 Dec 2019 19:29:58 +0100
-Subject: [PATCH] Switch to 'locationforecast' product
-
----
- panel-plugin/weather.c | 8 +++++---
- panel-plugin/weather.h | 1 +
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
-index be745b3..7d79566 100644
---- a/panel-plugin/weather.c
-+++ b/panel-plugin/weather.c
-@@ -588,6 +588,7 @@ cb_weather_update(SoupSession *session,
- static gboolean
- update_handler(plugin_data *data)
- {
-+    gchar *api_version = FORECAST_API;
-     gchar *url;
-     gboolean night_time;
-     time_t now_t;
-@@ -653,9 +654,10 @@ update_handler(plugin_data *data)
-         data->weather_update->started = TRUE;
- 
-         /* build url */
--        url = g_strdup_printf("https://api.met.no/weatherapi"
--                              "/locationforecastlts/1.3/?lat=%s&lon=%s&"
--                              "msl=%d",
-+        url = g_strdup_printf("https://api.met.no"
-+                              "/weatherapi/locationforecast/%s/"
-+                              "?lat=%s&lon=%s&msl=%d",
-+                              api_version,
-                               data->lat, data->lon, data->msl);
- 
-         /* start receive thread */
-diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
-index 86629c7..2723fc4 100644
---- a/panel-plugin/weather.h
-+++ b/panel-plugin/weather.h
-@@ -31,6 +31,7 @@
- #define MAX_FORECAST_DAYS 10
- #define DEFAULT_FORECAST_DAYS 5
- #define MAX_SCROLLBOX_LINES 10
-+#define FORECAST_API "1.9"
- 
- G_BEGIN_DECLS
- 
--- 
-2.24.1
-
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
index 73fab2fc6..073168233 100755
--- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-weather-plugin
 
-# Copyright 2006-2012  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2018  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -78,8 +78,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-zcat $CWD/update-met_no-API.patch.gz | patch -p1 --verbose || exit 1
-
 GEONAMES_USERNAME="slackware" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
index 9ee0ef010..f6c688609 100644
--- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
@@ -1 +1 @@
-http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/
+https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/
diff --git a/testing/source/vtown/deps/qt5/doinst.sh b/source/xfce/xfce4-whiskermenu-plugin/doinst.sh
index 3e5691a05..3e5691a05 100644
--- a/testing/source/vtown/deps/qt5/doinst.sh
+++ b/source/xfce/xfce4-whiskermenu-plugin/doinst.sh
diff --git a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/slack-desc b/source/xfce/xfce4-whiskermenu-plugin/slack-desc
index eaef5a40c..eaef5a40c 100644
--- a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/slack-desc
+++ b/source/xfce/xfce4-whiskermenu-plugin/slack-desc
diff --git a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
index d7bc6c4ea..e9422409b 100755
--- a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
+++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-whiskermenu-plugin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url
index e8d56c2dc..e8d56c2dc 100644
--- a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url
+++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url
diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild
index 30b288441..e99817e67 100755
--- a/source/xfce/xfconf/xfconf.SlackBuild
+++ b/source/xfce/xfconf/xfconf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfconf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -88,6 +88,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-gsettings-backend \
   --disable-static \
   --disable-debug \
   --build=$ARCH-slackware-linux || exit 1
@@ -121,7 +122,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild
index c6a9c9827..e0648495c 100755
--- a/source/xfce/xfdesktop/xfdesktop.SlackBuild
+++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfdesktop
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -70,7 +70,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfdesktop/xfdesktop.url b/source/xfce/xfdesktop/xfdesktop.url
deleted file mode 100644
index d4f9f65d8..000000000
--- a/source/xfce/xfdesktop/xfdesktop.url
+++ /dev/null
@@ -1 +0,0 @@
-http://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.5.tar.bz2
diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild
index f17f2d2e6..bb5fd18f9 100755
--- a/source/xfce/xfwm4/xfwm4.SlackBuild
+++ b/source/xfce/xfwm4/xfwm4.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -122,7 +122,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and