From 959b52c38191e821477eaa53320780eab10177b5 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 21 Nov 2019 22:19:23 +0000 Subject: Thu Nov 21 22:19:23 UTC 2019 a/efibootmgr-20191011_e8ce9fe-x86_64-1.txz: Upgraded. a/efivar-20191015_ca85d51-x86_64-1.txz: Upgraded. l/libtasn1-4.15.0-x86_64-1.txz: Upgraded. n/php-7.3.12-x86_64-1.txz: Upgraded. --- source/l/FTBFSlog | 3 +++ source/l/dconf/dconf.SlackBuild | 5 +++++ source/n/php/fetch-php.sh | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index fd657199d..a249aca22 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,6 @@ +Thu Nov 21 22:04:10 UTC 2019 + dconf: fix duplicate symbols building with meson. ++--------------------------+ Tue Sep 10 17:55:47 UTC 2019 gst-plugins-good: Fix type compatibility issue with glibc 2.30. +--------------------------+ diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild index c0ad9a1c1..8dd002676 100755 --- a/source/l/dconf/dconf.SlackBuild +++ b/source/l/dconf/dconf.SlackBuild @@ -78,6 +78,11 @@ 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 + sed -i "s/link_whole: libdconf_common,/link_with: libdconf_common,/g" common/meson.build +fi + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index 5b5153486..8bff47aa7 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-7.3.11.tar.xz.asc -lftpget http://us.php.net/distributions/php-7.3.11.tar.xz +lftpget http://us.php.net/distributions/php-7.3.12.tar.xz.asc +lftpget http://us.php.net/distributions/php-7.3.12.tar.xz -- cgit v1.2.3