Date: Tue, 30 Apr 2019 19:23:44 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500557 - in head/chinese/scim-fcitx: . files Message-ID: <201904301923.x3UJNiEI042373@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Tue Apr 30 19:23:44 2019 New Revision: 500557 URL: https://svnweb.freebsd.org/changeset/ports/500557 Log: chinese/scim-fcitx: fix build with GCC-based architectures Apart from using new GCC on GCC architectures, this port also needs to including sys/types.h and cstring in some cpp files: /usr/local/lib/libscim-1.0.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_assign(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@GLIBCXX_3.4.21' PR: 237148 Approved by: meta (maintainer timeout), mat (mentor) Differential Revision: https://reviews.freebsd.org/D20106 Added: head/chinese/scim-fcitx/files/patch-src_ime.cpp (contents, props changed) head/chinese/scim-fcitx/files/patch-src_ime.h (contents, props changed) head/chinese/scim-fcitx/files/patch-src_pyParser.h (contents, props changed) head/chinese/scim-fcitx/files/patch-src_scim__fcitx__imengine.cpp (contents, props changed) Modified: head/chinese/scim-fcitx/Makefile head/chinese/scim-fcitx/files/patch-src__sp.cpp head/chinese/scim-fcitx/files/patch-src__tools.cpp Modified: head/chinese/scim-fcitx/Makefile ============================================================================== --- head/chinese/scim-fcitx/Makefile Tue Apr 30 19:13:59 2019 (r500556) +++ head/chinese/scim-fcitx/Makefile Tue Apr 30 19:23:44 2019 (r500557) @@ -18,7 +18,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= scim:textproc/scim -USES= tar:bzip2 gmake libtool:keepla pkgconfig +USES= compiler:c++11-lang tar:bzip2 gmake libtool:keepla pkgconfig \ + localbase:ldflags GNU_CONFIGURE= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes @@ -27,8 +28,7 @@ WRKSRC= ${WRKDIR}/fcitx CONFIGURE_ENV+= SCIM_DATADIR=${PREFIX}/share/scim \ SCIM_ICONDIR=${PREFIX}/share/scim/icons -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl +LDFLAGS+= -lintl SUB_FILES= pkg-message Modified: head/chinese/scim-fcitx/files/patch-src__sp.cpp ============================================================================== --- head/chinese/scim-fcitx/files/patch-src__sp.cpp Tue Apr 30 19:13:59 2019 (r500556) +++ head/chinese/scim-fcitx/files/patch-src__sp.cpp Tue Apr 30 19:23:44 2019 (r500557) @@ -1,6 +1,11 @@ ---- src/sp.cpp.orig 2005-05-08 20:11:29.000000000 +0400 -+++ src/sp.cpp 2014-07-23 03:21:49.000000000 +0400 -@@ -11,6 +11,7 @@ +--- src/sp.cpp.orig 2005-05-08 16:11:29 UTC ++++ src/sp.cpp +@@ -7,10 +7,12 @@ + #include "scim_fcitx_imengine.h" + using namespace scim; + ++#include <cstring> + #include <stdio.h> #include <sys/stat.h> #include <limits.h> #include <ctype.h> Modified: head/chinese/scim-fcitx/files/patch-src__tools.cpp ============================================================================== --- head/chinese/scim-fcitx/files/patch-src__tools.cpp Tue Apr 30 19:13:59 2019 (r500556) +++ head/chinese/scim-fcitx/files/patch-src__tools.cpp Tue Apr 30 19:23:44 2019 (r500557) @@ -1,6 +1,6 @@ ---- src/tools.cpp.orig 2005-05-20 18:41:12.000000000 +0400 -+++ src/tools.cpp 2014-07-23 02:57:51.000000000 +0400 -@@ -14,6 +14,7 @@ +--- src/tools.cpp.orig 2005-05-20 14:41:12 UTC ++++ src/tools.cpp +@@ -14,6 +14,7 @@ using namespace scim; #include <sys/stat.h> #include <limits.h> #include <string.h> Added: head/chinese/scim-fcitx/files/patch-src_ime.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/scim-fcitx/files/patch-src_ime.cpp Tue Apr 30 19:23:44 2019 (r500557) @@ -0,0 +1,10 @@ +--- src/ime.cpp.orig 2019-04-09 08:15:56 UTC ++++ src/ime.cpp +@@ -2,6 +2,7 @@ + #define Uses_SCIM_ICONV + #define Uses_SCIM_CONFIG_BASE + #define Uses_SCIM_CONFIG_PATH ++#include <cstring> + #include <ctype.h> + + #include <scim.h> Added: head/chinese/scim-fcitx/files/patch-src_ime.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/scim-fcitx/files/patch-src_ime.h Tue Apr 30 19:23:44 2019 (r500557) @@ -0,0 +1,12 @@ +--- src/ime.h.orig 2019-04-09 08:16:46 UTC ++++ src/ime.h +@@ -2,6 +2,9 @@ + #define _IME_H + + #include "xim.h" ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#endif + + #include "scim_fcitx_imengine.h" + Added: head/chinese/scim-fcitx/files/patch-src_pyParser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/scim-fcitx/files/patch-src_pyParser.h Tue Apr 30 19:23:44 2019 (r500557) @@ -0,0 +1,13 @@ +--- src/pyParser.h.orig 2019-04-09 08:24:03 UTC ++++ src/pyParser.h +@@ -11,6 +11,10 @@ + + #include "py.h" + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#endif ++ + #define PY_SEPERATOR '\'' + #define PY_SEPERATOR_S "'" + Added: head/chinese/scim-fcitx/files/patch-src_scim__fcitx__imengine.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/scim-fcitx/files/patch-src_scim__fcitx__imengine.cpp Tue Apr 30 19:23:44 2019 (r500557) @@ -0,0 +1,13 @@ +--- src/scim_fcitx_imengine.cpp.orig 2019-04-09 08:12:58 UTC ++++ src/scim_fcitx_imengine.cpp +@@ -35,6 +35,10 @@ + #define Uses_SCIM_CONFIG_BASE + #define Uses_SCIM_CONFIG_PATH + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#endif ++#include <cstring> + #include <scim.h> + #include "scim_fcitx_imengine.h" + #include "main.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904301923.x3UJNiEI042373>