CVS commit: pkgsrc/inputmethod/fcitx5

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May 21 05:55:39 UTC 2023

Modified Files:
        pkgsrc/inputmethod/fcitx5: Makefile distinfo
Added Files:
        pkgsrc/inputmethod/fcitx5/patches:
            patch-src_modules_dbus_dbusmodule.cpp

Log Message:
fcitx5: fix build with fmtlib 10

Clean some pkglint while here, and update HOMEPAGE.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/inputmethod/fcitx5/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/inputmethod/fcitx5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_dbus_dbusmodule.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/Makefile
diff -u pkgsrc/inputmethod/fcitx5/Makefile:1.10 pkgsrc/inputmethod/fcitx5/Makefile:1.11
--- pkgsrc/inputmethod/fcitx5/Makefile:1.10     Tue May 16 21:20:52 2023
+++ pkgsrc/inputmethod/fcitx5/Makefile  Sun May 21 05:55:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/05/16 21:20:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2023/05/21 05:55:39 wiz Exp $
 
 DISTNAME=      fcitx5-5.0.5
 PKGREVISION=   6
@@ -7,7 +7,7 @@ MASTER_SITES=   https://download.fcitx-im.
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
-HOMEPAGE=      https://download.fcitx-im.org/fcitx5/fcitx5/
+HOMEPAGE=      https://github.com/fcitx/fcitx5
 COMMENT=       Input method framework with extension support
 LICENSE=       gnu-lgpl-v2.1
 
@@ -32,6 +32,7 @@ USE_CMAKE=            yes
 USE_TOOLS+=            bash:run pkg-config
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
+BUILD_DEFS+=           VARBASE
 
 REPLACE_BASH+=         data/fcitx5-diagnose.sh
 
@@ -58,7 +59,7 @@ SUBST_FILES.xdg=      data/CMakeLists.txt
 SUBST_SED.xdg=         -e 's,{CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart,{CMAKE_INSTALL_PREFIX}/share/examples/fcitx5,'
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/autostart
-CONF_FILES+=   ${PREFIX}/share/examples/fcitx5/org.fcitx.Fcitx5.desktop        \
+CONF_FILES+=   ${PREFIX}/share/examples/fcitx5/org.fcitx.Fcitx5.desktop \
                ${PKG_SYSCONFDIR}/xdg/autostart/org.fcitx.Fcitx5.desktop
 
 pre-configure:

Index: pkgsrc/inputmethod/fcitx5/distinfo
diff -u pkgsrc/inputmethod/fcitx5/distinfo:1.7 pkgsrc/inputmethod/fcitx5/distinfo:1.8
--- pkgsrc/inputmethod/fcitx5/distinfo:1.7      Sun Dec 18 11:41:39 2022
+++ pkgsrc/inputmethod/fcitx5/distinfo  Sun May 21 05:55:39 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2022/12/18 11:41:39 nros Exp $
+$NetBSD: distinfo,v 1.8 2023/05/21 05:55:39 wiz Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -11,5 +11,6 @@ SHA1 (patch-src_lib_fcitx-utils_endian__
 SHA1 (patch-src_lib_fcitx-utils_library.cpp) = 89f5a45336823057fcaedb0b3dac5b546e15c537
 SHA1 (patch-src_lib_fcitx-utils_misc.cpp) = 3f7b13bea6fba8d59935465b3ede3732b1571c26
 SHA1 (patch-src_lib_fcitx_inputcontext__p.h) = 11c753f699ad1068e315797911864279b924e231
+SHA1 (patch-src_modules_dbus_dbusmodule.cpp) = 7e7e9afee1397afd088bc3f95d36c8597156d3f8
 SHA1 (patch-src_modules_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66
 SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462

Added files:

Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_dbus_dbusmodule.cpp
diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_dbus_dbusmodule.cpp:1.1
--- /dev/null   Sun May 21 05:55:39 2023
+++ pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_dbus_dbusmodule.cpp     Sun May 21 05:55:39 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_modules_dbus_dbusmodule.cpp,v 1.1 2023/05/21 05:55:39 wiz Exp $
+
+Fix fmt 10 compatibility
+https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b
+
+--- src/modules/dbus/dbusmodule.cpp.orig       2021-01-25 16:03:44.057809000 +0000
++++ src/modules/dbus/dbusmodule.cpp
+@@ -536,8 +536,9 @@ public:
+                     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;
+             });