summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/QCMA/QCMA.SlackBuild4
-rw-r--r--misc/QCMA/qcma-avdecoder.patch.gzbin0 -> 309 bytes
-rw-r--r--misc/ardesia/010-ardesia-gcc10-fix.patch22
-rw-r--r--misc/ardesia/ardesia.SlackBuild2
-rw-r--r--misc/ardesia/ardesia.info2
-rw-r--r--misc/ardesia/doinst.sh2
-rw-r--r--misc/asr-manpages/asr-manpages.info2
-rw-r--r--misc/asterixInspector/doinst.sh6
-rw-r--r--misc/bdfresize/bdfresize.SlackBuild27
-rw-r--r--misc/bdfresize/check_factor_args.diff48
-rw-r--r--misc/clawsker/clawsker.SlackBuild1
-rw-r--r--misc/clawsker/doinst.sh9
-rw-r--r--misc/cp437/cp437.SlackBuild3
-rw-r--r--misc/cwiid/README2
-rw-r--r--misc/cwiid/add_other_plugins_#487498.patch394
-rw-r--r--misc/cwiid/bluetooth-linker.patch48
-rw-r--r--misc/cwiid/cwiid.SlackBuild86
-rw-r--r--misc/cwiid/cwiid.info10
-rw-r--r--misc/cwiid/doinst.sh4
-rw-r--r--misc/cwiid/lswm.154
-rw-r--r--misc/cwiid/python310.patch11
-rw-r--r--misc/cwiid/wmgui.desktop11
-rw-r--r--misc/cwiid/wmgui.xpm552
-rw-r--r--misc/dcc/dcc.SlackBuild2
-rw-r--r--misc/dcc/dcc.info6
-rw-r--r--misc/dcc/slack-desc2
-rw-r--r--misc/deroff/deroff.SlackBuild3
-rw-r--r--misc/fbcat/README14
-rw-r--r--misc/fbcat/fbcat.SlackBuild14
-rw-r--r--misc/fbcat/fbcat.info8
-rw-r--r--misc/fbdump/README16
-rw-r--r--misc/fbdump/fbdump.SlackBuild10
-rw-r--r--misc/fbdump/fbdump.info4
-rw-r--r--misc/font-unscii/font-unscii.SlackBuild3
-rw-r--r--misc/funny-manpages/funny-manpages.SlackBuild48
-rw-r--r--misc/funny-manpages/funny-manpages.info8
-rw-r--r--misc/funny-manpages/funny-manpages_1.3-5.diff244
-rw-r--r--misc/ghostpcl/ghostpcl.SlackBuild2
-rw-r--r--misc/ghostpcl/ghostpcl.info6
-rw-r--r--misc/glogg/glogg.SlackBuild2
-rw-r--r--misc/glogg/glogg.info2
-rw-r--r--misc/gourmet/doinst.sh9
-rw-r--r--misc/gourmet/gourmet.SlackBuild1
-rw-r--r--misc/gramps/doinst.sh2
-rw-r--r--misc/gxmessage/gxmessage.info4
-rw-r--r--misc/gxmessage/slack-desc2
-rw-r--r--misc/hashkill/hashkill.SlackBuild2
-rw-r--r--misc/hashkill/hashkill.info2
-rw-r--r--misc/heyu/heyu.SlackBuild12
-rw-r--r--misc/heyu/heyu.info8
-rw-r--r--misc/ibus-chewing/doinst.sh4
-rw-r--r--misc/ibus-skk/doinst.sh32
-rw-r--r--misc/jmri/doinst.sh4
-rw-r--r--misc/kde_cdemu/kde_cdemu.SlackBuild8
-rw-r--r--misc/kde_cdemu/kde_cdemu.info8
-rw-r--r--misc/kde_cdemu/slack-desc2
-rw-r--r--misc/libydpdict/libydpdict.info4
-rw-r--r--misc/moreutils/moreutils.SlackBuild2
-rw-r--r--misc/mosquitto/mosquitto.SlackBuild2
-rw-r--r--misc/mosquitto/mosquitto.info6
-rw-r--r--misc/ophcrack/README4
-rw-r--r--misc/ophcrack/ophcrack.SlackBuild4
-rw-r--r--misc/ophcrack/ophcrack.info8
-rw-r--r--misc/ophcrack/slack-desc2
-rw-r--r--misc/par/README2
-rw-r--r--misc/par/par.SlackBuild5
-rw-r--r--misc/pinfo/README9
-rw-r--r--misc/pinfo/pinfo.SlackBuild3
-rw-r--r--misc/projectM/doinst.sh6
-rw-r--r--misc/protobuf3/protobuf3.SlackBuild2
-rw-r--r--misc/protobuf3/protobuf3.info6
-rw-r--r--misc/rarcrack/README4
-rw-r--r--misc/rarcrack/rarcrack.SlackBuild3
-rw-r--r--misc/sbo-templates/sbo-templates.SlackBuild1
-rw-r--r--misc/sdcv/patches/01_gettext.patch14
-rw-r--r--misc/sdcv/patches/02_manpage.patch143
-rw-r--r--misc/sdcv/patches/03_c++.patch45
-rw-r--r--misc/sdcv/patches/04_format.patch21
-rw-r--r--misc/sdcv/patches/05_locales.patch80
-rw-r--r--misc/sdcv/patches/06_sk.po.patch134
-rw-r--r--misc/sdcv/patches/07_cs.po.patch145
-rw-r--r--misc/sdcv/patches/08_fr.po.patch158
-rw-r--r--misc/sdcv/patches/09_fix-tests.patch53
-rw-r--r--misc/sdcv/patches/10_use-env-home.patch31
-rw-r--r--misc/sdcv/patches/11_allignment.patch27
-rw-r--r--misc/sdcv/patches/12_fix-formats.patch35
-rw-r--r--misc/sdcv/patches/13_zlib-return-value.patch19
-rw-r--r--misc/sdcv/sdcv.SlackBuild36
-rw-r--r--misc/sdcv/sdcv.info8
-rw-r--r--misc/sdcv/slack-desc2
-rw-r--r--misc/slop/slop.SlackBuild3
-rw-r--r--misc/solunar/solunar.info2
-rw-r--r--misc/ssss/ssss.SlackBuild6
-rw-r--r--misc/txt2regex/txt2regex.SlackBuild3
-rw-r--r--misc/txt2regex/txt2regex.info2
-rw-r--r--misc/utimer/utimer-0.4-fno-common.patch29
-rw-r--r--misc/utimer/utimer-0.4-locale.patch10
-rw-r--r--misc/utimer/utimer.SlackBuild3
-rw-r--r--misc/vdpauinfo/vdpauinfo.SlackBuild2
-rw-r--r--misc/vdpauinfo/vdpauinfo.info10
-rw-r--r--misc/vttest/vttest.SlackBuild3
-rw-r--r--misc/vttest/vttest.info4
-rw-r--r--misc/wcd/wcd.SlackBuild39
-rw-r--r--misc/wcd/wcd.info8
-rw-r--r--misc/weather/doinst.sh11
-rw-r--r--misc/wmbday/wmbday.info4
-rw-r--r--misc/xapian-omega/slack-desc2
-rw-r--r--misc/xapian-omega/xapian-omega.SlackBuild10
-rw-r--r--misc/xapian-omega/xapian-omega.info8
-rw-r--r--misc/xbanish/xbanish.SlackBuild3
-rw-r--r--misc/xwinwrap/xwinwrap.info2
-rw-r--r--misc/yapet/doinst.sh (renamed from misc/sbo-templates/doinst.sh)0
-rw-r--r--misc/yapet/gcc6.patch11
-rw-r--r--misc/yapet/yapet.SlackBuild12
-rw-r--r--misc/yapet/yapet.info10
-rw-r--r--misc/ydpdict/ydpdict.SlackBuild14
-rw-r--r--misc/ydpdict/ydpdict.info8
-rw-r--r--misc/yubioath-desktop/doinst.sh3
-rw-r--r--misc/yubioath-desktop/yubioath-desktop.SlackBuild1
119 files changed, 447 insertions, 2594 deletions
diff --git a/misc/QCMA/QCMA.SlackBuild b/misc/QCMA/QCMA.SlackBuild
index 687b3b4576..cc3c097a3c 100644
--- a/misc/QCMA/QCMA.SlackBuild
+++ b/misc/QCMA/QCMA.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=QCMA
VERSION=${VERSION:-0.4.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -74,6 +74,8 @@ cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
+# thanks arch linux maintainer
+zcat $CWD/qcma-avdecoder.patch.gz | patch -p1
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/misc/QCMA/qcma-avdecoder.patch.gz b/misc/QCMA/qcma-avdecoder.patch.gz
new file mode 100644
index 0000000000..1de3b4c0a9
--- /dev/null
+++ b/misc/QCMA/qcma-avdecoder.patch.gz
Binary files differ
diff --git a/misc/ardesia/010-ardesia-gcc10-fix.patch b/misc/ardesia/010-ardesia-gcc10-fix.patch
new file mode 100644
index 0000000000..c422990195
--- /dev/null
+++ b/misc/ardesia/010-ardesia-gcc10-fix.patch
@@ -0,0 +1,22 @@
+--- a/src/bar.c
++++ b/src/bar.c
+@@ -26,6 +26,8 @@
+ #include <utils.h>
+ #include <bar.h>
+
++GtkBuilder *bar_gtk_builder = NULL;
++
+ /*
+ * Calculate the better position where put the bar.
+ */
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -62,7 +62,7 @@
+
+
+ /* The gtk builder object of the bar window */
+-GtkBuilder *bar_gtk_builder;
++extern GtkBuilder *bar_gtk_builder;
+
+
+ #define PROGRAM_NAME "Ardesia"
diff --git a/misc/ardesia/ardesia.SlackBuild b/misc/ardesia/ardesia.SlackBuild
index 885b3de3d8..d7df0640c1 100644
--- a/misc/ardesia/ardesia.SlackBuild
+++ b/misc/ardesia/ardesia.SlackBuild
@@ -56,6 +56,8 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
+# thanks arch linux maintainers
+patch -p1 < $CWD/010-ardesia-gcc10-fix.patch
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/misc/ardesia/ardesia.info b/misc/ardesia/ardesia.info
index def32515e2..a3d16b1ecb 100644
--- a/misc/ardesia/ardesia.info
+++ b/misc/ardesia/ardesia.info
@@ -1,7 +1,7 @@
PRGNAM="ardesia"
VERSION="1.1"
HOMEPAGE="https://github.com/gfreeau/ardesia"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ardesia-1.1.tar.gz"
+DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ardesia/ardesia-1.1.tar.gz"
MD5SUM="b0abe145ce4ade50ab897ec658d2d664"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/ardesia/doinst.sh b/misc/ardesia/doinst.sh
index 4a25de5e6f..6f79eae735 100644
--- a/misc/ardesia/doinst.sh
+++ b/misc/ardesia/doinst.sh
@@ -4,7 +4,7 @@ fi
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ /usr/bin/gtk-update-icon-cache -f usr/share/ardesia/ui/icons >/dev/null 2>&1
fi
fi
diff --git a/misc/asr-manpages/asr-manpages.info b/misc/asr-manpages/asr-manpages.info
index 4c95d09953..64fa06dcd2 100644
--- a/misc/asr-manpages/asr-manpages.info
+++ b/misc/asr-manpages/asr-manpages.info
@@ -1,7 +1,7 @@
PRGNAM="asr-manpages"
VERSION="1.3.6"
HOMEPAGE="http://packages.debian.org/stable/asr-manpages"
-DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/a/asr-manpages/asr-manpages_1.3.orig.tar.gz"
+DOWNLOAD="https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/asr-manpages/1.3-6/asr-manpages_1.3.orig.tar.gz"
MD5SUM="ee77b619e01a2d841a45469708d90631"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/asterixInspector/doinst.sh b/misc/asterixInspector/doinst.sh
index aea0f894eb..9a8ded3c60 100644
--- a/misc/asterixInspector/doinst.sh
+++ b/misc/asterixInspector/doinst.sh
@@ -5,9 +5,3 @@ fi
if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/misc/bdfresize/bdfresize.SlackBuild b/misc/bdfresize/bdfresize.SlackBuild
index cfeae4d3b5..e2e41c8b5f 100644
--- a/misc/bdfresize/bdfresize.SlackBuild
+++ b/misc/bdfresize/bdfresize.SlackBuild
@@ -6,11 +6,15 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210910 bkw: BUILD=2
+# - fix FONTBOUNDINGBIX typo.
+# - add check_factor_args.diff.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bdfresize
VERSION=${VERSION:-1.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,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
@@ -57,14 +58,22 @@ 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 {} \+
+# 20210910 bkw: this one-liner patch came from Debian
patch -p1 < $CWD/compilefix.diff
+# 20210910 bkw: fix typo in docs
+sed -i 's,FONTBOUNDINGBIX,FONTBOUNDINGBOX,g' README $PRGNAM.1
+
+# 20210910 bkw: if someone tries to use a decimal as a factor,
+# e.g. 1.5, bdfresize silently ignores the .5 and treats the argument
+# as just 1. This patch adds a check to make sure the factors consist
+# only of digits and 0 or 1 slashes. Patch is by the SlackBuild
+# author, who keeps trying to say "-f 1.5" despite all sanity...
+patch -p1 < $CWD/check_factor_args.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/misc/bdfresize/check_factor_args.diff b/misc/bdfresize/check_factor_args.diff
new file mode 100644
index 0000000000..5b9ad32e2c
--- /dev/null
+++ b/misc/bdfresize/check_factor_args.diff
@@ -0,0 +1,48 @@
+diff -Naur bdfresize-1.5/bdfresize.c bdfresize-1.5.patched/bdfresize.c
+--- bdfresize-1.5/bdfresize.c 2001-01-16 07:11:11.000000000 -0500
++++ bdfresize-1.5.patched/bdfresize.c 2021-09-10 14:39:09.553534254 -0400
+@@ -48,6 +48,22 @@
+
+ static int line;
+
++static int factor_is_bad(const char *p) {
++ int slashes = 0;
++ while(*p) {
++ if(*p == '/') {
++ if(++slashes > 1)
++ return 1;
++ } else if(*p >= '0' && *p <= '9') {
++ /* NOP */
++ } else {
++ return 1;
++ }
++ p++;
++ }
++ return 0;
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -64,18 +80,21 @@
+ if (blackness <= 0) err ++;
+ break;
+ case 'w':
++ err += factor_is_bad(optarg);
+ numerator_x = atoi(optarg);
+ denominator_x = strchr(optarg,'/')
+ ? atoi(strchr(optarg,'/')+1) : 1;
+ if (numerator_x <= 0 || denominator_x <= 0) err ++;
+ break;
+ case 'h':
++ err += factor_is_bad(optarg);
+ numerator_y = atoi(optarg);
+ denominator_y = strchr(optarg,'/')
+ ? atoi(strchr(optarg,'/')+1) : 1;
+ if (numerator_y <= 0 || denominator_y <= 0) err ++;
+ break;
+ case 'f':
++ err += factor_is_bad(optarg);
+ numerator_x = numerator_y = atoi(optarg);
+ denominator_x = denominator_y = strchr(optarg,'/')
+ ? atoi(strchr(optarg,'/')+1) : 1;
diff --git a/misc/clawsker/clawsker.SlackBuild b/misc/clawsker/clawsker.SlackBuild
index a4ebf55cea..3b9b98491f 100644
--- a/misc/clawsker/clawsker.SlackBuild
+++ b/misc/clawsker/clawsker.SlackBuild
@@ -68,6 +68,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/clawsker/doinst.sh b/misc/clawsker/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/misc/clawsker/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/misc/cp437/cp437.SlackBuild b/misc/cp437/cp437.SlackBuild
index 7ca5a150fb..854ed2b520 100644
--- a/misc/cp437/cp437.SlackBuild
+++ b/misc/cp437/cp437.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/misc/cwiid/README b/misc/cwiid/README
index 1731334a02..84ea5d363c 100644
--- a/misc/cwiid/README
+++ b/misc/cwiid/README
@@ -1,3 +1,5 @@
+cwiid (tools for the Nintendo Wii remote)
+
CWiid is a collection of Linux tools written in C for interfacing to the
Nintendo Wiimote, including an event-based API, an event/mouse/joystick
driver, and GUI/control panel.
diff --git a/misc/cwiid/add_other_plugins_#487498.patch b/misc/cwiid/add_other_plugins_#487498.patch
deleted file mode 100644
index c9d28963a1..0000000000
--- a/misc/cwiid/add_other_plugins_#487498.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-Index: cwiid-0.6.00+svn184.orig/wminput/plugins/Makefile.in
-===================================================================
---- cwiid-0.6.00+svn184.orig.orig/wminput/plugins/Makefile.in 2008-06-24 21:43:05.000000000 +0200
-+++ cwiid-0.6.00+svn184.orig/wminput/plugins/Makefile.in 2009-03-27 13:15:50.000000000 +0100
-@@ -2,7 +2,7 @@
-
- include @top_builddir@/defs.mak
-
--PLUGINS = ir_ptr acc nunchuk_acc led nunchuk_stick2btn
-+PLUGINS = ir_ptr ir_fps acc nunchuk_acc led nunchuk_stick2btn nunchuk_kb
-
- all install clean distclean uninstall: TARGET += $(MAKECMDGOALS)
-
-Index: cwiid-0.6.00+svn184.orig/wminput/plugins/ir_fps/Makefile.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cwiid-0.6.00+svn184.orig/wminput/plugins/ir_fps/Makefile.in 2009-03-27 13:15:50.000000000 +0100
-@@ -0,0 +1,15 @@
-+#Copyright (C) 2007 L. Donnie Smith
-+
-+include @top_builddir@/defs.mak
-+
-+PLUGIN_NAME = ir_fps
-+SOURCES = ir_fps.c
-+CFLAGS += -I@top_builddir@/wminput -I@top_builddir@/libcwiid
-+INST_DIR = $(CWIID_PLUGINS_DIR)
-+
-+include $(COMMON)/include/plugin.mak
-+
-+distclean: clean
-+ rm Makefile
-+
-+.PHONY: distclean
-Index: cwiid-0.6.00+svn184.orig/wminput/plugins/ir_fps/ir_fps.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cwiid-0.6.00+svn184.orig/wminput/plugins/ir_fps/ir_fps.c 2009-03-27 13:15:50.000000000 +0100
-@@ -0,0 +1,162 @@
-+/* Copyright (C) 2007 L. Donnie Smith <cwiidabstrakraft.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "wmplugin.h"
-+
-+#define DEBOUNCE_THRESHOLD 50
-+
-+//deadzone is a circle of diameter a 10th of the screen
-+#define DEADZONE (CWIID_IR_X_MAX*CWIID_IR_X_MAX+CWIID_IR_Y_MAX*CWIID_IR_Y_MAX)/100
-+
-+//speed is here
-+#define XSPEED 10/(CWIID_IR_X_MAX/2)
-+#define YSPEED 10/(CWIID_IR_Y_MAX/2)
-+
-+cwiid_wiimote_t *wiimote;
-+
-+static struct wmplugin_info info;
-+static struct wmplugin_data data;
-+
-+wmplugin_info_t wmplugin_info;
-+wmplugin_init_t wmplugin_init;
-+wmplugin_exec_t wmplugin_exec;
-+
-+struct wmplugin_info *wmplugin_info() {
-+ static unsigned char info_init = 0;
-+
-+ if (!info_init) {
-+ info.button_count = 0;
-+ info.axis_count = 2;
-+ info.axis_info[0].name = "X";
-+ info.axis_info[0].type = WMPLUGIN_REL;
-+ info.axis_info[0].max = CWIID_IR_X_MAX;
-+ info.axis_info[0].min = 0;
-+ info.axis_info[0].fuzz = 0;
-+ info.axis_info[0].flat = 0;
-+ info.axis_info[1].name = "Y";
-+ info.axis_info[1].type = WMPLUGIN_REL;
-+ info.axis_info[1].max = CWIID_IR_Y_MAX;
-+ info.axis_info[1].min = 0;
-+ info.axis_info[1].fuzz = 0;
-+ info.axis_info[1].flat = 0;
-+ info.param_count = 0;
-+ info_init = 1;
-+ }
-+ return &info;
-+}
-+
-+int wmplugin_init(int id, cwiid_wiimote_t *arg_wiimote)
-+{
-+ wiimote = arg_wiimote;
-+
-+ data.buttons = 0;
-+
-+ if (wmplugin_set_rpt_mode(id, CWIID_RPT_IR)) {
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
-+struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
-+{
-+ static int src_index = -1;
-+ static int debounce = 0;
-+ static uint8_t old_flag;
-+
-+ int i;
-+ uint8_t flag;
-+ struct cwiid_ir_mesg *ir_mesg;
-+ int dx, dy;
-+
-+ ir_mesg = NULL;
-+ for (i=0; i < mesg_count; i++) {
-+ if (mesg[i].type == CWIID_MESG_IR) {
-+ ir_mesg = &mesg[i].ir_mesg;
-+ }
-+ }
-+
-+ if (!ir_mesg) {
-+ return NULL;
-+ }
-+
-+ /* invalidate src index if source is no longer present */
-+ if ((src_index != -1) && !ir_mesg->src[src_index].valid) {
-+ if (debounce > DEBOUNCE_THRESHOLD) {
-+ src_index = -1;
-+ }
-+ else {
-+ debounce++;
-+ }
-+ }
-+ else {
-+ debounce = 0;
-+ }
-+
-+ /* of not set, pick largest available source */
-+ if (src_index == -1) {
-+ for (i=0; i < CWIID_IR_SRC_COUNT; i++) {
-+ if (ir_mesg->src[i].valid) {
-+ if ((src_index == -1) ||
-+ (ir_mesg->src[i].size > ir_mesg->src[src_index].size)) {
-+ src_index = i;
-+ }
-+ }
-+ }
-+ }
-+
-+ /* LEDs */
-+ switch (src_index) {
-+ case 0:
-+ flag = CWIID_LED1_ON;
-+ break;
-+ case 1:
-+ flag = CWIID_LED2_ON;
-+ break;
-+ case 2:
-+ flag = CWIID_LED3_ON;
-+ break;
-+ case 3:
-+ flag = CWIID_LED4_ON;
-+ break;
-+ default:
-+ flag = 0;
-+ break;
-+ }
-+ if (flag != old_flag) {
-+ cwiid_set_led(wiimote, flag);
-+ old_flag = flag;
-+ }
-+
-+ if ((src_index == -1) || !ir_mesg->src[src_index].valid) {
-+ data.axes[0].valid = data.axes[1].valid = 0;
-+ }
-+ else {
-+ data.axes[0].valid = data.axes[1].valid = 1;
-+ dx = CWIID_IR_X_MAX/2 - ir_mesg->src[src_index].pos[CWIID_X];
-+ dy = ir_mesg->src[src_index].pos[CWIID_Y] - CWIID_IR_Y_MAX/2;
-+ if (dx*dx+dy*dy > DEADZONE){
-+ data.axes[0].value = dx*XSPEED;
-+ data.axes[1].value = dy*YSPEED;
-+ }else {
-+ data.axes[0].value = 0;
-+ data.axes[1].value = 0;
-+ }
-+ }
-+ return &data;
-+}
-Index: cwiid-0.6.00+svn184.orig/wminput/plugins/nunchuk_kb/Makefile.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cwiid-0.6.00+svn184.orig/wminput/plugins/nunchuk_kb/Makefile.in 2009-03-27 13:15:50.000000000 +0100
-@@ -0,0 +1,16 @@
-+#Copyright (C) 2007 L. Donnie Smith
-+
-+include @top_builddir@/defs.mak
-+
-+PLUGIN_NAME = nunchuk_kb
-+SOURCES = nunchuk_kb.c
-+CFLAGS += -I@top_builddir@/wminput -I@top_builddir@/libcwiid
-+LDLIBS += -lm
-+INST_DIR = $(CWIID_PLUGINS_DIR)
-+
-+include $(COMMON)/include/plugin.mak
-+
-+distclean: clean
-+ rm Makefile
-+
-+.PHONY: distclean
-Index: cwiid-0.6.00+svn184.orig/wminput/plugins/nunchuk_kb/nunchuk_kb.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cwiid-0.6.00+svn184.orig/wminput/plugins/nunchuk_kb/nunchuk_kb.c 2009-03-27 13:15:50.000000000 +0100
-@@ -0,0 +1,116 @@
-+/* Copyright (C) 2007 L. Donnie Smith <cwiid@abstrakraft.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <math.h>
-+
-+#include "wmplugin.h"
-+
-+/* Button flags */
-+#define STICK_KEY_UP 0x0001
-+#define STICK_KEY_DOWN 0x0002
-+#define STICK_KEY_RIGHT 0x0004
-+#define STICK_KEY_LEFT 0x0008
-+#define STICK_MID_VAL 128
-+#define STICK_NEUTRAL 20
-+
-+static unsigned char info_init = 0;
-+static struct wmplugin_info info;
-+static struct wmplugin_data data;
-+
-+static cwiid_wiimote_t *wiimote;
-+
-+static struct acc_cal acc_cal;
-+static int plugin_id;
-+
-+wmplugin_info_t wmplugin_info;
-+wmplugin_init_t wmplugin_init;
-+wmplugin_exec_t wmplugin_exec;
-+static void process_nunchuk(struct cwiid_nunchuk_mesg *mesg);
-+
-+static float Roll_Scale = 1.0;
-+static float Pitch_Scale = 1.0;
-+static float X_Scale = 1.0;
-+static float Y_Scale = 1.0;
-+
-+struct wmplugin_info *wmplugin_info() {
-+ if (!info_init) {
-+ info.button_count = 4;
-+ info.button_info[0].name = "Up";
-+ info.button_info[1].name = "Down";
-+ info.button_info[2].name = "Right";
-+ info.button_info[3].name = "Left";
-+ info.axis_count = 0;
-+ info_init = 1;
-+ }
-+ return &info;
-+}
-+
-+int wmplugin_init(int id, cwiid_wiimote_t *arg_wiimote)
-+{
-+ plugin_id = id;
-+ wiimote = arg_wiimote;
-+ data.buttons = 0;
-+ data.axes[0].valid = 1;
-+ data.axes[1].valid = 1;
-+ if (wmplugin_set_rpt_mode(id, CWIID_RPT_STATUS | CWIID_RPT_NUNCHUK)) {
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
-+struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
-+{
-+ int i;
-+ enum cwiid_ext_type ext_type = CWIID_EXT_NONE;
-+ struct wmplugin_data *ret = NULL;
-+
-+ for (i=0; i < mesg_count; i++) {
-+ switch (mesg[i].type) {
-+ case CWIID_MESG_STATUS:
-+ if ((mesg[i].status_mesg.ext_type == CWIID_EXT_NUNCHUK) &&
-+ (ext_type != CWIID_EXT_NUNCHUK)) {
-+ if (cwiid_get_acc_cal(wiimote, CWIID_EXT_NUNCHUK, &acc_cal)) {
-+ wmplugin_err(plugin_id, "calibration error");
-+ }
-+ }
-+ ext_type = mesg[i].status_mesg.ext_type;
-+ break;
-+ case CWIID_MESG_NUNCHUK:
-+ process_nunchuk(&mesg[i].nunchuk_mesg);
-+ ret = &data;
-+ break;
-+ default:
-+ break;
-+ }
-+ }
-+
-+ return ret;
-+}
-+
-+static void process_nunchuk(struct cwiid_nunchuk_mesg *mesg)
-+{
-+ double stx=(double)mesg->stick[CWIID_X];
-+ double sty=(double)mesg->stick[CWIID_Y];
-+ data.buttons=0;
-+ if (sty > STICK_MID_VAL+STICK_NEUTRAL) data.buttons |= STICK_KEY_UP;
-+ if (sty < STICK_MID_VAL-STICK_NEUTRAL) data.buttons |= STICK_KEY_DOWN;
-+ if (stx > STICK_MID_VAL+STICK_NEUTRAL) data.buttons |= STICK_KEY_RIGHT;
-+ if (stx < STICK_MID_VAL-STICK_NEUTRAL) data.buttons |= STICK_KEY_LEFT;
-+}
-+
-Index: cwiid-0.6.00+svn184.orig/wminput/configs/fps_config
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cwiid-0.6.00+svn184.orig/wminput/configs/fps_config 2009-03-27 13:15:50.000000000 +0100
-@@ -0,0 +1,32 @@
-+# Fps config for wminput by kyrlian
-+# needs plugins ir_fps and nunchuk_kb
-+# available from http://kyrlian.free.fr/binaries/cwiid/latest/
-+# wminput source and info at http://abstrakraft.org/cwiid/
-+
-+# IR for mouse REL - fps style
-+Plugin.ir_fps.X = REL_X
-+Plugin.ir_fps.Y = REL_Y
-+
-+#custom buttons
-+Wiimote.A = BTN_LEFT
-+Wiimote.B = BTN_RIGHT
-+Wiimote.Up = KEY_UP
-+Wiimote.Down = KEY_DOWN
-+Wiimote.Left = KEY_LEFT
-+Wiimote.Right = KEY_RIGHT
-+Wiimote.Minus = KEY_PAGEDOWN
-+Wiimote.Plus = KEY_PAGEUP
-+Wiimote.Home = KEY_ESC
-+
-+Wiimote.1 = KEY_TAB
-+Wiimote.2 = KEY_ESC
-+
-+Nunchuk.C = KEY_C
-+Nunchuk.Z = KEY_SPACE
-+
-+#plugin for nunchuk stick
-+Plugin.nunchuk_kb.Up = KEY_W
-+Plugin.nunchuk_kb.Down = KEY_S
-+Plugin.nunchuk_kb.Left = KEY_A
-+Plugin.nunchuk_kb.Right = KEY_D
-+
-Index: cwiid-0.6.00+svn184.orig/configure.ac
-===================================================================
---- cwiid-0.6.00+svn184.orig.orig/configure.ac 2008-06-24 21:43:05.000000000 +0200
-+++ cwiid-0.6.00+svn184.orig/configure.ac 2009-03-27 13:15:50.000000000 +0100
-@@ -142,8 +142,10 @@
- [wminput/Makefile]
- [wminput/plugins/Makefile]
- [wminput/plugins/ir_ptr/Makefile]
-+ [wminput/plugins/ir_fps/Makefile]
- [wminput/plugins/acc/Makefile]
- [wminput/plugins/nunchuk_acc/Makefile]
-+ [wminput/plugins/nunchuk_kb/Makefile]
- [wminput/plugins/led/Makefile]
- [wminput/plugins/nunchuk_stick2btn/Makefile]
- [lswm/Makefile]
diff --git a/misc/cwiid/bluetooth-linker.patch b/misc/cwiid/bluetooth-linker.patch
deleted file mode 100644
index dc22b918d5..0000000000
--- a/misc/cwiid/bluetooth-linker.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur cwiid-0.6.00.orig/lswm/Makefile.in cwiid-0.6.00/lswm/Makefile.in
---- cwiid-0.6.00.orig/lswm/Makefile.in 2007-07-28 18:47:03.000000000 +0000
-+++ cwiid-0.6.00/lswm/Makefile.in 2012-09-19 01:36:44.624050597 +0000
-@@ -8,7 +8,7 @@
-
- CFLAGS += -I@top_builddir@/libcwiid
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += -lcwiid
-+LDLIBS += -lcwiid -lbluetooth
- INST_DIR = @bindir@
-
- include $(COMMON)/include/app.mak
-diff -Naur cwiid-0.6.00.orig/wmdemo/Makefile.in cwiid-0.6.00/wmdemo/Makefile.in
---- cwiid-0.6.00.orig/wmdemo/Makefile.in 2007-04-11 02:57:27.000000000 +0000
-+++ cwiid-0.6.00/wmdemo/Makefile.in 2012-09-19 01:37:25.008051673 +0000
-@@ -8,7 +8,7 @@
-
- CFLAGS += -I@top_builddir@/libcwiid
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += -lcwiid
-+LDLIBS += -lcwiid -lbluetooth
- INST_DIR = @bindir@
-
- include $(COMMON)/include/app.mak
-diff -Naur cwiid-0.6.00.orig/wmgui/Makefile.in cwiid-0.6.00/wmgui/Makefile.in
---- cwiid-0.6.00.orig/wmgui/Makefile.in 2007-07-28 18:47:03.000000000 +0000
-+++ cwiid-0.6.00/wmgui/Makefile.in 2012-09-19 01:31:32.977042284 +0000
-@@ -8,7 +8,7 @@
-
- CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += @GTK_LIBS@ -lm -lcwiid
-+LDLIBS += @GTK_LIBS@ -lm -lcwiid -lbluetooth
- INST_DIR = @bindir@
-
- include $(COMMON)/include/app.mak
-diff -Naur cwiid-0.6.00.orig/wminput/Makefile.in cwiid-0.6.00/wminput/Makefile.in
---- cwiid-0.6.00.orig/wminput/Makefile.in 2007-07-28 18:47:03.000000000 +0000
-+++ cwiid-0.6.00/wminput/Makefile.in 2012-09-19 01:38:42.031053733 +0000
-@@ -14,7 +14,7 @@
- -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \
- -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\"
-
--LDLIBS += -lcwiid -ldl
-+LDLIBS += -lcwiid -ldl -lbluetooth -lpthread
- LDFLAGS += -L@top_builddir@/libcwiid -rdynamic
- INST_DIR = @bindir@
-
diff --git a/misc/cwiid/cwiid.SlackBuild b/misc/cwiid/cwiid.SlackBuild
index f419b3ae14..7d19cef3ae 100644
--- a/misc/cwiid/cwiid.SlackBuild
+++ b/misc/cwiid/cwiid.SlackBuild
@@ -6,6 +6,12 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210910 bkw:
+# - Upgrade to 0.6.91_2 (Debian's 0.6.91-2).
+# - Actually apply SLKCFLAGS.
+# - Use icon, .desktop, lswm.1 from Debian tarball instead of
+# including in SBo git.
+
# 20170306 bkw:
# - Add --disable-ldconfig
@@ -18,11 +24,14 @@
# - Fixed permissions of config files and header
# - Added ir_fps and nunchuk_kb plugins
+# https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91-2.debian.tar.xz
+# https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91.orig.tar.xz
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=cwiid
-VERSION=${VERSION:-0.6.00+svn201}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.6.91_2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -34,9 +43,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
@@ -62,64 +68,72 @@ fi
set -e
+TARVER=${VERSION/_*}
+DEBVER=${VERSION/*_}
+
+LIBDIR=/usr/lib$LIBDIRSUFFIX
+PKGLIB=$PKG/$LIBDIR
+
rm -rf $PKG
mkdir -p $TMP $PKG/usr $PKG/etc $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_$TARVER.orig.tar.xz
+cd $PRGNAM
+tar xvf $CWD/${PRGNAM}_$TARVER-$DEBVER.debian.tar.xz
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 {} \+
-# Underlinking fix (add -lbluetooth)
-patch -p1 < $CWD/bluetooth-linker.patch
+# this patch is debian-specific (calls dpkg):
+rm -f debian/patches/python-setup.py.patch
-# Add ir_fps and nunchuk_kb plugins (patch comes from Debian)
-patch -p1 < $CWD/"add_other_plugins_#487498.patch"
+for i in $( cat debian/patches/series ); do
+ [ -e $i ] && patch -p1 < debian/patches/$i
+done
+
+patch -p1 < $CWD/python310.patch
autoreconf -if
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
./configure \
- --disable-ldconfig \
--prefix=/usr \
- --libdir=/usr/lib$LIBDIRSUFFIX \
+ --libdir=$LIBDIR \
--sysconfdir=/etc \
--localstatedir=/var \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--mandir=/usr/man \
--build=$ARCH-slackware-linux
-make
+# configure script ignores CFLAGS in the env. Can't use CFLAGS
+# nor DEBUGFLAGS with make... sneak them in this way.
+make WARNFLAGS="-Wall $SLKCFLAGS"
make install DESTDIR=$PKG
-# Config and include files get installed +x, fix
-find $PKG/etc/cwiid/wminput/ -maxdepth 1 -a -type f | xargs chmod 644
-chmod 644 $PKG/usr/include/*.h
+# no install-strip...
+strip $PKG/usr/bin/* \
+ $PKGLIB/*.so.?.? \
+ $PKGLIB/$PRGNAM/plugins/*.so \
+ $PKGLIB/python*/site-packages/*.so
-# Remove static library, configure doesn't accept --disable-static
-rm -f $PKG/usr/lib$LIBDIRSUFFIX/libcwiid.a
+# Header gets installed +x, fix
+chmod 644 $PKG/etc/cwiid/wminput/*
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# Remove static library, configure doesn't accept --disable-static
+rm -f $PKGLIB/libcwiid.a
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man1/*
-# lswm man page borrowed from Debian
-gzip -9c $CWD/lswm.1 > $PKG/usr/man/man1/lswm.1.gz
+# Use Debian's extra man page, desktop file, icons.
+gzip -9c debian/lswm.1 > $PKG/usr/man/man1/lswm.1.gz
-# icon borrowed from Debian
mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/wmgui.xpm > $PKG/usr/share/pixmaps/wmgui.xpm
+cp -a debian/icons/*.xpm $PKG/usr/share/pixmaps
-# .desktop borrowed from Debian and fixed so it validates
mkdir -p $PKG/usr/share/applications
-cat $CWD/wmgui.desktop > $PKG/usr/share/applications/wmgui.desktop
+sed -e '/^Icon/s,=.*,=/usr/share/pixmaps/wmgui.xpm,' \
+ -e '/^Categories/s,$,;Settings;,' \
+ debian/menus/wmgui.desktop > $PKG/usr/share/applications/wmgui.desktop
# init script written for this build
mkdir -p $PKG/etc/rc.d/
diff --git a/misc/cwiid/cwiid.info b/misc/cwiid/cwiid.info
index f2e8fb6625..49aa09c93b 100644
--- a/misc/cwiid/cwiid.info
+++ b/misc/cwiid/cwiid.info
@@ -1,8 +1,10 @@
PRGNAM="cwiid"
-VERSION="0.6.00+svn201"
-HOMEPAGE="http://abstrakraft.org/cwiid/"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.00+svn201.orig.tar.gz"
-MD5SUM="a57605bba039dd2d4460574574f950e7"
+VERSION="0.6.91_2"
+HOMEPAGE="https://packages.debian.org/sid/libcwiid1"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91.orig.tar.xz \
+ https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91-2.debian.tar.xz"
+MD5SUM="3af0651c9d81693d39bb69675885c3d7 \
+ 0a3361ed2a29e4b68d6798e2347725de"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/cwiid/doinst.sh b/misc/cwiid/doinst.sh
index 4a2e19e598..e52d1fc170 100644
--- a/misc/cwiid/doinst.sh
+++ b/misc/cwiid/doinst.sh
@@ -1,15 +1,11 @@
-
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
rm $NEW
fi
- # Otherwise, we leave the .new copy for the admin to consider...
}
preserve_perms() {
diff --git a/misc/cwiid/lswm.1 b/misc/cwiid/lswm.1
deleted file mode 100644
index e51ca794b2..0000000000
--- a/misc/cwiid/lswm.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LSWM 1 "janvier 18, 2007"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-lswm \- discover new wiimotes
-.SH SYNOPSIS
-.B lswm
-.RI [ options ]
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B lswm
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-.SH OPTIONS
-.TP
-.B \-h
-Show summary of options.
-.TP
-.B \-a
-List all bluetooth devices (not just wiimotes)
-.TP
-.B \-l
-Long format (device details)
-.TP
-.B \-q
-Quiet mode
-
-.SH SEE ALSO
-.BR wminput (1),
-.BR wmgui (1),
-.br
-.SH AUTHOR
-wmgui was written by L. Donnie Smith <cwiid@abstrakraft.org>
-.PP
-This manual page was written by Romain Beauxis <toots@rastageeks.org>,
-for the Debian project (but may be used by others).
diff --git a/misc/cwiid/python310.patch b/misc/cwiid/python310.patch
new file mode 100644
index 0000000000..5a835aef7e
--- /dev/null
+++ b/misc/cwiid/python310.patch
@@ -0,0 +1,11 @@
+--- cwiid/configure.ac.orig 2021-10-25 12:06:48.965614546 +0700
++++ cwiid/configure.ac 2021-10-25 12:07:01.190613822 +0700
+@@ -67,7 +67,7 @@
+ fi
+ AC_SUBST(PYTHON)
+ if test $PYTHON; then
+- PYTHON_VERSION=[`$PYTHON -c 'import sys; print (sys.version[:3])'`]
++ PYTHON_VERSION=[`$PYTHON -c 'import sys; print (sys.version[:4])'`]
+ AC_SUBST(PYTHON_VERSION)
+ AC_DEFINE([HAVE_PYTHON],1,[Define to 1 if python support is enabled])
+ fi
diff --git a/misc/cwiid/wmgui.desktop b/misc/cwiid/wmgui.desktop
deleted file mode 100644
index 39030cb597..0000000000
--- a/misc/cwiid/wmgui.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Wmgui
-GenericName=Graphical user interface to the wiimote
-GenericName[fr]=Interface graphique pour la wiimote
-Comment=Simple GTK gui to the wiimote to test and display the wiimote data.
-Comment[fr]=Simple interface graphique pour la wiimote pour tester et afficher les informations de la wiimote.
-Exec=wmgui
-Icon=wmgui
-Terminal=false
-Type=Application
-Categories=Utility;HardwareSettings;Settings;
diff --git a/misc/cwiid/wmgui.xpm b/misc/cwiid/wmgui.xpm
deleted file mode 100644
index 6f66669f67..0000000000
--- a/misc/cwiid/wmgui.xpm
+++ /dev/null
@@ -1,552 +0,0 @@
-/* XPM */
-static char * wmgui_xpm[] = {
-"39 45 504 2",
-" c None",
-". c #010C2D",
-"+ c #000B2B",
-"@ c #000C2B",
-"# c #000B2A",
-"$ c #000C2A",
-"% c #000B29",
-"& c #000A29",
-"* c #000C30",
-"= c #000B2E",
-"- c #000A2D",
-"; c #000A2B",
-"> c #000A2A",
-", c #000B2D",
-"' c #000D2F",
-") c #000F35",
-"! c #000D33",
-"~ c #000C31",
-"{ c #000B30",
-"] c #000C2E",
-"^ c #000C2D",
-"/ c #000B2C",
-"( c #000D32",
-"_ c #010F35",
-": c #00153C",
-"< c #001139",
-"[ c #001037",
-"} c #000E35",
-"| c #000E34",
-"1 c #000D31",
-"2 c #000C2C",
-"3 c #000C2F",
-"4 c #000D34",
-"5 c #001138",
-"6 c #001840",
-"7 c #00153E",
-"8 c #00133C",
-"9 c #00123A",
-"0 c #001038",
-"a c #000F37",
-"b c #030F31",
-"c c #71737A",
-"d c #B0B0B1",
-"e c #B8B8B8",
-"f c #BCBCBC",
-"g c #BDBDBD",
-"h c #BEBEBE",
-"i c #BFBFBF",
-"j c #A4A5A7",
-"k c #2A3145",
-"l c #000F36",
-"m c #00143C",
-"n c #001C45",
-"o c #001943",
-"p c #001741",
-"q c #00163F",
-"r c #00143D",
-"s c #00123C",
-"t c #646872",
-"u c #E5E5E6",
-"v c #E5DDDF",
-"w c #DBD8D9",
-"x c #F5F5F5",
-"y c #F6F6F6",
-"z c #F8F8F8",
-"A c #F9F9F9",
-"B c #FAFAFA",
-"C c #DCDCDC",
-"D c #081432",
-"E c #00123B",
-"F c #001841",
-"G c #01214B",
-"H c #001D48",
-"I c #001B46",
-"J c #001A44",
-"K c #001842",
-"L c #001742",
-"M c #001640",
-"N c #A1A1A1",
-"O c #E8E8E8",
-"P c #DBD4D5",
-"Q c #DCD7D8",
-"R c #F7F7F7",
-"S c #F4F4F4",
-"T c #293449",
-"U c #001C46",
-"V c #00214C",
-"W c #00204B",
-"X c #001F49",
-"Y c #001E48",
-"Z c #001D47",
-"` c #001C47",
-" . c #9D9D9D",
-".. c #EFEFEF",
-"+. c #EBEBEB",
-"@. c #EDEDED",
-"#. c #D7D7D7",
-"$. c #D1D1D1",
-"%. c #2A374D",
-"&. c #001A46",
-"*. c #001B45",
-"=. c #001E49",
-"-. c #00244E",
-";. c #00234E",
-">. c #00224D",
-",. c #00214D",
-"'. c #00214E",
-"). c #00204D",
-"!. c #F2F2F2",
-"~. c #F1F1F1",
-"{. c #B9B9B9",
-"]. c #2A3A50",
-"^. c #00204C",
-"/. c #01254F",
-"(. c #00244F",
-"_. c #002550",
-":. c #002551",
-"<. c #002652",
-"[. c #002653",
-"}. c #002753",
-"|. c #002754",
-"1. c #002755",
-"2. c #002654",
-"3. c #D6D6D6",
-"4. c #C1C1C1",
-"5. c #E2E2E2",
-"6. c #D0D0D0",
-"7. c #2A3D54",
-"8. c #002552",
-"9. c #002450",
-"0. c #00224C",
-"a. c #002956",
-"b. c #002B58",
-"c. c #002C5A",
-"d. c #002D5B",
-"e. c #002D5C",
-"f. c #002D5E",
-"g. c #002C5C",
-"h. c #D9D9D9",
-"i. c #CBCBCB",
-"j. c #E1E1E1",
-"k. c #E4E4E4",
-"l. c #D4D4D4",
-"m. c #2A4058",
-"n. c #002C5B",
-"o. c #002B59",
-"p. c #002A58",
-"q. c #002854",
-"r. c #00204A",
-"s. c #002F5E",
-"t. c #003261",
-"u. c #003363",
-"v. c #003465",
-"w. c #003466",
-"x. c #003364",
-"y. c #F3F3F3",
-"z. c #CACACA",
-"A. c #2A435C",
-"B. c #003365",
-"C. c #003263",
-"D. c #003262",
-"E. c #00305F",
-"F. c #002E5C",
-"G. c #002855",
-"H. c #003463",
-"I. c #003868",
-"J. c #003A6C",
-"K. c #003C6E",
-"L. c #003C6F",
-"M. c #003B6D",
-"N. c #DFDFDF",
-"O. c #2A4760",
-"P. c #003A6D",
-"Q. c #00396A",
-"R. c #003666",
-"S. c #003362",
-"T. c #002957",
-"U. c #003160",
-"V. c #003767",
-"W. c #004173",
-"X. c #004376",
-"Y. c #004478",
-"Z. c #CDCDCD",
-"`. c #D3D3D3",
-" + c #2A4B65",
-".+ c #004174",
-"++ c #003F71",
-"@+ c #003B6C",
-"#+ c #004578",
-"$+ c #004A7D",
-"%+ c #004D81",
-"&+ c #004D7F",
-"*+ c #C9C9C9",
-"=+ c #D2D2D2",
-"-+ c #2A506A",
-";+ c #004B7F",
-">+ c #00487C",
-",+ c #003E70",
-"'+ c #003769",
-")+ c #003161",
-"!+ c #001944",
-"~+ c #001C48",
-"{+ c #00214F",
-"]+ c #002D5D",
-"^+ c #00396C",
-"/+ c #004F82",
-"(+ c #005588",
-"_+ c #005888",
-":+ c #2A556E",
-"<+ c #005386",
-"[+ c #00467A",
-"}+ c #003F72",
-"|+ c #00386A",
-"1+ c #003162",
-"2+ c #002B5B",
-"3+ c #002554",
-"4+ c #001B47",
-"5+ c #011943",
-"6+ c #001641",
-"7+ c #001844",
-"8+ c #001C49",
-"9+ c #002150",
-"0+ c #002757",
-"a+ c #004175",
-"b+ c #004A7E",
-"c+ c #005C8D",
-"d+ c #006290",
-"e+ c #CFCFCF",
-"f+ c #F0F0F0",
-"g+ c #2A5A71",
-"h+ c #005A8C",
-"i+ c #005184",
-"j+ c #004073",
-"k+ c #00386B",
-"l+ c #003163",
-"m+ c #002B5C",
-"n+ c #002655",
-"o+ c #00204E",
-"p+ c #001B48",
-"q+ c #001843",
-"r+ c #001541",
-"s+ c #001845",
-"t+ c #001C4A",
-"u+ c #002151",
-"v+ c #002758",
-"w+ c #002D5F",
-"x+ c #003366",
-"y+ c #003A6E",
-"z+ c #004276",
-"A+ c #005688",
-"B+ c #006291",
-"C+ c #006B95",
-"D+ c #2A5E74",
-"E+ c #005F8F",
-"F+ c #005486",
-"G+ c #00497D",
-"H+ c #004074",
-"I+ c #00386C",
-"J+ c #003164",
-"K+ c #002B5D",
-"L+ c #002556",
-"M+ c #00204F",
-"N+ c #001B49",
-"O+ c #001744",
-"P+ c #011843",
-"Q+ c #001642",
-"R+ c #001C4B",
-"S+ c #002152",
-"T+ c #002659",
-"U+ c #002C60",
-"V+ c #003267",
-"W+ c #003A6F",
-"X+ c #004377",
-"Y+ c #004D80",
-"Z+ c #005989",
-"`+ c #006693",
-" @ c #007198",
-".@ c #2A6075",
-"+@ c #006390",
-"@@ c #005687",
-"#@ c #004B7E",
-"$@ c #004075",
-"%@ c #00386D",
-"&@ c #003165",
-"*@ c #002B5E",
-"=@ c #002557",
-"-@ c #002050",
-";@ c #011B45",
-">@ c #001643",
-",@ c #001846",
-"'@ c #001B4C",
-")@ c #002053",
-"!@ c #002559",
-"~@ c #002B60",
-"{@ c #003268",
-"]@ c #003A70",
-"^@ c #004F81",
-"/@ c #005C8A",
-"(@ c #006994",
-"_@ c #007499",
-":@ c #D8D8D8",
-"<@ c #1D5468",
-"[@ c #006691",
-"}@ c #005887",
-"|@ c #004C7E",
-"1@ c #003065",
-"2@ c #002A5E",
-"3@ c #002457",
-"4@ c #001F51",
-"5@ c #001A4A",
-"6@ c #001745",
-"7@ c #001847",
-"8@ c #001B4D",
-"9@ c #001F53",
-"0@ c #002459",
-"a@ c #002B61",
-"b@ c #003B70",
-"c@ c #005181",
-"d@ c #005D8A",
-"e@ c #006B94",
-"f@ c #00769A",
-"g@ c #DADADA",
-"h@ c #C2C2C2",
-"i@ c #BBC2C7",
-"j@ c #AABAC6",
-"k@ c #ACACAC",
-"l@ c #C5C5C5",
-"m@ c #C3C3C3",
-"n@ c #195164",
-"o@ c #006792",
-"p@ c #005A88",
-"q@ c #004E7F",
-"r@ c #00386E",
-"s@ c #003066",
-"t@ c #00295E",
-"u@ c #002357",
-"v@ c #001E51",
-"w@ c #001A4B",
-"x@ c #00245A",
-"y@ c #004679",
-"z@ c #005281",
-"A@ c #005E8B",
-"B@ c #00779A",
-"C@ c #E5E5E5",
-"D@ c #C7C7C7",
-"E@ c #D5D5D5",
-"F@ c #CBCED0",
-"G@ c #B4BDC4",
-"H@ c #DDDDDD",
-"I@ c #00396E",
-"J@ c #00285F",
-"K@ c #002258",
-"L@ c #001D51",
-"M@ c #001743",
-"N@ c #001945",
-"O@ c #003269",
-"P@ c #005282",
-"Q@ c #00779B",
-"R@ c #ECECEC",
-"S@ c #011B46",
-"T@ c #00255A",
-"U@ c #003368",
-"V@ c #005D8B",
-"W@ c #006A94",
-"X@ c #EEEEEE",
-"Y@ c #E4E5E8",
-"Z@ c #E1E3E6",
-"`@ c #EAEBEC",
-" # c #195064",
-".# c #005988",
-"+# c #004D7E",
-"@# c #001C4C",
-"## c #002153",
-"$# c #005B8A",
-"%# c #006894",
-"&# c #007399",
-"*# c #E9E9EB",
-"=# c #D6D7DB",
-"-# c #C9CACE",
-";# c #E6E7EA",
-"># c #194F64",
-",# c #006591",
-"'# c #001F50",
-")# c #002759",
-"!# c #002D60",
-"~# c #003367",
-"{# c #003B6F",
-"]# c #005889",
-"^# c #006592",
-"/# c #006D96",
-"(# c #E9E9EA",
-"_# c #DBDCDF",
-":# c #D0D1D4",
-"<# c #E5E6E9",
-"[# c #194D63",
-"}# c #00618F",
-"|# c #005586",
-"1# c #001A49",
-"2# c #001D4B",
-"3# c #002251",
-"4# c #002858",
-"5# c #002E5F",
-"6# c #003467",
-"7# c #004277",
-"8# c #005587",
-"9# c #9B9B9B",
-"0# c #DBDCE0",
-"a# c #D1D2D6",
-"b# c #194A61",
-"c# c #005D8D",
-"d# c #005285",
-"e# c #001D4A",
-"f# c #002250",
-"g# c #002857",
-"h# c #002E5E",
-"i# c #004275",
-"j# c #005084",
-"k# c #005789",
-"l# c #005A89",
-"m# c #999999",
-"n# c #E8E9EB",
-"o# c #19455E",
-"p# c #004E82",
-"q# c #00477B",
-"r# c #003F73",
-"s# c #002555",
-"t# c #001A45",
-"u# c #001D49",
-"v# c #00224F",
-"w# c #002856",
-"x# c #002E5D",
-"y# c #003464",
-"z# c #004E80",
-"A# c #19405A",
-"B# c #003E71",
-"C# c #00376A",
-"D# c #00224E",
-"E# c #003869",
-"F# c #003E6F",
-"G# c #004579",
-"H# c #004477",
-"I# c #193B55",
-"J# c #003768",
-"K# c #003565",
-"L# c #003969",
-"M# c #003C70",
-"N# c #003B6E",
-"O# c #E9E9E9",
-"P# c #193751",
-"Q# c #003D71",
-"R# c #003D70",
-"S# c #002A57",
-"T# c #003567",
-"U# c #EAEAEA",
-"V# c #19334C",
-"W# c #003668",
-"X# c #003566",
-"Y# c #00234F",
-"Z# c #002C5D",
-"`# c #E3E3E3",
-" $ c #192F48",
-".$ c #002F60",
-"+$ c #00214B",
-"@$ c #002756",
-"#$ c #E7E7E7",
-"$$ c #B7B7B7",
-"%$ c #192C44",
-"&$ c #002451",
-"*$ c #192940",
-"=$ c #01244F",
-"-$ c #989898",
-";$ c #E4EAED",
-">$ c #EAECEC",
-",$ c #19263D",
-"'$ c #001F4A",
-")$ c #011F49",
-"!$ c #898989",
-"~$ c #E6E6E6",
-"{$ c #B6B6B6",
-"]$ c #131F36",
-"^$ c #001B44",
-"/$ c #353A45",
-"($ c #E0E0E0",
-"_$ c #717171",
-":$ c #011032",
-"<$ c #001740",
-"[$ c #00173F",
-"}$ c #00133B",
-"|$ c #000F33",
-"1$ c #242A38",
-"2$ c #56575B",
-"3$ c #5E6062",
-"4$ c #5F6063",
-"5$ c #5D5E61",
-"6$ c #43454C",
-"7$ c #09132D",
-"8$ c #00143B",
-"9$ c #000E33",
-"0$ c #000E36",
-"a$ c #000B2F",
-"b$ c #000C32",
-"c$ c #011137",
-"d$ c #000A2C",
-"e$ c #010B2D",
-" ",
-" . + @ @ # $ $ % & ",
-" * = - ; > > & & & & > ; , ' ",
-" ) ! ~ { ] ^ ^ , , / / , , , = * ( _ ",
-" : < [ } | ! ( 1 ^ ^ ^ ^ 2 2 3 1 1 ( 4 ) 5 ",
-" 6 7 8 9 < 0 a b c d e f g h i j k ) l a 0 9 m ",
-" n o p q 7 r 8 s t u v w x y z A B C D E E 8 r q F ",
-" G H I J o K L p M N O P Q x y R A B S T M M p p K J U ",
-" V W X Y Z ` ` ` I ...+.@.#.$.R A B S %.&.*.*.I U Z =.W ",
-" -.;.;.>.>.,.,.,.'.). ...!.~.$.{.S z B S ].).^.W W W W V >./. ",
-" -.(._.:.<.<.[.}.|.1.2. ...3.4.5.@.i 6.B S 7.2.[.8.:._.9.(.(.-. ",
-" 0.;.:.|.a.b.c.d.e.f.g. ...h.i.j.k.l.l.B S m.g.n.o.p.a.q.<.9.;.>. ",
-" X r.>.:.a.c.s.t.u.v.w.x. ...!.y.z.g !.A B S A.B.C.D.E.F.o.G.9.>.W ",
-" Z =.,.8.p.s.H.I.J.K.L.M. ...!.y.5.N.R A B S O.P.J.Q.R.S.F.T.:.V =.Y ",
-" *.H ,.[.o.U.V.K.W.X.Y.X. ...!.!.Z.`.y A B S +X..+++@+R.E.p.8.^.H I ",
-" K J H '.2.n.S.Q.++#+$+%+&+ ...!.z.*+`.=+A B S -+;+>+X.,+'+)+o.8.^.` J ",
-" p !+~+{+1.]+x.^+.+>+/+(+_+ ...!.i.6.6.6.A B S :+<+%+[+}+|+1+2+3+).4+o 5+ ",
-" 6+7+8+9+0+f.B.P.a+b+<+c+d+ ...!.+.$.e+f+A B S g+h+i+>+j+k+l+m+n+o+p+q+6+ ",
-" r+s+t+u+v+w+x+y+z+;+A+B+C+ ...!.y.x y R A B S D+E+F+G+H+I+J+K+L+M+N+O+6+ ",
-" P+Q+s+R+S+T+U+V+W+X+Y+Z+`+ @ ...!.y.x y R A B S .@+@@@#@$@%@&@*@=@-@N+O+Q+ ",
-" ;@>@,@'@)@!@~@{@]@Y.^@/@(@_@ ...+.!.!.f+R ~.z :@<@[@}@|@a+%@1@2@3@4@5@6@7+ ",
-" !+>@7@8@9@0@a@{@b@#+c@d@e@f@ .g@h@z.i@j@3.k@l@m@n@o@p@q@z+r@s@t@u@v@w@6@O+` ",
-" q+>@7@8@9@x@a@{@b@y@z@A@e@B@ .C@D@E@F@G@H@{.=+m@n@o@p@q@X.I@s@J@K@L@w@6@M@N@",
-" J >@7@8@9@x@a@O@b@y@P@A@C+Q@ ...!.y.f+R@R@R@R@m@n@o@p@q@X.I@s@J@K@L@w@6@O+` ",
-" S@>@,@8@)@T@a@U@b@#+c@V@W@f@ ...!.X@Y@Z@`@R@R@m@ #[@.#+#z+%@s@t@u@v@5@6@7+ ",
-" o >@,@@###T+U+U@b@Y.^@$#%#&# ...X@*#=#-#;#R@R@m@>#,#}@|@a+%@1@2@3@'#5@6@M@ ",
-" Q+,@@#S+)#!#~#{#X+Y+]#^#/# .@.R@(#_#:#<#R@R@m@[#}#|#$+$@%@&@*@=@'#1#6@Q+ ",
-" 6+s+2#3#4#5#6#{#7#;+8#E+,#9#+.R@*#0#a#;#R@R@m@b#c#d#>+H+I+J+K+L+M+N+O+Q+ ",
-" L N@e#f#g#h#w.y+i#G+j#k#l#m#+.R@R@*#n#+.R@R@m@o#A+p#q#r#k+l+m+s#o+p+7+P+ ",
-" K t#u#v#w#x#y#J.j+[+b+p#z#m#+.R@R@e+*+O R@R@m@A#p#b+#+B#C#1+2+3+).~+!+ ",
-" I =.D#1.d.u.E#F#.+X+G#H#m#+.R@j.6.C@*+R@R@m@I#[+H#.+K.J#)+o.8.^.` t# ",
-" Z =.D#|.c.U.K#L#@+K.M#N#m#+.R@O#h l@E@R@R@m@P#Q#R#M.Q.y#s.p.:.^.H Z ",
-" X W D#<.S#e.E.S.y#w.T#B.m#+.R@R@e+h@U#R@R@m@V#W#T#X#u.U.d.a.9.V =. ",
-" V Y#:.|.a.b.c.e.]+h#Z#m#+.R@`#$.3.i.R@R@m@ $.$5#x#e.c.S#}.9.>.+$ ",
-" -.Y#9.9.:.<.[.|.1.@$n+m#+.R@#$$$=+=+R@R@m@%$4#g#G.|.}.<.&$Y#;. ",
-" ;.>.,.V V V ,.'.{+o+m#+.R@R@5.#.R@R@R@m@*$f#v#D#D#>.>.D#;.=$ ",
-" W =.H Z ` ` ` ~+4+-$+.;$>$#$U#+.O R@m@,$8+H H H H =.'$V ",
-" )$U J o K F p p 6+!$~$R@R@R@R@R@R@+.{$]$K K K o J *.H ",
-" ^$F q 7 r m 8 8 /${$C j.j.j.j.($Z._$:$r r 7 q <$o ",
-" [$m }$< 5 [ [ |$1$2$3$4$4$4$5$6$7$0 0 < 9 m 7 ",
-" 8$5 l } | ! ! ! ! 9$9$9$9$9$9$9$9$| 0$[ 9 ",
-" ) ! ~ { a$] ] ] ] ] ] ] ] a$* b$4 c$ ",
-" * = d$; ; > > > > ; ; - = 1 ",
-" e$; @ @ # $ @ # ; ",
-" "};
diff --git a/misc/dcc/dcc.SlackBuild b/misc/dcc/dcc.SlackBuild
index 5bbd2153b1..f811b4eb0d 100644
--- a/misc/dcc/dcc.SlackBuild
+++ b/misc/dcc/dcc.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dcc
-VERSION=${VERSION:-1.3.158}
+VERSION=${VERSION:-1.3.163}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/misc/dcc/dcc.info b/misc/dcc/dcc.info
index 43647be46a..8aed5bcfc1 100644
--- a/misc/dcc/dcc.info
+++ b/misc/dcc/dcc.info
@@ -1,8 +1,8 @@
PRGNAM="dcc"
-VERSION="1.3.158"
+VERSION="1.3.163"
HOMEPAGE="https://www.rhyolite.com/dcc/"
-DOWNLOAD="https://www.dcc-servers.net/src/dcc/old/dcc-1.3.158.tar.Z"
-MD5SUM="bbdea80e544ade4f8a04081fa68f9e8a"
+DOWNLOAD="https://www.dcc-servers.net/src/dcc/old/dcc-1.3.163.tar.Z"
+MD5SUM="bfa9eba5e52e914ea25d8cbf89fa7e7d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/dcc/slack-desc b/misc/dcc/slack-desc
index e14c334d29..9f00fc14ae 100644
--- a/misc/dcc/slack-desc
+++ b/misc/dcc/slack-desc
@@ -16,4 +16,4 @@ dcc: common checksums. The checksums include values that are contant
dcc: accross common variations in bulk messages, including
dcc: "personalizations".
dcc:
-dcc: Homepage: http://www.rhyolite.com/dcc/
+dcc: Homepage: https://www.rhyolite.com/dcc/
diff --git a/misc/deroff/deroff.SlackBuild b/misc/deroff/deroff.SlackBuild
index 16c2500621..293c433f05 100644
--- a/misc/deroff/deroff.SlackBuild
+++ b/misc/deroff/deroff.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/misc/fbcat/README b/misc/fbcat/README
index 926e05e60e..6b18bbf38b 100644
--- a/misc/fbcat/README
+++ b/misc/fbcat/README
@@ -1,10 +1,12 @@
fbcat (take screenshots of the framebuffer console)
-fbcat takes a screenshot using the framebuffer device and stores it in a
-PPM file. Also provided is a fbgrab command, which takes PNG screenshots
-and supports several useful options (such as changing consoles).
+fbcat takes a screenshot using the framebuffer device and stores it
+in a PPM file. Also provided is a fbgrab command, which takes PNG
+screenshots and supports several useful options (such as changing
+consoles).
-The following visuals are supported: TRUECOLOR, DIRECTCOLOR, PSEUDOCOLOR,
-STATIC_PSEUDOCOLOR, MONO01, MONO10.
+The following visuals are supported: TRUECOLOR, DIRECTCOLOR,
+PSEUDOCOLOR, STATIC_PSEUDOCOLOR, MONO01, MONO10.
-On the SlackBuild author's system, fbcat runs about 3x as fast as fbdump.
+On the SlackBuild author's system, fbcat runs about 3x as fast as
+fbdump.
diff --git a/misc/fbcat/fbcat.SlackBuild b/misc/fbcat/fbcat.SlackBuild
index 35f9efa382..ede7238329 100644
--- a/misc/fbcat/fbcat.SlackBuild
+++ b/misc/fbcat/fbcat.SlackBuild
@@ -6,10 +6,12 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210910 bkw: update for v0.5.2.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fbcat
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.5.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +24,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
@@ -57,11 +56,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 {} \+
sed -i "s,-g -O2,$SLKCFLAGS," Makefile
make
diff --git a/misc/fbcat/fbcat.info b/misc/fbcat/fbcat.info
index 5466c852ad..5f0761826c 100644
--- a/misc/fbcat/fbcat.info
+++ b/misc/fbcat/fbcat.info
@@ -1,8 +1,8 @@
PRGNAM="fbcat"
-VERSION="0.5.1"
-HOMEPAGE="http://jwilk.net/software/fbcat"
-DOWNLOAD="https://github.com/jwilk/fbcat/releases/download/0.5.1/fbcat-0.5.1.tar.gz"
-MD5SUM="944fd3854bfe00971bfcd830f6c94497"
+VERSION="0.5.2"
+HOMEPAGE="https://jwilk.net/software/fbcat"
+DOWNLOAD="https://github.com/jwilk/fbcat/releases/download/0.5.2/fbcat-0.5.2.tar.gz"
+MD5SUM="b54912af77a865f550cab9f54f840f54"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/fbdump/README b/misc/fbdump/README
index c7cd539bb1..43c62d8ed7 100644
--- a/misc/fbdump/README
+++ b/misc/fbdump/README
@@ -1,15 +1,17 @@
fbdump (captures the visible portion of framebuffer to stdout)
-fbdump is a simple tool that captures the contents of the visible portion of
-the Linux framebuffer device and writes it to the standard output as a PPM
-file. In other words, it takes a screenshot of anything running on the
-framebuffer. It currently has fairly complete support for packed-pixel
-framebuffer types and also works with the VGA16 framebuffer driver.
+fbdump is a simple tool that captures the contents of the visible
+portion of the Linux framebuffer device and writes it to the standard
+output as a PPM file. In other words, it takes a screenshot of
+anything running on the framebuffer. It currently has fairly complete
+support for packed-pixel framebuffer types and also works with the
+VGA16 framebuffer driver.
To get a popular image format, issue a command like:
fbdump | pnmtopng > shot.png
Note: fbdump is rather slow on modern systems with high-resolution
-framebuffers at 32-bit color depth. On the maintainer's system, it takes
-8 seconds to dump a 1920x1080x32 framebuffer. Be patient.
+framebuffers at 32-bit color depth. On some systems, it takes several
+seconds to dump a 1920x1080x32 framebuffer. Be patient. Or use fbcat
+instead.
diff --git a/misc/fbdump/fbdump.SlackBuild b/misc/fbdump/fbdump.SlackBuild
index e504c42a50..dc918d7587 100644
--- a/misc/fbdump/fbdump.SlackBuild
+++ b/misc/fbdump/fbdump.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
@@ -93,11 +90,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 {} \+
# 20170324 bkw: maybe returning from main() used to cause stdout to
# be flushed, back when fbdump was new... but these days we need to
diff --git a/misc/fbdump/fbdump.info b/misc/fbdump/fbdump.info
index 790bce43a3..8b08ecae06 100644
--- a/misc/fbdump/fbdump.info
+++ b/misc/fbdump/fbdump.info
@@ -1,7 +1,7 @@
PRGNAM="fbdump"
VERSION="0.4.2"
-HOMEPAGE="http://www.rcdrummond.net/fbdump/"
-DOWNLOAD="http://www.rcdrummond.net/fbdump/fbdump-0.4.2.tar.gz"
+HOMEPAGE="https://www.rcdrummond.net/fbdump/"
+DOWNLOAD="https://www.rcdrummond.net/fbdump/fbdump-0.4.2.tar.gz"
MD5SUM="85ae97c0800a2caf2b04ad7764e3915b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/font-unscii/font-unscii.SlackBuild b/misc/font-unscii/font-unscii.SlackBuild
index cdc69de119..a7078b83b1 100644
--- a/misc/font-unscii/font-unscii.SlackBuild
+++ b/misc/font-unscii/font-unscii.SlackBuild
@@ -17,9 +17,6 @@ TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
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/misc/funny-manpages/funny-manpages.SlackBuild b/misc/funny-manpages/funny-manpages.SlackBuild
index 65e8fb25cc..209cedf7f1 100644
--- a/misc/funny-manpages/funny-manpages.SlackBuild
+++ b/misc/funny-manpages/funny-manpages.SlackBuild
@@ -26,15 +26,13 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=funny-manpages
-VERSION=${VERSION:-1.3.5}
-SRC_VERSION=$( echo $VERSION | cut -d. -f1,2 )
-DEB_VERSION=5
-
-ARCH=noarch
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
+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.
@@ -52,45 +50,35 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$SRC_VERSION.orig.tar.gz
-cd $PRGNAM-$SRC_VERSION.orig
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
+cd $PRGNAM
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 {} \;
-
-# Patch the manpages to the latest version.
-patch -p1 < $CWD/${PRGNAM}_$SRC_VERSION-$DEB_VERSION.diff
+ \( -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 {} \;
-# Create the directories we need
-mkdir -p $PKG/usr/man/man{1,3,6,7}
+make install DESTDIR=$PKG
-for manpage in $(echo *fun); do
- section=$(echo $manpage | awk -F. '{print $2}' | colrm 2 4)
- install -m 0644 $manpage $PKG/usr/man/man$section/$manpage
-done
+mv $PKG/usr/share/man $PKG/usr
+rm -rf $PKG/usr/share
# Move date.1fun over to mansection 6. It is kinda screwing with upstream,
# but right now causes a conflict with the systems date(1)
( cd $PKG/usr/man/man1
- ln -sf grope.1fun egrope.1fun
- ln -sf grope.1fun fgrope.1fun
mv date.1fun ../man6/date.6fun
)
# Add custom noobfarm manpage. Thanks to Matt Hayes.
-install -m 0644 $CWD/noobfarm.7 $PKG/usr/man/man7/noobfarm.7fun
+install -m644 -D $CWD/noobfarm.7 $PKG/usr/man/man7/noobfarm.7fun
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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 debian/README.Debian debian/changelog debian/copyright \
+cp -a CHANGELOG LICENSE README.md \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/funny-manpages/funny-manpages.info b/misc/funny-manpages/funny-manpages.info
index 351b73cb35..a36d546ab1 100644
--- a/misc/funny-manpages/funny-manpages.info
+++ b/misc/funny-manpages/funny-manpages.info
@@ -1,8 +1,8 @@
PRGNAM="funny-manpages"
-VERSION="1.3.5"
-HOMEPAGE="http://packages.debian.org/etch/funny-manpages"
-DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/f/funny-manpages/funny-manpages_1.3.orig.tar.gz"
-MD5SUM="bed1deef82218d42fb230a2176a11ed4"
+VERSION="2.3"
+HOMEPAGE="https://github.com/ltworf/funny-manpages"
+DOWNLOAD="https://github.com/ltworf/funny-manpages/releases/download/2.3/funny-manpages_2.3.orig.tar.gz"
+MD5SUM="43ac37d9173da676ca71e4e09591c472"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/funny-manpages/funny-manpages_1.3-5.diff b/misc/funny-manpages/funny-manpages_1.3-5.diff
deleted file mode 100644
index 78e394e2ee..0000000000
--- a/misc/funny-manpages/funny-manpages_1.3-5.diff
+++ /dev/null
@@ -1,244 +0,0 @@
---- funny-manpages-1.3.orig/debian/README.Debian
-+++ funny-manpages-1.3/debian/README.Debian
-@@ -0,0 +1,9 @@
-+funny-manpages for Debian
-+----------------------
-+
-+The sources for funny manpages were collected from various sources.
-+This basically means that the only 'original' thing in .orig.tar.gz is the
-+fact, that there are debian control files and some manpages' contents have
-+bugs fixed in the package.
-+
-+ -- Pawel Wiecek <coven@debian.org>, Fri, 15 Dec 2000 12:13:37 +0100
---- funny-manpages-1.3.orig/debian/changelog
-+++ funny-manpages-1.3/debian/changelog
-@@ -0,0 +1,77 @@
-+funny-manpages (1.3-5) unstable; urgency=low
-+
-+ * Added lintian override to remove reports of missing manpage for woman (as
-+ this is intentional) (closes: #219907)
-+ * Changed Build-Depends to Build-Depends-Indep (as per policy)
-+ * Updated standards version (no changes required)
-+
-+ -- Pawel Wiecek <coven@debian.org> Thu, 12 Feb 2004 14:49:22 +0100
-+
-+funny-manpages (1.3-4) unstable; urgency=low
-+
-+ * Changed description so it's less confusing (closes: #129502)
-+
-+ -- Pawel Wiecek <coven@debian.org> Wed, 23 Jan 2002 13:17:44 +0100
-+
-+funny-manpages (1.3-3) unstable; urgency=low
-+
-+ * Added sumlinks for [ef]grope.1fun.gz (closes: #99528)
-+ * Now compliant with 3.5.5 policy
-+
-+ -- Pawel Wiecek <coven@debian.org> Fri, 8 Jun 2001 09:27:43 +0200
-+
-+funny-manpages (1.3-2) unstable; urgency=low
-+
-+ * Corrected Build-Depends line in debian/control (was missing debhelper
-+ version)
-+
-+ -- Pawel Wiecek <coven@debian.org> Tue, 22 May 2001 12:38:20 +0200
-+
-+funny-manpages (1.3-1) unstable; urgency=low
-+
-+ * Rebuilt source -- all manpages are now in fun subsection (closes: #96463)
-+ * General cleaning (standards version, etc.)
-+
-+ -- Pawel Wiecek <coven@debian.org> Mon, 7 May 2001 10:59:02 +0200
-+
-+funny-manpages (1.2-1) unstable frozen; urgency=low
-+
-+ * Rebuilt source -- added date.1fun, echo.1fun, rm.1fun, strfry.3fun,
-+ xkill.1fun (closes: #28990)
-+ * uubp.1 now in orig source
-+ * should no longer create sex.1 (closes: #52543)
-+ * fixes to party.1 (closes: #52659)
-+ * added woman.6 (closes: #63862)
-+ * updated to newest standards version and moved to debhelper
-+
-+ -- Pawel Wiecek <coven@debian.org> Fri, 15 Dec 2000 12:26:02 +0100
-+
-+funny-manpages (1.1-3) unstable frozen; urgency=low
-+
-+ * Minor fixes in manpages for sex (fixes bugs #45120)
-+ * Changed section for sex from 1 to 6 (fixes #30977, #37897, #45120)
-+ * Updated standards version to 3.0.1
-+
-+ -- Pawel Wiecek <coven@debian.org> Tue, 26 Oct 1999 21:11:51 +0200
-+
-+funny-manpages (1.1-2) unstable frozen; urgency=low
-+
-+ * Changed path in rtfm.1 as suggested by Yann Dirson (fixes bug #25393)
-+ * Updated Standards-Version
-+
-+ -- Pawel Wiecek <coven@debian.org> Sat, 31 Oct 1998 22:13:20 +0100
-+
-+funny-manpages (1.1-1) unstable; urgency=low
-+
-+ * Added uubp(1) which was previously in asr-manpages.
-+ * Removed strfry (conflicted with libc) - this closes bugs #16785 and
-+ #16840.
-+
-+ -- Pawel Wiecek <coven@pwr.wroc.pl> Tue, 23 Dec 1997 00:05:14 +0100
-+
-+funny-manpages (1.0-1) unstable; urgency=low
-+
-+ * Initial Release.
-+
-+ -- Pawel Wiecek <coven@pwr.wroc.pl> Wed, 10 Dec 1997 01:10:17 +0100
-+
---- funny-manpages-1.3.orig/debian/copyright
-+++ funny-manpages-1.3/debian/copyright
-@@ -0,0 +1,32 @@
-+This package was debianized by Pawel Wiecek coven@pwr.wroc.pl on
-+Wed, 10 Dec 1997 01:10:17 +0100.
-+
-+This set of manpages was collected from all over the net. No specific
-+location can be given.
-+
-+Copyright:
-+
-+To the best of my knowledge all of these manpages are free to use and
-+redistribute.
-+
-+The authors are:
-+
-+baby.1fun - unknown, based on man page by Joe Beck <beck@cs.ualberta.ca>
-+celibacy.1fun - unknown
-+condom.1fun - Ken Maupin <maupin@cs.washington.edu>
-+flame.1fun - unknown
-+flog.1fun - unknown
-+gong.1fun - unknown
-+grope.1fun - unknown
-+party.1fun - unknown
-+rescrog.1fun - unknown
-+rtfm.1fun - unknown
-+sex.1fun - unknown
-+tm.1fun - unknown
-+xlart.1fun - James McPherson
-+date.1fun - Glen Overby <overby@sendit.nodak.edu>
-+echo.1fun - unknown
-+rm.1fun - Matthew Farwell <dylan@ibmpcug.co.uk>
-+strfry.3fun - <chuck@druco.att.com>
-+xkill.1fun - Claudio Calvelli <Claudio@edinburgh.ac.uk>
-+uubp.1fun - unknown
---- funny-manpages-1.3.orig/debian/dirs
-+++ funny-manpages-1.3/debian/dirs
-@@ -0,0 +1,2 @@
-+/usr/share/man/man1
-+/usr/share/lintian/overrides
---- funny-manpages-1.3.orig/debian/lintian
-+++ funny-manpages-1.3/debian/lintian
-@@ -0,0 +1 @@
-+funny-manpages: link-to-undocumented-manpage usr/share/man/man6/woman.6fun.gz
---- funny-manpages-1.3.orig/debian/control
-+++ funny-manpages-1.3/debian/control
-@@ -0,0 +1,15 @@
-+Source: funny-manpages
-+Section: doc
-+Priority: optional
-+Maintainer: Pawel Wiecek <coven@debian.org>
-+Build-Depends-Indep: debhelper (>> 3.0.0)
-+Standards-Version: 3.6.1
-+
-+Package: funny-manpages
-+Architecture: all
-+Suggests: asr-manpages (>=1.3-4)
-+Description: more funny manpages
-+ A set of miscellaneous humorous manpages (don't take them too seriously!).
-+ Includes, amongst others, rtfm (1).
-+ Warning! Some of these manpages might be treated offensive.
-+ You've been warned.
---- funny-manpages-1.3.orig/debian/rules
-+++ funny-manpages-1.3/debian/rules
-@@ -0,0 +1,87 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# This is the debhelper compatability version to use.
-+export DH_COMPAT=3
-+
-+configure: configure-stamp
-+configure-stamp:
-+ dh_testdir
-+ # Add here commands to configure the package.
-+
-+
-+ touch configure-stamp
-+
-+build: configure-stamp build-stamp
-+build-stamp:
-+ dh_testdir
-+
-+ # Add here commands to compile the package.
-+# $(MAKE)
-+ #/usr/bin/docbook-to-man debian/funny-manpages.sgml > funny-manpages.1
-+
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+ rm -f build-stamp configure-stamp
-+
-+ # Add here commands to clean up after the build process.
-+# -$(MAKE) clean
-+
-+ dh_clean
-+
-+install: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+
-+ # Add here commands to install the package into debian/tmp.
-+# $(MAKE) install DESTDIR=`pwd`/debian/tmp
-+ ln -s grope.1fun.gz debian/funny-manpages/usr/share/man/man1/egrope.1fun.gz
-+ ln -s grope.1fun.gz debian/funny-manpages/usr/share/man/man1/fgrope.1fun.gz
-+ cp debian/lintian debian/funny-manpages/usr/share/lintian/overrides/$(package)
-+
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+ dh_testdir
-+ dh_testroot
-+# dh_installdebconf
-+ dh_installdocs
-+# dh_installexamples
-+# dh_installmenu
-+# dh_installemacsen
-+# dh_installpam
-+# dh_installinit
-+# dh_installcron
-+ dh_installmanpages
-+# dh_installinfo
-+ dh_undocumented woman.6fun
-+ dh_installchangelogs
-+# dh_link
-+ dh_strip
-+ dh_compress
-+ dh_fixperms
-+ # You may want to make some executables suid here.
-+# dh_suidregister
-+# dh_makeshlibs
-+ dh_installdeb
-+# dh_perl
-+ dh_shlibdeps
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/misc/ghostpcl/ghostpcl.SlackBuild b/misc/ghostpcl/ghostpcl.SlackBuild
index 41f520afff..c74fbbf43a 100644
--- a/misc/ghostpcl/ghostpcl.SlackBuild
+++ b/misc/ghostpcl/ghostpcl.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ghostpcl
SRCNAM=ghostpdl
-VERSION=${VERSION:-9.54.0}
+VERSION=${VERSION:-9.55.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/misc/ghostpcl/ghostpcl.info b/misc/ghostpcl/ghostpcl.info
index d4d566c5b8..84a3c2a24c 100644
--- a/misc/ghostpcl/ghostpcl.info
+++ b/misc/ghostpcl/ghostpcl.info
@@ -1,8 +1,8 @@
PRGNAM="ghostpcl"
-VERSION="9.54.0"
+VERSION="9.55.0"
HOMEPAGE="https://www.ghostscript.com"
-DOWNLOAD="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostpdl-9.54.0.tar.gz"
-MD5SUM="25de435bce3ddb370a86ddf9b7f090da"
+DOWNLOAD="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/ghostpdl-9.55.0.tar.gz"
+MD5SUM="cfc1d242c4680eca78a989b21d6ed180"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/glogg/glogg.SlackBuild b/misc/glogg/glogg.SlackBuild
index ca740b8135..4192c098e4 100644
--- a/misc/glogg/glogg.SlackBuild
+++ b/misc/glogg/glogg.SlackBuild
@@ -70,7 +70,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/"$PRGNAM"_"$VERSION".orig.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/misc/glogg/glogg.info b/misc/glogg/glogg.info
index d7a63adc6e..abad2da20b 100644
--- a/misc/glogg/glogg.info
+++ b/misc/glogg/glogg.info
@@ -1,7 +1,7 @@
PRGNAM="glogg"
VERSION="1.1.4"
HOMEPAGE="http://glogg.bonnefon.org/"
-DOWNLOAD="http://glogg.bonnefon.org/files/glogg-1.1.4.tar.gz"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/g/glogg/glogg_1.1.4.orig.tar.gz"
MD5SUM="065d292411df490dcb3c6abae35ed608"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/gourmet/doinst.sh b/misc/gourmet/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/misc/gourmet/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/misc/gourmet/gourmet.SlackBuild b/misc/gourmet/gourmet.SlackBuild
index 0b844024bb..856bce54d9 100644
--- a/misc/gourmet/gourmet.SlackBuild
+++ b/misc/gourmet/gourmet.SlackBuild
@@ -93,6 +93,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/gramps/doinst.sh b/misc/gramps/doinst.sh
index aea0f894eb..f55e090a55 100644
--- a/misc/gramps/doinst.sh
+++ b/misc/gramps/doinst.sh
@@ -8,6 +8,6 @@ fi
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ /usr/bin/gtk-update-icon-cache -f usr/share/gramps/images/hicolor/ >/dev/null 2>&1
fi
fi
diff --git a/misc/gxmessage/gxmessage.info b/misc/gxmessage/gxmessage.info
index 8a5f1d297d..9ce19e6324 100644
--- a/misc/gxmessage/gxmessage.info
+++ b/misc/gxmessage/gxmessage.info
@@ -1,7 +1,7 @@
PRGNAM="gxmessage"
VERSION="2.12.4"
-HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
-DOWNLOAD="http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-2.12.4.tar.gz"
+HOMEPAGE="https://trmusson.dreamhosters.com/programs.html#gxmessage"
+DOWNLOAD="https://trmusson.dreamhosters.com/stuff/gxmessage-2.12.4.tar.gz"
MD5SUM="7c94c714ebedbfa2db2d645cc4a4092a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/gxmessage/slack-desc b/misc/gxmessage/slack-desc
index 317e46d1a9..8dc3a5469b 100644
--- a/misc/gxmessage/slack-desc
+++ b/misc/gxmessage/slack-desc
@@ -16,4 +16,4 @@ gxmessage: xmessage, gxmessage accepts any option xmessage would, and returns
gxmessage: the same exit codes.
gxmessage:
gxmessage: Homepage:
-gxmessage: http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
+gxmessage: https://trmusson.dreamhosters.com/programs.html#gxmessage
diff --git a/misc/hashkill/hashkill.SlackBuild b/misc/hashkill/hashkill.SlackBuild
index 150ffacaf6..6135614805 100644
--- a/misc/hashkill/hashkill.SlackBuild
+++ b/misc/hashkill/hashkill.SlackBuild
@@ -70,7 +70,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/misc/hashkill/hashkill.info b/misc/hashkill/hashkill.info
index a86e8d75f2..c5ccffbd9b 100644
--- a/misc/hashkill/hashkill.info
+++ b/misc/hashkill/hashkill.info
@@ -1,7 +1,7 @@
PRGNAM="hashkill"
VERSION="0.3.1"
HOMEPAGE="https://github.com/gat3way/hashkill"
-DOWNLOAD="http://github.com/gat3way/hashkill/archive/0.3.1.tar.gz"
+DOWNLOAD="https://github.com/gat3way/hashkill/archive/0.3.1/hashkill-0.3.1.tar.gz"
MD5SUM="6a9ca282b2156fe340c583fdedc2fccb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/heyu/heyu.SlackBuild b/misc/heyu/heyu.SlackBuild
index 133ad3ff2f..fa2917d499 100644
--- a/misc/heyu/heyu.SlackBuild
+++ b/misc/heyu/heyu.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=heyu
-VERSION=${VERSION:-2.10.2}
+VERSION=${VERSION:-2.10.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -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
@@ -51,11 +48,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 {} \+
./Configure
diff --git a/misc/heyu/heyu.info b/misc/heyu/heyu.info
index 51b02e3d0e..653ec2a98d 100644
--- a/misc/heyu/heyu.info
+++ b/misc/heyu/heyu.info
@@ -1,8 +1,8 @@
PRGNAM="heyu"
-VERSION="2.10.2"
-HOMEPAGE="http://www.heyu.org/"
-DOWNLOAD="https://github.com/HeyuX10Automation/heyu/archive/v2.10.2/heyu-2.10.2.tar.gz"
-MD5SUM="9351e92c0d7fa1a0354825f99eb51c2d"
+VERSION="2.10.3"
+HOMEPAGE="https://www.heyu.org/"
+DOWNLOAD="https://github.com/HeyuX10Automation/heyu/archive/v2.10.3/heyu-2.10.3.tar.gz"
+MD5SUM="4ad7d4c2e074528c5c15dd35f88adde6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/ibus-chewing/doinst.sh b/misc/ibus-chewing/doinst.sh
index 56b9e419c1..f6a6676883 100644
--- a/misc/ibus-chewing/doinst.sh
+++ b/misc/ibus-chewing/doinst.sh
@@ -1,3 +1,7 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
if [ -e usr/share/glib-2.0/schemas ]; then
if [ -x /usr/bin/glib-compile-schemas ]; then
/usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
diff --git a/misc/ibus-skk/doinst.sh b/misc/ibus-skk/doinst.sh
index 8fc0d3d332..34b0449960 100644
--- a/misc/ibus-skk/doinst.sh
+++ b/misc/ibus-skk/doinst.sh
@@ -22,37 +22,5 @@ preserve_perms() {
config $NEW
}
-schema_install() {
- SCHEMA="$1"
- GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
- chroot . gconftool-2 --makefile-install-rule \
- /etc/gconf/schemas/$SCHEMA \
- 1>/dev/null
-}
-
preserve_perms etc/profile.d/ibus-skk.sh.new
preserve_perms etc/profile.d/ibus-skk.csh.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
- /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
- if [ -x /usr/bin/glib-compile-schemas ]; then
- /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
- fi
-fi
-
-# If needed -- be sure to sed @LIBDIR@ inside the build script
-chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ 1> /dev/null 2> /dev/null
-
diff --git a/misc/jmri/doinst.sh b/misc/jmri/doinst.sh
index 50a085e059..85ab62cb4b 100644
--- a/misc/jmri/doinst.sh
+++ b/misc/jmri/doinst.sh
@@ -3,7 +3,3 @@ if [ ! -e var/log/jmri/messages.log ]; then
else
rm -f var/log/jmri/messages.log.new
fi
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/misc/kde_cdemu/kde_cdemu.SlackBuild b/misc/kde_cdemu/kde_cdemu.SlackBuild
index 419cca6cb2..6176dc2dc0 100644
--- a/misc/kde_cdemu/kde_cdemu.SlackBuild
+++ b/misc/kde_cdemu/kde_cdemu.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=kde_cdemu
-VERSION=${VERSION:-0.5.0}
+VERSION=${VERSION:-0.8.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -40,7 +40,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM
-tar xvf $CWD/99752-$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM
chown -R root:root .
find -L . \
@@ -49,7 +49,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` .
+cmake -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` .
make
make install DESTDIR=$PKG
@@ -57,7 +57,7 @@ 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
-install -m0644 -oroot ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 -oroot LICENSE CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/misc/kde_cdemu/kde_cdemu.info b/misc/kde_cdemu/kde_cdemu.info
index 9afa962a52..b1f00016ad 100644
--- a/misc/kde_cdemu/kde_cdemu.info
+++ b/misc/kde_cdemu/kde_cdemu.info
@@ -1,8 +1,8 @@
PRGNAM="kde_cdemu"
-VERSION="0.5.0"
-HOMEPAGE="https://www.kde-look.org/p/998461/"
-DOWNLOAD="https://distribute.kde.org/khotnewstuff/servicemenu/downloads/99752-kde_cdemu-0.5.0.tar.bz2"
-MD5SUM="c0e56401e2c2f2c4652915a44af128b8"
+VERSION="0.8.0"
+HOMEPAGE="https://store.kde.org/p/998461/"
+DOWNLOAD="https://netactuate.dl.sourceforge.net/project/kde-cdemu-manager/kde_cdemu-0.8.0.tar.bz2"
+MD5SUM="a88bb002728db8be594b10fb403f5b08"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cdemu-daemon"
diff --git a/misc/kde_cdemu/slack-desc b/misc/kde_cdemu/slack-desc
index f67cd88eb5..1f3a5ce06f 100644
--- a/misc/kde_cdemu/slack-desc
+++ b/misc/kde_cdemu/slack-desc
@@ -16,4 +16,4 @@ kde_cdemu: Dolphin/Konqueror (which is what most people will want to use).
kde_cdemu: Images can be unmounted like any other media through Dolphin or
kde_cdemu: the Device Notifier plasmoid.
kde_cdemu:
-kde_cdemu: Homepage: https://www.kde-look.org/p/998461/
+kde_cdemu: Homepage: https://store.kde.org/p/998461/
diff --git a/misc/libydpdict/libydpdict.info b/misc/libydpdict/libydpdict.info
index 03abd14301..e2fa1a7022 100644
--- a/misc/libydpdict/libydpdict.info
+++ b/misc/libydpdict/libydpdict.info
@@ -1,7 +1,7 @@
PRGNAM="libydpdict"
VERSION="1.0.4"
-HOMEPAGE="http://toxygen.net/ydpdict/"
-DOWNLOAD="http://toxygen.net/ydpdict/libydpdict-1.0.4.tar.gz"
+HOMEPAGE="https://github.com/wojtekka/ydpdict"
+DOWNLOAD="https://slackware.uk/sbosrcarch/by-md5/3/8/3884d6298abbc22b4ed9c86ec24f439f/libydpdict-1.0.4.tar.gz"
MD5SUM="3884d6298abbc22b4ed9c86ec24f439f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/moreutils/moreutils.SlackBuild b/misc/moreutils/moreutils.SlackBuild
index 9327453ae7..e31c5d7ef2 100644
--- a/misc/moreutils/moreutils.SlackBuild
+++ b/misc/moreutils/moreutils.SlackBuild
@@ -87,7 +87,7 @@ mkdir $PKG/usr/man
mv $PKG/usr/share/man/* $PKG/usr/man
rm -rf $PKG/usr/share/ $PKG/usr/man/man1/ts.1
-if [ "${PARALLEL:-yes}" = "no" ]; then
+if [ "${PARALLEL:-no}" = "no" ]; then
rm -f $PKG/usr/bin/parallel $PKG/usr/man/man1/parallel.1
fi
diff --git a/misc/mosquitto/mosquitto.SlackBuild b/misc/mosquitto/mosquitto.SlackBuild
index 504c29c521..6d05551c73 100644
--- a/misc/mosquitto/mosquitto.SlackBuild
+++ b/misc/mosquitto/mosquitto.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=mosquitto
-VERSION=${VERSION:-2.0.11}
+VERSION=${VERSION:-2.0.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/misc/mosquitto/mosquitto.info b/misc/mosquitto/mosquitto.info
index 462f81e5df..3dde5d05a2 100644
--- a/misc/mosquitto/mosquitto.info
+++ b/misc/mosquitto/mosquitto.info
@@ -1,8 +1,8 @@
PRGNAM="mosquitto"
-VERSION="2.0.11"
+VERSION="2.0.12"
HOMEPAGE="https://mosquitto.org/"
-DOWNLOAD="https://mosquitto.org/files/source/mosquitto-2.0.11.tar.gz"
-MD5SUM="638d801e6aac611b41de76d030951612"
+DOWNLOAD="https://mosquitto.org/files/source/mosquitto-2.0.12.tar.gz"
+MD5SUM="c226d3ae261f5611adbc0d9f10bc7a77"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/ophcrack/README b/misc/ophcrack/README
index 8cd92e9e2d..cc203c49a7 100644
--- a/misc/ophcrack/README
+++ b/misc/ophcrack/README
@@ -5,11 +5,11 @@ and runs on multiple platforms.
Ophcrack has a graphing function that goes with the ophcrack gui. The
graphing function depends on the "qwt" package available at
-slackbuilds.org.
+slackbuilds.org.
To enable the graphing function run the build script like this:
GRAPH=yes ./ophcrack.SlackBuild
Ophcrack tables can be found at
-http://ophcrack.sourceforge.net/tables.php
+https://ophcrack.sourceforge.io/tables.php
diff --git a/misc/ophcrack/ophcrack.SlackBuild b/misc/ophcrack/ophcrack.SlackBuild
index fc0be95634..1bf0c01929 100644
--- a/misc/ophcrack/ophcrack.SlackBuild
+++ b/misc/ophcrack/ophcrack.SlackBuild
@@ -5,7 +5,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ophcrack
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.8.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -92,7 +92,7 @@ cat src/gui/pixmaps/os.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS ChangeLog COPYING INSTALL LICENSE* NEWS README \
+ AUTHORS COPYING ChangeLog INSTALL LICENSE* NEWS README* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/ophcrack/ophcrack.info b/misc/ophcrack/ophcrack.info
index 71aa1939c3..1c1edc1073 100644
--- a/misc/ophcrack/ophcrack.info
+++ b/misc/ophcrack/ophcrack.info
@@ -1,8 +1,8 @@
PRGNAM="ophcrack"
-VERSION="3.4.0"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ophcrack/ophcrack-3.4.0.tar.bz2"
-MD5SUM="a43b1288325e586c0ed6bc6e0bd5357e"
+VERSION="3.8.0"
+HOMEPAGE="https://ophcrack.sourceforge.io/"
+DOWNLOAD="https://sourceforge.net/projects/ophcrack/files/ophcrack/3.8.0/ophcrack-3.8.0.tar.bz2"
+MD5SUM="d4449e15f65b1f0f82abfd963ceff452"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/ophcrack/slack-desc b/misc/ophcrack/slack-desc
index cc2a1798d2..f1ffe06272 100644
--- a/misc/ophcrack/slack-desc
+++ b/misc/ophcrack/slack-desc
@@ -15,5 +15,5 @@ ophcrack: runs on multiple platforms.
ophcrack:
ophcrack: 3.4 adds support for XP flash and Vista eight XL tables.
ophcrack:
-ophcrack: Homepage: http://ophcrack.sourceforge.net/
+ophcrack: https://ophcrack.sourceforge.io/
ophcrack:
diff --git a/misc/par/README b/misc/par/README
index a0488a9367..887c83b647 100644
--- a/misc/par/README
+++ b/misc/par/README
@@ -1,3 +1,5 @@
+par (paragraph reformatter)
+
par is a paragraph reformatter, vaguely similar to fmt, but better.
For example, the command "par 44gqr", given the input:
diff --git a/misc/par/par.SlackBuild b/misc/par/par.SlackBuild
index 67727fa788..fb8ac03ee0 100644
--- a/misc/par/par.SlackBuild
+++ b/misc/par/par.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Slackware build script for par
-# Written by slakmagik <slakmagik@gmail.com>
+# Written by slakmagik <email removed>
# Released under the WTFPL
# Now maintained by B. Watson <yalhcru@gmail.com>
@@ -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
diff --git a/misc/pinfo/README b/misc/pinfo/README
index ad750c3d7d..6aa0b8f40b 100644
--- a/misc/pinfo/README
+++ b/misc/pinfo/README
@@ -1,7 +1,8 @@
pinfo (info file viewer)
-Pinfo is an info file viewer. It was created when the author, Przemek Borys,
-was very depressed trying to read gtk info entries using the standard tools.
+Pinfo is an info file viewer. It was created when the author, Przemek
+Borys, was very depressed trying to read gtk info entries using the
+standard tools.
-Pinfo is similar in use to lynx. It has similar key movements, and gives
-similar intuition.
+Pinfo is similar in use to lynx. It has similar key movements, and
+gives similar intuition.
diff --git a/misc/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild
index 71f2aab426..5c640b1222 100644
--- a/misc/pinfo/pinfo.SlackBuild
+++ b/misc/pinfo/pinfo.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/misc/projectM/doinst.sh b/misc/projectM/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/misc/projectM/doinst.sh
+++ b/misc/projectM/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/misc/protobuf3/protobuf3.SlackBuild b/misc/protobuf3/protobuf3.SlackBuild
index 1cc6510ff2..177c8ddfec 100644
--- a/misc/protobuf3/protobuf3.SlackBuild
+++ b/misc/protobuf3/protobuf3.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=protobuf3
-VERSION=${VERSION:-3.17.3}
+VERSION=${VERSION:-3.18.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/misc/protobuf3/protobuf3.info b/misc/protobuf3/protobuf3.info
index 897f252b5d..228961c16b 100644
--- a/misc/protobuf3/protobuf3.info
+++ b/misc/protobuf3/protobuf3.info
@@ -1,8 +1,8 @@
PRGNAM="protobuf3"
-VERSION="3.17.3"
+VERSION="3.18.1"
HOMEPAGE="https://github.com/google/protobuf"
-DOWNLOAD="https://github.com/google/protobuf/archive/v3.17.3/protobuf-3.17.3.tar.gz"
-MD5SUM="d7f8e0e3ffeac721e18cdf898eff7d31"
+DOWNLOAD="https://github.com/google/protobuf/archive/v3.18.1/protobuf-3.18.1.tar.gz"
+MD5SUM="4e22487ec6823faf5523954e2eef727f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/rarcrack/README b/misc/rarcrack/README
index 356fbbf6c5..0ac5e309f3 100644
--- a/misc/rarcrack/README
+++ b/misc/rarcrack/README
@@ -7,3 +7,7 @@ This program can crack zip, 7z and rar file passwords.
Optional (recommended) dependencies: At runtime, you'll need unrar to
crack rar files, and/or p7zip to crack 7z files.
+
+Note: this is *really slow*, as it executes zip/7z/rar repeatedly,
+once per generated password. If you're dealing with a zip file,
+fcrackzip is much faster (but doesn't support 7z or rar).
diff --git a/misc/rarcrack/rarcrack.SlackBuild b/misc/rarcrack/rarcrack.SlackBuild
index 2645c53f9d..e391932cc3 100644
--- a/misc/rarcrack/rarcrack.SlackBuild
+++ b/misc/rarcrack/rarcrack.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/misc/sbo-templates/sbo-templates.SlackBuild b/misc/sbo-templates/sbo-templates.SlackBuild
index 8b4340c0f2..5c8e70af17 100644
--- a/misc/sbo-templates/sbo-templates.SlackBuild
+++ b/misc/sbo-templates/sbo-templates.SlackBuild
@@ -90,7 +90,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/sdcv/patches/01_gettext.patch b/misc/sdcv/patches/01_gettext.patch
deleted file mode 100644
index b64565335a..0000000000
--- a/misc/sdcv/patches/01_gettext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Update gettext version to use newer m4 macros
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@
- dnl Gettext stuff.
- dnl ================================================================
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION(0.14.1)
-+AM_GNU_GETTEXT_VERSION(0.17)
- GETTEXT_PACKAGE=sdcv
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
diff --git a/misc/sdcv/patches/02_manpage.patch b/misc/sdcv/patches/02_manpage.patch
deleted file mode 100644
index cc112d5d24..0000000000
--- a/misc/sdcv/patches/02_manpage.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Fix man page to be correct.
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125983&group_id=122858&atid=694730
---- a/doc/uk/sdcv.1
-+++ b/doc/uk/sdcv.1
-@@ -1,14 +1,14 @@
--..TH SDCV 1 "2004-12-06" "sdcv-0.4"
--..SH NAME
-+.TH SDCV 1 "2004-12-06" "sdcv-0.4"
-+.SH NAME
- sdcv \- консольна версія Зоряного словника [Stardict]
--..SH SYNOPSIS
--..B sdcv
-+.SH SYNOPSIS
-+.B sdcv
- [
--..BI options
-+.BI options
- ]
- [list of words]
--..SH DESCRIPTION
--..I sdcv
-+.SH DESCRIPTION
-+.I sdcv
- sdcv проста, міжплатформена текстова утиліта для роботи із
- словниками у форматі Зоряного словника [StarDict].
- Слово зі "списку слів", може бути рядком з початковим слешем '/'
-@@ -19,37 +19,37 @@
- У діалоговому режимі, якщо sdcv був скомпільований з підтримкою
- бібліотеки readline, Ви можете використовувати клавіші ДОГОРИ
- та ВНИЗ для роботи з хронологією.
--..SH OPTIONS
--..TP 8
--..B "\-h \-\-help"
-+.SH OPTIONS
-+.TP 8
-+.B "\-h \-\-help"
- відображає повідомлення довідки та виходить
--..TP 8
--..B "\-v \-\-verbose"
-+.TP 8
-+.B "\-v \-\-verbose"
- відображає версію та виходить
--..TP 8
--..B "\-l \-\-list\-dicts"
-+.TP 8
-+.B "\-l \-\-list\-dicts"
- відображає список доступних словників та виходить
--..TP 8
--..B "\-u \-\-use\-dict filename"
-+.TP 8
-+.B "\-u \-\-use\-dict filename"
- для пошуку з використанням лише словника з цим іменем(bookname)
--..TP 8
--..B "\-n \-\-non\-interactive"
-+.TP 8
-+.B "\-n \-\-non\-interactive"
- для використання в скриптах
--..TP 8
--..B "\-\-utf8\-output"
-+.TP 8
-+.B "\-\-utf8\-output"
- Заставити sdcv розмовляти не в системному кодуванні locale, а робити вивід в utf8
--..TP 8
--..B "\-\-utf8\-input"
-+.TP 8
-+.B "\-\-utf8\-input"
- Заставити sdcv слухати не в системному кодуванні locale, а припускати що це
- ввід в utf8
--..TP 8
--..B "\-\-data\-dir path/to/directory"
-+.TP 8
-+.B "\-\-data\-dir path/to/directory"
- Використовуйте цю теку як шлях до теки даних зоряного словника [stardict].
- Це значає, що sdcv шукає словники у теці data-dir/dic.
--..SH FILES
--..TP
-+.SH FILES
-+.TP
- /usr/share/stardict/dic
--..TP
-+.TP
- $(HOME)/.stardict/dic
-
- Місце, де sdcv очікує знайти словники.
-@@ -57,28 +57,28 @@
- що Ви хочете, лише встановіть змінну оточення STARDICT_DATA_DIR.
- Наприклад, якщо Ви маєте словники у теці /mnt/data/stardict-dicts/dic,
- встановіть STARDICT_DATA_DIR у /mnt/data/stardict-dicts.
--..TP
-+.TP
- $(HOME)/.sdcv_history
-
- Цей файл містить останні $(SDCV_HISTSIZE) слова, які Ви шукали з sdcv.
- SDCV використовує цей файл при умові, якщо sdcv був скомпільований
- з підтримкою бібліотеки readline.
-
--..SH ENVIROMENT
-+.SH ENVIROMENT
- Змінні оточення для \fIsdcv\fR:
--..TP 20
--..B STARDICT_DATA_DIR
-+.TP 20
-+.B STARDICT_DATA_DIR
- Якщо встановлена, sdcv використає цю змінну як теку даних, це означає,
- що sdcv шукатиме словники у $\fBSTARDICT_DATA_DIR\fR\dic
--..TP 20
--..B SDCV_HISTSIZE
-+.TP 20
-+.B SDCV_HISTSIZE
- Якщо встановлена, sdcv писатиме у $(HOME)/.sdcv_history лише
- останні $(SDCV_HISTSIZE) слова, які Ви шукали з sdcv. Якщо не встановлена,
- то збірігатиметься останніх 2000 слів у $(HOME)/.sdcv_history.
--..SH BUGS
-+.SH BUGS
- Звіти про помилки висилайте на адресу dushistov на mail крапка ru.
- Не забувайте включати слово "sdcv" десь у полі "Тема:".
--..SH AUTHORS
-+.SH AUTHORS
- Эвгений А. Душистов, Hu Zheng
--..SH SEE ALSO
-+.SH SEE ALSO
- stardict(1), http://sdcv.sourceforge.net/, http://stardict.sourceforge.net
---- a/doc/sdcv.1
-+++ b/doc/sdcv.1
-@@ -55,7 +55,7 @@
-
- Place, where sdcv expect to find dictionaries.
- Instead of /usr/share/stardict/dic you can use everything
--that you want, just set STARDICT_DATA_DIR enviroment variable.
-+that you want, just set STARDICT_DATA_DIR environment variable.
- For example, if you have dictionaries in /mnt/data/stardict-dicts/dic,
- set STARDICT_DATA_DIR to /mnt/data/stardict-dicts.
- .TP
-@@ -64,7 +64,7 @@
- This file include last $(SDCV_HISTSIZE) words, which you seek with sdcv.
- SDCV use this file only if it was compiled with readline library support.
-
--.SH ENVIROMENT
-+.SH ENVIRONMENT
- Environment Variables Used By \fIsdcv\fR:
- .TP 20
- .B STARDICT_DATA_DIR
diff --git a/misc/sdcv/patches/03_c++.patch b/misc/sdcv/patches/03_c++.patch
deleted file mode 100644
index d8e99e028b..0000000000
--- a/misc/sdcv/patches/03_c++.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Fixes compilation with recent GCC which is more strict about C++.
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125955&group_id=122858&atid=694730
---- a/src/readline.cpp
-+++ b/src/readline.cpp
-@@ -23,6 +23,7 @@
- #endif
-
- #include <cstdio>
-+#include <cstdlib>
- #ifdef WITH_READLINE
- # include <readline/readline.h>
- # include <readline/history.h>
---- a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
-@@ -24,6 +24,7 @@
-
- #include <glib/gi18n.h>
- #include <map>
-+#include <cstring>
-
- #include "utils.hpp"
-
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -22,6 +22,8 @@
- # include "config.h"
- #endif
-
-+#include <cstdio>
-+#include <cstdlib>
- #include <glib.h>
- #include <glib/gi18n.h>
-
---- a/src/lib/lib.cpp
-+++ b/src/lib/lib.cpp
-@@ -513,7 +513,7 @@
- {
- fseek(idxfile, wordoffset[page_idx], SEEK_SET);
- guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
-- fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
-+ fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
- return wordentry_buf;
- }
-
diff --git a/misc/sdcv/patches/04_format.patch b/misc/sdcv/patches/04_format.patch
deleted file mode 100644
index bbb562363a..0000000000
--- a/misc/sdcv/patches/04_format.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Fixes displaying of 'g' (gtk markup) entries.
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125962&group_id=122858&atid=694730
---- a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
-@@ -118,7 +118,6 @@
- switch (*p++) {
- case 'm':
- case 'l': //need more work...
-- case 'g':
- sec_size = strlen(p);
- if (sec_size) {
- res+="\n";
-@@ -128,6 +127,7 @@
- }
- sec_size++;
- break;
-+ case 'g':
- case 'x':
- sec_size = strlen(p);
- if (sec_size) {
diff --git a/misc/sdcv/patches/05_locales.patch b/misc/sdcv/patches/05_locales.patch
deleted file mode 100644
index 3724e3b57e..0000000000
--- a/misc/sdcv/patches/05_locales.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Fixes typo in program (choise -> choice).
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125953&group_id=122858&atid=694730
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -127,7 +127,7 @@
- #: src/libwrapper.cpp:366
- #, c-format
- msgid ""
--"Invalid choise.\n"
-+"Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
- " .\n"
---- a/po/sdcv.pot
-+++ b/po/sdcv.pot
-@@ -118,7 +118,7 @@
- #: src/libwrapper.cpp:366
- #, c-format
- msgid ""
--"Invalid choise.\n"
-+"Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
-
---- a/po/sk.po
-+++ b/po/sk.po
-@@ -124,7 +124,7 @@
- #: src/libwrapper.cpp:366
- #, fuzzy, c-format
- msgid ""
--"Invalid choise.\n"
-+"Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
- "Neplatná voľba.\n"
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -127,7 +127,7 @@
- #: src/libwrapper.cpp:366
- #, fuzzy, c-format
- msgid ""
--"Invalid choise.\n"
-+"Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
- "Неправильний вибір.\n"
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -118,7 +118,7 @@
- #: src/libwrapper.cpp:366
- #, fuzzy, c-format
- msgid ""
--"Invalid choise.\n"
-+"Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
- "无效的选择。\n"
---- a/po/zh_TW.po
-+++ b/po/zh_TW.po
-@@ -120,7 +120,7 @@
- #: src/libwrapper.cpp:366
- #, fuzzy, c-format
- msgid ""
--"Invalid choise.\n"
-+"Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
- "無效的選擇。\n"
---- a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
-@@ -364,7 +364,7 @@
- } else if (choise==-1)
- break;
- else
-- printf(_("Invalid choise.\nIt must be from 0 to %d or -1.\n"),
-+ printf(_("Invalid choice.\nIt must be from 0 to %d or -1.\n"),
- res_list.size()-1);
- }
- } else {
diff --git a/misc/sdcv/patches/06_sk.po.patch b/misc/sdcv/patches/06_sk.po.patch
deleted file mode 100644
index 69a26fd7ec..0000000000
--- a/misc/sdcv/patches/06_sk.po.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Ivan Masár <helix84@centrum.sk>
-Subject: Updates Slovak translation.
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125956&group_id=122858&atid=694730
---- a/po/sk.po
-+++ b/po/sk.po
-@@ -1,21 +1,21 @@
- # translation of sdcv.po to Slovak
- # Copyright (C)
- # Zdenko Podobný <zdpo@mailbox.sk>, 2004, 2005.
--#
-+# Ivan Masár <helix84@centrum.sk>, 2007.
-+
- msgid ""
- msgstr ""
- "Project-Id-Version: sdcv 0.3.2\n"
- "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
- "POT-Creation-Date: 2006-04-24 15:18+0400\n"
--"PO-Revision-Date: 2005-01-04 20:19+0100\n"
--"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
--"Language-Team: Slovak <<sk-i18n@lists.linux.sk>>\n"
-+"PO-Revision-Date: 2007-09-11 00:22+0100\n"
-+"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
-+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: KBabel 1.9.1\n"
--"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
--"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
- #: src/sdcv.cpp:127
- #, c-format
-@@ -24,7 +24,7 @@
- "Try '%s --help' for more information.\n"
- msgstr ""
- "Neznáma voľba.\n"
--"Skúste `%s --help'.\n"
-+"Skúste „%s --help“.\n"
-
- #: src/sdcv.cpp:134
- #, c-format
-@@ -43,15 +43,12 @@
-
- #: src/sdcv.cpp:137
- #, c-format
--msgid ""
--"-l, --list-dicts display list of available dictionaries and exit\n"
--msgstr ""
--"-l, --list-dicts zobrazí zoznam dostupných slovníkov a skončí\n"
-+msgid "-l, --list-dicts display list of available dictionaries and exit\n"
-+msgstr "-l, --list-dicts zobrazí zoznam dostupných slovníkov a skončí\n"
-
- #: src/sdcv.cpp:138
- #, c-format
--msgid ""
--"-u, --use-dict bookname for search use only dictionary with this bookname\n"
-+msgid "-u, --use-dict bookname for search use only dictionary with this bookname\n"
- msgstr "-u, --use-dict názov použiť pre hľadanie iba zvolený slovník\n"
-
- #: src/sdcv.cpp:139
-@@ -71,12 +68,8 @@
-
- #: src/sdcv.cpp:142
- #, c-format
--msgid ""
--"--data-dir path/to/dir use this directory as path to stardict data "
--"directory\n"
--msgstr ""
--"--data-dir path/to/dir použiť tento priečinok ako cestu pre stardict "
--"dátový priečinok\n"
-+msgid "--data-dir path/to/dir use this directory as path to stardict data directory\n"
-+msgstr "--data-dir path/to/dir použiť tento priečinok ako cestu pre stardict dátový priečinok\n"
-
- #: src/sdcv.cpp:148
- #, c-format
-@@ -84,14 +77,14 @@
- msgstr "Konzolová verzia StarDict, verzia %s\n"
-
- #: src/sdcv.cpp:169
--#, fuzzy, c-format
-+#, c-format
- msgid "Dictionary's name Word count\n"
--msgstr "názov počet slov\n"
-+msgstr "názov slovníka počet slov\n"
-
- #: src/sdcv.cpp:191
- #, c-format
- msgid "g_mkdir failed: %s\n"
--msgstr ""
-+msgstr "g_mkdir zlyhalo: %s\n"
-
- #: src/sdcv.cpp:207
- msgid "Enter word or phrase: "
-@@ -104,7 +97,7 @@
-
- #: src/libwrapper.cpp:245
- msgid "popen failed"
--msgstr ""
-+msgstr "popen zlyhalo"
-
- #: src/libwrapper.cpp:282
- #, c-format
-@@ -117,18 +110,18 @@
- msgstr "Nájdené %d položiek, podobných %s,\n"
-
- #: src/libwrapper.cpp:352
--#, fuzzy, c-format
-+#, c-format
- msgid "Your choice[-1 to abort]: "
--msgstr "Vaša voľba: "
-+msgstr "Vaša voľba[-1 zruší]: "
-
- #: src/libwrapper.cpp:366
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Invalid choice.\n"
- "It must be from 0 to %d or -1.\n"
- msgstr ""
- "Neplatná voľba.\n"
--"Musí byť od 0 po %d.\n"
-+"Musí byť od 0 do %d alebo -1.\n"
-
- #: src/libwrapper.cpp:382
- #, c-format
-@@ -137,6 +130,6 @@
-
- #~ msgid "Can not convert %s to current locale.\n"
- #~ msgstr "Nie je možné konvertovať %s na aktuálne locale.\n"
--
- #~ msgid "There is no dictionary with this bookname: %s.\n"
- #~ msgstr "Neexistuje slovník s takýmto názvom: %s.\n"
-+
diff --git a/misc/sdcv/patches/07_cs.po.patch b/misc/sdcv/patches/07_cs.po.patch
deleted file mode 100644
index 300727dd57..0000000000
--- a/misc/sdcv/patches/07_cs.po.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Add Czech translation.
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125958&group_id=122858&atid=694730
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1,2 +1,2 @@
- # Set of available languages.
--sk zh_CN ru uk zh_TW
-+cs sk zh_CN ru uk zh_TW
---- /dev/null
-+++ b/po/cs.po
-@@ -0,0 +1,133 @@
-+# Czech translations for sdcv package.
-+# Copyright (C) 2008 Free Software Foundation, Inc.
-+# This file is distributed under the same license as the sdcv package.
-+# Michal Čihař <michal@cihar.com>, 2008.
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: sdcv 0.4.2\n"
-+"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-+"POT-Creation-Date: 2008-09-24 10:54+0200\n"
-+"PO-Revision-Date: 2008-09-24 10:42+0200\n"
-+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-+"Language-Team: Czech <cs@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-+
-+#: src/sdcv.cpp:127
-+#, c-format
-+msgid ""
-+"Unknown option.\n"
-+"Try '%s --help' for more information.\n"
-+msgstr ""
-+"Neznámý parametr.\n"
-+"Zkuste '%s --help' pro nápovědu.\n"
-+
-+#: src/sdcv.cpp:134
-+#, c-format
-+msgid "Usage: %s [OPTIONS] words\n"
-+msgstr "Použití: %s [PARAMETRY] slova\n"
-+
-+#: src/sdcv.cpp:135
-+#, c-format
-+msgid "-h, --help display this help and exit\n"
-+msgstr "-h, --help zobrazí tuto nápovědu a skončí\n"
-+
-+#: src/sdcv.cpp:136
-+#, c-format
-+msgid "-v, --version display version information and exit\n"
-+msgstr "-v, --version zobrazí informace o verzi a skončí\n"
-+
-+#: src/sdcv.cpp:137
-+#, c-format
-+msgid ""
-+"-l, --list-dicts display list of available dictionaries and exit\n"
-+msgstr "-l, --list-dicts zobrazí seznam dostupných slovníků a skončí\n"
-+
-+#: src/sdcv.cpp:138
-+#, c-format
-+msgid ""
-+"-u, --use-dict bookname for search use only dictionary with this bookname\n"
-+msgstr "-u, --use-dict jméno vyhledávat jen v zadaném slovníku\n"
-+
-+#: src/sdcv.cpp:139
-+#, c-format
-+msgid "-n, --non-interactive for use in scripts\n"
-+msgstr "-n, --non-interactive pro použití ve skriptech\n"
-+
-+#: src/sdcv.cpp:140
-+#, c-format
-+msgid "--utf8-output output must be in utf8\n"
-+msgstr "--utf8-output výstup musí být v utf8\n"
-+
-+#: src/sdcv.cpp:141
-+#, c-format
-+msgid "--utf8-input input of sdcv in utf8\n"
-+msgstr "--utf8-input vstup musí být v utf8\n"
-+
-+#: src/sdcv.cpp:142
-+#, c-format
-+msgid ""
-+"--data-dir path/to/dir use this directory as path to stardict data "
-+"directory\n"
-+msgstr ""
-+"--data-dir cesta/někam použít tento adresář jako cestu ke slovníkům "
-+"stardict\n"
-+
-+#: src/sdcv.cpp:148
-+#, c-format
-+msgid "Console version of Stardict, version %s\n"
-+msgstr "Konzolová verze Stardictu, verze %s\n"
-+
-+#: src/sdcv.cpp:169
-+#, c-format
-+msgid "Dictionary's name Word count\n"
-+msgstr "Jméno slovníku Počet slov\n"
-+
-+#: src/sdcv.cpp:191
-+#, c-format
-+msgid "g_mkdir failed: %s\n"
-+msgstr "g_mkdir selhalo: %s\n"
-+
-+#: src/sdcv.cpp:207
-+msgid "Enter word or phrase: "
-+msgstr "Zadejte slovo nebo frázi: "
-+
-+#: src/sdcv.cpp:215
-+#, c-format
-+msgid "There are no words/phrases to translate.\n"
-+msgstr "Nebyla zadáno nic k přeložení.\n"
-+
-+#: src/libwrapper.cpp:246
-+msgid "popen failed"
-+msgstr "popen selhalo"
-+
-+#: src/libwrapper.cpp:283
-+#, c-format
-+msgid "Can not convert %s to utf8.\n"
-+msgstr "Nepodařilo se převést %s do utf8.\n"
-+
-+#: src/libwrapper.cpp:340 src/libwrapper.cpp:372
-+#, c-format
-+msgid "Found %d items, similar to %s.\n"
-+msgstr "Nalezeno %d záznamů podobných %s.\n"
-+
-+#: src/libwrapper.cpp:353
-+#, c-format
-+msgid "Your choice[-1 to abort]: "
-+msgstr "Vaše volba [-1 pro ukončení]: "
-+
-+#: src/libwrapper.cpp:367
-+#, c-format
-+msgid ""
-+"Invalid choice.\n"
-+"It must be from 0 to %d or -1.\n"
-+msgstr ""
-+"Chybná volba.\n"
-+"Musí být mezi 0 a %d nebo -1.\n"
-+
-+#: src/libwrapper.cpp:383
-+#, c-format
-+msgid "Nothing similar to %s, sorry :(\n"
-+msgstr "Nic podobného %s nenalezeno, promiň :(\n"
diff --git a/misc/sdcv/patches/08_fr.po.patch b/misc/sdcv/patches/08_fr.po.patch
deleted file mode 100644
index 498772d751..0000000000
--- a/misc/sdcv/patches/08_fr.po.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From: Vincent Petry <PVince81@yahoo.fr>
-Subject: This patch adds a french translation.
---- /dev/null
-+++ b/po/fr.po
-@@ -0,0 +1,147 @@
-+# French translations for sdcv package
-+# Traduction française pour le paquet sdcv.
-+# Copyright (C) 2004 THE sdcv'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the sdcv package.
-+# <dushistov@mail.ru>, 2004.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: sdcv 0.4.2\n"
-+"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-+"POT-Creation-Date: 2009-06-15 23:20+0800\n"
-+"PO-Revision-Date: 2009-06-15 23:20+0800\n"
-+"Last-Translator: <PVince81@yahoo.fr>\n"
-+"Language-Team: Vincent Petry <PVince81@yahoo.fr>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+
-+#: src/sdcv.cpp:127
-+#, c-format
-+msgid ""
-+"Unknown option.\n"
-+"Try '%s --help' for more information.\n"
-+msgstr ""
-+"Option inconnue.\n"
-+"Essayez '%s --help' pour plus d'informations.\n"
-+
-+#: src/sdcv.cpp:134
-+#, c-format
-+msgid "Usage: %s [OPTIONS] words\n"
-+msgstr "Usage: %s [OPTIONS] mots\n"
-+
-+#: src/sdcv.cpp:135
-+#, c-format
-+msgid "-h, --help display this help and exit\n"
-+msgstr "-h, --help afficher cet aide et sortir\n"
-+
-+#: src/sdcv.cpp:136
-+#, c-format
-+msgid "-v, --version display version information and exit\n"
-+msgstr ""
-+"-v, --version afficher les informations de version et sortir\n"
-+
-+#: src/sdcv.cpp:137
-+#, c-format
-+msgid ""
-+"-l, --list-dicts display list of available dictionaries and exit\n"
-+msgstr ""
-+"-l, --list-dicts afficher la liste des dictionnaires disponibles et "
-+"sortir\n"
-+
-+#: src/sdcv.cpp:138
-+#, c-format
-+msgid ""
-+"-u, --use-dict bookname for search use only dictionary with this bookname\n"
-+msgstr ""
-+"-u, --use-dict nom_dict pour chercher seulement en utilisant le dictionnaire "
-+"spécifié\n"
-+
-+#: src/sdcv.cpp:139
-+#, c-format
-+msgid "-n, --non-interactive for use in scripts\n"
-+msgstr "-n, --non-interactive pour l'utilisation dans des scripts\n"
-+
-+#: src/sdcv.cpp:140
-+#, c-format
-+msgid "--utf8-output output must be in utf8\n"
-+msgstr "--utf8-output force la sortie au format utf8\n"
-+
-+#: src/sdcv.cpp:141
-+#, c-format
-+msgid "--utf8-input input of sdcv in utf8\n"
-+msgstr "--utf8-input force l'entrée de sdcv au format utf8\n"
-+
-+#: src/sdcv.cpp:142
-+#, c-format
-+msgid ""
-+"--data-dir path/to/dir use this directory as path to stardict data "
-+"directory\n"
-+msgstr ""
-+"--data-dir chemin utiliser ce chemin pour trouver les données de "
-+"stardict\n"
-+
-+#: src/sdcv.cpp:148
-+#, c-format
-+msgid "Console version of Stardict, version %s\n"
-+msgstr "Version console de Stardict, version %s\n"
-+
-+#: src/sdcv.cpp:169
-+#, c-format
-+msgid "Dictionary's name Word count\n"
-+msgstr "Nom dictionnaire Nombre de mots\n"
-+
-+#: src/sdcv.cpp:191
-+#, c-format
-+msgid "g_mkdir failed: %s\n"
-+msgstr "Échec de g_mkdir : %s\n"
-+
-+#: src/sdcv.cpp:207
-+msgid "Enter word or phrase: "
-+msgstr "Entrez un mot ou une phrase: "
-+
-+#: src/sdcv.cpp:215
-+#, c-format
-+msgid "There are no words/phrases to translate.\n"
-+msgstr "Il n'y a pas de mots/phrases à traduire.\n"
-+
-+#: src/libwrapper.cpp:245
-+msgid "popen failed"
-+msgstr "Échec de popen"
-+
-+#: src/libwrapper.cpp:282
-+#, c-format
-+msgid "Can not convert %s to utf8.\n"
-+msgstr "Ne peut convertir %s au format utf8.\n"
-+
-+#: src/libwrapper.cpp:339 src/libwrapper.cpp:371
-+#, c-format
-+msgid "Found %d items, similar to %s.\n"
-+msgstr "Trouvé %d éléments similaires à %s.\n"
-+
-+#: src/libwrapper.cpp:352
-+#, c-format
-+msgid "Your choice[-1 to abort]: "
-+msgstr "Votre choix[-1 pour abandonner] : "
-+
-+#: src/libwrapper.cpp:366
-+#, c-format
-+msgid ""
-+"Invalid choise.\n"
-+"It must be from 0 to %d or -1.\n"
-+msgstr ""
-+"Selection invalide.\n"
-+"Veuillez choisir un nombre entre 0 et %d, ou -1.\n"
-+
-+#: src/libwrapper.cpp:382
-+#, c-format
-+msgid "Nothing similar to %s, sorry :(\n"
-+msgstr "Aucun mot/phrase similaire à %s, désolé :(\n"
-+
-+#~ msgid "Can not convert %s to current locale.\n"
-+#~ msgstr "Ne peut pas convertir %s dans la locale courante.\n"
-+
-+#~ msgid "There is no dictionary with this bookname: %s.\n"
-+#~ msgstr "Pas de dictionnaire : %s.\n"
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1,2 +1,2 @@
- # Set of available languages.
--cs sk zh_CN ru uk zh_TW
-+cs sk zh_CN ru uk zh_TW fr
diff --git a/misc/sdcv/patches/09_fix-tests.patch b/misc/sdcv/patches/09_fix-tests.patch
deleted file mode 100644
index cc93890280..0000000000
--- a/misc/sdcv/patches/09_fix-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Fixes tests so that they can be executed using dash as /bin/sh.
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125959&group_id=122858&atid=694730
---- a/tests/t_datadir
-+++ b/tests/t_datadir
-@@ -2,11 +2,11 @@
-
- unset SDCV_PAGER
- have=`../src/sdcv --data-dir ./ -l | wc -l`
--let have=have-1
-+have=$(($have-1))
- ndicts=`find "${HOME}"/.stardict/dic -name "*.ifo" -print | wc -l`
--let ndicts=ndicts+1
-+ndicts=$(($ndicts+1))
- if [ $have -ne $ndicts ]; then
-- let ndicts=ndicts-1
-+ ndicts=$(($ndicts-1))
- echo "test failed: sdcv says: we have: $have, but really we have: $ndicts" >&2
- exit 1
- fi
---- a/tests/t_list
-+++ b/tests/t_list
-@@ -1,10 +1,10 @@
- #!/bin/sh
-
- ndicts=`../src/sdcv -l | wc -l`
--let ndicts=ndicts-1
-+ndicts=$(($ndicts-1))
- ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
- nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
--let nmy=ncom+nspe
-+nmy=$(($ncom+$nspe))
-
- if [ $nmy -ne $ndicts ]; then
- echo "should be: $nmy, we have: $ndicts" >&2
---- a/tests/t_utf8input
-+++ b/tests/t_utf8input
-@@ -9,13 +9,13 @@
- "
- j=0
- for i in `../src/sdcv --utf8-input -n человек 2>&1`; do
-- let j=j+1
-+ j=$(($j+1))
- if [ $j -ne 1 ]; then
- break;
- fi
- done
-
--if [ $j -eq 1 ]; then
-+if [ $j -ne 1 ]; then
- echo "empty results of search: test failed" >&2
- exit 1
- fi
diff --git a/misc/sdcv/patches/10_use-env-home.patch b/misc/sdcv/patches/10_use-env-home.patch
deleted file mode 100644
index e912c68268..0000000000
--- a/misc/sdcv/patches/10_use-env-home.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Use environment variable HOME to get home directory. g_get_home_dir does ignore it.
-Index: sdcv-0.4.2/src/sdcv.cpp
-===================================================================
---- sdcv-0.4.2.orig/src/sdcv.cpp 2008-10-03 09:15:26.000000000 +0200
-+++ sdcv-0.4.2/src/sdcv.cpp 2008-10-03 09:16:25.000000000 +0200
-@@ -157,11 +157,14 @@
- data_dir="/usr/share/stardict/dic";
- }
-
-+ const char *homedir = g_getenv ("HOME");
-+ if (!homedir)
-+ homedir = g_get_home_dir ();
-
-
- strlist_t dicts_dir_list;
-
-- dicts_dir_list.push_back(std::string(g_get_home_dir())+G_DIR_SEPARATOR+
-+ dicts_dir_list.push_back(std::string(homedir)+G_DIR_SEPARATOR+
- ".stardict"+G_DIR_SEPARATOR+"dic");
- dicts_dir_list.push_back(data_dir);
-
-@@ -186,7 +189,7 @@
- }
-
-
-- string conf_dir = string(g_get_home_dir())+G_DIR_SEPARATOR+".stardict";
-+ string conf_dir = string(homedir)+G_DIR_SEPARATOR+".stardict";
- if (g_mkdir(conf_dir.c_str(), S_IRWXU)==-1 && errno!=EEXIST)
- fprintf(stderr, _("g_mkdir failed: %s\n"), strerror(errno));
-
diff --git a/misc/sdcv/patches/11_allignment.patch b/misc/sdcv/patches/11_allignment.patch
deleted file mode 100644
index dd719f6b7f..0000000000
--- a/misc/sdcv/patches/11_allignment.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Fix unalligned access to buffer.
-
-On several architectures (arm, armel, sparc and ia64), unalligned access to
-integers is not allowed. Buffer in this function is not alligned at all and
-attempt to read integer from it causes crash of application on such
-architectures.
-
-Bug: https://sourceforge.net/tracker/index.php?func=detail&aid=2149388&group_id=122858&atid=694730
---- a/src/lib/lib.cpp
-+++ b/src/lib/lib.cpp
-@@ -496,9 +496,13 @@
- entries[i].keystr=p;
- len=strlen(p);
- p+=len+1;
-- entries[i].off=g_ntohl(*reinterpret_cast<guint32 *>(p));
-+ /*
-+ * Can not use typecasting here, because *data does not have
-+ * to be alligned and unalligned access fails on some architectures.
-+ */
-+ entries[i].off=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
- p+=sizeof(guint32);
-- entries[i].size=g_ntohl(*reinterpret_cast<guint32 *>(p));
-+ entries[i].size=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
- p+=sizeof(guint32);
- }
- }
diff --git a/misc/sdcv/patches/12_fix-formats.patch b/misc/sdcv/patches/12_fix-formats.patch
deleted file mode 100644
index 2d8fcc3025..0000000000
--- a/misc/sdcv/patches/12_fix-formats.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Printing of size_t type should use %zd.
---- a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
-@@ -337,13 +337,13 @@
- }//if (!force)
-
- if (!show_all_results && !force) {
-- printf(_("Found %d items, similar to %s.\n"), res_list.size(),
-+ printf(_("Found %zd items, similar to %s.\n"), res_list.size(),
- utf8_output ? str : utf8_to_locale_ign_err(str).c_str());
- for (size_t i=0; i<res_list.size(); ++i) {
- string loc_bookname, loc_def;
- loc_bookname=utf8_to_locale_ign_err(res_list[i].bookname);
- loc_def=utf8_to_locale_ign_err(res_list[i].def);
-- printf("%d)%s-->%s\n", i,
-+ printf("%zd)%s-->%s\n", i,
- utf8_output ? res_list[i].bookname.c_str() : loc_bookname.c_str(),
- utf8_output ? res_list[i].def.c_str() : loc_def.c_str());
- }
-@@ -364,12 +364,12 @@
- } else if (choise==-1)
- break;
- else
-- printf(_("Invalid choice.\nIt must be from 0 to %d or -1.\n"),
-+ printf(_("Invalid choice.\nIt must be from 0 to %zd or -1.\n"),
- res_list.size()-1);
- }
- } else {
- sdcv_pager pager(force);
-- fprintf(pager.get_stream(), _("Found %d items, similar to %s.\n"),
-+ fprintf(pager.get_stream(), _("Found %zd items, similar to %s.\n"),
- res_list.size(), utf8_output ? str : utf8_to_locale_ign_err(str).c_str());
- for (PSearchResult ptr=res_list.begin(); ptr!=res_list.end(); ++ptr)
- print_search_result(pager.get_stream(), *ptr);
diff --git a/misc/sdcv/patches/13_zlib-return-value.patch b/misc/sdcv/patches/13_zlib-return-value.patch
deleted file mode 100644
index 171ac15538..0000000000
--- a/misc/sdcv/patches/13_zlib-return-value.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Michal Čihař <nijel@debian.org>
-Subject: Zlib can return negative value, but gulong is unsigned, so it can not catch the error state.
---- a/src/lib/lib.cpp
-+++ b/src/lib/lib.cpp
-@@ -751,12 +751,12 @@
-
- idxdatabuf = (gchar *)g_malloc(fsize);
-
-- gulong len = gzread(in, idxdatabuf, fsize);
-+ ssize_t len = gzread(in, idxdatabuf, fsize);
- gzclose(in);
- if (len < 0)
- return false;
-
-- if (len != fsize)
-+ if (len != (ssize_t)fsize)
- return false;
-
- wordlist.resize(wc+1);
diff --git a/misc/sdcv/sdcv.SlackBuild b/misc/sdcv/sdcv.SlackBuild
index 25393c9013..9f38341998 100644
--- a/misc/sdcv/sdcv.SlackBuild
+++ b/misc/sdcv/sdcv.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=sdcv
-VERSION=${VERSION:-0.4.2}
+VERSION=${VERSION:-0.5.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,34 +79,30 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Apply Debian patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --with-readline \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build/locale
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make lang
+ make install DESTDIR=$PKG
+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
+mv $PKG/usr/share/man $PKG/usr
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 \
- ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO\
+ AUTHORS LICENSE NEWS README.org \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/sdcv/sdcv.info b/misc/sdcv/sdcv.info
index 0415f46a7d..08f292fe0c 100644
--- a/misc/sdcv/sdcv.info
+++ b/misc/sdcv/sdcv.info
@@ -1,8 +1,8 @@
PRGNAM="sdcv"
-VERSION="0.4.2"
-HOMEPAGE="http://sdcv.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/sdcv/sdcv-0.4.2.tar.bz2"
-MD5SUM="f624662b333daa5da2d3e99cef519f17"
+VERSION="0.5.3"
+HOMEPAGE="https://dushistov.github.io/sdcv/"
+DOWNLOAD="https://github.com/Dushistov/sdcv/archive/v0.5.3/sdcv-0.5.3.tar.gz"
+MD5SUM="6a75cfe650ce1d0fca229e63278d5c0e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/sdcv/slack-desc b/misc/sdcv/slack-desc
index bbad001845..bf3ca424b5 100644
--- a/misc/sdcv/slack-desc
+++ b/misc/sdcv/slack-desc
@@ -11,7 +11,7 @@ sdcv:
sdcv: sdcv is a console version of stardict, a cross-platform
sdcv: and international dictionary.
sdcv:
-sdcv: homepage: http://sdcv.sourceforge.net
+sdcv: homepage: https://dushistov.github.io/sdcv/
sdcv:
sdcv:
sdcv:
diff --git a/misc/slop/slop.SlackBuild b/misc/slop/slop.SlackBuild
index 3b0abfe588..49feb48510 100644
--- a/misc/slop/slop.SlackBuild
+++ b/misc/slop/slop.SlackBuild
@@ -90,6 +90,9 @@ rm -rf $PKG/usr/share
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 COPYING README.md license.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/solunar/solunar.info b/misc/solunar/solunar.info
index d15bd8e27a..d3d745719e 100644
--- a/misc/solunar/solunar.info
+++ b/misc/solunar/solunar.info
@@ -1,7 +1,7 @@
PRGNAM="solunar"
VERSION="0.1.0"
HOMEPAGE="http://kevinboone.net/README_solunar.html"
-DOWNLOAD="http://kevinboone.net/solunar.tar.gz"
+DOWNLOAD="https://slackware.uk/sbosrcarch/by-md5/e/2/e264e77db001c5ded56725088db36ac0/solunar.tar.gz"
MD5SUM="e264e77db001c5ded56725088db36ac0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/ssss/ssss.SlackBuild b/misc/ssss/ssss.SlackBuild
index fa4a21816c..a66351c252 100644
--- a/misc/ssss/ssss.SlackBuild
+++ b/misc/ssss/ssss.SlackBuild
@@ -91,15 +91,15 @@ make ssss-split
make ssss-combine
cp -a ssss-split ssss-combine $PKG/usr/bin
-cp $CWD/ssss.1 $PKG/usr/man/man1/
-
+cat $CWD/ssss.1 > $PKG/usr/man/man1/ssss.1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
gzip -9 $PKG/usr/man/man1/ssss.1
-cp -a HISTORY LICENSE doc.html $CWD/ssss.1.html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a HISTORY LICENSE doc.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/ssss.1.html > $PKG/usr/doc/$PRGNAM-$VERSION/ssss.1.html
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/misc/txt2regex/txt2regex.SlackBuild b/misc/txt2regex/txt2regex.SlackBuild
index 6d7164854f..d89b765935 100644
--- a/misc/txt2regex/txt2regex.SlackBuild
+++ b/misc/txt2regex/txt2regex.SlackBuild
@@ -15,9 +15,6 @@ TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
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/misc/txt2regex/txt2regex.info b/misc/txt2regex/txt2regex.info
index ff487ac5a3..de1d7c8e7f 100644
--- a/misc/txt2regex/txt2regex.info
+++ b/misc/txt2regex/txt2regex.info
@@ -1,6 +1,6 @@
PRGNAM="txt2regex"
VERSION="0.9"
-HOMEPAGE="http://aurelio.net/projects/txt2regex/"
+HOMEPAGE="https://aurelio.net/projects/txt2regex/"
DOWNLOAD="https://github.com/aureliojargas/txt2regex/archive/v0.9/txt2regex-0.9.tar.gz"
MD5SUM="7066adc50e55300f5bcad276cf65b852"
DOWNLOAD_x86_64=""
diff --git a/misc/utimer/utimer-0.4-fno-common.patch b/misc/utimer/utimer-0.4-fno-common.patch
new file mode 100644
index 0000000000..a8386fe8e2
--- /dev/null
+++ b/misc/utimer/utimer-0.4-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -66,9 +66,9 @@
+ #define TIMER_PRINT_RATE_MSEC 79
+ #define TIMER_CHECK_RATE_MSEC 500
+
+-GMainLoop *loop;
+-gboolean paused;
+-struct termios savedttystate;
+-Config ut_config;
++extern GMainLoop *loop;
++extern gboolean paused;
++extern struct termios savedttystate;
++extern Config ut_config;
+
+ #endif /* UTIMER_H */
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -36,6 +36,10 @@
+ #include "utils.h"
+ #include "utimer.h"
+
++GMainLoop *loop;
++gboolean paused;
++struct termios savedttystate;
++Config ut_config;
+
+ gulong ul_add (gulong a, gulong b)
+ {
diff --git a/misc/utimer/utimer-0.4-locale.patch b/misc/utimer/utimer-0.4-locale.patch
new file mode 100644
index 0000000000..68acdd471a
--- /dev/null
+++ b/misc/utimer/utimer-0.4-locale.patch
@@ -0,0 +1,10 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -35,6 +35,7 @@
+ #include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
++#include <locale.h>
+
+ #include "utils.h"
+ #include "timer.h"
diff --git a/misc/utimer/utimer.SlackBuild b/misc/utimer/utimer.SlackBuild
index a5aab681ea..3d69312a36 100644
--- a/misc/utimer/utimer.SlackBuild
+++ b/misc/utimer/utimer.SlackBuild
@@ -54,6 +54,9 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
+# some patches from gentoo
+patch -p1 < $CWD/utimer-0.4-fno-common.patch
+patch -p1 < $CWD/utimer-0.4-locale.patch
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/misc/vdpauinfo/vdpauinfo.SlackBuild b/misc/vdpauinfo/vdpauinfo.SlackBuild
index 81400fa51b..a8aae55ffc 100644
--- a/misc/vdpauinfo/vdpauinfo.SlackBuild
+++ b/misc/vdpauinfo/vdpauinfo.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=vdpauinfo
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/misc/vdpauinfo/vdpauinfo.info b/misc/vdpauinfo/vdpauinfo.info
index 72e040a866..525be22797 100644
--- a/misc/vdpauinfo/vdpauinfo.info
+++ b/misc/vdpauinfo/vdpauinfo.info
@@ -1,10 +1,10 @@
PRGNAM="vdpauinfo"
-VERSION="1.0"
-HOMEPAGE="https://cgit.freedesktop.org/~aplattner/vdpauinfo"
-DOWNLOAD="https://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-1.0.tar.gz"
-MD5SUM="4eba3e7bf5062b9c245276860493804f"
+VERSION="1.4"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
+DOWNLOAD="https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/8f047eac351672cc4316724edb6ad2b2/vdpauinfo-1.4.tar.gz"
+MD5SUM="b0d43317b6bfbf4d55be07f5ad5c085f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/misc/vttest/vttest.SlackBuild b/misc/vttest/vttest.SlackBuild
index fd495d69ca..41a3a01347 100644
--- a/misc/vttest/vttest.SlackBuild
+++ b/misc/vttest/vttest.SlackBuild
@@ -29,9 +29,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/misc/vttest/vttest.info b/misc/vttest/vttest.info
index 9f00527391..7c5fa4c0ab 100644
--- a/misc/vttest/vttest.info
+++ b/misc/vttest/vttest.info
@@ -1,7 +1,7 @@
PRGNAM="vttest"
VERSION="2.7.20210210"
-HOMEPAGE="http://invisible-island.net/vttest/"
-DOWNLOAD="ftp://ftp.invisible-island.net/vttest/vttest-20210210.tgz"
+HOMEPAGE="https://invisible-island.net/vttest/"
+DOWNLOAD="https://invisible-mirror.net/archives/vttest/vttest-20210210.tgz"
MD5SUM="21c7493640a7912ea746b3eb0689f2a7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/wcd/wcd.SlackBuild b/misc/wcd/wcd.SlackBuild
index c7054210d0..cb4f7cd453 100644
--- a/misc/wcd/wcd.SlackBuild
+++ b/misc/wcd/wcd.SlackBuild
@@ -2,28 +2,16 @@
# Slackware build script for wcd
-# Originally written by:
-# Ryan P.C. McQuen <email removed>
-
+# Originally written by Ryan P.C. McQuen <email removed>
# Now maintained by B. Watson <yalhcru@gmail.com>
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <https://www.gnu.org/licenses/>.
+# 20210910 bkw:
+# - updated for v6.0.4_beta2. there are no code changes in the beta,
+# only the documentation and translations have been updated, so
+# it's a safe upgrade that won't break anything.
+# - relicense as WTFPL with permission from original author.
# 20191201 bkw: updated for v6.0.3.
# 20180612 bkw: updated for v6.0.2.
@@ -33,7 +21,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=wcd
-VERSION=${VERSION:-6.0.3}
+VERSION=${VERSION:-6.0.4_beta2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -46,9 +34,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
@@ -60,12 +45,14 @@ OUTPUT=${OUTPUT:-/tmp}
set -e
+TARVER=${VERSION/_/-}
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$TARVER
+tar xvf $CWD/$PRGNAM-$TARVER.tar.gz
+cd $PRGNAM-$TARVER
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 {} \+
diff --git a/misc/wcd/wcd.info b/misc/wcd/wcd.info
index e69dd930eb..2edf38ab91 100644
--- a/misc/wcd/wcd.info
+++ b/misc/wcd/wcd.info
@@ -1,8 +1,8 @@
PRGNAM="wcd"
-VERSION="6.0.3"
-HOMEPAGE="http://waterlan.home.xs4all.nl/"
-DOWNLOAD="http://waterlan.home.xs4all.nl/wcd/wcd-6.0.3.tar.gz"
-MD5SUM="833dec747e810aacc060f7ef50fade85"
+VERSION="6.0.4_beta2"
+HOMEPAGE="https://waterlan.home.xs4all.nl/"
+DOWNLOAD="https://waterlan.home.xs4all.nl/wcd/wcd-6.0.4-beta2.tar.gz"
+MD5SUM="8640752eecfb07058ceb2a85965800e4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/weather/doinst.sh b/misc/weather/doinst.sh
index 04a38d4744..daa63450b0 100644
--- a/misc/weather/doinst.sh
+++ b/misc/weather/doinst.sh
@@ -19,15 +19,6 @@ elif [ ! -e usr/bin/weather.expect -a -e usr/bin/weather ]; then
# the existing /usr/bin/weather, which is assumed to come from the
# stock expect package
cp -a usr/bin/weather usr/bin/weather.expect
-fi
-
-config etc/weatherrc.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
- /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
+config etc/weatherrc.new
diff --git a/misc/wmbday/wmbday.info b/misc/wmbday/wmbday.info
index 5b0348f51d..55abe94f94 100644
--- a/misc/wmbday/wmbday.info
+++ b/misc/wmbday/wmbday.info
@@ -1,7 +1,7 @@
PRGNAM="wmbday"
VERSION="0.3.1"
-HOMEPAGE="http://freecode.com/projects/wmbday"
-DOWNLOAD="http://ftp.nsysu.edu.tw/FreeBSD/ports/local-distfiles/uqs/wmbday-0.3.1.tar.gz"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/wmbday"
+DOWNLOAD="https://slackware.uk/sbosrcarch/by-md5/7/b/7ba1394ea2eb65cdf08dea52349d27f8/wmbday-0.3.1.tar.gz"
MD5SUM="7ba1394ea2eb65cdf08dea52349d27f8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/xapian-omega/slack-desc b/misc/xapian-omega/slack-desc
index cb7e513a92..2b24abcdc7 100644
--- a/misc/xapian-omega/slack-desc
+++ b/misc/xapian-omega/slack-desc
@@ -15,5 +15,5 @@ xapian-omega: The default configuration file is /etc/xapian-omega.conf. This dif
xapian-omega: from the upstream Xapian Omega default of /etc/omega.conf to avoid
xapian-omega: clashing with other applications that use /etc/omega.conf.
xapian-omega:
-xapian-omega: Homepage: http://www.xapian.org/
+xapian-omega: Homepage: https://xapian.org/
xapian-omega:
diff --git a/misc/xapian-omega/xapian-omega.SlackBuild b/misc/xapian-omega/xapian-omega.SlackBuild
index 11025dbd3e..ce0a22c646 100644
--- a/misc/xapian-omega/xapian-omega.SlackBuild
+++ b/misc/xapian-omega/xapian-omega.SlackBuild
@@ -28,7 +28,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xapian-omega
-VERSION=${VERSION:-1.2.12}
+VERSION=${VERSION:-1.4.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -37,7 +37,7 @@ HTTPD_DIR=${HTTPD_DIR:-/srv/httpd}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -55,8 +55,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"
@@ -75,7 +75,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/misc/xapian-omega/xapian-omega.info b/misc/xapian-omega/xapian-omega.info
index d5f9b61c4a..1b0b26b435 100644
--- a/misc/xapian-omega/xapian-omega.info
+++ b/misc/xapian-omega/xapian-omega.info
@@ -1,8 +1,8 @@
PRGNAM="xapian-omega"
-VERSION="1.2.12"
-HOMEPAGE="http://www.xapian.org/"
-DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.12/xapian-omega-1.2.12.tar.gz"
-MD5SUM="7eed3c1e9e6acb703d6587ed9a038265"
+VERSION="1.4.18"
+HOMEPAGE="https://xapian.org/"
+DOWNLOAD="https://oligarchy.co.uk/xapian/1.4.18/xapian-omega-1.4.18.tar.xz"
+MD5SUM="a17d54d17eb5b40482901821f0f3d785"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/xbanish/xbanish.SlackBuild b/misc/xbanish/xbanish.SlackBuild
index 10dbdd3b1f..533f4a4eb7 100644
--- a/misc/xbanish/xbanish.SlackBuild
+++ b/misc/xbanish/xbanish.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/misc/xwinwrap/xwinwrap.info b/misc/xwinwrap/xwinwrap.info
index bf9aac1a34..10dc630e9e 100644
--- a/misc/xwinwrap/xwinwrap.info
+++ b/misc/xwinwrap/xwinwrap.info
@@ -1,7 +1,7 @@
PRGNAM="xwinwrap"
VERSION="0.3"
HOMEPAGE="https://launchpad.net/xwinwrap"
-DOWNLOAD="http://ftp.nsysu.edu.tw/FreeBSD/ports/local-distfiles/vg/xwinwrap-0.3.tar.bz2"
+DOWNLOAD="http://mirror.its.dal.ca/freebsd/distfiles/xwinwrap-0.3.tar.bz2"
MD5SUM="028e54d47747d50b6e7eee4167fbb06a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/misc/sbo-templates/doinst.sh b/misc/yapet/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/misc/sbo-templates/doinst.sh
+++ b/misc/yapet/doinst.sh
diff --git a/misc/yapet/gcc6.patch b/misc/yapet/gcc6.patch
deleted file mode 100644
index a57e0c93c1..0000000000
--- a/misc/yapet/gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- yapet-1.0/yapet/cfg.h 2014-02-23 10:18:41.000000000 -0700
-+++ yapet-1.0/yapet/cfg.h 2016-04-14 07:06:49.665672169 -0700
-@@ -163,7 +163,7 @@
- locked = false;
- }
-
-- void is_locked() const {
-+ bool is_locked() const {
- return locked;
- }
-
diff --git a/misc/yapet/yapet.SlackBuild b/misc/yapet/yapet.SlackBuild
index db87d312d3..fca88e49d0 100644
--- a/misc/yapet/yapet.SlackBuild
+++ b/misc/yapet/yapet.SlackBuild
@@ -25,14 +25,14 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=yapet
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-2.5}
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
@@ -50,8 +50,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"
@@ -79,9 +79,6 @@ 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 {} \;
-# From upstream
-patch -p1 < $CWD/gcc6.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -104,6 +101,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/yapet/yapet.info b/misc/yapet/yapet.info
index fd177d8e29..9fcb99e482 100644
--- a/misc/yapet/yapet.info
+++ b/misc/yapet/yapet.info
@@ -1,10 +1,10 @@
PRGNAM="yapet"
-VERSION="1.0"
-HOMEPAGE="https://www.guengel.ch/myapps/yapet/"
-DOWNLOAD="https://www.guengel.ch/myapps/yapet/downloads/yapet-1.0.tar.bz2"
-MD5SUM="a3cf3c274abefdbee15acd74dbdbb1ee"
+VERSION="2.5"
+HOMEPAGE="https://yapet.guengel.ch/"
+DOWNLOAD="https://yapet.guengel.ch/downloads/yapet-2.5.tar.bz2"
+MD5SUM="4016dbb2a1826691ce76d68b6116efab"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="cppunit"
MAINTAINER="Eric Mulvaney"
EMAIL="eric.mulvaney@gmail.com"
diff --git a/misc/ydpdict/ydpdict.SlackBuild b/misc/ydpdict/ydpdict.SlackBuild
index d4f7832e44..287c7a7d30 100644
--- a/misc/ydpdict/ydpdict.SlackBuild
+++ b/misc/ydpdict/ydpdict.SlackBuild
@@ -8,14 +8,14 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ydpdict
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.0.3}
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
@@ -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"
@@ -63,6 +63,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 {} \;
+./autogen.sh
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -75,8 +77,6 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--build=$ARCH-slackware-linux
-patch -p0 < $CWD/ydpdict.patch
-
make
make install DESTDIR=$PKG
@@ -91,7 +91,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mv $PKG/etc/ydpdict.conf $PKG/etc/ydpdict.conf.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING 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/misc/ydpdict/ydpdict.info b/misc/ydpdict/ydpdict.info
index 38d6266e12..902ac6ac2c 100644
--- a/misc/ydpdict/ydpdict.info
+++ b/misc/ydpdict/ydpdict.info
@@ -1,8 +1,8 @@
PRGNAM="ydpdict"
-VERSION="1.0.2"
-HOMEPAGE="http://toxygen.net/ydpdict/"
-DOWNLOAD="http://toxygen.net/ydpdict/ydpdict-1.0.2.tar.gz"
-MD5SUM="339be2191e94f0af5abcd037c3ef368a"
+VERSION="1.0.3"
+HOMEPAGE="https://github.com/wojtekka/ydpdict"
+DOWNLOAD="https://github.com/wojtekka/ydpdict/archive/1.0.3/ydpdict-1.0.3.tar.gz"
+MD5SUM="8af97ad2598a5e339c778fa949349b12"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libydpdict"
diff --git a/misc/yubioath-desktop/doinst.sh b/misc/yubioath-desktop/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/misc/yubioath-desktop/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/misc/yubioath-desktop/yubioath-desktop.SlackBuild b/misc/yubioath-desktop/yubioath-desktop.SlackBuild
index 6ca4593c42..2b0fd0e736 100644
--- a/misc/yubioath-desktop/yubioath-desktop.SlackBuild
+++ b/misc/yubioath-desktop/yubioath-desktop.SlackBuild
@@ -96,6 +96,7 @@ cp $CWD/$PRGNAM-$VERSION-linux.AppImage $PKG/usr/bin/$PRGNAM
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE