Merge some changes from upstream to build with Sun PRO and libc++,

from rakuco@FreeBSD.org.

5 files changed, 198 insertions, 1 deletions

diff --git a/devel/umbrello/distinfo b/devel/umbrello/distinfo
index 1d912e812a6..b709bae01c7 100644
--- a/devel/umbrello/distinfo
+++ b/devel/umbrello/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.3 2013/11/07 10:42:26 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/11/11 16:47:07 joerg Exp $
 
 SHA1 (umbrello-4.11.3.tar.xz) = 98274cfe91db7b56429a9de0d23ae490adee9ce0
 RMD160 (umbrello-4.11.3.tar.xz) = e3455869134019335ac47ce89b4f074fbdb9bc79
 Size (umbrello-4.11.3.tar.xz) = 1478632 bytes
+SHA1 (patch-umbrello_CMakeLists.txt) = 9188a7d3b8a0b69def0cdfd2280a4f51eb4cde5b
+SHA1 (patch-umbrello_codeimport_classimport.cpp) = 8c4be72436bba4696d3b3e88bca8b360259123d3
+SHA1 (patch-umbrello_codeimport_kdevcppparser_position.h) = 5a2d2e24df8fbbc56c910f2e800b21083319d8c5
+SHA1 (patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp) = 87c6c12c1e19009723aa58c89ef7ca67eedc04f0
diff --git a/devel/umbrello/patches/patch-umbrello_CMakeLists.txt b/devel/umbrello/patches/patch-umbrello_CMakeLists.txt
new file mode 100644
index 00000000000..86db0cab1e0
--- /dev/null
+++ b/devel/umbrello/patches/patch-umbrello_CMakeLists.txt
@@ -0,0 +1,59 @@
+$NetBSD: patch-umbrello_CMakeLists.txt,v 1.1 2013/11/11 16:47:07 joerg Exp $
+
+Patches from upstream.
+
+--- umbrello/CMakeLists.txt.orig	2013-08-28 17:14:58.000000000 +0000
++++ umbrello/CMakeLists.txt
+@@ -268,37 +268,21 @@ set(libcodeimport_SRCS
+     codeimport/csharp/csharpimport.cpp
+ )
+ 
+-if (WIN32 AND NOT MSVC)
+-    # SunPRO CC have a problem with position.h; we try to put a
+-    # QChar into a spirit iterator, which, after a bunch of futzing, ends up in
+-    # the STL string_ref templates, which use
+-    #
+-    #     union {
+-    #        size_type _C_size;    // Number of actual data values stored
+-    #        _CharT    _C_dummy;   // force the alignment of the first char
+-    #     } _C_size;               // named to work around an HP aCC 3.30 bug
+-    #
+-    # and you can't have a class which requires an initializer in a union.
+-    #
+-    add_definitions(-DDISABLE_CPP_IMPORT)
+-    set(libkdevcppparser_SRCS)
+-else (WIN32 AND NOT MSVC)
+-    list(APPEND libcodeimport_SRCS
+-        codeimport/cppimport.cpp
+-    )
+-    set(libkdevcppparser_SRCS
+-        codeimport/kdevcppparser/ast.cpp
+-        codeimport/kdevcppparser/driver.cpp
+-        codeimport/kdevcppparser/errors.cpp
+-        codeimport/kdevcppparser/lexer.cpp
+-        codeimport/kdevcppparser/lookup.cpp
+-        codeimport/kdevcppparser/parser.cpp
+-        codeimport/kdevcppparser/preprocesslexer.cpp
+-        codeimport/kdevcppparser/tree_parser.cpp
+-        codeimport/kdevcppparser/ast_utils.cpp
+-        codeimport/kdevcppparser/cpptree2uml.cpp
+-    )
+-endif(WIN32 AND NOT MSVC)
++list(APPEND libcodeimport_SRCS
++    codeimport/cppimport.cpp
++)
++set(libkdevcppparser_SRCS
++    codeimport/kdevcppparser/ast.cpp
++    codeimport/kdevcppparser/driver.cpp
++    codeimport/kdevcppparser/errors.cpp
++    codeimport/kdevcppparser/lexer.cpp
++    codeimport/kdevcppparser/lookup.cpp
++    codeimport/kdevcppparser/parser.cpp
++    codeimport/kdevcppparser/preprocesslexer.cpp
++    codeimport/kdevcppparser/tree_parser.cpp
++    codeimport/kdevcppparser/ast_utils.cpp
++    codeimport/kdevcppparser/cpptree2uml.cpp
++)
+ 
+ set(libclipboard_SRCS
+     clipboard/umldragdata.cpp
diff --git a/devel/umbrello/patches/patch-umbrello_codeimport_classimport.cpp b/devel/umbrello/patches/patch-umbrello_codeimport_classimport.cpp
new file mode 100644
index 00000000000..5ffcc558d3f
--- /dev/null
+++ b/devel/umbrello/patches/patch-umbrello_codeimport_classimport.cpp
@@ -0,0 +1,30 @@
+$NetBSD: patch-umbrello_codeimport_classimport.cpp,v 1.1 2013/11/11 16:47:07 joerg Exp $
+
+Patches from upstream.
+
+--- umbrello/codeimport/classimport.cpp.orig	2013-06-28 18:06:03.000000000 +0000
++++ umbrello/codeimport/classimport.cpp
+@@ -20,9 +20,7 @@
+ #include "javaimport.h"
+ #include "adaimport.h"
+ #include "pascalimport.h"
+-#ifndef DISABLE_CPP_IMPORT
+ #include "cppimport.h"
+-#endif
+ #include "csharpimport.h"
+ #include "codeimpthread.h"
+ 
+@@ -52,13 +50,8 @@ ClassImport *ClassImport::createImporter
+         classImporter = new PascalImport(thread);
+     else if (fileName.endsWith(QLatin1String(".cs")))
+         classImporter = new CSharpImport(thread);
+-#ifndef DISABLE_CPP_IMPORT
+     else
+         classImporter = new CppImport(thread);  // the default.
+-#else
+-    else 
+-        classImporter = 0;
+-#endif
+     return classImporter;
+ }
+ 
diff --git a/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_position.h b/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_position.h
new file mode 100644
index 00000000000..2083bcb175b
--- /dev/null
+++ b/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_position.h
@@ -0,0 +1,65 @@
+$NetBSD: patch-umbrello_codeimport_kdevcppparser_position.h,v 1.1 2013/11/11 16:47:07 joerg Exp $
+
+Patches from upstream.
+
+--- umbrello/codeimport/kdevcppparser/position.h.orig	2013-06-28 18:06:03.000000000 +0000
++++ umbrello/codeimport/kdevcppparser/position.h
+@@ -20,22 +20,6 @@
+ #ifndef POSITION_H
+ #define POSITION_H
+ 
+-#ifdef _MSC_VER //Q_CC_MSVC isn't defined here
+-/*
+-workaround for the following msvc error 
+-...\Microsoft Visual Studio 8\VC\INCLUDE\xstring(2044) : error C2620: 
+-    member 'std::basic_string<_Elem>::_Bxty::_Buf ' of union 'std::basic_string<_Elem>::_Bxty' 
+-    has user-defined constructor or non-trivial default constructor with [  _Elem=QChar]
+-...\Microsoft Visual Studio 8\VC\INCLUDE\xstring(2046) : see reference to class 
+-    template instantiation 'std::basic_string<_Elem>::_Bxty' being compiled with [  _Elem=QChar]
+-..\umbrello\umbrello\codeimport\kdevcppparser\position.h(49) : see reference to class 
+-    template instantiation 'std::basic_string<_Elem>' being compiled with [  _Elem=QChar]
+-*/
+-#define union struct 
+-#include <xstring>
+-#undef union 
+-#endif
+-
+ #include <limits.h>
+ #include <boost/version.hpp>
+ #include <boost/spirit/include/classic.hpp>
+@@ -43,34 +27,7 @@ workaround for the following msvc error 
+ #include <QChar>
+ #include <QDebug>
+ 
+-typedef std::basic_string<QChar> PositionFilenameType;
+-
+-class PositionFilename : public PositionFilenameType
+-{
+-public:
+-    PositionFilename()
+-    {
+-    }
+-
+-    explicit PositionFilename(const QString &p) : PositionFilenameType(p.data())
+-    {
+-    }
+-
+-    QString toString() const
+-    {
+-        QString result;
+-        for(unsigned int i = 0; i < size(); i++)
+-            result.append(at(i));
+-        return result;
+-    }
+-};
+-
+-inline QDebug operator<<(QDebug out, const PositionFilename &p)
+-{
+-    out << p.toString();
+-    return out;
+-}
+-
++typedef QString PositionFilename;
+ typedef boost::spirit::classic::file_position_base<PositionFilename> PositionType;
+ 
+ class Position : public PositionType
diff --git a/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp b/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp
new file mode 100644
index 00000000000..f220ae548c7
--- /dev/null
+++ b/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp
@@ -0,0 +1,39 @@
+$NetBSD: patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp,v 1.1 2013/11/11 16:47:07 joerg Exp $
+
+Patches from upstream.
+
+--- umbrello/codeimport/kdevcppparser/preprocesslexer.cpp.orig	2013-06-28 18:06:03.000000000 +0000
++++ umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
+@@ -41,13 +41,11 @@
+ 
+ #define PREPROCESSLEXER_DEBUG
+ 
+-#ifdef Q_CC_MSVC
+ template <class _Tp>
+-struct _Identity : public std::unary_function<_Tp,_Tp> {
++struct identity : public std::unary_function<_Tp,_Tp> {
+   _Tp& operator()(_Tp& __x) const { return __x; }
+   const _Tp& operator()(const _Tp& __x) const { return __x; }
+ };
+-#endif
+ 
+ template <class _Tp>
+ struct tilde : public std::unary_function<_Tp, _Tp> {
+@@ -593,7 +591,7 @@ void PreprocessLexer::dumpToFile()
+     if (!d.exists())
+         d.mkdir(tempPath);
+ 
+-    QString fileName = tempPath + '/' + currentPosition().file.toString().replace(QRegExp("[/:mn]"), "-");
++    QString fileName = tempPath + '/' + currentPosition().file.replace(QRegExp("[/:mn]"), "-");
+     QFile f(fileName);
+     if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {
+         QTextStream out(&f);
+@@ -839,7 +837,7 @@ int PreprocessLexer::macroPrimary()
+         if (!l_hit)
+             result = 0;
+     } else {
+-        boost::function < int (int) > l_op = _Identity<int>();
++        boost::function < int (int) > l_op = identity<int>();
+         if (m_source.parse(ch_p('+')
+                            | ch_p('-')[var(l_op) = std::negate<int>()]
+                            | ch_p('!')[var(l_op) = std::logical_not<int>()]