summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/9menu/9menu.SlackBuild3
-rw-r--r--desktop/catfish/catfish.SlackBuild2
-rw-r--r--desktop/catfish/catfish.info6
-rw-r--r--desktop/clipmenu/clipmenu.SlackBuild3
-rw-r--r--desktop/ctwm/ctwm.SlackBuild3
-rw-r--r--desktop/cwm/cwm.SlackBuild3
-rw-r--r--desktop/echinus/echinus.SlackBuild15
-rw-r--r--desktop/echinus/xinitrc.echinus30
-rw-r--r--desktop/enlightenment/enlightenment.SlackBuild3
-rw-r--r--desktop/flatpak/flatpak.SlackBuild2
-rw-r--r--desktop/flatpak/flatpak.info6
-rw-r--r--desktop/fvwm3/cmd_geometrywindow-move_null_check.patch21
-rw-r--r--desktop/fvwm3/fvwm3.SlackBuild58
-rw-r--r--desktop/fvwm3/fvwm3.info24
-rw-r--r--desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch13
-rw-r--r--desktop/idesk/idesk.SlackBuild10
-rw-r--r--desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild3
-rw-r--r--desktop/mcwm/mcwm.SlackBuild10
-rw-r--r--desktop/menulibre/fix_gtk4_conflict.patch24
-rw-r--r--desktop/menulibre/menulibre.SlackBuild2
-rw-r--r--desktop/peksystray/README2
-rw-r--r--desktop/peksystray/peksystray.SlackBuild14
-rw-r--r--desktop/peksystray/peksystray.info2
-rw-r--r--desktop/pekwm/pekwm.SlackBuild6
-rw-r--r--desktop/pekwm/pekwm.info8
-rw-r--r--desktop/pekwm/xinitrc.pekwm21
-rw-r--r--desktop/picom/picom.SlackBuild3
-rw-r--r--desktop/rss-glx/patches/rss-glx-0.9.1-missing-include.patch10
-rw-r--r--desktop/salmon/salmon.SlackBuild3
-rw-r--r--desktop/salmon/salmon.info4
-rw-r--r--desktop/seafile-client/seafile-client.SlackBuild2
-rw-r--r--desktop/seafile-client/seafile-client.info6
-rw-r--r--desktop/trayer-srg/README4
-rw-r--r--desktop/trayer-srg/spelling_grammar_fixes.diff122
-rw-r--r--desktop/trayer-srg/trayer-srg.SlackBuild18
-rw-r--r--desktop/unsaver/unsaver.SlackBuild3
-rw-r--r--desktop/vbox-runner/vbox-runner.SlackBuild51
-rw-r--r--desktop/vbox-runner/vbox-runner.info8
-rw-r--r--desktop/vwm/README5
-rw-r--r--desktop/vwm/git2tarxz.sh54
-rw-r--r--desktop/vwm/patches/paths.diff90
-rw-r--r--desktop/vwm/patches/vterm_static.diff26
-rw-r--r--desktop/vwm/slack-desc4
-rw-r--r--desktop/vwm/vwm.SlackBuild165
-rw-r--r--desktop/vwm/vwm.info12
-rw-r--r--desktop/wmSunMoon/wmSunMoon.SlackBuild2
-rw-r--r--desktop/wmblob/README2
-rw-r--r--desktop/wmblob/wmblob.SlackBuild10
-rw-r--r--desktop/wmcliphist/wmcliphist.SlackBuild10
-rw-r--r--desktop/wmclock/README2
-rw-r--r--desktop/wmclock/wmclock.SlackBuild10
-rw-r--r--desktop/wmclock/wmclock.info2
-rw-r--r--desktop/wmdl/README6
-rw-r--r--desktop/wmdl/slack-desc6
-rw-r--r--desktop/wmdl/wmdl.SlackBuild10
-rw-r--r--desktop/wmmixer/wmmixer.SlackBuild16
-rw-r--r--desktop/wmmon/wmmon.SlackBuild3
-rw-r--r--desktop/wmmon/wmmon.info4
-rw-r--r--desktop/wmsupermon/wmsupermon.SlackBuild3
-rw-r--r--desktop/wmsystemtray/wmsystemtray.SlackBuild10
-rw-r--r--desktop/wmsystemtray/wmsystemtray.info2
-rw-r--r--desktop/wmtime/wmtime.SlackBuild3
-rw-r--r--desktop/wmtimer/README2
-rw-r--r--desktop/wmtimer/wmtimer.1130
-rw-r--r--desktop/wmtimer/wmtimer.SlackBuild21
-rw-r--r--desktop/wmtimer/wmtimer.rst108
-rw-r--r--desktop/wmudmount/README4
-rw-r--r--desktop/wmudmount/wmudmount.SlackBuild3
-rw-r--r--desktop/wmweather+/wmweather+.SlackBuild3
-rw-r--r--desktop/wmwebcam/README2
-rw-r--r--desktop/wmwebcam/wmwebcam.SlackBuild15
-rw-r--r--desktop/wmxss/README2
-rw-r--r--desktop/wmxss/wmxss.SlackBuild15
-rw-r--r--desktop/wmxss/wmxss.info4
-rw-r--r--desktop/x2x/x2x.SlackBuild3
-rw-r--r--desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info2
-rw-r--r--desktop/xdg-desktop-portal/README9
-rw-r--r--desktop/xdg-desktop-portal/slack-desc19
-rw-r--r--desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild111
-rw-r--r--desktop/xdg-desktop-portal/xdg-desktop-portal.info10
-rw-r--r--desktop/xdgmenumaker/xdgmenumaker.SlackBuild3
-rw-r--r--desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild6
-rw-r--r--desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info6
-rw-r--r--desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild2
-rw-r--r--desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info6
-rw-r--r--desktop/xtrlock/xtrlock.SlackBuild3
-rw-r--r--desktop/zenity/README13
-rw-r--r--desktop/zenity/slack-desc6
-rw-r--r--desktop/zenity/zenity.SlackBuild66
-rw-r--r--desktop/zenity/zenity.info10
90 files changed, 835 insertions, 734 deletions
diff --git a/desktop/9menu/9menu.SlackBuild b/desktop/9menu/9menu.SlackBuild
index 228b6f486d..3e625fbc60 100644
--- a/desktop/9menu/9menu.SlackBuild
+++ b/desktop/9menu/9menu.SlackBuild
@@ -48,9 +48,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/catfish/catfish.SlackBuild b/desktop/catfish/catfish.SlackBuild
index 22f556164a..d50a804fad 100644
--- a/desktop/catfish/catfish.SlackBuild
+++ b/desktop/catfish/catfish.SlackBuild
@@ -24,7 +24,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=catfish
-VERSION=${VERSION:-4.16.0}
+VERSION=${VERSION:-4.16.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/desktop/catfish/catfish.info b/desktop/catfish/catfish.info
index 93e3b7db56..dd5bc9ac92 100644
--- a/desktop/catfish/catfish.info
+++ b/desktop/catfish/catfish.info
@@ -1,8 +1,8 @@
PRGNAM="catfish"
-VERSION="4.16.0"
+VERSION="4.16.3"
HOMEPAGE="http://www.twotoasts.de/index.php/catfish/"
-DOWNLOAD="https://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.0.tar.bz2"
-MD5SUM="9974def9a922bf23b872bd5a9037daec"
+DOWNLOAD="https://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.3.tar.bz2"
+MD5SUM="01eef9cdedcb1acbb7b51cd7b5c822f4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pexpect python-distutils-extra"
diff --git a/desktop/clipmenu/clipmenu.SlackBuild b/desktop/clipmenu/clipmenu.SlackBuild
index b115f7fb8c..79ff083e7e 100644
--- a/desktop/clipmenu/clipmenu.SlackBuild
+++ b/desktop/clipmenu/clipmenu.SlackBuild
@@ -28,9 +28,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/ctwm/ctwm.SlackBuild b/desktop/ctwm/ctwm.SlackBuild
index a74c6141c5..1038e9c696 100644
--- a/desktop/ctwm/ctwm.SlackBuild
+++ b/desktop/ctwm/ctwm.SlackBuild
@@ -48,9 +48,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/cwm/cwm.SlackBuild b/desktop/cwm/cwm.SlackBuild
index 9fcecf1dbd..c39e2f871e 100644
--- a/desktop/cwm/cwm.SlackBuild
+++ b/desktop/cwm/cwm.SlackBuild
@@ -49,9 +49,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/echinus/echinus.SlackBuild b/desktop/echinus/echinus.SlackBuild
index d112eb7e64..3b2375495a 100644
--- a/desktop/echinus/echinus.SlackBuild
+++ b/desktop/echinus/echinus.SlackBuild
@@ -1,9 +1,8 @@
#!/bin/bash
+# Slackware build script for echinus
-# Slackware build script for <appname>
-
-# Written by Charles E. Kauffman gahlgwogi@lycos.com
+# Written by Charles E. Kauffman <email removed>.
# Modified from Tom Canich's slackbuild for dwm.
# Modified by B. Watson
@@ -11,18 +10,21 @@
# had no license; modified version is licensed under the WTFPL.
# See http://www.wtfpl.net/txt/copying/ for details.
+# 20210907 bkw: BUILD=3, *actually* add the xinitrc. Nobody noticed
+# this build was broken for 1.5 years, so would anyone miss it if
+# it went away?
+
# 20200101 bkw:
# - take over maintenance
# - BUILD=2
# - add xinitrc
# - simplify build
-
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=echinus
VERSION=${VERSION:-0.4.9}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -34,9 +36,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/echinus/xinitrc.echinus b/desktop/echinus/xinitrc.echinus
new file mode 100644
index 0000000000..7827671dbb
--- /dev/null
+++ b/desktop/echinus/xinitrc.echinus
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+if [ -f $sysresources ]; then
+ xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+ xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+ xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+ xmodmap $usermodmap
+fi
+
+# Start the window manager:
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session dbus-launch --exit-with-session /usr/bin/echinus
+else
+ exec dbus-launch --exit-with-session /usr/bin/echinus
+fi
diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild
index daffe3dc05..00953bac92 100644
--- a/desktop/enlightenment/enlightenment.SlackBuild
+++ b/desktop/enlightenment/enlightenment.SlackBuild
@@ -92,10 +92,9 @@ meson . build \
-Dpam=false \
-Dbuild-id=$ARCH-slackware-linux
-"${NINJA:=ninja}"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-$NINJA -C build -v
+"${NINJA:=ninja}" -C build -v
DESTDIR=$PKG $NINJA -C build install
diff --git a/desktop/flatpak/flatpak.SlackBuild b/desktop/flatpak/flatpak.SlackBuild
index 3288af20eb..0241e0b8a8 100644
--- a/desktop/flatpak/flatpak.SlackBuild
+++ b/desktop/flatpak/flatpak.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=flatpak
-VERSION=${VERSION:-1.8.3}
+VERSION=${VERSION:-1.10.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/desktop/flatpak/flatpak.info b/desktop/flatpak/flatpak.info
index 00c62ca332..7e74487847 100644
--- a/desktop/flatpak/flatpak.info
+++ b/desktop/flatpak/flatpak.info
@@ -1,8 +1,8 @@
PRGNAM="flatpak"
-VERSION="1.8.3"
+VERSION="1.10.2"
HOMEPAGE="https://flatpak.org/"
-DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.8.3/flatpak-1.8.3.tar.xz"
-MD5SUM="e0babce042b5a630c4ba1e9c2239143d"
+DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.10.2/flatpak-1.10.2.tar.xz"
+MD5SUM="61701ebaac700a2fe6eb33233bb7d493"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="bubblewrap ostree appstream-glib libseccomp xdg-desktop-portal-gtk"
diff --git a/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch b/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch
new file mode 100644
index 0000000000..7d3c7b2f3f
--- /dev/null
+++ b/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch
@@ -0,0 +1,21 @@
+--- fvwm3-1.0.4.orig/fvwm/move_resize.c 2021-07-17 18:03:08.000000000 +0300
++++ fvwm3-1.0.4/fvwm/move_resize.c 2021-07-21 01:20:34.428964491 +0300
+@@ -3269,13 +3269,14 @@
+
+ static void set_geom_win_visible_val(char *token, bool val)
+ {
+- if (token == NULL)
+- return;
+-
+ Scr.gs.do_hide_position_window = !val;
+ Scr.gs.do_hide_resize_window = !val;
+
+- if (StrEquals(token, "never"))
++ if (token == NULL)
++ {
++ return;
++ }
++ else if (StrEquals(token, "never"))
+ {
+ Scr.gs.do_hide_position_window = val;
+ Scr.gs.do_hide_resize_window = val;
diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild
index c824bffe8d..6996e2b1be 100644
--- a/desktop/fvwm3/fvwm3.SlackBuild
+++ b/desktop/fvwm3/fvwm3.SlackBuild
@@ -25,8 +25,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fvwm3
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -73,34 +73,7 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
-patch -p1 < $CWD/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
-
-mkdir -p bin/FvwmPrompt/vendor/golang.org/x
-for DEPENDENCY in \
- abiosoft/ishell/2.0.0 \
- abiosoft/readline/155bce2042db95a783081fab225e74dd879055b0 \
- fatih/color/1.9.0 \
- flynn-archive/go-shlex/3f9db97f856818214da2e1057f8ad84803971cff \
- mattn/go-colorable/0.1.4 \
- mattn/go-isatty/0.0.12 \
- sirupsen/logrus/1.6.0 \
- golang/sys/12a6c2dcc1e4cb348b57847c73987099e261714b
-do
- DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
- DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
- DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
- mkdir -p "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER"
- tar xvf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
- if [ "$DEPENDENCY_OWNER" = "golang" ]; then
- mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \
- "bin/FvwmPrompt/vendor/golang.org/x/$DEPENDENCY_NAME"
- else
- mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \
- "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME"
- fi
-done
-
-cat $CWD/modules.txt > bin/FvwmPrompt/vendor/modules.txt
+patch -p1 < $CWD/cmd_geometrywindow-move_null_check.patch
chown -R root:root .
find -L . \
@@ -122,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-golang \
--program-prefix= \
--program-suffix= \
- --program-transform-name='s/^fvwm-/fvwm3-/' \
+ --program-transform-name='/vwm[^3]/ s/vwm/vwm3/' \
--build=$ARCH-slackware-linux
make
@@ -135,35 +108,12 @@ mkdir -p $PKG/etc/X11/xinit
zcat $CWD/xinitrc.fvwm3.gz > $PKG/etc/X11/xinit/xinitrc.fvwm3
chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm3
-rm -rf $PKG/usr/share/doc
-rm -rf $PKG/usr/share/locale
-rm -f $PKG/usr/bin/fvwm3-convert-2.6
-mv $PKG/usr/bin/FvwmCommand $PKG/usr/bin/Fvwm3Command
-mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot3
-
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-for m in $PKG/usr/man/man1/Fvwm* ; do
- case "$m" in *FvwmPrompt*) continue ;; esac
- mv $m ${m/Fvwm/Fvwm3}
-done
-
-for m in $PKG/usr/man/man1/fvwm-* ; do
- mv $m ${m/fvwm-/fvwm3-}
-done
-
-rm -f $PKG/usr/man/man1/xpmroot*
-ln -s fvwm3-root.1.gz $PKG/usr/man/man1/xpmroot3.1.gz
-
-rm -f $PKG/usr/man/man1/fvwm3-convert-2.6.1.gz
-rm -f $PKG/usr/man/man1/fvwm3-config-2.6.1.gz
-rm -f $PKG/usr/man/man1/Fvwm3Console.1.gz
-rm -f $PKG/usr/man/man1/Fvwm3ConsoleC.pl.1.gz
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info
index 7043ad4509..36aa677e53 100644
--- a/desktop/fvwm3/fvwm3.info
+++ b/desktop/fvwm3/fvwm3.info
@@ -1,26 +1,10 @@
PRGNAM="fvwm3"
-VERSION="1.0.2"
+VERSION="1.0.4"
HOMEPAGE="https://github.com/fvwmorg/fvwm3"
-DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.2/fvwm3-1.0.2.tar.gz \
- https://github.com/abiosoft/ishell/archive/v2.0.0/ishell-2.0.0.tar.gz \
- https://github.com/abiosoft/readline/archive/155bce2042db95a783081fab225e74dd879055b0/readline-155bce2042db95a783081fab225e74dd879055b0.tar.gz \
- https://github.com/fatih/color/archive/v1.9.0/color-1.9.0.tar.gz \
- https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff/go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz \
- https://github.com/mattn/go-colorable/archive/v0.1.4/go-colorable-0.1.4.tar.gz \
- https://github.com/mattn/go-isatty/archive/v0.0.12/go-isatty-0.0.12.tar.gz \
- https://github.com/sirupsen/logrus/archive/v1.6.0/logrus-1.6.0.tar.gz \
- https://github.com/golang/sys/archive/12a6c2dcc1e4cb348b57847c73987099e261714b/sys-12a6c2dcc1e4cb348b57847c73987099e261714b.tar.gz"
-MD5SUM="afdf88159cf06486a8a86d3d64b69b18 \
- 3058feb8c64ce23c122c212673a769fc \
- 5f9283762aece4866ec12481c911dc04 \
- 63c08b74df39b3df587594710c13d543 \
- 73c1c839e2866ecfe7ad25aa21dd74d6 \
- c67b2200da0ec27b69b62afc308b6d0c \
- 56a6121ba7ae8a13dad2925edd9f11b5 \
- 7e9bd1531d38f1994307cc2cd9435cb9 \
- 62bb00c7e07850c8fa836a3614667ded"
+DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.4/fvwm3-1.0.4.tar.gz"
+MD5SUM="3fd50b508940e9549fc9a9b40ec94a47"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libbson google-go-lang"
+REQUIRES="google-go-lang"
MAINTAINER="Alexander Verbovetsky"
EMAIL="alik@ejik.org"
diff --git a/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch b/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
deleted file mode 100644
index 8635f5a35c..0000000000
--- a/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur fvwm3-1.0.2.orig/fvwm/screen.h fvwm3-1.0.2/fvwm/screen.h
---- fvwm3-1.0.2.orig/fvwm/screen.h 2020-12-12 03:37:08.000000000 +0300
-+++ fvwm3-1.0.2/fvwm/screen.h 2020-12-22 03:21:41.103120674 +0300
-@@ -485,8 +485,7 @@
- get_unshaded_geometry((fw), &g); \
- mnew = FindScreenOfXY((fw)->g.frame.x, (fw)->g.frame.y); \
- /* Avoid unnecessary updates. */ \
-- if (mnew == (fw)->m && \
-- (fw)->Desk == mnew->virtual_scr.CurrentDesk) \
-+ if (mnew == (fw)->m) \
- break; \
- (fw)->m_prev = (fw)->m; \
- (fw)->m = mnew; \
diff --git a/desktop/idesk/idesk.SlackBuild b/desktop/idesk/idesk.SlackBuild
index 1aa62bf0c3..37c9facafc 100644
--- a/desktop/idesk/idesk.SlackBuild
+++ b/desktop/idesk/idesk.SlackBuild
@@ -33,9 +33,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -68,11 +65,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# missing #include files, newer g++ cares more than the ones from 2005.
patch -p1 < $CWD/compilefix.diff
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index f5b1b43d54..3e4f498367 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -51,9 +51,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/mcwm/mcwm.SlackBuild b/desktop/mcwm/mcwm.SlackBuild
index e6292574ec..8b17df5f8a 100644
--- a/desktop/mcwm/mcwm.SlackBuild
+++ b/desktop/mcwm/mcwm.SlackBuild
@@ -54,9 +54,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -89,11 +86,8 @@ rm -rf $PRGNAM-$SRCVER
tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
cd $PRGNAM-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# 20180628 bkw: This warning shouldn't hurt anything on Slack 14.2:
# mcwm.c:1554:9: warning: implicit declaration of function 'asprintf'
diff --git a/desktop/menulibre/fix_gtk4_conflict.patch b/desktop/menulibre/fix_gtk4_conflict.patch
new file mode 100644
index 0000000000..b28dca9449
--- /dev/null
+++ b/desktop/menulibre/fix_gtk4_conflict.patch
@@ -0,0 +1,24 @@
+diff -Naur menulibre-2.2.1.org/menulibre/MenulibreApplication.py menulibre-2.2.1/menulibre/MenulibreApplication.py
+--- menulibre-2.2.1.org/menulibre/MenulibreApplication.py 2019-05-31 01:55:18.000000000 +0100
++++ menulibre-2.2.1/menulibre/MenulibreApplication.py 2021-06-03 20:43:35.507256870 +0100
+@@ -26,6 +26,8 @@
+
+ from locale import gettext as _
+
++import gi
++gi.require_version("Gtk", "3.0")
+ from gi.repository import Gio, GLib, GObject, Gtk, Gdk, GdkPixbuf
+
+ from . import MenulibreStackSwitcher, MenulibreIconSelection
+diff -Naur menulibre-2.2.1.org/menulibre_lib/helpers.py menulibre-2.2.1/menulibre_lib/helpers.py
+--- menulibre-2.2.1.org/menulibre_lib/helpers.py 2019-05-31 01:55:18.000000000 +0100
++++ menulibre-2.2.1/menulibre_lib/helpers.py 2021-06-03 20:44:04.194017263 +0100
+@@ -18,6 +18,8 @@
+ import logging
+ import os
+
++import gi
++gi.require_version("Gtk", "3.0")
+ from gi.repository import Gtk
+
+ from . menulibreconfig import get_data_file
diff --git a/desktop/menulibre/menulibre.SlackBuild b/desktop/menulibre/menulibre.SlackBuild
index 754f8428cb..345868526c 100644
--- a/desktop/menulibre/menulibre.SlackBuild
+++ b/desktop/menulibre/menulibre.SlackBuild
@@ -80,6 +80,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/fix_gtk4_conflict.patch
+
python3 setup.py install --root=$PKG
mv $PKG/usr/share/man $PKG/usr/man
diff --git a/desktop/peksystray/README b/desktop/peksystray/README
index 3e9427e1e3..e4ab8c76c2 100644
--- a/desktop/peksystray/README
+++ b/desktop/peksystray/README
@@ -1,3 +1,5 @@
+peksystray (small system tray)
+
Peksystray is a small system tray (also called notification tray)
designed for all the light window managers supporting docking. As
more and more applications use a small icon in the system tray to
diff --git a/desktop/peksystray/peksystray.SlackBuild b/desktop/peksystray/peksystray.SlackBuild
index c13720b9b2..a86e951d4b 100644
--- a/desktop/peksystray/peksystray.SlackBuild
+++ b/desktop/peksystray/peksystray.SlackBuild
@@ -2,9 +2,11 @@
# Slackware build script for peksystray
-# Written by Pablo Santamaria (pablosantamaria@gmail.com)
+# Written by Pablo Santamaria <email removed>
# Modified slightly and resubmitted to SBo by B. Watson <yalhcru@gmail.com>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=peksystray
@@ -21,9 +23,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -56,11 +55,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
autoreconf -fi
diff --git a/desktop/peksystray/peksystray.info b/desktop/peksystray/peksystray.info
index 3a593043c6..de41f29a08 100644
--- a/desktop/peksystray/peksystray.info
+++ b/desktop/peksystray/peksystray.info
@@ -1,7 +1,7 @@
PRGNAM="peksystray"
VERSION="0.4.0"
HOMEPAGE="http://peksystray.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/peksystray/peksystray/0.4.0/peksystray-0.4.0.tar.bz2"
+DOWNLOAD="https://downloads.sourceforge.net/project/peksystray/peksystray/0.4.0/peksystray-0.4.0.tar.bz2"
MD5SUM="735a216684f1db65bfe71697452cafc0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/desktop/pekwm/pekwm.SlackBuild b/desktop/pekwm/pekwm.SlackBuild
index 4f661c9019..7447a5d9aa 100644
--- a/desktop/pekwm/pekwm.SlackBuild
+++ b/desktop/pekwm/pekwm.SlackBuild
@@ -27,8 +27,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=pekwm
-VERSION=${VERSION:-0.1.17}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.1.18}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -72,7 +72,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/desktop/pekwm/pekwm.info b/desktop/pekwm/pekwm.info
index 250fd35bc1..39bf62927b 100644
--- a/desktop/pekwm/pekwm.info
+++ b/desktop/pekwm/pekwm.info
@@ -1,8 +1,8 @@
PRGNAM="pekwm"
-VERSION="0.1.17"
-HOMEPAGE="https://web.archive.org/web/20171215085950/http://pekwm.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/pekwm-0.1.17.tar.bz2"
-MD5SUM="514c04ff1c6123635c00e57443b5e86f"
+VERSION="0.1.18"
+HOMEPAGE="https://github.com/pekdon/pekwm"
+DOWNLOAD="https://github.com/pekdon/pekwm/releases/download/release-0.1.18/pekwm-0.1.18.tar.gz"
+MD5SUM="00697ed12201541f5c96b3cf48ca05e2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm
index 8337e08883..d3109b5b69 100644
--- a/desktop/pekwm/xinitrc.pekwm
+++ b/desktop/pekwm/xinitrc.pekwm
@@ -6,22 +6,10 @@ sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
- xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
- xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
- xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
- xmodmap $usermodmap
-fi
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
@@ -29,4 +17,3 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
else
exec /usr/bin/pekwm
fi
-
diff --git a/desktop/picom/picom.SlackBuild b/desktop/picom/picom.SlackBuild
index d3b0b5b1e6..af5041aa42 100644
--- a/desktop/picom/picom.SlackBuild
+++ b/desktop/picom/picom.SlackBuild
@@ -82,8 +82,7 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
meson build . -D build_docs=true -D b_ndebug=true --prefix=/usr
-"${NINJA:=ninja}"
-DESTDIR=$PKG $NINJA -C build install
+DESTDIR=$PKG "${NINJA:=ninja}" -C build install
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/desktop/rss-glx/patches/rss-glx-0.9.1-missing-include.patch b/desktop/rss-glx/patches/rss-glx-0.9.1-missing-include.patch
new file mode 100644
index 0000000000..6a6e286f87
--- /dev/null
+++ b/desktop/rss-glx/patches/rss-glx-0.9.1-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/Implicit/impSurface.h
++++ b/src/Implicit/impSurface.h
+@@ -25,6 +25,7 @@
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
++#include <cstddef>
+ #include <vector>
+ #include <GL/gl.h>
+
diff --git a/desktop/salmon/salmon.SlackBuild b/desktop/salmon/salmon.SlackBuild
index 16d536b118..9d06fcf1a3 100644
--- a/desktop/salmon/salmon.SlackBuild
+++ b/desktop/salmon/salmon.SlackBuild
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/salmon/salmon.info b/desktop/salmon/salmon.info
index f699b9bd7f..28ecbf2d08 100644
--- a/desktop/salmon/salmon.info
+++ b/desktop/salmon/salmon.info
@@ -1,7 +1,7 @@
PRGNAM="salmon"
VERSION="1.2.2"
-HOMEPAGE="http://tigr.net/afterstep/download/salmon/README"
-DOWNLOAD="http://tigr.net/afterstep/download/salmon/salmon-1.2.2.tar.gz"
+HOMEPAGE="https://tigr.net/afterstep/download/salmon/README"
+DOWNLOAD="https://tigr.net/afterstep/download/salmon/salmon-1.2.2.tar.gz"
MD5SUM="02725f0b035463ad089a189f1e7d62ed"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/desktop/seafile-client/seafile-client.SlackBuild b/desktop/seafile-client/seafile-client.SlackBuild
index 89b8ad2955..dad66b2260 100644
--- a/desktop/seafile-client/seafile-client.SlackBuild
+++ b/desktop/seafile-client/seafile-client.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=seafile-client
-VERSION=${VERSION:-6.2.5}
+VERSION=${VERSION:-8.0.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/desktop/seafile-client/seafile-client.info b/desktop/seafile-client/seafile-client.info
index 460e04ab5b..996a21205d 100644
--- a/desktop/seafile-client/seafile-client.info
+++ b/desktop/seafile-client/seafile-client.info
@@ -1,8 +1,8 @@
PRGNAM="seafile-client"
-VERSION="6.2.5"
+VERSION="8.0.4"
HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v6.2.5/seafile-client-6.2.5.tar.gz"
-MD5SUM="3f3cd465109e1d49888fbca310033a3b"
+DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v8.0.4/seafile-client-8.0.4.tar.gz"
+MD5SUM="f1962a9033be781bf68acccc43c895ea"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="seafile"
diff --git a/desktop/trayer-srg/README b/desktop/trayer-srg/README
index 1557a266ff..9f197159c2 100644
--- a/desktop/trayer-srg/README
+++ b/desktop/trayer-srg/README
@@ -1,7 +1,9 @@
+trayer-srg (GTK2-based systray for UNIX desktop)
+
trayer is a small program designed to provide systray functionality
present in GNOME/KDE desktop environments for window managers which
do not support that function. It's similar to other applications
such as 'peksystray' and 'docker'.
trayer-srg was forked from trayer in 2010 to add some fancy features
-and clean up code.
+and clean up the code.
diff --git a/desktop/trayer-srg/spelling_grammar_fixes.diff b/desktop/trayer-srg/spelling_grammar_fixes.diff
new file mode 100644
index 0000000000..11b37c7f88
--- /dev/null
+++ b/desktop/trayer-srg/spelling_grammar_fixes.diff
@@ -0,0 +1,122 @@
+diff -Naur trayer-srg-trayer-1.1.8/README trayer-srg-trayer-1.1.8.patched/README
+--- trayer-srg-trayer-1.1.8/README 2018-03-16 06:13:40.000000000 -0400
++++ trayer-srg-trayer-1.1.8.patched/README 2021-09-07 17:59:05.721290632 -0400
+@@ -1,7 +1,7 @@
+ trayer-srg
+
+ NAME
+- trayer-srg is a lightweight GTK2-based systray for UNIX desktop
++ trayer-srg is a lightweight GTK2-based systray for UNIX desktops
+
+ SYNOPSYS
+ trayer [OPTION]...
+@@ -10,8 +10,8 @@
+ trayer-srg was forked from trayer in january 2010 to add some
+ fancy features and clean up code.
+
+- trayer is small program designed to provide systray functionality present
+- in GNOME/KDE desktop enviroments for window managers which doesn't
++ trayer is small program designed to provide systray functionality (present
++ in GNOME/KDE desktop environments) for window managers that don't
+ support that function. It's similar to other applications such as
+ 'peksystray' and 'docker'.
+
+@@ -31,22 +31,22 @@
+ --align - alignment <left|center|right>
+ --margin - length of margin in pixels
+ --distance - space between trayer's window and screen edge
+- --distancefrom - Specifies which edge to calculate distance from, see above.
++ --distancefrom - specifies which edge to calculate distance from, see above.
+ --widthtype - how panel width is calculated:
+ request - follow widgets' size requests. can shrink or grow dynamically
+ pixel - ocupy fixed number of pixels, then 'width' variable holds a number
+ percent - be 'width' precent of an edge
+ --width - width of a panel (not used with --widthtype=request)
+- --heighttype - how panel height is calcilated:
+- pixel - ocupy fixed number of pixels, then 'height' variable
++ --heighttype - how panel height is calculated:
++ pixel - occupy fixed number of pixels, then 'height' variable
+ holds a number
+ --height - height of a panel in pixels
+- --SetDockTpe - Identify panel window type as dock <true|false>
+- --SetPartialStrut - Reserve panel's space so that it will not be covered by
+- maximazied windows <true|false>
++ --SetDockTpe - identify panel window type as dock <true|false>
++ --SetPartialStrut - reserve panel's space so that it will not be covered by
++ maximized windows <true|false>
+ --transparent - use transparency <true|false>
+ --tint - color used to "tint" background wallpaper with
+- --alpha - pocentage of transparency <0-256>
++ --alpha - percentage of transparency <0-256>
+ --expand - specifies if trayer can accomodate extra space
+ or not <true|false>
+ --padding - extra space between trayer's window frame and docked icons
+diff -Naur trayer-srg-trayer-1.1.8/man/trayer.1 trayer-srg-trayer-1.1.8.patched/man/trayer.1
+--- trayer-srg-trayer-1.1.8/man/trayer.1 2018-03-16 06:13:40.000000000 -0400
++++ trayer-srg-trayer-1.1.8.patched/man/trayer.1 2021-09-07 18:07:03.116235098 -0400
+@@ -1,15 +1,15 @@
+ .TH TRAYER-SRG 1 LOCAL
+ .SH NAME
+- trayer-srg - a lightweight GTK2-based systray for UNIX desktop
++ trayer-srg - a lightweight GTK2-based systray for UNIX desktops
+ .SH SYNOPSYS
+ .B trayer
+ .B "[
+ .I OPTIONS
+ .B "]
+ .SH DESCRIPTION
+-trayer is small program designed to provide systray functionality present in GNOME/KDE desktop enviroments for window managers which doesn't support that function. It's similar to other applications such as 'peksystray' and 'docker'.
++trayer is small program designed to provide systray functionality (present in GNOME/KDE desktop environments) for window managers which don't support that function. It's similar to other applications such as 'peksystray' and 'docker'.
+
+-trayer code was extracted from fbpanel application, you can find more about it on it's homepage:
++trayer code was extracted from fbpanel application, you can find more about it on its homepage:
+ .IB http://fbpanel.sourceforge.net/
+
+ You can find new versions of trayer and support on FVWM-Crystal project homepage:
+@@ -27,7 +27,7 @@
+ .BR \-v
+ prints version and exits
+ .TP
+-.BR \--edge " EDGE"
++.BR \-\-edge " EDGE"
+ Use
+ .I EDGE
+ for orientation. Possible values for
+@@ -112,7 +112,7 @@
+ .BR true.
+ .TP
+ .BR \--SetPartialStrut " BOOL"
+-Reserve panel's space so that it will not be covered by maximazied windows. The
++Reserve panel's space so that it will not be covered by maximized windows. The
+ default value is
+ .BR false.
+ .TP
+@@ -144,23 +144,23 @@
+ .BR 0.
+ .TP
+ .BR \--monitor " NUM|STRING"
+-Define the monitor on which you like trayer to appear, number of zero to number
+-of monitors minus one, or the string "primary" are valid. The default value is
++Define the monitor on which you'd like trayer to appear. 0 to (number
++of monitors minus one), or the string "primary", are valid. The default value is
+ .BR 0.
+ .SH EXAMPLES
+ .LP
+ Place trayer to the top right edge of the screen and prevent other fullsize
+-windows to overlay it:
++windows from overlaying it:
+ .RS
+ .nf
+-\f8trayer trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --transparent true\fP
++\fBtrayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --transparent true\fP
+ .fi
+ .RE
+ .SH BUGS
+ Report bugs to the issue tracker:
+ .I https://github.com/sargon/trayer-srg/issues
+ .SH CONTRIBUTORS
+- Following people are or has been involved in development of trayer-srg:
++The following people are or have been involved in development of trayer-srg:
+
+ .IP "Maciej Delmanowski <harnir@users.berlios.de>"
+ .IP "Anatoly Asviyan <aanatoly@users.sf.net>
diff --git a/desktop/trayer-srg/trayer-srg.SlackBuild b/desktop/trayer-srg/trayer-srg.SlackBuild
index 6896dd1491..1d29a349ce 100644
--- a/desktop/trayer-srg/trayer-srg.SlackBuild
+++ b/desktop/trayer-srg/trayer-srg.SlackBuild
@@ -24,8 +24,8 @@
# Now maintained by B. Watson (yalhcru@gmail.com)
+# 20210907 bkw: BUILD=2, spelling/grammar fixes in docs.
# 20180612 bkw: updated for v1.1.8.
-
# 20170708 bkw:
# - updated for v1.1.7.
# - stop installing INSTALL in doc dir.
@@ -43,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=trayer-srg
VERSION=${VERSION:-1.1.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -55,9 +55,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -94,12 +91,13 @@ rm -rf $TARNAM-$VERSION
tar xvf $CWD/$TARNAM-$VERSION.tar.?z*
cd $TARNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+patch -p1 < $CWD/spelling_grammar_fixes.diff
+# not a real (autotools) configure script, notice non-canonical use
+# of --prefix here!
./configure --prefix=/usr/bin
CFLAGS="$SLKCFLAGS" make # This will also strip the executable
diff --git a/desktop/unsaver/unsaver.SlackBuild b/desktop/unsaver/unsaver.SlackBuild
index 21dc85bdfb..89fd2b3c26 100644
--- a/desktop/unsaver/unsaver.SlackBuild
+++ b/desktop/unsaver/unsaver.SlackBuild
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/vbox-runner/vbox-runner.SlackBuild b/desktop/vbox-runner/vbox-runner.SlackBuild
index bbfd0e982e..0e9caec57f 100644
--- a/desktop/vbox-runner/vbox-runner.SlackBuild
+++ b/desktop/vbox-runner/vbox-runner.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for vbox-runner
-# Copyright 2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
# 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.
+# 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)
PRGNAM=vbox-runner
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-git_20200604_e2306271}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +70,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/107926-$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -79,20 +79,23 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-KDEPREF=$(kde4-config --prefix)
+mkdir cmake-build
+cd cmake-build
+ cmake \
+ -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \
+ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
+ -DCMAKE_INSTALL_MANDIR="man" \
+ ..
-cmake \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX="$KDEPREF" \
- -DLIB_SUFFIX="$LIBDIRSUFFIX" \
- .
-
-make
-make install DESTDIR=$PKG
+ make VERBOSE=1
+ make install/strip DESTDIR=$PKG
+cd ..
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/desktop/vbox-runner/vbox-runner.info b/desktop/vbox-runner/vbox-runner.info
index 11248a8a8b..dab0186808 100644
--- a/desktop/vbox-runner/vbox-runner.info
+++ b/desktop/vbox-runner/vbox-runner.info
@@ -1,8 +1,8 @@
PRGNAM="vbox-runner"
-VERSION="0.3.3"
-HOMEPAGE="https://store.kde.org/p/1081264/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/vbox-runner/107926-vbox-runner-0.3.3.tar.gz"
-MD5SUM="1a5946de409e6e5bde67f58f542dcfd2"
+VERSION="git_20200604_e2306271"
+HOMEPAGE="https://github.com/alvanieto/vbox-runner"
+DOWNLOAD="http://www.liwjatan.at/files/src/vbox-runner/vbox-runner-git_20200604_e2306271.tar.xz"
+MD5SUM="302d11652f9dbc900f07069b2d3e0cc7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/vwm/README b/desktop/vwm/README
index 557767fccf..9040a52c86 100644
--- a/desktop/vwm/README
+++ b/desktop/vwm/README
@@ -1,4 +1,4 @@
-vwm (console based window manager)
+vwm (console text-based window manager)
Viper Window Manager (VWM) is a lightweight, extensible window manager
for the console. Originally, VWM was designed to be the reference
@@ -15,5 +15,4 @@ a few simple API rules, anyone can create a "native application"
which will appear on the VWM Main Menu. The mechanism for this is very
similar to Mozilla-style plugins.
-See /usr/doc/vwm-2.0.2/samples/vwmrc for information on customising
-VWM.
+See /usr/doc/$VERSION/samples/vwmrc for information on customising VWM.
diff --git a/desktop/vwm/git2tarxz.sh b/desktop/vwm/git2tarxz.sh
new file mode 100644
index 0000000000..5dd951db3c
--- /dev/null
+++ b/desktop/vwm/git2tarxz.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# This git2tarxz's output is a tarball with 2 separate projects.
+# Upstream doesn't use tags. The version number of the tarball is the
+# version of vwm, taken from vwm.h, plus the commit date and hash of
+# the vwm tree. The libvterm version isn't included in the version
+# number.
+
+PRGNAM=vwm
+PRGURL=https://github.com/TragicWarrior/vwm
+LIBURL1=https://github.com/TragicWarrior/libvterm
+LIBURL2=https://github.com/TragicWarrior/libviper
+
+set -e
+
+CWD="$( pwd )"
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+mkdir -p $GITDIR
+
+cd $GITDIR
+
+git clone $PRGURL
+git clone $LIBURL1
+git clone $LIBURL2
+
+cd $PRGNAM
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+RELVER="$( grep '#define *VWM_VERSION' vwm.h | cut -d'"' -f2 )"
+VERSION=$RELVER+${DATE}_${GIT_SHA}
+
+cd -
+
+rm -rf */.git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/desktop/vwm/patches/paths.diff b/desktop/vwm/patches/paths.diff
deleted file mode 100644
index 486135ebff..0000000000
--- a/desktop/vwm/patches/paths.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur vwm.orig/Makefile vwm/Makefile
---- vwm.orig/Makefile 2009-10-20 15:57:55.000000000 -0400
-+++ vwm/Makefile 2017-08-25 17:11:58.787940216 -0400
-@@ -8,8 +8,8 @@
- headerdir = ${prefix}/include
- includedir = -I${headerdir} -I./
- bindir = ${prefix}/bin
--moddir = /usr/lib/vwm/modules
--moddir_wide = /usr/lib/vwm/modules_wide
-+moddir = ${libdir}/vwm/modules
-+moddir_wide = ${libdir}/vwm/modules_wide
-
- makefile: all
-
-@@ -24,7 +24,7 @@
- gcc $(CFLAGS) $(DEFS) $(WLIBS) $(PKG_CFG) $(includedir) -D_VIPER_WIDE *.c -o vwm_wide
-
- vwm:
-- gcc $(CFLAGS) $(DEFS) $(LIBS) $(PKG_CFG) $(includdir) *.c -o vwm
-+ gcc $(CFLAGS) $(DEFS) $(LIBS) $(PKG_CFG) $(includedir) *.c -o vwm
-
- vwmterm:
- cd modules/vwmterm3 && $(MAKE)
-@@ -45,9 +45,10 @@
- rm -f vwm_wide.h
-
- install:
-- mkdir -p $(moddir)
-+ mkdir -p $(moddir) $(bindir) $(headerdir) $(libdir)
- chmod 644 vwm.h
- cp -f vwm.h $(headerdir)
-+ strip vwm
- chmod 755 vwm
- cp -f vwm $(bindir)
- cd modules/vwmterm3 && $(MAKE) install
-diff -Naur vwm.orig/modules/sysmon/Makefile vwm/modules/sysmon/Makefile
---- vwm.orig/modules/sysmon/Makefile 2009-06-23 14:41:32.000000000 -0400
-+++ vwm/modules/sysmon/Makefile 2017-08-25 17:12:41.742937932 -0400
-@@ -4,8 +4,8 @@
- libdir = ${prefix}/lib
- includedir = ${prefix}/include -I../..
- bindir = ${prefix}/bin
--moddir = /usr/lib/vwm/modules
--moddir_wide = /usr/lib/vwm/modules_wide
-+moddir = ${libdir}/vwm/modules
-+moddir_wide = ${libdir}/vwm/modules_wide
-
- makefile: all
-
-diff -Naur vwm.orig/modules/vwmterm3/Makefile vwm/modules/vwmterm3/Makefile
---- vwm.orig/modules/vwmterm3/Makefile 2009-10-20 16:02:05.000000000 -0400
-+++ vwm/modules/vwmterm3/Makefile 2017-08-25 17:11:25.953941962 -0400
-@@ -2,11 +2,11 @@
- PKG_CFG = `pkg-config --cflags glib-2.0 gmodule-2.0`
- DEFS = -D_REENTRANT -D_GNU_SOURCE
- prefix = /usr/local
--libdir = ${prefix}/lib
-+libdir = ${prefix}/lib${arch}
- includedir = -I${prefix}/include -I../..
- bindir = ${prefix}/bin
--moddir = /usr/lib/vwm/modules
--moddir_wide = /usr/lib/vwm/modules_wide
-+moddir = ${libdir}/vwm/modules
-+moddir_wide = ${libdir}/vwm/modules_wide
-
- makefile: all
-
-diff -Naur vwm.orig/vwm.h vwm/vwm.h
---- vwm.orig/vwm.h 2009-11-04 17:10:01.000000000 -0500
-+++ vwm/vwm.h 2017-08-25 17:16:32.528925658 -0400
-@@ -22,11 +22,17 @@
- #define _VWM_SCREENSAVER_TIMEOUT 5
- #endif
-
-+#ifdef __amd64__
-+#define LIBDIRSUFFIX "64"
-+#else
-+#define LIBDIRSUFFIX ""
-+#endif
-+
- #ifndef _VWM_SHARED_MODULES
- #ifdef _VIPER_WIDE
--#define _VWM_SHARED_MODULES "/usr/lib/vwm/modules_wide/"
-+#define _VWM_SHARED_MODULES "/usr/lib" LIBDIRSUFFIX "/vwm/modules_wide/"
- #else
--#define _VWM_SHARED_MODULES "/usr/lib/vwm/modules/"
-+#define _VWM_SHARED_MODULES "/usr/lib" LIBDIRSUFFIX "/vwm/modules/"
- #endif
- #endif
-
diff --git a/desktop/vwm/patches/vterm_static.diff b/desktop/vwm/patches/vterm_static.diff
deleted file mode 100644
index b3356a17bc..0000000000
--- a/desktop/vwm/patches/vterm_static.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur vwm.orig/modules/vwmterm3/Makefile vwm/modules/vwmterm3/Makefile
---- vwm.orig/modules/vwmterm3/Makefile 2009-10-20 16:02:05.000000000 -0400
-+++ vwm/modules/vwmterm3/Makefile 2017-08-25 19:55:30.380418408 -0400
-@@ -20,7 +20,7 @@
-
- vwmterm3:
- gcc $(CFLAGS) $(DEFS) $(PKG_CFG) $(includedir) -c -fpic *.c
-- gcc $(CFLAGS) -shared -o vwmterm3.so *.o
-+ gcc $(CFLAGS) -shared -o vwmterm3.so *.o $(VTERM_A)
-
- vwmterm3_wide:
- gcc $(CFLAGS) $(DEFS) $(PKG_CFG) $(includedir) -D_VIPER_WIDE -c -fpic *.c
-diff -Naur vwm.orig/modules/vwmterm3/init.c vwm/modules/vwmterm3/init.c
---- vwm.orig/modules/vwmterm3/init.c 2009-10-30 17:31:44.000000000 -0400
-+++ vwm/modules/vwmterm3/init.c 2017-08-25 19:56:03.036416671 -0400
-@@ -36,10 +36,6 @@
- if(g_module_open("libutil.so",G_MODULE_BIND_LAZY)==NULL)
- return "\ncould not preload libutil.so";
-
-- // preload libvterm for use with this module
-- if(g_module_open("libvterm.so",G_MODULE_BIND_LAZY)==NULL)
-- return "\ncould not preload libvterm.so";
--
- /* register with vwm */
- libfilename=(gchar*)g_module_name(module);
- vwm_module_add("Tools","VTerm",vwmterm_init,NULL,libfilename);
diff --git a/desktop/vwm/slack-desc b/desktop/vwm/slack-desc
index f5da6433b6..428b5afcc7 100644
--- a/desktop/vwm/slack-desc
+++ b/desktop/vwm/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-vwm: vwm (console based window manager)
+vwm: vwm (console text-based window manager)
vwm:
vwm: Viper Window Manager (VWM) is a lightweight, extensible window manager
vwm: for the console. Originally, VWM was designed to be the reference
@@ -16,4 +16,4 @@ vwm: From conception, VWM was designed to be both lightweight and ssh
vwm: friendly. Character based line-art compresses very well as do the
vwm: escape sequences which handle cursor manipulation. This makes VWM
vwm: quite suitable for low-bandwidth, remote connectivity over ssh.
-vwm: http://vwm.sourceforge.net/
+vwm:
diff --git a/desktop/vwm/vwm.SlackBuild b/desktop/vwm/vwm.SlackBuild
index ff1829de96..eddd72444e 100644
--- a/desktop/vwm/vwm.SlackBuild
+++ b/desktop/vwm/vwm.SlackBuild
@@ -25,6 +25,17 @@
# Previously maintained by Gerardo Zamudio.
# Now maintained by B. Watson <yalhcru@gmail.com>.
+# 20210908 bkw:
+# - Update this stale build. It compiled on -current, but failed to
+# run properly. Upstream never updated the old sourceforge page to
+# let us know he moved to github, so I just now found it out...
+# Upstream doesn't use tags for releases, I used latest git for
+# all 3 projects (vwm, libviper, libvterm).
+# - Bundle libviper. The old libviper build is gone (nothing else used it).
+# - Bundled libs are now shared, not static, and are included in the
+# built package (along with their includes).
+# - Upstream switched to cmake, many changes because of that.
+
# 20170825 bkw:
# - Take over maintenance.
# - Update for v2.1.3.
@@ -41,8 +52,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=vwm
-VERSION=${VERSION:-2.1.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-3.3.2+20200112_207d888}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -54,9 +65,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -80,76 +88,95 @@ else
LIBDIRSUFFIX=""
fi
-fixperms() {
- chown -R root:root .
- find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
-}
set -e
-rm -rf $PKG
-mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
-
-# First, the library. This is "libvterm", by the same author as vwm,
-# but it's completely unrelated to the libvterm on SBo. Two projects
-# happened to pick the same name. This one doesn't build a static lib
-# by default (which we need) so it's done here with 'ar'. None of this
-# stuff gets included in the package.
-# libvterm-20170804.tar.xz was created thus:
-# git clone https://github.com/TragicWarrior/libvterm.git libvterm-20170804
-# tar cvfJ libvterm-20170804.tar.xz libvterm-20170804
-LIBNAM=libvterm
-LIBVER=${LIBVER:-20170804}
-
-cd $TMP/$PRGNAM
-rm -rf $LIBNAM-$LIBVER
-tar xvf $CWD/$LIBNAM-$LIBVER.tar.xz
-cd $LIBNAM-$LIBVER
-fixperms
-
-# Build a static library. We need -fPIC even on 32-bit.
-make CFLAGS="$SLKCFLAGS -fPIC"
-rm -f *.so
-ar rcs $LIBNAM.a *.o
-
-# Now, the main program, which will link with the static lib we just built.
-cd $TMP/$PRGNAM
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
-fixperms
-
-# Patch the relevant Makefiles to not use hardcoded paths.
-patch -p1 < $CWD/patches/paths.diff
-
-# Allows us to pass a full path to libvterm.a, avoids 'undefined symbol'
-# when starting vmterm3.
-patch -p1 < $CWD/patches/vterm_static.diff
-
-LIBDIR=$TMP/$PRGNAM/$LIBNAM-$LIBVER
-make CFLAGS="$SLKCFLAGS -I$LIBDIR" VTERM_A=$LIBDIR/libvterm.a
-make install prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX}
-
-# Build and install the sysmon module (the vmwterm3 one is done with
-# the main installation).
-cd modules/sysmon
- make CFLAGS="$SLKCFLAGS -I$PKG/usr/include"
- make install prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX}
+rm -rf $PKG $TMP/$PRGNAM-$VERSION
+mkdir -p $PKG $OUTPUT
+cd $TMP
+
+# The tarball includes all 3 projects (vwm, libviper, libvterm) and
+# was created by git2tarxz.sh.
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+BASEDIR=$( pwd )
+
+# First, we build the two libraries vwm needs. These are by the same
+# author as vwm. The one called libvterm is *not* related to the
+# libvterm on SBo (two projects happened to pick the same name).
+# These have to be shared libs (or anyway, libvterm has to be, as
+# vwm's vwmterm module loads it via dlopen()).
+
+buildlib() {
+ cd $BASEDIR/lib$1
+ mkdir -p build
+ cd build
+
+ # Note: the cmake stuff here ignores any attempt to install to lib64.
+ # We'll fix it later.
+ cmake \
+ -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make VERBOSE=1
+ make install/strip DESTDIR=$PKG
+}
+
+buildlib vterm
+buildlib viper
+
+# no way to disable static libs via cmake, so...
+rm -f $PKG/usr/lib/*.a
+
+# Finally, we can build vwm. Easier to force-override the autodetect
+# for the libs, than it would be to make the autodetect actually work.
+cd $BASEDIR/$PRGNAM
+
+ # why is this hardcoded?
+ sed -i "s,/usr/local/lib/vwm/,/usr/lib$LIBDIRSUFFIX/vwm/," vwm.h
+
+ mkdir -p build
+ cd build
+ cmake \
+ -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DVTERM_LIBRARY=$PKG/usr/lib/libvterm.so \
+ -DVIPER_LIBRARY=$PKG/usr/lib/libviper.so \
+ -DVTERM_INCLUDE_DIR=$PKG/usr/include \
+ -DVIPER_INCLUDE_DIR=$PKG/usr/include \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make VERBOSE=1
+ make install/strip DESTDIR=$PKG
cd -
+# *Now* we can fix the lib=>lib64 mess, if needed.
+[ "$LIBDIRSUFFIX" != "" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
+
# Build and install the keycodes tool to determine codes for remapping
-# keystrokes in '~/.vwm/vwmrc'.
-make -j1 keycode_tool
-install -s -m0755 keycodes/keycodes $PKG/usr/bin/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG LICENSE NOTES samples $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
+# keystrokes in '~/.vwm/vwmrc'. Don't think we need the non-wide version,
+# since the main program uses wide ncurses.
+make -j1 -C keycodes keycodes_wide
+install -s -m0755 keycodes/keycodes_wide $PKG/usr/bin/keycodes
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# upstream's README.md is mostly install instructions.
+mkdir -p $PKGDOC
+cp -a BUGS CHANGELOG LICENSE NEWS* README* TODO samples $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README > $PKGDOC/README$TAG
+
+# include docs for the libraries too.
+cd $BASEDIR
+mkdir -p $PKGDOC/{libviper,libvterm}
+cp -a libviper/{CHANGELOG,LICENSE,README.md,TODO} $PKGDOC/libviper
+cp -a libvterm/{API,CHANGELOG,COPY*,LIC*,*.md} $PKGDOC/libvterm
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/vwm/vwm.info b/desktop/vwm/vwm.info
index 219693e7a2..e844ca171d 100644
--- a/desktop/vwm/vwm.info
+++ b/desktop/vwm/vwm.info
@@ -1,12 +1,10 @@
PRGNAM="vwm"
-VERSION="2.1.3"
-HOMEPAGE="http://vwm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/vwm/vwm-2.1.3.tar.gz \
- https://slackware.uk/~urchlay/src/libvterm-20170804.tar.xz"
-MD5SUM="2a5c1ecba9db9a6f85f3e3b358136179 \
- d2d6344a67eb011ef7d0307bf3b267e3"
+VERSION="3.3.2+20200112_207d888"
+HOMEPAGE="https://github.com/TragicWarrior/vwm"
+DOWNLOAD="https://slackware.uk/~urchlay/src/vwm-3.3.2+20200112_207d888.tar.xz"
+MD5SUM="096673cc32536c0e170d02fb7aef5322"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libpseudo libviper"
+REQUIRES="libconfig"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/desktop/wmSunMoon/wmSunMoon.SlackBuild b/desktop/wmSunMoon/wmSunMoon.SlackBuild
index 1cc3ad4626..c6d7aa55a7 100644
--- a/desktop/wmSunMoon/wmSunMoon.SlackBuild
+++ b/desktop/wmSunMoon/wmSunMoon.SlackBuild
@@ -65,7 +65,7 @@ find -L . \
cd wmSunMoon
mkdir -p $PKG/usr/{bin,man/man1,,man/man7,doc/$PRGNAM-$VERSION}
make \
- COPTS="$SLKCFLAGS" \
+ COPTS="$SLKCFLAGS -fcommon" \
INCDIR="-I/usr/include/X11" \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
cp -a wmSunMoon $PKG/usr/bin
diff --git a/desktop/wmblob/README b/desktop/wmblob/README
index a6313d90ac..fa638a5e2a 100644
--- a/desktop/wmblob/README
+++ b/desktop/wmblob/README
@@ -1,3 +1,5 @@
+wmblob (Fancy Moving Blobs DockApp)
+
I'll be honest with you. The truth is: wmblob is a totally useless
program. But unlike other totally useless programs, it looks good
and shows funny moving `blobs'. I'm sure you'll like it. It's a nice
diff --git a/desktop/wmblob/wmblob.SlackBuild b/desktop/wmblob/wmblob.SlackBuild
index effbeadfbc..cdd3c8589e 100644
--- a/desktop/wmblob/wmblob.SlackBuild
+++ b/desktop/wmblob/wmblob.SlackBuild
@@ -50,9 +50,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -85,11 +82,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
./configure \
--prefix=/usr \
diff --git a/desktop/wmcliphist/wmcliphist.SlackBuild b/desktop/wmcliphist/wmcliphist.SlackBuild
index 1161cf17f8..960d09ed4f 100644
--- a/desktop/wmcliphist/wmcliphist.SlackBuild
+++ b/desktop/wmcliphist/wmcliphist.SlackBuild
@@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -75,11 +72,8 @@ cd $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd dockapps
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Patches are from: https://packages.debian.org/sid/wmcliphist
# Probably not even necessary (they fix compiler warnings), and not
diff --git a/desktop/wmclock/README b/desktop/wmclock/README
index 8fe9495c50..442fe1e23b 100644
--- a/desktop/wmclock/README
+++ b/desktop/wmclock/README
@@ -1,3 +1,5 @@
+wmclock (simple windowmaker clock/calendar dockapp)
+
wmclock is an applet which displays the date and time in a dockable
tile in the same style as the clock from the NEXTSTEP(tm) operating
system. wmclock is specially designed for the Window Maker window
diff --git a/desktop/wmclock/wmclock.SlackBuild b/desktop/wmclock/wmclock.SlackBuild
index 5dd43c25c8..c30a529cc4 100644
--- a/desktop/wmclock/wmclock.SlackBuild
+++ b/desktop/wmclock/wmclock.SlackBuild
@@ -26,9 +26,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -61,11 +58,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Set the default language with LANGUAGE=<language> in the environment
# Default is english. It's still possible to display in other
diff --git a/desktop/wmclock/wmclock.info b/desktop/wmclock/wmclock.info
index e0b347372a..7667ceab13 100644
--- a/desktop/wmclock/wmclock.info
+++ b/desktop/wmclock/wmclock.info
@@ -1,6 +1,6 @@
PRGNAM="wmclock"
VERSION="1.0.14"
-HOMEPAGE="http://web.archive.org/web/20171115102002/http://www.bluestop.org/wmclock/"
+HOMEPAGE="https://web.archive.org/web/20171115102002/http://www.bluestop.org/wmclock/"
DOWNLOAD="https://slackware.uk/~urchlay/src/wmclock-1.0.14.tar.gz"
MD5SUM="15a83f45e2baabec26b22a2153aa2417"
DOWNLOAD_x86_64=""
diff --git a/desktop/wmdl/README b/desktop/wmdl/README
index d7289d0b12..810539e027 100644
--- a/desktop/wmdl/README
+++ b/desktop/wmdl/README
@@ -1,4 +1,4 @@
-Window Maker DOOM load meter
+wmdl (WindowMaker DOOM load meter)
-A simple LOAD or CPU meter using ID Software's DOOM faces.
-( More Bloody = more system load or CPU usage ).
+A simple load or CPU meter using ID Software's DOOM faces.
+More Bloody = more system load or CPU usage.
diff --git a/desktop/wmdl/slack-desc b/desktop/wmdl/slack-desc
index 2d1c50f56d..dc8d3d812e 100644
--- a/desktop/wmdl/slack-desc
+++ b/desktop/wmdl/slack-desc
@@ -6,10 +6,10 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-wmdl: wmdl (Window Maker DOOM load meter)
+wmdl: wmdl (WindowMaker DOOM load meter)
wmdl:
-wmdl: A simple LOAD or CPU meter using ID Software's DOOM faces.
-wmdl: ( More Bloody = more system load or CPU usage ).
+wmdl: A simple load or CPU meter using ID Software's DOOM faces.
+wmdl: More Bloody = more system load or CPU usage.
wmdl:
wmdl:
wmdl:
diff --git a/desktop/wmdl/wmdl.SlackBuild b/desktop/wmdl/wmdl.SlackBuild
index 128863058e..3fafdaf92f 100644
--- a/desktop/wmdl/wmdl.SlackBuild
+++ b/desktop/wmdl/wmdl.SlackBuild
@@ -30,9 +30,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -65,11 +62,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
make CFLAGS="$SLKCFLAGS"
mkdir -p $PKG/usr/bin
diff --git a/desktop/wmmixer/wmmixer.SlackBuild b/desktop/wmmixer/wmmixer.SlackBuild
index ac3679ef4b..7015caeb0d 100644
--- a/desktop/wmmixer/wmmixer.SlackBuild
+++ b/desktop/wmmixer/wmmixer.SlackBuild
@@ -15,7 +15,7 @@ PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -33,8 +33,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,13 +57,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make \
- CXXFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS -std=gnu++14" \
prefix=/usr \
mandir=/usr/man
diff --git a/desktop/wmmon/wmmon.SlackBuild b/desktop/wmmon/wmmon.SlackBuild
index bcfad017a8..68c92363ed 100644
--- a/desktop/wmmon/wmmon.SlackBuild
+++ b/desktop/wmmon/wmmon.SlackBuild
@@ -37,9 +37,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/wmmon/wmmon.info b/desktop/wmmon/wmmon.info
index 16346111d1..939cfb8f3b 100644
--- a/desktop/wmmon/wmmon.info
+++ b/desktop/wmmon/wmmon.info
@@ -1,7 +1,7 @@
PRGNAM="wmmon"
VERSION="1.4"
-HOMEPAGE="http://repo.or.cz/w/dockapps.git"
-DOWNLOAD="http://http.debian.net/debian/pool/main/w/wmmon/wmmon_1.4.orig.tar.gz"
+HOMEPAGE="https://repo.or.cz/w/dockapps.git"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/w/wmmon/wmmon_1.4.orig.tar.gz"
MD5SUM="3d6c918355880e4d313dd7402b5b6b3d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/desktop/wmsupermon/wmsupermon.SlackBuild b/desktop/wmsupermon/wmsupermon.SlackBuild
index d8828adf91..cb36253ae7 100644
--- a/desktop/wmsupermon/wmsupermon.SlackBuild
+++ b/desktop/wmsupermon/wmsupermon.SlackBuild
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/wmsystemtray/wmsystemtray.SlackBuild b/desktop/wmsystemtray/wmsystemtray.SlackBuild
index befa53b603..c19f8e5ed9 100644
--- a/desktop/wmsystemtray/wmsystemtray.SlackBuild
+++ b/desktop/wmsystemtray/wmsystemtray.SlackBuild
@@ -30,9 +30,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -65,11 +62,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/wmsystemtray/wmsystemtray.info b/desktop/wmsystemtray/wmsystemtray.info
index 32c5294c26..6ed941a23c 100644
--- a/desktop/wmsystemtray/wmsystemtray.info
+++ b/desktop/wmsystemtray/wmsystemtray.info
@@ -1,7 +1,7 @@
PRGNAM="wmsystemtray"
VERSION="1.4"
HOMEPAGE="http://wmsystemtray.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"
MD5SUM="5f04edd3989b5030176492943795b6b0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/desktop/wmtime/wmtime.SlackBuild b/desktop/wmtime/wmtime.SlackBuild
index af17e6ed57..d1f01d30c6 100644
--- a/desktop/wmtime/wmtime.SlackBuild
+++ b/desktop/wmtime/wmtime.SlackBuild
@@ -37,9 +37,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/wmtimer/README b/desktop/wmtimer/README
index 634138c5ef..ca9b255e0a 100644
--- a/desktop/wmtimer/README
+++ b/desktop/wmtimer/README
@@ -1,3 +1,5 @@
+wmtimer (Timer DockApp)
+
WMTimer is a dockable alarm clock for WindowMaker which can be run in
alarm, countdown timer, or chronograph mode. In alarm or timer mode,
you can either execute a command or sound the system bell when the time
diff --git a/desktop/wmtimer/wmtimer.1 b/desktop/wmtimer/wmtimer.1
new file mode 100644
index 0000000000..ffb8eb7db4
--- /dev/null
+++ b/desktop/wmtimer/wmtimer.1
@@ -0,0 +1,130 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "WMTIMER" 1 "2021-09-09" "2.92" "SlackBuilds.org"
+.SH NAME
+wmtimer \- alarm clock dockapp for windowmaker
+.\" RST source for wmtimer(1) man page. Convert with:
+.
+.\" rst2man.py wmtimer.rst > wmtimer.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+wmtimer \-[a|c|r] [\-b] [\-color \fI<color>\fP] [\-display \fI<display>\fP] [\-geometry \fI<geom>\fP] \-t \fI<hh:mm:ss>\fP \-e \fI<command>\fP
+.SH DESCRIPTION
+.sp
+\fBwmtimer\fP is a dockable alarm clock for WindowMaker which can be run in
+alarm, countdown timer, or chronograph mode. In alarm or timer mode,
+you can either execute a command or sound the system bell when the time
+is reached.
+.sp
+\fBwmtimer\fP can be configured either at startup time via the command
+line, or by using the GTK interface by clicking on the main part of the
+window (anywhere except the buttons).
+.sp
+To switch to the Chrono function simply click on the right arrow button to
+start the chronograph.
+.sp
+You can pause the chronogaph by clicking on the center, rectangle button
+and resume again by clicking the right arrow button.
+.sp
+You can reset the timer by clicking on the left arrow button.
+.sp
+Without any of the \fB\-a\fP, \fB\-c\fP, or \fB\-r\fP options, \fBwmtimer\fP
+just shows the current time until it\(aqs clicked on.
+.sp
+Time entered via the command line must be in the form of hh:mm:ss. You
+don\(aqt need to have 2 digits for each number but you must have at least
+zeroes as placeholders for hours, minutes and seconds.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-a
+Alarm mode. \fBwmtimer\fP will beep or exec a command at the specified time.
+.TP
+.B \-b
+Beep. This uses the X11 "system bell", which may be disabled
+via \fBxset(1)\fP (in which case you won\(aqt hear anything).
+.TP
+.B \-c
+Countdown timer mode. \fBwmtimer\fP will beep or exec a command when specified time counts down to 0.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-color \fIcolor\fP
+Set text color; as a color name (e.g. \fBgreen\fP), or hex digits: \fIrgb:RR/GG/BB\fP or \fI#RRGGBB\fP\&.
+.TP
+.B \-display \fIdisplay\fP
+X display to connect to (default: \fB:0\fP).
+.TP
+.B \-e \fIcommand\fP
+Exec command. If the command has arguments, it must be quoted. If
+any of the arguments have spaces, quote them again (e.g. use
+double\-quotes around the whole command, and single\-quotes around
+filenames with spaces).
+.TP
+.B \-geometry \fIgeom\fP
+Window size and placement. Not usually needed.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-r
+Start in chronograph (stopwatch) mode.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-t \fI<hh:mm:ss>\fP
+With \fB\-a\fP, sets the alarm time. With \fB\-c\fP, sets the initial time
+to count down from. With \fB\-r\fP, sets the initial time to count \fIup\fP
+from. Without this option, the default time is \fB00:00:00\fP\&.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-h
+Show built\-in help.
+.TP
+.B \-v
+Print the version number and exit.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/wmtimer\-2.92/COPYING for license information.
+.SH AUTHORS
+.sp
+wmtimer was written by Josh King <\fI\%wmtimer@darkops.net\fP>.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+/usr/doc/wmtimer\-2.92/README
+.\" Generated by docutils manpage writer.
+.
diff --git a/desktop/wmtimer/wmtimer.SlackBuild b/desktop/wmtimer/wmtimer.SlackBuild
index aff16ab044..9167bc1c1f 100644
--- a/desktop/wmtimer/wmtimer.SlackBuild
+++ b/desktop/wmtimer/wmtimer.SlackBuild
@@ -27,6 +27,8 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20210909 bkw: BUILD=3, got bored and wrote a man page.
+
# 20160816 bkw:
# - took over maintenance
# - fix literal string == compares (need to be strcmp())
@@ -36,7 +38,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=wmtimer
VERSION=${VERSION:-2.92}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -48,9 +50,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -83,21 +82,19 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
patch -p1 < $CWD/compilefix.diff
-sed -i -e "s,-O2,$SLKCFLAGS -fgnu89-inline," -e "s,-g ,," $PRGNAM/Makefile
+sed -i -e "s,-O2,$SLKCFLAGS -fcommon -fgnu89-inline," -e "s,-g ,," $PRGNAM/Makefile
make -C $PRGNAM
-mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
install -s -m0755 $PRGNAM/$PRGNAM $PKG/usr/bin
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING CREDITS INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog COPYING CREDITS README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/desktop/wmtimer/wmtimer.rst b/desktop/wmtimer/wmtimer.rst
new file mode 100644
index 0000000000..71bbca1cd3
--- /dev/null
+++ b/desktop/wmtimer/wmtimer.rst
@@ -0,0 +1,108 @@
+.. RST source for wmtimer(1) man page. Convert with:
+.. rst2man.py wmtimer.rst > wmtimer.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 2.92
+.. |date| date::
+
+=======
+wmtimer
+=======
+
+-----------------------------------
+alarm clock dockapp for windowmaker
+-----------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+wmtimer -[a|c|r] [-b] [-color *<color>*] [-display *<display>*] [-geometry *<geom>*] -t *<hh:mm:ss>* -e *<command>*
+
+DESCRIPTION
+===========
+
+**wmtimer** is a dockable alarm clock for WindowMaker which can be run in
+alarm, countdown timer, or chronograph mode. In alarm or timer mode,
+you can either execute a command or sound the system bell when the time
+is reached.
+
+**wmtimer** can be configured either at startup time via the command
+line, or by using the GTK interface by clicking on the main part of the
+window (anywhere except the buttons).
+
+To switch to the Chrono function simply click on the right arrow button to
+start the chronograph.
+
+You can pause the chronogaph by clicking on the center, rectangle button
+and resume again by clicking the right arrow button.
+
+You can reset the timer by clicking on the left arrow button.
+
+Without any of the **-a**, **-c**, or **-r** options, **wmtimer**
+just shows the current time until it's clicked on.
+
+Time entered via the command line must be in the form of hh:mm:ss. You
+don't need to have 2 digits for each number but you must have at least
+zeroes as placeholders for hours, minutes and seconds.
+
+OPTIONS
+=======
+
+-a
+ Alarm mode. **wmtimer** will beep or exec a command at the specified time.
+
+-b Beep. This uses the X11 "system bell", which may be disabled
+ via **xset(1)** (in which case you won't hear anything).
+
+-c
+ Countdown timer mode. **wmtimer** will beep or exec a command when specified time counts down to 0.
+
+-color *color*
+ Set text color; as a color name (e.g. **green**), or hex digits: *rgb:RR/GG/BB* or *#RRGGBB*.
+
+-display *display*
+ X display to connect to (default: **:0**).
+
+-e *command*
+ Exec command. If the command has arguments, it must be quoted. If
+ any of the arguments have spaces, quote them again (e.g. use
+ double-quotes around the whole command, and single-quotes around
+ filenames with spaces).
+
+-geometry *geom*
+ Window size and placement. Not usually needed.
+
+-r
+ Start in chronograph (stopwatch) mode.
+
+-t *<hh:mm:ss>*
+ With **-a**, sets the alarm time. With **-c**, sets the initial time
+ to count down from. With **-r**, sets the initial time to count *up*
+ from. Without this option, the default time is **00:00:00**.
+
+-h Show built-in help.
+
+-v Print the version number and exit.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/wmtimer-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+wmtimer was written by Josh King <wmtimer@darkops.net>.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+/usr/doc/wmtimer-|version|/README
diff --git a/desktop/wmudmount/README b/desktop/wmudmount/README
index 826fb79088..743d4e9a66 100644
--- a/desktop/wmudmount/README
+++ b/desktop/wmudmount/README
@@ -5,11 +5,11 @@ filesystems and mounting of the filesystems as a non-root user. It also
includes a mode to display the mounted filesystems with the least free
space percentage (similar to wmfsm).
-This build is for version 2.2, which uses udisks2 and GTK3. If you'd
+This build is for version 3.x, which uses udisks2 and GTK3. If you'd
prefer to build an older version with udisks1 and GTK2, download the
source from here:
-http://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-1.13.tar.gz
+https://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-1.13.tar.gz
Its md5sum is: 988955faca6db4f9c4d26f8b79a38744
diff --git a/desktop/wmudmount/wmudmount.SlackBuild b/desktop/wmudmount/wmudmount.SlackBuild
index 34fe12c7b4..a7a728896a 100644
--- a/desktop/wmudmount/wmudmount.SlackBuild
+++ b/desktop/wmudmount/wmudmount.SlackBuild
@@ -58,9 +58,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild
index 12cbc952cc..eabec1edbe 100644
--- a/desktop/wmweather+/wmweather+.SlackBuild
+++ b/desktop/wmweather+/wmweather+.SlackBuild
@@ -61,9 +61,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/wmwebcam/README b/desktop/wmwebcam/README
index 5cf998f8c2..08fb990998 100644
--- a/desktop/wmwebcam/README
+++ b/desktop/wmwebcam/README
@@ -1,3 +1,5 @@
+wmwebcam (Webcam DockApp)
+
wmwebcam is a dockapp that grabs an image from your webcam every second
and displays the captured image. Original written years ago, it was
updated by eukara to work with the newer V4L2. Credits go to him for
diff --git a/desktop/wmwebcam/wmwebcam.SlackBuild b/desktop/wmwebcam/wmwebcam.SlackBuild
index f3bf98d42b..50331aa313 100644
--- a/desktop/wmwebcam/wmwebcam.SlackBuild
+++ b/desktop/wmwebcam/wmwebcam.SlackBuild
@@ -27,6 +27,11 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20210909 bkw: I still don't have (or want) a webcam. All I can say
+# about wmwebcam is that it compiles, creates a valid package, and
+# when I run it, "Can't open device /dev/video0" (as expected). Do
+# you use this? Please take it!
+
# 20160821 bkw:
# - take over maintenance
# - BUILD=2
@@ -52,9 +57,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -87,11 +89,8 @@ rm -rf $PRGNAM-$VERSION-fixed
tar xvf $CWD/$PRGNAM-$VERSION-fixed.tar.gz
cd $PRGNAM-$VERSION-fixed
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# probably unnecessary, paranoia says memcpy() needs a prototype.
patch -p1 < $CWD/compilefix.diff
diff --git a/desktop/wmxss/README b/desktop/wmxss/README
index 18feeab60c..3119052dea 100644
--- a/desktop/wmxss/README
+++ b/desktop/wmxss/README
@@ -1,3 +1,5 @@
+wmxss (XScreenSaver DockApp)
+
A simple dockapp frontend for XScreenSaver that can also display XSS
screensavers. Execute like so:
diff --git a/desktop/wmxss/wmxss.SlackBuild b/desktop/wmxss/wmxss.SlackBuild
index cafac25de0..a8138ba599 100644
--- a/desktop/wmxss/wmxss.SlackBuild
+++ b/desktop/wmxss/wmxss.SlackBuild
@@ -24,6 +24,7 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20210909 bkw: BUILD=3, -fcommon for -current.
# 20160816 bkw:
# - BUILD=2
# - took over as maintainer
@@ -35,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=wmxss
VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -47,9 +48,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -82,11 +80,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# lazy typist patch: search in /usr/libexec/xscreensaver first.
patch -p1 < $CWD/libexecpath.diff
@@ -94,7 +89,7 @@ patch -p1 < $CWD/libexecpath.diff
# This archive is very dirty:
rm -f Src/$PRGNAM Src/*.o
-make -C Src all CFLAGS="$SLKCFLAGS"
+make -C Src all CFLAGS="$SLKCFLAGS -fcommon"
mkdir -p $PKG/usr/bin
install -s -m 0755 Src/wmxss $PKG/usr/bin/wmxss
diff --git a/desktop/wmxss/wmxss.info b/desktop/wmxss/wmxss.info
index ad616a2720..00f12227c3 100644
--- a/desktop/wmxss/wmxss.info
+++ b/desktop/wmxss/wmxss.info
@@ -1,7 +1,7 @@
PRGNAM="wmxss"
VERSION="0.1"
-HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html"
-DOWNLOAD="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmxss-0.1.tar.gz"
+HOMEPAGE="https://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html"
+DOWNLOAD="https://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmxss-0.1.tar.gz"
MD5SUM="26d4f00c3a3d1b2306ba4924a9fbb0fa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/desktop/x2x/x2x.SlackBuild b/desktop/x2x/x2x.SlackBuild
index a53d912c6e..775973b578 100644
--- a/desktop/x2x/x2x.SlackBuild
+++ b/desktop/x2x/x2x.SlackBuild
@@ -26,9 +26,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info b/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info
index 21b7da479f..f2343973a2 100644
--- a/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info
+++ b/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.
MD5SUM="aaecbb1e91621423ae61b12b4d2a5e79"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="xdg-desktop-portal"
+REQUIRES=""
MAINTAINER="Vincent Batts"
EMAIL="vbatts@hashbangbash.com"
diff --git a/desktop/xdg-desktop-portal/README b/desktop/xdg-desktop-portal/README
deleted file mode 100644
index 5fbdf3de69..0000000000
--- a/desktop/xdg-desktop-portal/README
+++ /dev/null
@@ -1,9 +0,0 @@
-xdg-desktop-portal is a portal frontend service for Flatpak and possibly
-other desktop containment frameworks.
-
-xdg-desktop-portal works by exposing a series of D-Bus interfaces known
-as portals under a well-known name (org.freedesktop.portal.Desktop) and
-object path (/org/freedesktop/portal/desktop).
-
-The portal interfaces include APIs for file access, opening URIs,
-printing, and others.
diff --git a/desktop/xdg-desktop-portal/slack-desc b/desktop/xdg-desktop-portal/slack-desc
deleted file mode 100644
index fb5220efa5..0000000000
--- a/desktop/xdg-desktop-portal/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-xdg-desktop-portal: xdg-desktop-portal (sandboxing for desktop APIs)
-xdg-desktop-portal:
-xdg-desktop-portal: xdg-desktop-portal provides sandbox "portal" APIs.
-xdg-desktop-portal:
-xdg-desktop-portal:
-xdg-desktop-portal:
-xdg-desktop-portal:
-xdg-desktop-portal:
-xdg-desktop-portal:
-xdg-desktop-portal:
-xdg-desktop-portal:
diff --git a/desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild b/desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild
deleted file mode 100644
index c1ca3000ac..0000000000
--- a/desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for xdg-desktop-portal
-
-# Copyright 2018 Vincent Batts <vbatts@hashbangbash.com>
-# 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)
-
-PRGNAM=xdg-desktop-portal
-VERSION=${VERSION:-1.8.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
- exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --disable-geoclue
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- README.md COPYING INSTALL NEWS ABOUT-NLS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/xdg-desktop-portal/xdg-desktop-portal.info b/desktop/xdg-desktop-portal/xdg-desktop-portal.info
deleted file mode 100644
index 95c593ca50..0000000000
--- a/desktop/xdg-desktop-portal/xdg-desktop-portal.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="xdg-desktop-portal"
-VERSION="1.8.0"
-HOMEPAGE="https://github.com/flatpak/xdg-desktop-portal/"
-DOWNLOAD="https://github.com/flatpak/xdg-desktop-portal/releases/download/1.8.0/xdg-desktop-portal-1.8.0.tar.xz"
-MD5SUM="2755b3cd9ff5f41a56ae01808a928d77"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libportal"
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbangbash.com"
diff --git a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
index fe9b955446..9c5b476338 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
+++ b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
@@ -29,9 +29,6 @@ PKGTYPE=${PKGTYPE:-tgz}
# pure python, no compiled code at all
ARCH=noarch
-# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild
index 4f75fa3884..3a26ac2509 100644
--- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild
+++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xfce4-cpugraph-plugin
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -93,12 +93,12 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING ChangeLog INSTALL NEWS README \
+ AUTHORS COPYING ChangeLog NEWS README* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info
index 0654653c68..3be9f15e90 100644
--- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info
+++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="xfce4-cpugraph-plugin"
-VERSION="1.1.0"
+VERSION="1.2.4"
HOMEPAGE="https://goodies.xfce.org/"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.1/xfce4-cpugraph-plugin-1.1.0.tar.bz2"
-MD5SUM="48ead9dcc019212795637c170d9e2ca2"
+DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.4.tar.bz2"
+MD5SUM="6014c4dca8b055972bcc43ddac41cc9b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild
index c586d0b88a..8c521628ec 100644
--- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild
+++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xfce4-sensors-plugin
-VERSION=${VERSION:-1.3.95}
+VERSION=${VERSION:-1.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info
index ae150bffaa..3288b921d1 100644
--- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info
+++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="xfce4-sensors-plugin"
-VERSION="1.3.95"
+VERSION="1.4.1"
HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.95.tar.bz2"
-MD5SUM="1c1d2b547d98660e385f233ecc9a418a"
+DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.1.tar.bz2"
+MD5SUM="4abe5e746f3bfc1848377b90c2e87a15"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/xtrlock/xtrlock.SlackBuild b/desktop/xtrlock/xtrlock.SlackBuild
index 7a6b41fb72..fa3743f332 100644
--- a/desktop/xtrlock/xtrlock.SlackBuild
+++ b/desktop/xtrlock/xtrlock.SlackBuild
@@ -28,9 +28,6 @@ if [ -z "$ARCH" ]; then
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/desktop/zenity/README b/desktop/zenity/README
index 0abb6d90d8..9ecb1efdd8 100644
--- a/desktop/zenity/README
+++ b/desktop/zenity/README
@@ -1,3 +1,10 @@
-Zenity is a tool that allows you to display Gtk+ dialog boxes from
-the command line and through shell scripts. It is similar to
-gdialog, but is intended to be saner.
+Zenity is a tool that allows you to display GTK dialog boxes from
+the command line and through shell scripts. It is designed to be
+similar to the classic `dialog` program, but with a GUI interface.
+
+OPTIONAL DEPENDENCIES:
+
+* webkit2gtk >= 2.8.1
+
+ To enable: pass `WEBKITGTK=true` as an option to the slackbuild.
+ If this is not specified, it will default to `false`.
diff --git a/desktop/zenity/slack-desc b/desktop/zenity/slack-desc
index 750495cf46..c56b7bcf3c 100644
--- a/desktop/zenity/slack-desc
+++ b/desktop/zenity/slack-desc
@@ -9,9 +9,9 @@
zenity: zenity (display gtk dialog boxes from cli)
zenity:
zenity: Zenity is a tool that allows you to display Gtk+ dialog boxes from
-zenity: the command line and through shell scripts. It is similar to
-zenity: gdialog, but is intended to be saner.
-zenity:
+zenity: the command line and through shell scripts. It is designed to be
+zenity: similar to the classic `dialog` program, but with a GUI interface.
+zenity:
zenity: Homepage: http://live.gnome.org/Zenity
zenity:
zenity:
diff --git a/desktop/zenity/zenity.SlackBuild b/desktop/zenity/zenity.SlackBuild
index 1d33c9e8d7..003a8ceb36 100644
--- a/desktop/zenity/zenity.SlackBuild
+++ b/desktop/zenity/zenity.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for Zenity
# Copyright 2015-2018 Erik W. Hanson, Minneapolis, MN, USA
+# Copyright © 2021 Logan Rathbone <poprocks@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,14 +28,14 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zenity
-VERSION=${VERSION:-3.28.0}
+VERSION=${VERSION:-3.41.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -52,8 +53,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,36 +73,49 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-debug=no \
- --enable-libnotify \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# nb: libnotify is enabled by default as it is included in slackware.
+# webkitgtk is an optional dependency (NOT included in slackware) which may be
+# enabled upon request.
+
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ -Dlibnotify=true \
+ -Dwebkitgtk=${WEBKITGTK:-false}
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING HACKING NEWS README THANKS TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ AUTHORS ChangeLog HACKING README TODO \
+ COPYING ChangeLog.pre-git NEWS THANKS \
+ $PKG/usr/doc/$PRGNAM-$VERSION || true
+
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/desktop/zenity/zenity.info b/desktop/zenity/zenity.info
index ece2237030..08086ec597 100644
--- a/desktop/zenity/zenity.info
+++ b/desktop/zenity/zenity.info
@@ -1,10 +1,10 @@
PRGNAM="zenity"
-VERSION="3.28.0"
+VERSION="3.41.0"
HOMEPAGE="http://live.gnome.org/Zenity"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/zenity/3.28/zenity-3.28.0.tar.xz"
-MD5SUM="0916c428ed858242c0864da4dc4c7f02"
+DOWNLOAD="https://download.gnome.org/sources/zenity/3.41/zenity-3.41.0.tar.xz"
+MD5SUM="65d1cad680248b2d3dd3c4dd9379eb52"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"