summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-05-22 19:05:02 +0000
committer Eric Hameleers <alien@slackware.com>2023-05-22 21:32:45 +0200
commitb2fa3fdbd7ee8367f9ea371367850e010a58dfee (patch)
tree83bd592b2b06dac60ba1843d143f701c2942dbf1 /source/x
parent9880ebe43153cc38df982e3bc0916141ffe03c6a (diff)
downloadcurrent-b2fa3fdbd7ee8367f9ea371367850e010a58dfee.tar.gz
current-b2fa3fdbd7ee8367f9ea371367850e010a58dfee.tar.xz
Mon May 22 19:05:02 UTC 202320230522190502
ap/qpdf-11.4.0-x86_64-1.txz: Upgraded. l/exiv2-0.27.7-x86_64-1.txz: Upgraded. l/imagemagick-7.1.1_10-x86_64-1.txz: Upgraded. n/c-ares-1.19.1-x86_64-1.txz: Upgraded. This update fixes bugs and security issues: 0-byte UDP payload causes Denial of Service. Insufficient randomness in generation of DNS query IDs. Buffer Underwrite in ares_inet_net_pton(). AutoTools does not set CARES_RANDOM_FILE during cross compilation. For more information, see: https://www.cve.org/CVERecord?id=CVE-2023-32067 https://www.cve.org/CVERecord?id=CVE-2023-31147 https://www.cve.org/CVERecord?id=CVE-2023-31130 https://www.cve.org/CVERecord?id=CVE-2023-31124 (* Security fix *) n/wget-1.21.4-x86_64-1.txz: Upgraded. xap/gnuplot-5.4.7-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rw-r--r--source/x/FTBFSlog3
-rw-r--r--source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch26
-rwxr-xr-xsource/x/fcitx5/fcitx5.SlackBuild2
3 files changed, 31 insertions, 0 deletions
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog
index 82cf785b6..056948557 100644
--- a/source/x/FTBFSlog
+++ b/source/x/FTBFSlog
@@ -1,3 +1,6 @@
+Mon May 22 17:50:35 UTC 2023
+fcitx5: Fix build against recent fmt. Thanks to lucabon.
++--------------------------+
Thu Apr 13 19:25:28 UTC 2023
mesa: fix build by removing deprecated rust-bindgen option. Thanks to lucabon.
+--------------------------+
diff --git a/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch b/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch
new file mode 100644
index 000000000..0e8a33913
--- /dev/null
+++ b/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch
@@ -0,0 +1,26 @@
+From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sat, 20 May 2023 20:02:24 -0700
+Subject: [PATCH] Fix compatiblity with fmt 10.0
+
+Fix #797
+---
+ src/modules/dbus/dbusmodule.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp
+index a7196676..6bebee30 100644
+--- a/src/modules/dbus/dbusmodule.cpp
++++ b/src/modules/dbus/dbusmodule.cpp
+@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable<Controller1> {
+ ss << fmt::format("{:02x}", static_cast<int>(v));
+ }
+ ss << "] program:" << ic->program()
+- << " frontend:" << ic->frontend()
+- << " cap:" << fmt::format("{:x}", ic->capabilityFlags())
++ << " frontend:" << ic->frontend() << " cap:"
++ << fmt::format("{:x}",
++ static_cast<uint64_t>(ic->capabilityFlags()))
+ << " focus:" << ic->hasFocus() << std::endl;
+ return true;
+ });
diff --git a/source/x/fcitx5/fcitx5.SlackBuild b/source/x/fcitx5/fcitx5.SlackBuild
index 085e2eb77..ce3d80a10 100755
--- a/source/x/fcitx5/fcitx5.SlackBuild
+++ b/source/x/fcitx5/fcitx5.SlackBuild
@@ -87,6 +87,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+zcat $CWD/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch.gz | patch -p1 --verbose || exit 1
+
mkdir build
cd build
cmake \