CVS commit: pkgsrc/inputmethod/fcitx5

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Dec  7 00:17:25 UTC 2025

Modified Files:
        pkgsrc/inputmethod/fcitx5: distinfo
Added Files:
        pkgsrc/inputmethod/fcitx5/patches: patch-src_lib_fcitx-utils_log.cpp

Log Message:
fcitx5: Fix build failure with fmtlib > 12.0.0 (pkgsrc version: 12.1.0)

Don't use optional code hunk that adds timestamps to logs for newer fmtlib.
The recommended migration path is for std::localtime, but this seemed like
a patch that I'm less likely to get wrong, as someone who is not experienced
in C++.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/inputmethod/fcitx5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_log.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/fcitx5/distinfo
diff -u pkgsrc/inputmethod/fcitx5/distinfo:1.9 pkgsrc/inputmethod/fcitx5/distinfo:1.10
--- pkgsrc/inputmethod/fcitx5/distinfo:1.9      Sat Feb 10 09:58:33 2024
+++ pkgsrc/inputmethod/fcitx5/distinfo  Sun Dec  7 00:17:24 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2024/02/10 09:58:33 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2025/12/07 00:17:24 maya Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -9,6 +9,7 @@ Size (fcitx5-5.1.7.tar.xz) = 6867544 byt
 SHA1 (patch-src_frontend_ibusfrontend_ibusfrontend.cpp) = 06d009f2d3977f5f72ca727a41e6aeb15aa257a2
 SHA1 (patch-src_lib_fcitx-utils_endian__p.h) = 0511238bab61758ff76eb364386aea687443fa7f
 SHA1 (patch-src_lib_fcitx-utils_library.cpp) = 89f5a45336823057fcaedb0b3dac5b546e15c537
+SHA1 (patch-src_lib_fcitx-utils_log.cpp) = d95bd21afedb544a9c92df54f0a38abdabe0cf95
 SHA1 (patch-src_lib_fcitx-utils_uuid__p.h) = 100b1687a525863716249f08146c530dd31a1539
 SHA1 (patch-src_modules_spell_CMakeLists.txt) = 3a69e37b895fe7432e47b304713e70504aafcb1b
 SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462

Added files:

Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_log.cpp
diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_log.cpp:1.1
--- /dev/null   Sun Dec  7 00:17:25 2025
+++ pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_log.cpp Sun Dec  7 00:17:25 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_fcitx-utils_log.cpp,v 1.1 2025/12/07 00:17:25 maya Exp $
+
+Avoid optional hunk of code that uses fmt::localtime, which was removed
+in fmtlib 12.0.0.
+
+This removes timestamps from logs.
+
+--- src/lib/fcitx-utils/log.cpp.orig   2025-12-07 00:04:14.180802233 +0000
++++ src/lib/fcitx-utils/log.cpp
+@@ -207,7 +207,7 @@ LogMessageBuilder::LogMessageBuilder(std
+         break;
+     }
+ 
+-#if FMT_VERSION >= 50300
++#if FMT_VERSION >= 50300 && FMT_VERSION < 120000
+     if (globalLogConfig.showTimeDate) {
+         auto now = std::chrono::system_clock::now();
+         auto floor = std::chrono::floor<std::chrono::seconds>(now);