CVS commit: pkgsrc/inputmethod/fcitx

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Nov 27 13:07:26 UTC 2018

Modified Files:
        pkgsrc/inputmethod/fcitx: Makefile distinfo
Added Files:
        pkgsrc/inputmethod/fcitx/patches: patch-cmake_FindEnchant.cmake

Log Message:
Port build to enchant2, bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/fcitx/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/fcitx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx/patches/patch-cmake_FindEnchant.cmake

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/Makefile
diff -u pkgsrc/inputmethod/fcitx/Makefile:1.17 pkgsrc/inputmethod/fcitx/Makefile:1.18
--- pkgsrc/inputmethod/fcitx/Makefile:1.17      Wed Nov 14 22:21:49 2018
+++ pkgsrc/inputmethod/fcitx/Makefile   Tue Nov 27 13:07:25 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/11/14 22:21:49 kleink Exp $
+# $NetBSD: Makefile,v 1.18 2018/11/27 13:07:25 bsiegert Exp $
 #
 
 DISTNAME=              fcitx-4.2.9.6
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            inputmethod
 MASTER_SITES=          https://download.fcitx-im.org/fcitx/
 EXTRACT_SUFX=          .tar.xz
@@ -67,7 +67,7 @@ post-extract:
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/inputmethod/fcitx/distinfo
diff -u pkgsrc/inputmethod/fcitx/distinfo:1.3 pkgsrc/inputmethod/fcitx/distinfo:1.4
--- pkgsrc/inputmethod/fcitx/distinfo:1.3       Sat Aug 18 01:11:16 2018
+++ pkgsrc/inputmethod/fcitx/distinfo   Tue Nov 27 13:07:25 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/08/18 01:11:16 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2018/11/27 13:07:25 bsiegert Exp $
 
 SHA1 (en_dict-20121020.tar.gz) = 3d6b85cbede261b3703b916e6a1a3303f6cba9a6
 RMD160 (en_dict-20121020.tar.gz) = ae6a1fcf214b9ba1b9d300edeec4d61ad62caf18
@@ -25,6 +25,7 @@ RMD160 (table.tar.gz) = b678c943b232b8ab
 SHA512 (table.tar.gz) = 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
 Size (table.tar.gz) = 4144686 bytes
 SHA1 (patch-cmake_FcitxMacro.cmake) = e3dcba315711fc6b96f5620de1e03e096635bab2
+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

Added files:

Index: pkgsrc/inputmethod/fcitx/patches/patch-cmake_FindEnchant.cmake
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-cmake_FindEnchant.cmake:1.1
--- /dev/null   Tue Nov 27 13:07:26 2018
+++ pkgsrc/inputmethod/fcitx/patches/patch-cmake_FindEnchant.cmake      Tue Nov 27 13:07:26 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_FindEnchant.cmake,v 1.1 2018/11/27 13:07:26 bsiegert Exp $
+
+--- cmake/FindEnchant.cmake.orig       2017-12-22 18:02:24.000000000 +0000
++++ cmake/FindEnchant.cmake
+@@ -24,7 +24,7 @@ find_path(ENCHANT_INCLUDE_DIR
+   PATH_SUFFIXES "enchant")
+ 
+ find_library(ENCHANT_LIBRARIES
+-  NAMES enchant
++  NAMES enchant-2
+   HINTS ${PC_ENCHANT_LIBRARY_DIRS})
+ 
+ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+@@ -39,7 +39,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRA
+   #include <stdlib.h>
+   #include <stddef.h>
+   #include <string.h>
+-  #include <enchant/enchant.h>
++  #include <enchant.h>
+ 
+   EnchantBroker *enchant_broker_init();
+   char **enchant_dict_suggest(EnchantDict *dict, const char *str,