head	1.2;
access;
symbols
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2014.02.01.02.20.44;	author markd;	state dead;
branches;
next	1.1;
commitid	gfmldqi8twZsclnx;

1.1
date	2013.11.11.16.47.07;	author joerg;	state Exp;
branches;
next	;
commitid	BORAuYcC54M8DScx;


desc
@@


1.2
log
@Update to KDE SC 4.11.5

bug fixes
@
text
@$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
@


1.1
log
@Merge some changes from upstream to build with Sun PRO and libc++,
from rakuco@@FreeBSD.org.
@
text
@d1 1
a1 1
$NetBSD$
@