pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/inputmethod/fcitx5

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 10 09:58:34 UTC 2024

Modified Files:
        pkgsrc/inputmethod/fcitx5: Makefile PLIST distinfo
        pkgsrc/inputmethod/fcitx5/patches:
            patch-src_lib_fcitx-utils_endian__p.h
Added Files:
        pkgsrc/inputmethod/fcitx5/patches: patch-src_lib_fcitx-utils_uuid__p.h
            patch-src_modules_spell_CMakeLists.txt
Removed Files:
        pkgsrc/inputmethod/fcitx5/patches: patch-src_lib_fcitx-utils_misc.cpp
            patch-src_lib_fcitx_inputcontext__p.h
            patch-src_modules_dbus_dbusmodule.cpp
            patch-src_modules_spell_dict_CMakeLists.txt

Log Message:
inputmethod/fcitx5: Update to 5.1.7

Changelog:
Many bugfixes.
Update translations.
Improve Wayland support.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/fcitx5/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/fcitx5/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/inputmethod/fcitx5/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_endian__p.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_misc.cpp \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_dbus_dbusmodule.cpp \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_spell_dict_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt

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.16 pkgsrc/inputmethod/fcitx5/Makefile:1.17
--- pkgsrc/inputmethod/fcitx5/Makefile:1.16     Tue Nov 14 14:02:17 2023
+++ pkgsrc/inputmethod/fcitx5/Makefile  Sat Feb 10 09:58:33 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2023/11/14 14:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/02/10 09:58:33 ryoon Exp $
 
-DISTNAME=      fcitx5-5.0.5
-PKGREVISION=   10
+DISTNAME=      fcitx5-5.1.7
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://download.fcitx-im.org/fcitx5/fcitx5/
 EXTRACT_SUFX=  .tar.xz
@@ -28,7 +27,6 @@ SUBST_SED.fix-machine-id+=    -e 's,/var/li
 
 CONFLICTS+=    fcitx-[0-9]*
 
-USE_CMAKE=             yes
 USE_TOOLS+=            bash:run pkg-config
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
@@ -64,14 +62,17 @@ CONF_FILES+=        ${PREFIX}/share/examples/fc
 
 pre-configure:
        ${LN} -s ${DISTDIR}/en_dict-20121020.tar.gz \
-               ${WRKSRC}/src/modules/spell/dict
+               ${WRKSRC}/src/modules/spell/
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+USE_BUILTIN.libevent=  no
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/inputmethod/fcitx5/PLIST
diff -u pkgsrc/inputmethod/fcitx5/PLIST:1.2 pkgsrc/inputmethod/fcitx5/PLIST:1.3
--- pkgsrc/inputmethod/fcitx5/PLIST:1.2 Sun Mar 27 13:17:34 2022
+++ pkgsrc/inputmethod/fcitx5/PLIST     Sat Feb 10 09:58:33 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/03/27 13:17:34 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/02/10 09:58:33 ryoon Exp $
 bin/fcitx5
 bin/fcitx5-configtool
 bin/fcitx5-diagnose
@@ -50,6 +50,7 @@ include/Fcitx5/Module/fcitx-module/quick
 include/Fcitx5/Module/fcitx-module/spell/spell_public.h
 include/Fcitx5/Module/fcitx-module/testfrontend/testfrontend_public.h
 include/Fcitx5/Module/fcitx-module/testim/testim_public.h
+include/Fcitx5/Module/fcitx-module/unicode/unicode_public.h
 include/Fcitx5/Module/fcitx-module/xcb/xcb_public.h
 include/Fcitx5/Utils/fcitx-utils/capabilityflags.h
 include/Fcitx5/Utils/fcitx-utils/charutils.h
@@ -62,6 +63,7 @@ include/Fcitx5/Utils/fcitx-utils/dbus/me
 include/Fcitx5/Utils/fcitx-utils/dbus/message_details.h
 include/Fcitx5/Utils/fcitx-utils/dbus/objectvtable.h
 include/Fcitx5/Utils/fcitx-utils/dbus/servicewatcher.h
+include/Fcitx5/Utils/fcitx-utils/dbus/variant.h
 include/Fcitx5/Utils/fcitx-utils/element.h
 include/Fcitx5/Utils/fcitx-utils/event.h
 include/Fcitx5/Utils/fcitx-utils/eventdispatcher.h
@@ -83,6 +85,7 @@ include/Fcitx5/Utils/fcitx-utils/macros.
 include/Fcitx5/Utils/fcitx-utils/metastring.h
 include/Fcitx5/Utils/fcitx-utils/misc.h
 include/Fcitx5/Utils/fcitx-utils/rect.h
+include/Fcitx5/Utils/fcitx-utils/semver.h
 include/Fcitx5/Utils/fcitx-utils/signals.h
 include/Fcitx5/Utils/fcitx-utils/signals_details.h
 include/Fcitx5/Utils/fcitx-utils/standardpath.h
@@ -122,6 +125,8 @@ lib/cmake/Fcitx5ModuleTestFrontend/Fcitx
 lib/cmake/Fcitx5ModuleTestFrontend/Fcitx5ModuleTestFrontendConfigVersion.cmake
 lib/cmake/Fcitx5ModuleTestIM/Fcitx5ModuleTestIMConfig.cmake
 lib/cmake/Fcitx5ModuleTestIM/Fcitx5ModuleTestIMConfigVersion.cmake
+lib/cmake/Fcitx5ModuleUnicode/Fcitx5ModuleUnicodeConfig.cmake
+lib/cmake/Fcitx5ModuleUnicode/Fcitx5ModuleUnicodeConfigVersion.cmake
 lib/cmake/Fcitx5ModuleXCB/Fcitx5ModuleXCBConfig.cmake
 lib/cmake/Fcitx5ModuleXCB/Fcitx5ModuleXCBConfigVersion.cmake
 lib/cmake/Fcitx5Utils/Fcitx5CompilerSettings.cmake
@@ -132,26 +137,27 @@ lib/cmake/Fcitx5Utils/Fcitx5UtilsConfig.
 lib/cmake/Fcitx5Utils/Fcitx5UtilsConfigVersion.cmake
 lib/cmake/Fcitx5Utils/Fcitx5UtilsTargets-noconfig.cmake
 lib/cmake/Fcitx5Utils/Fcitx5UtilsTargets.cmake
-lib/fcitx5/classicui.so
-lib/fcitx5/clipboard.so
-lib/fcitx5/dbus.so
-lib/fcitx5/dbusfrontend.so
-lib/fcitx5/emoji.so
-lib/fcitx5/fcitx4frontend.so
-lib/fcitx5/ibusfrontend.so
-lib/fcitx5/imselector.so
-lib/fcitx5/kimpanel.so
+lib/fcitx5/libclassicui.so
+lib/fcitx5/libclipboard.so
+lib/fcitx5/libdbus.so
+lib/fcitx5/libdbusfrontend.so
+lib/fcitx5/libemoji.so
 lib/fcitx5/libexec/comp-spell-dict
-lib/fcitx5/notificationitem.so
-lib/fcitx5/notifications.so
-lib/fcitx5/quickphrase.so
-lib/fcitx5/spell.so
-lib/fcitx5/testfrontend.so
-lib/fcitx5/testim.so
-lib/fcitx5/testui.so
-lib/fcitx5/unicode.so
-lib/fcitx5/xcb.so
-lib/fcitx5/xim.so
+lib/fcitx5/libfcitx4frontend.so
+lib/fcitx5/libibusfrontend.so
+lib/fcitx5/libimselector.so
+lib/fcitx5/libkimpanel.so
+lib/fcitx5/libnotificationitem.so
+lib/fcitx5/libnotifications.so
+lib/fcitx5/libquickphrase.so
+lib/fcitx5/libspell.so
+lib/fcitx5/libtestfrontend.so
+lib/fcitx5/libtestim.so
+lib/fcitx5/libtestui.so
+lib/fcitx5/libunicode.so
+lib/fcitx5/libvirtualkeyboard.so
+lib/fcitx5/libxcb.so
+lib/fcitx5/libxim.so
 lib/libFcitx5Config.so
 lib/libFcitx5Config.so.${PKGVERSION}
 lib/libFcitx5Config.so.6
@@ -184,6 +190,7 @@ share/fcitx5/addon/notifications.conf
 share/fcitx5/addon/quickphrase.conf
 share/fcitx5/addon/spell.conf
 share/fcitx5/addon/unicode.conf
+share/fcitx5/addon/virtualkeyboard.conf
 share/fcitx5/addon/xcb.conf
 share/fcitx5/addon/xim.conf
 share/fcitx5/data/quickphrase.d/emoji-eac.mb
@@ -238,14 +245,153 @@ share/fcitx5/default/ur_IN
 share/fcitx5/default/zh_CN
 share/fcitx5/default/zh_HK
 share/fcitx5/default/zh_TW
+share/fcitx5/emoji/data/af.dict
+share/fcitx5/emoji/data/am.dict
+share/fcitx5/emoji/data/ar.dict
+share/fcitx5/emoji/data/ar_SA.dict
+share/fcitx5/emoji/data/as.dict
+share/fcitx5/emoji/data/ast.dict
+share/fcitx5/emoji/data/az.dict
+share/fcitx5/emoji/data/be.dict
+share/fcitx5/emoji/data/bg.dict
+share/fcitx5/emoji/data/bn.dict
+share/fcitx5/emoji/data/br.dict
+share/fcitx5/emoji/data/bs.dict
+share/fcitx5/emoji/data/ca.dict
+share/fcitx5/emoji/data/ccp.dict
+share/fcitx5/emoji/data/ceb.dict
+share/fcitx5/emoji/data/chr.dict
+share/fcitx5/emoji/data/ckb.dict
+share/fcitx5/emoji/data/cs.dict
+share/fcitx5/emoji/data/cy.dict
+share/fcitx5/emoji/data/da.dict
+share/fcitx5/emoji/data/de.dict
+share/fcitx5/emoji/data/de_CH.dict
+share/fcitx5/emoji/data/dsb.dict
+share/fcitx5/emoji/data/el.dict
+share/fcitx5/emoji/data/en.dict
+share/fcitx5/emoji/data/en_001.dict
+share/fcitx5/emoji/data/en_AU.dict
+share/fcitx5/emoji/data/en_CA.dict
+share/fcitx5/emoji/data/en_GB.dict
+share/fcitx5/emoji/data/es.dict
+share/fcitx5/emoji/data/es_419.dict
+share/fcitx5/emoji/data/es_MX.dict
+share/fcitx5/emoji/data/es_US.dict
+share/fcitx5/emoji/data/et.dict
+share/fcitx5/emoji/data/eu.dict
+share/fcitx5/emoji/data/fa.dict
+share/fcitx5/emoji/data/fi.dict
+share/fcitx5/emoji/data/fil.dict
+share/fcitx5/emoji/data/fo.dict
+share/fcitx5/emoji/data/fr.dict
+share/fcitx5/emoji/data/fr_CA.dict
+share/fcitx5/emoji/data/ga.dict
+share/fcitx5/emoji/data/gd.dict
+share/fcitx5/emoji/data/gl.dict
+share/fcitx5/emoji/data/gu.dict
+share/fcitx5/emoji/data/ha.dict
+share/fcitx5/emoji/data/he.dict
+share/fcitx5/emoji/data/hi.dict
+share/fcitx5/emoji/data/hi_Latn.dict
+share/fcitx5/emoji/data/hr.dict
+share/fcitx5/emoji/data/hsb.dict
+share/fcitx5/emoji/data/hu.dict
+share/fcitx5/emoji/data/hy.dict
+share/fcitx5/emoji/data/ia.dict
+share/fcitx5/emoji/data/id.dict
+share/fcitx5/emoji/data/ig.dict
+share/fcitx5/emoji/data/is.dict
+share/fcitx5/emoji/data/it.dict
+share/fcitx5/emoji/data/ja.dict
+share/fcitx5/emoji/data/jv.dict
+share/fcitx5/emoji/data/ka.dict
+share/fcitx5/emoji/data/kab.dict
+share/fcitx5/emoji/data/kk.dict
+share/fcitx5/emoji/data/kl.dict
+share/fcitx5/emoji/data/km.dict
+share/fcitx5/emoji/data/kn.dict
+share/fcitx5/emoji/data/ko.dict
+share/fcitx5/emoji/data/kok.dict
+share/fcitx5/emoji/data/ky.dict
+share/fcitx5/emoji/data/lb.dict
+share/fcitx5/emoji/data/lo.dict
+share/fcitx5/emoji/data/lt.dict
+share/fcitx5/emoji/data/lv.dict
+share/fcitx5/emoji/data/mi.dict
+share/fcitx5/emoji/data/mk.dict
+share/fcitx5/emoji/data/ml.dict
+share/fcitx5/emoji/data/mn.dict
+share/fcitx5/emoji/data/mni.dict
+share/fcitx5/emoji/data/mr.dict
+share/fcitx5/emoji/data/ms.dict
+share/fcitx5/emoji/data/mt.dict
+share/fcitx5/emoji/data/my.dict
+share/fcitx5/emoji/data/ne.dict
+share/fcitx5/emoji/data/nl.dict
+share/fcitx5/emoji/data/nn.dict
+share/fcitx5/emoji/data/no.dict
+share/fcitx5/emoji/data/or.dict
+share/fcitx5/emoji/data/pa.dict
+share/fcitx5/emoji/data/pa_Arab.dict
+share/fcitx5/emoji/data/pcm.dict
+share/fcitx5/emoji/data/pl.dict
+share/fcitx5/emoji/data/ps.dict
+share/fcitx5/emoji/data/pt.dict
+share/fcitx5/emoji/data/pt_PT.dict
+share/fcitx5/emoji/data/qu.dict
+share/fcitx5/emoji/data/rm.dict
+share/fcitx5/emoji/data/ro.dict
+share/fcitx5/emoji/data/ru.dict
+share/fcitx5/emoji/data/rw.dict
+share/fcitx5/emoji/data/sc.dict
+share/fcitx5/emoji/data/sd.dict
+share/fcitx5/emoji/data/si.dict
+share/fcitx5/emoji/data/sk.dict
+share/fcitx5/emoji/data/sl.dict
+share/fcitx5/emoji/data/so.dict
+share/fcitx5/emoji/data/sq.dict
+share/fcitx5/emoji/data/sr.dict
+share/fcitx5/emoji/data/sr_Cyrl_BA.dict
+share/fcitx5/emoji/data/sr_Latn.dict
+share/fcitx5/emoji/data/sr_Latn_BA.dict
+share/fcitx5/emoji/data/sv.dict
+share/fcitx5/emoji/data/sw.dict
+share/fcitx5/emoji/data/sw_KE.dict
+share/fcitx5/emoji/data/ta.dict
+share/fcitx5/emoji/data/te.dict
+share/fcitx5/emoji/data/tg.dict
+share/fcitx5/emoji/data/th.dict
+share/fcitx5/emoji/data/ti.dict
+share/fcitx5/emoji/data/tk.dict
+share/fcitx5/emoji/data/to.dict
+share/fcitx5/emoji/data/tr.dict
+share/fcitx5/emoji/data/ug.dict
+share/fcitx5/emoji/data/uk.dict
+share/fcitx5/emoji/data/ur.dict
+share/fcitx5/emoji/data/uz.dict
+share/fcitx5/emoji/data/vi.dict
+share/fcitx5/emoji/data/wo.dict
+share/fcitx5/emoji/data/xh.dict
+share/fcitx5/emoji/data/yo.dict
+share/fcitx5/emoji/data/yo_BJ.dict
+share/fcitx5/emoji/data/yue.dict
+share/fcitx5/emoji/data/yue_Hans.dict
+share/fcitx5/emoji/data/zh.dict
+share/fcitx5/emoji/data/zh_Hant.dict
+share/fcitx5/emoji/data/zh_Hant_HK.dict
+share/fcitx5/emoji/data/zu.dict
 share/fcitx5/spell/en_dict.fscd
 share/fcitx5/testing/addon/testfrontend.conf
 share/fcitx5/testing/addon/testim.conf
 share/fcitx5/testing/addon/testui.conf
+share/fcitx5/themes/default-dark/arrow.png
+share/fcitx5/themes/default-dark/next.png
+share/fcitx5/themes/default-dark/prev.png
+share/fcitx5/themes/default-dark/radio.png
+share/fcitx5/themes/default-dark/theme.conf
 share/fcitx5/themes/default/arrow.png
-share/fcitx5/themes/default/highlight.png
 share/fcitx5/themes/default/next.png
-share/fcitx5/themes/default/panel.png
 share/fcitx5/themes/default/prev.png
 share/fcitx5/themes/default/radio.png
 share/fcitx5/themes/default/theme.conf
@@ -273,6 +419,7 @@ share/locale/he/LC_MESSAGES/fcitx5.mo
 share/locale/ja/LC_MESSAGES/fcitx5.mo
 share/locale/ko/LC_MESSAGES/fcitx5.mo
 share/locale/ru/LC_MESSAGES/fcitx5.mo
+share/locale/vi/LC_MESSAGES/fcitx5.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx5.mo
 share/metainfo/org.fcitx.Fcitx5.metainfo.xml

Index: pkgsrc/inputmethod/fcitx5/distinfo
diff -u pkgsrc/inputmethod/fcitx5/distinfo:1.8 pkgsrc/inputmethod/fcitx5/distinfo:1.9
--- pkgsrc/inputmethod/fcitx5/distinfo:1.8      Sun May 21 05:55:39 2023
+++ pkgsrc/inputmethod/fcitx5/distinfo  Sat Feb 10 09:58:33 2024
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.8 2023/05/21 05:55:39 wiz Exp $
+$NetBSD: distinfo,v 1.9 2024/02/10 09:58:33 ryoon Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 Size (en_dict-20121020.tar.gz) = 630491 bytes
-BLAKE2s (fcitx5-5.0.5.tar.xz) = c4265cf8b03f0a1629355052808942be464f5e49fefa8e497296f889367b973a
-SHA512 (fcitx5-5.0.5.tar.xz) = 3bc1a51119c9ee0c62a7112b520f88bdc6afe10b6a7d61c97d4b7b69556716a15815b9523eb9aa566918217ad299285116a60a60978cd8297225e6f4b856785a
-Size (fcitx5-5.0.5.tar.xz) = 1294560 bytes
+BLAKE2s (fcitx5-5.1.7.tar.xz) = af0fc76b769090bd5412bd5415f65ea924771cda9267fa23f28adba787a3a01e
+SHA512 (fcitx5-5.1.7.tar.xz) = b9e59975bb21be093f422de3f72bf493bdd8f0744d73394614b6747266405f85926c95f993cd02343e712ae9d9d0738dad40c87cc3cdf546726102fafdbfe178
+Size (fcitx5-5.1.7.tar.xz) = 6867544 bytes
 SHA1 (patch-src_frontend_ibusfrontend_ibusfrontend.cpp) = 06d009f2d3977f5f72ca727a41e6aeb15aa257a2
-SHA1 (patch-src_lib_fcitx-utils_endian__p.h) = dfc1ec5fdfacc589b2b0755066e8d3bc22419eb4
+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_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-src_lib_fcitx-utils_uuid__p.h) = 100b1687a525863716249f08146c530dd31a1539
+SHA1 (patch-src_modules_spell_CMakeLists.txt) = 3a69e37b895fe7432e47b304713e70504aafcb1b
 SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462

Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_endian__p.h
diff -u pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_endian__p.h:1.1 pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_endian__p.h:1.2
--- pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_endian__p.h:1.1 Sun Mar 27 12:45:04 2022
+++ pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_endian__p.h     Sat Feb 10 09:58:33 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_lib_fcitx-utils_endian__p.h,v 1.1 2022/03/27 12:45:04 tnn Exp $
+$NetBSD: patch-src_lib_fcitx-utils_endian__p.h,v 1.2 2024/02/10 09:58:33 ryoon Exp $
 
 Fix build on SunOS
 
---- src/lib/fcitx-utils/endian_p.h.orig        2020-12-19 01:28:15.422710700 +0000
+--- src/lib/fcitx-utils/endian_p.h.orig        2024-01-13 02:04:45.526720000 +0000
 +++ src/lib/fcitx-utils/endian_p.h
-@@ -7,7 +7,7 @@
- #ifndef _FCITX_UTILS_ENDIAN_P_H_
+@@ -8,7 +8,7 @@
  #define _FCITX_UTILS_ENDIAN_P_H_
  
+ #include <cstdint>
 -#if defined(__linux__) || defined(__GLIBC__)
 +#if defined(__linux__) || defined(__GLIBC__) || defined(__sun)
  #include <endian.h>

Added files:

Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h
diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h:1.1
--- /dev/null   Sat Feb 10 09:58:34 2024
+++ pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h       Sat Feb 10 09:58:33 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib_fcitx-utils_uuid__p.h,v 1.1 2024/02/10 09:58:33 ryoon Exp $
+
+Make sure uuiod.h from libuuid is included, when using <uuid.h>
+the risk is that uuid.h from /usr/include gets included on BSD
+systems and it does not have uuid_generate causeing build failure.
+
+--- src/lib/fcitx-utils/uuid_p.h.orig  2023-11-25 13:47:31.641844962 +0000
++++ src/lib/fcitx-utils/uuid_p.h
+@@ -21,7 +21,7 @@
+ #endif
+ 
+ #ifdef ENABLE_LIBUUID
+-#include <uuid.h>
++#include <uuid/uuid.h>
+ #endif
+ 
+ namespace fcitx {
Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt
diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt:1.1
--- /dev/null   Sat Feb 10 09:58:34 2024
+++ pkgsrc/inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt    Sat Feb 10 09:58:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_spell_CMakeLists.txt,v 1.1 2024/02/10 09:58:33 ryoon Exp $
+
+* pkgsrc drops $ORIGIN and use LD_LIBRARY_PATH to run tool during build.
+
+--- src/modules/spell/CMakeLists.txt.orig      2023-11-25 13:43:52.518645056 +0000
++++ src/modules/spell/CMakeLists.txt
+@@ -42,7 +42,7 @@ fcitx5_extract(spell-en-extract "${SPELL
+ add_custom_command(
+   OUTPUT "${SPELL_EN_DICT}"
+   DEPENDS "${SPELL_EN_DICT_SRC}" Fcitx5::comp-spell-dict spell-en-extract
+-  COMMAND Fcitx5::comp-spell-dict --comp-dict
++  COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" ./comp-spell-dict --comp-dict
+   "${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}")
+ add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}")
+ install(FILES "${SPELL_EN_DICT}" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/spell")
Home | Main Index | Thread Index | Old Index