Date: Sat, 6 Jan 2018 03:03:42 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458189 - head/textproc/scim/files Message-ID: <201801060303.w0633gI1038434@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Jan 6 03:03:42 2018 New Revision: 458189 URL: https://svnweb.freebsd.org/changeset/ports/458189 Log: textproc/scim: unbreak build with Clang 6 (C++14 by default) In file included from scim_backend.cpp:33: In file included from ./scim.h:193: In file included from /usr/include/c++/v1/iostream:38: In file included from /usr/include/c++/v1/ios:216: In file included from /usr/include/c++/v1/__locale:15: In file included from /usr/include/c++/v1/string:477: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:56: In file included from /usr/include/c++/v1/algorithm:642: /usr/include/c++/v1/utility:324:5: error: the parameter for this explicitly-defaulted copy constructor is const, but a member or base requires it to be non-const pair(pair const&) = default; ^ /usr/include/c++/v1/map:624:16: note: in instantiation of template class 'std::__1::pair<const std::__1::basic_string<char>, scim::Pointer<scim::IMEngineFactoryBase> >' requested here value_type __cc; ^ scim_backend.cpp:117:53: note: in instantiation of template class 'std::__1::__value_type<std::__1::basic_string<char>, scim::Pointer<scim::IMEngineFactoryBase> >' requested here for (it = m_factory_repository.begin (); it != m_factory_repository.end (); ++it) { ^ In file included from scim_backend.cpp:33: In file included from ./scim.h:193: In file included from /usr/include/c++/v1/iostream:38: In file included from /usr/include/c++/v1/ios:216: In file included from /usr/include/c++/v1/__locale:15: In file included from /usr/include/c++/v1/string:477: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:56: In file included from /usr/include/c++/v1/algorithm:642: /usr/include/c++/v1/utility:324:5: error: the parameter for this explicitly-defaulted copy constructor is const, but a member or base requires it to be non-const pair(pair const&) = default; ^ /usr/include/c++/v1/map:625:21: note: in instantiation of template class 'std::__1::pair<std::__1::basic_string<char>, scim::Pointer<scim::IMEngineFactoryBase> >' requested here __nc_value_type __nc; ^ scim_backend.cpp:117:53: note: in instantiation of template class 'std::__1::__value_type<std::__1::basic_string<char>, scim::Pointer<scim::IMEngineFactoryBase> >' requested here for (it = m_factory_repository.begin (); it != m_factory_repository.end (); ++it) { ^ scim_debug.cpp:41:6: error: constant expression evaluates to -1 which cannot be narrowed to type 'scim::uint32' (aka 'unsigned int') [-Wc++11-narrowing] {SCIM_DEBUG_AllMask, "all"}, ^~~~~~~~~~~~~~~~~~ ./scim_debug.h:44:37: note: expanded from macro 'SCIM_DEBUG_AllMask' #define SCIM_DEBUG_AllMask (~0) /**< Show all messages. */ ^~~~ scim_debug.cpp:41:6: note: insert an explicit cast to silence this issue {SCIM_DEBUG_AllMask, "all"}, ^~~~~~~~~~~~~~~~~~ static_cast<uint32>( ) ./scim_debug.h:44:37: note: expanded from macro 'SCIM_DEBUG_AllMask' #define SCIM_DEBUG_AllMask (~0) /**< Show all messages. */ ^~~~ Reported by: antoine (via bug 224669) Obtained from: upstream (SCIM 1.4.16) Added: head/textproc/scim/files/patch-src_scim__debug.h (contents, props changed) head/textproc/scim/files/patch-src_scim__pointer.h (contents, props changed) Added: head/textproc/scim/files/patch-src_scim__debug.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/scim/files/patch-src_scim__debug.h Sat Jan 6 03:03:42 2018 (r458189) @@ -0,0 +1,13 @@ +https://github.com/scim-im/scim/commit/ea2a777b2fab + +--- src/scim_debug.h.orig 2008-11-02 06:42:34 UTC ++++ src/scim_debug.h +@@ -41,7 +41,7 @@ namespace scim { + * @name The mask for debug messages filtering. + * @{ + */ +-#define SCIM_DEBUG_AllMask (~0) /**< Show all messages. */ ++#define SCIM_DEBUG_AllMask ((uint32)~0) /**< Show all messages. */ + #define SCIM_DEBUG_MainMask 1 /**< Show messages of main application. */ + #define SCIM_DEBUG_ConfigMask 2 /**< Show messages of Config objects */ + #define SCIM_DEBUG_IMEngineMask 4 /**< Show messages of IMEngine objects */ Added: head/textproc/scim/files/patch-src_scim__pointer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/scim/files/patch-src_scim__pointer.h Sat Jan 6 03:03:42 2018 (r458189) @@ -0,0 +1,13 @@ +https://github.com/scim-im/scim/commit/bdeff0b45eda + +--- src/scim_pointer.h.orig 2008-11-02 06:42:37 UTC ++++ src/scim_pointer.h +@@ -84,7 +84,7 @@ class Pointer (public) + //!< + //!< <BR>Initialize a new Pointer with any dumb pointer. + +- Pointer(Pointer& src) : t(0) ++ Pointer(const Pointer& src) : t(0) + { + set(src.get()); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801060303.w0633gI1038434>