CVS commit: pkgsrc/inputmethod/fcitx5

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sun Dec 18 11:41:39 UTC 2022

Modified Files:
        pkgsrc/inputmethod/fcitx5: distinfo
Added Files:
        pkgsrc/inputmethod/fcitx5/patches:
            patch-src_lib_fcitx_inputcontext__p.h

Log Message:
fcitx5: fix build with libuuid on BSD systems


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/fcitx5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h

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.6 pkgsrc/inputmethod/fcitx5/distinfo:1.7
--- pkgsrc/inputmethod/fcitx5/distinfo:1.6      Sun Mar 27 12:45:04 2022
+++ pkgsrc/inputmethod/fcitx5/distinfo  Sun Dec 18 11:41:39 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2022/03/27 12:45:04 tnn Exp $
+$NetBSD: distinfo,v 1.7 2022/12/18 11:41:39 nros Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -10,5 +10,6 @@ SHA1 (patch-src_frontend_ibusfrontend_ib
 SHA1 (patch-src_lib_fcitx-utils_endian__p.h) = dfc1ec5fdfacc589b2b0755066e8d3bc22419eb4
 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_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66
 SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462

Added files:

Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h
diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h:1.1
--- /dev/null   Sun Dec 18 11:41:39 2022
+++ pkgsrc/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h     Sun Dec 18 11:41:39 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib_fcitx_inputcontext__p.h,v 1.1 2022/12/18 11:41:39 nros 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/inputcontext_p.h.orig        2022-12-18 11:28:32.792366572 +0000
++++ src/lib/fcitx/inputcontext_p.h
+@@ -15,7 +15,7 @@
+ #include <fcitx/inputpanel.h>
+ #include <fcitx/instance.h>
+ #include <fcitx/statusarea.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+ 
+ namespace fcitx {
+