Skip to content

Commit c546f97

Browse files
committed
fcitx5: fix build with fmtlib 10
Clean some pkglint while here, and update HOMEPAGE.
1 parent f0000ca commit c546f97

3 files changed

Lines changed: 25 additions & 4 deletions

File tree

inputmethod/fcitx5/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.10 2023/05/16 21:20:52 wiz Exp $
1+
# $NetBSD: Makefile,v 1.11 2023/05/21 05:55:39 wiz Exp $
22

33
DISTNAME= fcitx5-5.0.5
44
PKGREVISION= 6
@@ -7,7 +7,7 @@ MASTER_SITES= https://download.fcitx-im.org/fcitx5/fcitx5/
77
EXTRACT_SUFX= .tar.xz
88

99
MAINTAINER= ryoon@NetBSD.org
10-
HOMEPAGE= https://download.fcitx-im.org/fcitx5/fcitx5/
10+
HOMEPAGE= https://github.com/fcitx/fcitx5
1111
COMMENT= Input method framework with extension support
1212
LICENSE= gnu-lgpl-v2.1
1313

@@ -32,6 +32,7 @@ USE_CMAKE= yes
3232
USE_TOOLS+= bash:run pkg-config
3333
USE_PKGLOCALEDIR= yes
3434
USE_LANGUAGES= c c++
35+
BUILD_DEFS+= VARBASE
3536

3637
REPLACE_BASH+= data/fcitx5-diagnose.sh
3738

@@ -58,7 +59,7 @@ SUBST_FILES.xdg= data/CMakeLists.txt
5859
SUBST_SED.xdg= -e 's,{CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart,{CMAKE_INSTALL_PREFIX}/share/examples/fcitx5,'
5960

6061
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
61-
CONF_FILES+= ${PREFIX}/share/examples/fcitx5/org.fcitx.Fcitx5.desktop \
62+
CONF_FILES+= ${PREFIX}/share/examples/fcitx5/org.fcitx.Fcitx5.desktop \
6263
${PKG_SYSCONFDIR}/xdg/autostart/org.fcitx.Fcitx5.desktop
6364

6465
pre-configure:

inputmethod/fcitx5/distinfo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.7 2022/12/18 11:41:39 nros Exp $
1+
$NetBSD: distinfo,v 1.8 2023/05/21 05:55:39 wiz Exp $
22

33
BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
44
SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -11,5 +11,6 @@ SHA1 (patch-src_lib_fcitx-utils_endian__p.h) = dfc1ec5fdfacc589b2b0755066e8d3bc2
1111
SHA1 (patch-src_lib_fcitx-utils_library.cpp) = 89f5a45336823057fcaedb0b3dac5b546e15c537
1212
SHA1 (patch-src_lib_fcitx-utils_misc.cpp) = 3f7b13bea6fba8d59935465b3ede3732b1571c26
1313
SHA1 (patch-src_lib_fcitx_inputcontext__p.h) = 11c753f699ad1068e315797911864279b924e231
14+
SHA1 (patch-src_modules_dbus_dbusmodule.cpp) = 7e7e9afee1397afd088bc3f95d36c8597156d3f8
1415
SHA1 (patch-src_modules_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66
1516
SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
$NetBSD: patch-src_modules_dbus_dbusmodule.cpp,v 1.1 2023/05/21 05:55:39 wiz Exp $
2+
3+
Fix fmt 10 compatibility
4+
https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b
5+
6+
--- src/modules/dbus/dbusmodule.cpp.orig 2021-01-25 16:03:44.057809000 +0000
7+
+++ src/modules/dbus/dbusmodule.cpp
8+
@@ -536,8 +536,9 @@ public:
9+
ss << fmt::format("{:02x}", static_cast<int>(v));
10+
}
11+
ss << "] program:" << ic->program()
12+
- << " frontend:" << ic->frontend()
13+
- << " cap:" << fmt::format("{:x}", ic->capabilityFlags())
14+
+ << " frontend:" << ic->frontend() << " cap:"
15+
+ << fmt::format("{:x}",
16+
+ static_cast<uint64_t>(ic->capabilityFlags()))
17+
<< " focus:" << ic->hasFocus() << std::endl;
18+
return true;
19+
});

0 commit comments

Comments
 (0)