summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/k/kernel-configs/config-generic-5.4.30 (renamed from source/k/kernel-configs/config-generic-5.4.29)2
-rw-r--r--source/k/kernel-configs/config-generic-5.4.30.x64 (renamed from source/k/kernel-configs/config-generic-5.4.29.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.4.30-smp (renamed from source/k/kernel-configs/config-generic-smp-5.4.29-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.30 (renamed from source/k/kernel-configs/config-huge-5.4.29)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.30.x64 (renamed from source/k/kernel-configs/config-huge-5.4.29.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.4.30-smp (renamed from source/k/kernel-configs/config-huge-smp-5.4.29-smp)2
-rwxr-xr-xsource/l/libunwind/libunwind.SlackBuild2
-rw-r--r--source/n/conntrack-tools/conntrack-tools.url1
-rw-r--r--source/n/libnetfilter_conntrack/libnetfilter_conntrack.url1
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild2
-rwxr-xr-xsource/xap/network-manager-applet/network-manager-applet.SlackBuild53
11 files changed, 32 insertions, 39 deletions
diff --git a/source/k/kernel-configs/config-generic-5.4.29 b/source/k/kernel-configs/config-generic-5.4.30
index 6c03fe2f..7732b480 100644
--- a/source/k/kernel-configs/config-generic-5.4.29
+++ b/source/k/kernel-configs/config-generic-5.4.30
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.29 Kernel Configuration
+# Linux/x86 5.4.30 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-5.4.29.x64 b/source/k/kernel-configs/config-generic-5.4.30.x64
index d5c03bcf..bd685b2a 100644
--- a/source/k/kernel-configs/config-generic-5.4.29.x64
+++ b/source/k/kernel-configs/config-generic-5.4.30.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.29 Kernel Configuration
+# Linux/x86 5.4.30 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.29-smp b/source/k/kernel-configs/config-generic-smp-5.4.30-smp
index 977b6192..2f3a51be 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.29-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.30-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.29 Kernel Configuration
+# Linux/x86 5.4.30 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.29 b/source/k/kernel-configs/config-huge-5.4.30
index cd751856..def11af4 100644
--- a/source/k/kernel-configs/config-huge-5.4.29
+++ b/source/k/kernel-configs/config-huge-5.4.30
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.29 Kernel Configuration
+# Linux/x86 5.4.30 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.29.x64 b/source/k/kernel-configs/config-huge-5.4.30.x64
index e01f71dd..16524549 100644
--- a/source/k/kernel-configs/config-huge-5.4.29.x64
+++ b/source/k/kernel-configs/config-huge-5.4.30.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.29 Kernel Configuration
+# Linux/x86 5.4.30 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.29-smp b/source/k/kernel-configs/config-huge-smp-5.4.30-smp
index 1a69fa6c..c1e4bc20 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.29-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.30-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.29 Kernel Configuration
+# Linux/x86 5.4.30 Kernel Configuration
#
#
diff --git a/source/l/libunwind/libunwind.SlackBuild b/source/l/libunwind/libunwind.SlackBuild
index 476959ef..2c503569 100755
--- a/source/l/libunwind/libunwind.SlackBuild
+++ b/source/l/libunwind/libunwind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libunwind
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/n/conntrack-tools/conntrack-tools.url b/source/n/conntrack-tools/conntrack-tools.url
new file mode 100644
index 00000000..688ac4be
--- /dev/null
+++ b/source/n/conntrack-tools/conntrack-tools.url
@@ -0,0 +1 @@
+ftp://ftp.netfilter.org/pub/conntrack-tools
diff --git a/source/n/libnetfilter_conntrack/libnetfilter_conntrack.url b/source/n/libnetfilter_conntrack/libnetfilter_conntrack.url
new file mode 100644
index 00000000..37876307
--- /dev/null
+++ b/source/n/libnetfilter_conntrack/libnetfilter_conntrack.url
@@ -0,0 +1 @@
+ftp://ftp.netfilter.org/pub/libnetfilter_conntrack
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index ea18f8bf..da435062 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mesa
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
BUILD_DEMOS=${BUILD_DEMOS:-YES}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
index 07b972b4..f7c289f2 100755
--- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild
+++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for network-manager-applet
# Copyright 2010, 2011, 2014 Robby Workman, Northport, Alabama, USA
+# Copyyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=network-manager-applet
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -76,39 +77,29 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --disable-static \
- --enable-more-warnings=no \
- --without-team \
- --without-selinux \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# network-manager-applet-1.8.22 installs locale files with a different name
-# than what is expected causing localization to fail. To be on the safe side,
-# we'll symlink to the old name. This hack shouldn't hurt anything in the
-# future, but perhaps it should be revisited someday to see if it's still
-# required.
-for LOCALEDIR in $PKG/usr/share/locale/*/LC_MESSAGES ; do
- ( cd $LOCALEDIR
- if [ -r network-manager-applet.mo ]; then
- ln -sf network-manager-applet.mo nm-applet.mo
- fi
- )
-done
+ --buildtype=release \
+ -Dteam=false \
+ -Dselinux=false \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
# Compress and if needed symlink the man pages:
if [ -d $PKG/usr/man ]; then