From d29002b2b2bba13ec5d668a22febddf2e4001f62 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 3 Dec 2019 19:07:24 +0000
Subject: Tue Dec  3 19:07:24 UTC 2019

n/ebtables-2.0.11-x86_64-1.txz:  Upgraded.
n/iptables-1.8.4-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.5-x86_64-1.txz:  Upgraded.
n/nftables-0.9.3-x86_64-1.txz:  Upgraded.
n/whois-5.5.3-x86_64-1.txz:  Upgraded.
---
 source/l/FTBFSlog               | 3 +++
 source/l/dconf/dconf.SlackBuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'source/l')

diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index a249aca22..86834b4c9 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Tue Dec  3 18:47:08 UTC 2019
+  dconf: also fix duplicate symbols for meson-0.52.1.
++--------------------------+
 Thu Nov 21 22:04:10 UTC 2019
   dconf: fix duplicate symbols building with meson.
 +--------------------------+
diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild
index 8dd002676..927bba200 100755
--- a/source/l/dconf/dconf.SlackBuild
+++ b/source/l/dconf/dconf.SlackBuild
@@ -78,8 +78,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# Fix duplicate symbols at link time with meson-0.52.0:
-if [ "$(meson --version)" = "0.52.0" ]; then
+# Fix duplicate symbols at link time with meson-0.52.{0,1}:
+if [ "$(meson --version)" = "0.52.0" -o "$(meson --version)" = "0.52.1" ]; then
   sed -i "s/link_whole: libdconf_common,/link_with: libdconf_common,/g" common/meson.build
 fi
 
-- 
cgit v1.2.3-79-gdb01