summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-02-01 03:14:27 +0000
committerEric Hameleers <alien@slackware.com>2021-02-01 08:59:51 +0100
commit4e53e75339d9a66422c8dcfbfa09a177c3622160 (patch)
tree3bdd585cb361c59d8bd4d1b2668bb96fa4dfb0b0 /source
parent2c78f43e266f5e7d7b0903f1199441ed19451a08 (diff)
downloadcurrent-4e53e75339d9a66422c8dcfbfa09a177c3622160.tar.gz
Mon Feb 1 03:14:27 UTC 202120210201031427
d/python-pip-21.0.1-x86_64-1.txz: Upgraded. e/emacs-27.1-x86_64-4.txz: Rebuilt. Rebuilt using --with-pdumper=no and --with-dumping=unexec so that both emacs-27.1-no-x11 and emacs-27.1-with-x11 will work with the installed files. Thanks to Tonus. extra/brltty/brltty-6.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/dosfstools/dosfstools.SlackBuild15
-rw-r--r--source/a/dosfstools/dosfstools.url2
-rwxr-xr-xsource/ap/xorriso/xorriso.SlackBuild2
-rwxr-xr-xsource/e/emacs/emacs.SlackBuild7
-rw-r--r--source/kde/kde/build/calligraplan2
-rw-r--r--source/kde/kde/build/kid32
-rw-r--r--source/kde/kde/patch/calligraplan.patch2
-rw-r--r--source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch10
-rwxr-xr-xsource/x/ibus-m17n/ibus-m17n.SlackBuild4
-rwxr-xr-xsource/xfce/mousepad/mousepad.SlackBuild2
-rw-r--r--source/xfce/mousepad/mousepad.url2
11 files changed, 25 insertions, 25 deletions
diff --git a/source/a/dosfstools/dosfstools.SlackBuild b/source/a/dosfstools/dosfstools.SlackBuild
index 148b6f2c..64d17d33 100755
--- a/source/a/dosfstools/dosfstools.SlackBuild
+++ b/source/a/dosfstools/dosfstools.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2011, 2013, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2013, 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dosfstools
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION
chown -R root:root .
@@ -78,6 +78,13 @@ 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 \
diff --git a/source/a/dosfstools/dosfstools.url b/source/a/dosfstools/dosfstools.url
index 42670d94..0921f7fd 100644
--- a/source/a/dosfstools/dosfstools.url
+++ b/source/a/dosfstools/dosfstools.url
@@ -1 +1 @@
-lftpget https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz{,.sig}
+https://github.com/dosfstools/dosfstools
diff --git a/source/ap/xorriso/xorriso.SlackBuild b/source/ap/xorriso/xorriso.SlackBuild
index 77f629f9..27ec3494 100755
--- a/source/ap/xorriso/xorriso.SlackBuild
+++ b/source/ap/xorriso/xorriso.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xorriso
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/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild
index ebe3acd0..9716a05d 100755
--- a/source/e/emacs/emacs.SlackBuild
+++ b/source/e/emacs/emacs.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=emacs
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Determine version number the tarball is labeled with:
TARBALLVER=${TARBALLVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
# OK, now what's being used as the source directory version number... account
@@ -70,6 +70,9 @@ else
SLKCFLAGS="-O2"
fi
+# Without this, the emacs-no-x11 binary won't work with the installed files:
+PDUMPER=${PDUMPER:-"--with-pdumper=no --with-dumping=unexec"}
+
# Don't use icecream:
PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
@@ -113,6 +116,7 @@ CXXFLAGS="$SLKCFLAGS" \
--with-modules \
--with-x \
--with-x-toolkit=${X_TOOLKIT:-gtk3} \
+ $PDUMPER \
--build=${ARCH}-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
@@ -150,6 +154,7 @@ CXXFLAGS="$SLKCFLAGS" \
--without-gsettings \
--with-modules \
--with-x=no \
+ $PDUMPER \
--build=${ARCH}-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
diff --git a/source/kde/kde/build/calligraplan b/source/kde/kde/build/calligraplan
index 0cfbf088..d00491fd 100644
--- a/source/kde/kde/build/calligraplan
+++ b/source/kde/kde/build/calligraplan
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kid3 b/source/kde/kde/build/kid3
index 0cfbf088..d00491fd 100644
--- a/source/kde/kde/build/kid3
+++ b/source/kde/kde/build/kid3
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/calligraplan.patch b/source/kde/kde/patch/calligraplan.patch
deleted file mode 100644
index 5895d0ce..00000000
--- a/source/kde/kde/patch/calligraplan.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix build against Qt 5.15:
-cat $CWD/patch/calligraplan/calligraplan.qt-5.15.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
deleted file mode 100644
index c8962a1b..00000000
--- a/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/libs/ui/kptganttitemdelegate.cpp.orig 2019-12-12 05:48:13.000000000 -0600
-+++ ./src/libs/ui/kptganttitemdelegate.cpp 2020-07-18 14:48:48.058351438 -0500
-@@ -28,6 +28,7 @@
- #include <QModelIndex>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLocale>
-
- #include <KLocalizedString>
diff --git a/source/x/ibus-m17n/ibus-m17n.SlackBuild b/source/x/ibus-m17n/ibus-m17n.SlackBuild
index 683dd3a2..aa994a50 100755
--- a/source/x/ibus-m17n/ibus-m17n.SlackBuild
+++ b/source/x/ibus-m17n/ibus-m17n.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for ibus-m17n
# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2017, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ibus-m17n
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xfce/mousepad/mousepad.SlackBuild b/source/xfce/mousepad/mousepad.SlackBuild
index b7155ed9..393251b4 100755
--- a/source/xfce/mousepad/mousepad.SlackBuild
+++ b/source/xfce/mousepad/mousepad.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mousepad
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xfce/mousepad/mousepad.url b/source/xfce/mousepad/mousepad.url
index 797da6cc..0b77a060 100644
--- a/source/xfce/mousepad/mousepad.url
+++ b/source/xfce/mousepad/mousepad.url
@@ -1 +1 @@
-https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.2.tar.bz2
+https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.2.tar.bz2