CVS commit: pkgsrc/inputmethod/fcitx

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Dec 20 12:03:25 UTC 2023

Modified Files:
        pkgsrc/inputmethod/fcitx: distinfo
        pkgsrc/inputmethod/fcitx/patches: patch-src_lib_fcitx-utils_utils.c
Added Files:
        pkgsrc/inputmethod/fcitx/patches:
            patch-src_module_spell_dict_comp__spell__dict.c
            patch-src_module_spell_spell-custom-dict.c
            patch-src_module_spell_spell-custom.c
            patch-src_module_unicode_charselectdata.c

Log Message:
fcitx: fix build on illumos, illumos has endian.h just like linux


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/fcitx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_dict_comp__spell__dict.c \
    pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom-dict.c \
    pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom.c \
    pkgsrc/inputmethod/fcitx/patches/patch-src_module_unicode_charselectdata.c

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

Modified files:

Index: pkgsrc/inputmethod/fcitx/distinfo
diff -u pkgsrc/inputmethod/fcitx/distinfo:1.6 pkgsrc/inputmethod/fcitx/distinfo:1.7
--- pkgsrc/inputmethod/fcitx/distinfo:1.6       Tue Oct 26 10:49:30 2021
+++ pkgsrc/inputmethod/fcitx/distinfo   Wed Dec 20 12:03:24 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:49:30 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/12/20 12:03:24 nros Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -22,5 +22,9 @@ SHA1 (patch-cmake_FcitxMacro.cmake) = e3
 SHA1 (patch-cmake_FindEnchant.cmake) = e2a2572d60515c80ec736dd1d8d07779aa324da0
 SHA1 (patch-src_im_pinyin_data_CMakeLists.txt) = dd17df37a5b6781a645a4190cb8111811f804189
 SHA1 (patch-src_im_table_data_CMakeLists.txt) = 3ef3d05ee036f9bb845b69c97c50ac76cc11478e
-SHA1 (patch-src_lib_fcitx-utils_utils.c) = d89eccbcc8c1ee330efbcddea152db6d2725959b
+SHA1 (patch-src_lib_fcitx-utils_utils.c) = 6b555f159986a08645e36e27814111d59d71b0a8
 SHA1 (patch-src_module_spell_dict_CMakeLists.txt) = 98372bb2c160e9bb8917ea523465924edab2c1e3
+SHA1 (patch-src_module_spell_dict_comp__spell__dict.c) = 5f67983a9a96f6b6f61874a32ed3e70a9c66f083
+SHA1 (patch-src_module_spell_spell-custom-dict.c) = 374e5a7498c6a620f95199cdda40be615409a4ae
+SHA1 (patch-src_module_spell_spell-custom.c) = 6b677936dfdbe687a06e30703b309faa1bf6372f
+SHA1 (patch-src_module_unicode_charselectdata.c) = 8d771bdd934e5038f080f9cb87ae1e6a9be54e3e

Index: pkgsrc/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c
diff -u pkgsrc/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c:1.1 pkgsrc/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c:1.2
--- pkgsrc/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c:1.1      Sat Aug 18 01:11:16 2018
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c  Wed Dec 20 12:03:25 2023
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_lib_fcitx-utils_utils.c,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+$NetBSD: patch-src_lib_fcitx-utils_utils.c,v 1.2 2023/12/20 12:03:25 nros Exp $
+
+Illumos has endian.h just like Linux
 
 --- src/lib/fcitx-utils/utils.c.orig   2017-12-22 18:02:24.000000000 +0000
 +++ src/lib/fcitx-utils/utils.c
-@@ -56,7 +56,9 @@
+@@ -56,14 +56,16 @@
  #include <fcntl.h>
  #include <sys/param.h>
  #include <sys/sysctl.h>
@@ -12,3 +14,11 @@ $NetBSD: patch-src_lib_fcitx-utils_utils
  #endif
  
  #if defined(__linux__)
+ #include <sys/prctl.h>
+ #endif
+ 
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__GLIBC__) || defined(__illumos__)
+ #include <endian.h>
+ #else
+ #include <sys/endian.h>

Added files:

Index: pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_dict_comp__spell__dict.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_dict_comp__spell__dict.c:1.1
--- /dev/null   Wed Dec 20 12:03:25 2023
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_dict_comp__spell__dict.c    Wed Dec 20 12:03:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_module_spell_dict_comp__spell__dict.c,v 1.1 2023/12/20 12:03:25 nros Exp $
+
+Illumos has endian.h just like Linux
+
+--- src/module/spell/dict/comp_spell_dict.c.orig       2023-12-20 12:44:06.382093226 +0000
++++ src/module/spell/dict/comp_spell_dict.c
+@@ -26,7 +26,7 @@
+ #include <fcntl.h>
+ #include <stdint.h>
+ #include <unistd.h>
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__GLIBC__) || defined(__illumos__)
+ #include <endian.h>
+ #else
+ #include <sys/endian.h>
Index: pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom-dict.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom-dict.c:1.1
--- /dev/null   Wed Dec 20 12:03:25 2023
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom-dict.c Wed Dec 20 12:03:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_module_spell_spell-custom-dict.c,v 1.1 2023/12/20 12:03:25 nros Exp $
+
+Illumos has endian.h just like Linux
+
+--- src/module/spell/spell-custom-dict.c.orig  2023-12-20 12:47:53.102502536 +0000
++++ src/module/spell/spell-custom-dict.c
+@@ -32,7 +32,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <time.h>
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__GLIBC__) || defined(__illumos__)
+ #include <endian.h>
+ #else
+ #include <sys/endian.h>
Index: pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom.c:1.1
--- /dev/null   Wed Dec 20 12:03:25 2023
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell-custom.c      Wed Dec 20 12:03:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_module_spell_spell-custom.c,v 1.1 2023/12/20 12:03:25 nros Exp $
+
+Illumos has endian.h just like Linux
+
+--- src/module/spell/spell-custom.c.orig       2023-12-20 12:48:01.030638913 +0000
++++ src/module/spell/spell-custom.c
+@@ -31,7 +31,7 @@
+ #include "fcitx-utils/utf8.h"
+ #include <sys/stat.h>
+ #include <time.h>
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__GLIBC__) || defined(__illumos__)
+ #include <endian.h>
+ #else
+ #include <sys/endian.h>
Index: pkgsrc/inputmethod/fcitx/patches/patch-src_module_unicode_charselectdata.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-src_module_unicode_charselectdata.c:1.1
--- /dev/null   Wed Dec 20 12:03:25 2023
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_module_unicode_charselectdata.c  Wed Dec 20 12:03:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_module_unicode_charselectdata.c,v 1.1 2023/12/20 12:03:25 nros Exp $
+
+Illumos has endian.h just like Linux
+
+--- src/module/unicode/charselectdata.c.orig   2023-12-20 12:50:04.703947794 +0000
++++ src/module/unicode/charselectdata.c
+@@ -11,7 +11,7 @@
+ #include <fcitx-utils/utils.h>
+ #include <fcitx-config/xdg.h>
+ #include <fcitx/fcitx.h>
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__GLIBC__) || defined(__illumos__)
+ #include <endian.h>
+ #else
+ #include <sys/endian.h>