diff --git a/inputmethods/scim-fcitx/Makefile b/inputmethods/scim-fcitx/Makefile index a22ccaab86b..d0507a25a27 100644 --- a/inputmethods/scim-fcitx/Makefile +++ b/inputmethods/scim-fcitx/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2019/07/12 20:47:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2019/08/17 19:07:20 cwen Exp $ COMMENT= scim input method module for fcitx V= 3.1.1 DISTNAME= scim-fcitx.$V PKGNAME= scim-fcitx-$V -REVISION= 7 +REVISION= 8 CATEGORIES= inputmethods chinese @@ -14,9 +14,9 @@ HOMEPAGE= https://github.com/scim-im/scim-fcitx # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB= c iconv intl m ${COMPILER_LIBCXX} scim-1.0 pthread +WANTLIB += ${COMPILER_LIBCXX} c iconv intl m scim-1.0 -COMPILER = base-clang ports-gcc base-gcc +COMPILER= base-clang ports-gcc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/} EXTRACT_SUFX= .tar.bz2 diff --git a/inputmethods/scim-fcitx/patches/patch-src_ime_cpp b/inputmethods/scim-fcitx/patches/patch-src_ime_cpp new file mode 100644 index 00000000000..cd496928b9e --- /dev/null +++ b/inputmethods/scim-fcitx/patches/patch-src_ime_cpp @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_ime_cpp,v 1.1 2019/08/17 19:07:20 cwen Exp $ + +ports-gcc: add missing header + +Index: src/ime.cpp +--- src/ime.cpp.orig ++++ src/ime.cpp +@@ -3,6 +3,7 @@ + #define Uses_SCIM_CONFIG_BASE + #define Uses_SCIM_CONFIG_PATH + #include ++#include + + #include + #include "scim_fcitx_imengine.h" diff --git a/inputmethods/scim-fcitx/patches/patch-src_scim_fcitx_imengine_cpp b/inputmethods/scim-fcitx/patches/patch-src_scim_fcitx_imengine_cpp new file mode 100644 index 00000000000..b9c43ce1cd1 --- /dev/null +++ b/inputmethods/scim-fcitx/patches/patch-src_scim_fcitx_imengine_cpp @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_scim_fcitx_imengine_cpp,v 1.1 2019/08/17 19:07:20 cwen Exp $ + +ports-gcc: add missing header + +Index: src/scim_fcitx_imengine.cpp +--- src/scim_fcitx_imengine.cpp.orig ++++ src/scim_fcitx_imengine.cpp +@@ -35,6 +35,8 @@ + #define Uses_SCIM_CONFIG_BASE + #define Uses_SCIM_CONFIG_PATH + ++#include ++ + #include + #include "scim_fcitx_imengine.h" + #include "main.h" diff --git a/inputmethods/scim-fcitx/patches/patch-src_sp_cpp b/inputmethods/scim-fcitx/patches/patch-src_sp_cpp index 56c7dd1c94d..313f5459a2c 100644 --- a/inputmethods/scim-fcitx/patches/patch-src_sp_cpp +++ b/inputmethods/scim-fcitx/patches/patch-src_sp_cpp @@ -1,7 +1,15 @@ -$OpenBSD: patch-src_sp_cpp,v 1.1.1.1 2008/10/29 02:24:17 kevlo Exp $ ---- src/sp.cpp.orig Sat Oct 25 15:36:52 2008 -+++ src/sp.cpp Sat Oct 25 15:37:30 2008 -@@ -11,6 +11,7 @@ using namespace scim; +$OpenBSD: patch-src_sp_cpp,v 1.2 2019/08/17 19:07:20 cwen Exp $ + +ports-gcc: add missing headers + +Index: src/sp.cpp +--- src/sp.cpp.orig ++++ src/sp.cpp +@@ -8,9 +8,11 @@ + using namespace scim; + + #include ++#include #include #include #include