diff options
Diffstat (limited to 'source')
14 files changed, 36 insertions, 22 deletions
diff --git a/source/ap/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild index 75fb110ec..bd9523905 100755 --- a/source/ap/gutenprint/gutenprint.SlackBuild +++ b/source/ap/gutenprint/gutenprint.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gutenprint VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 55fdfaffa..2c2dfc8b2 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Tue Dec 8 19:22:18 UTC 2020 + SeTPKG: Change KDE blurb to say "The KDE Plasma Desktop" ++--------------------------+ Fri Oct 30 22:06:27 UTC 2020 Add libnsl. Thanks to Olek. +--------------------------+ diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTPKG b/source/installer/sources/initrd/usr/lib/setup/SeTPKG index 02a47373d..6ae2d2135 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTPKG +++ b/source/installer/sources/initrd/usr/lib/setup/SeTPKG @@ -74,19 +74,19 @@ fi if [ -d $DS/kde -o "$DS" = "" ]; then cat << EOF >> $TMP/tmpscript -"KDE" "The K Desktop Environment for X" on "The KDE series contains the K Desktop Environment and related libraries." \\ +"KDE" "The KDE Plasma Desktop" on "The KDE series contains the KDE Plasma Desktop for X." \\ EOF fi -if [ -d $DS/kdei -o "$DS" = "" ]; then -cat << EOF >> $TMP/tmpscript -"KDEI" "International language support for KDE" off "The KDEI series provides support for languages other than US English in KDE." \\ -EOF -fi +#if [ -d $DS/kdei -o "$DS" = "" ]; then +#cat << EOF >> $TMP/tmpscript +#"KDEI" "International language support for KDE" off "The KDEI series provides support for languages other than US English in KDE." \\ +#EOF +#fi if [ -d $DS/l -o "$DS" = "" ]; then cat << EOF >> $TMP/tmpscript -"L" "System Libraries (some needed by both KDE and GNOME)" "on" "The L series contains libraries needed by GNOME, KDE, and other programs." \\ +"L" "System Libraries (some needed by both KDE and Xfce)" "on" "The L series contains libraries needed by KDE, Xfce, and other programs." \\ EOF fi diff --git a/source/k/kernel-configs/config-generic-5.4.81 b/source/k/kernel-configs/config-generic-5.4.82 index c9d2295d5..93751b82c 100644 --- a/source/k/kernel-configs/config-generic-5.4.81 +++ b/source/k/kernel-configs/config-generic-5.4.82 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.81 Kernel Configuration +# Linux/x86 5.4.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-5.4.81.x64 b/source/k/kernel-configs/config-generic-5.4.82.x64 index 8494cd04c..5179f9ed3 100644 --- a/source/k/kernel-configs/config-generic-5.4.81.x64 +++ b/source/k/kernel-configs/config-generic-5.4.82.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.81 Kernel Configuration +# Linux/x86 5.4.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-5.4.81-smp b/source/k/kernel-configs/config-generic-smp-5.4.82-smp index 06e33847c..41856b0b6 100644 --- a/source/k/kernel-configs/config-generic-smp-5.4.81-smp +++ b/source/k/kernel-configs/config-generic-smp-5.4.82-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.81 Kernel Configuration +# Linux/x86 5.4.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.81 b/source/k/kernel-configs/config-huge-5.4.82 index 9e870dc82..635d41832 100644 --- a/source/k/kernel-configs/config-huge-5.4.81 +++ b/source/k/kernel-configs/config-huge-5.4.82 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.81 Kernel Configuration +# Linux/x86 5.4.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.81.x64 b/source/k/kernel-configs/config-huge-5.4.82.x64 index d2a2d8639..4334cbc26 100644 --- a/source/k/kernel-configs/config-huge-5.4.81.x64 +++ b/source/k/kernel-configs/config-huge-5.4.82.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.81 Kernel Configuration +# Linux/x86 5.4.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-5.4.81-smp b/source/k/kernel-configs/config-huge-smp-5.4.82-smp index dc3940e56..4e984cc8f 100644 --- a/source/k/kernel-configs/config-huge-smp-5.4.81-smp +++ b/source/k/kernel-configs/config-huge-smp-5.4.82-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.81 Kernel Configuration +# Linux/x86 5.4.82 Kernel Configuration # # diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild index 78b539f5a..5b0cd553a 100755 --- a/source/l/M2Crypto/M2Crypto.SlackBuild +++ b/source/l/M2Crypto/M2Crypto.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=M2Crypto VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/fcitx-configtool/fcitx-configtool.url b/source/x/fcitx-configtool/fcitx-configtool.url new file mode 100644 index 000000000..34012df2a --- /dev/null +++ b/source/x/fcitx-configtool/fcitx-configtool.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx-configtool diff --git a/source/x/libgee/libgee.url b/source/x/libgee/libgee.url new file mode 100644 index 000000000..7df6b30f0 --- /dev/null +++ b/source/x/libgee/libgee.url @@ -0,0 +1 @@ +https://download.gnome.org/sources/libgee/ diff --git a/source/x/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild index e2c19ff98..f21f027d4 100755 --- a/source/x/marisa/marisa.SlackBuild +++ b/source/x/marisa/marisa.SlackBuild @@ -1,7 +1,5 @@ #!/bin/bash -# Slackware build script for marisa - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -26,7 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=marisa -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +SRCNAM=marisa-trie +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -74,9 +73,9 @@ PKG=$TMP/package-marisa rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf marisa-$VERSION -tar xvf $CWD/marisa-$VERSION.tar.?z || exit 1 -cd marisa-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -85,6 +84,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -141,7 +148,8 @@ find $PKG | xargs 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/$PKGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \ +cp -a AUTHORS* ChangeLog* COPYING* INSTALL* NEWS* README* \ + docs/readme* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install diff --git a/source/x/marisa/marisa.url b/source/x/marisa/marisa.url new file mode 100644 index 000000000..e2cfa5f94 --- /dev/null +++ b/source/x/marisa/marisa.url @@ -0,0 +1 @@ +https://github.com/s-yata/marisa-trie |