mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00
Code Issues Releases Activity

textproc/scim: unbreak build with Clang 6 (C++14 by default)

Browse Source 
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)
This commit is contained in:
Jan Beich 2018-01-06 03:03:42 +00:00
parent 9c1afe1f60
commit c93db19487
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=458189
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
textproc/scim/files/patch-src_scim__debug.h Normal file
View File

@ -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 */

13
textproc/scim/files/patch-src_scim__pointer.h Normal file
View File

@ -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());
}