From 8ed399a7a71742513c5052b560a0e74cf0f0af47 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 23 Nov 2021 19:44:27 +0000
Subject: Tue Nov 23 19:44:27 UTC 2021

a/btrfs-progs-5.15.1-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20211123_b0e898f-noarch-1.txz:  Upgraded.
ap/vim-8.2.3656-x86_64-1.txz:  Upgraded.
d/mercurial-6.0-x86_64-1.txz:  Upgraded.
d/parallel-20211122-noarch-1.txz:  Upgraded.
l/fluidsynth-2.2.4-x86_64-1.txz:  Upgraded.
n/libnetfilter_log-1.0.2-x86_64-1.txz:  Upgraded.
x/wayland-protocols-1.24-noarch-1.txz:  Upgraded.
xap/vim-gvim-8.2.3656-x86_64-1.txz:  Upgraded.
extra/tigervnc/tigervnc-1.12.0-x86_64-3.txz:  Rebuilt.
  Removed pam_selinux.so module from /etc/pam.d/tigervnc. Thanks to 0XBF.
---
 source/d/mercurial/mercurial.SlackBuild            |  2 +-
 .../n/libnetfilter_log/libnetfilter_log.SlackBuild |  8 +++--
 .../wayland-protocols/wayland-protocols.SlackBuild | 34 +++++++++++-----------
 3 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'source')

diff --git a/source/d/mercurial/mercurial.SlackBuild b/source/d/mercurial/mercurial.SlackBuild
index a300da734..5074b56a5 100755
--- a/source/d/mercurial/mercurial.SlackBuild
+++ b/source/d/mercurial/mercurial.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mercurial
 VERSION=${VERSION:-$(echo mercurial-*.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/libnetfilter_log/libnetfilter_log.SlackBuild b/source/n/libnetfilter_log/libnetfilter_log.SlackBuild
index a92d993b7..5472ed656 100755
--- a/source/n/libnetfilter_log/libnetfilter_log.SlackBuild
+++ b/source/n/libnetfilter_log/libnetfilter_log.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for libnetfilter_log
 
 # Copyright 2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libnetfilter_log
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -69,7 +70,7 @@ rm -rf $PKG
 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 || exit 1
 chown -R root:root .
 find . \
@@ -84,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --mandir=/usr/man \
   --enable-static=no \
   --build=$ARCH-slackware-linux || exit 1
 
diff --git a/source/x/wayland-protocols/wayland-protocols.SlackBuild b/source/x/wayland-protocols/wayland-protocols.SlackBuild
index 8410c6a8f..2f96227c1 100755
--- a/source/x/wayland-protocols/wayland-protocols.SlackBuild
+++ b/source/x/wayland-protocols/wayland-protocols.SlackBuild
@@ -88,26 +88,26 @@ find . \
   -exec chmod 644 {} \+
 
 # Configure, build, and install:
-if [ ! -r configure ]; then
-  if [ -x ./autogen.sh ]; then
-    NOCONFIGURE=1 ./autogen.sh
-  else
-    autoreconf -vif
-  fi
-fi
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+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 \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --build=$ARCH-slackware-linux || exit 1
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-- 
cgit v1.2.3