[SCM] smokegen packaging branch, master, updated. 206491d618541e3f390b4e41de42ab14d816603d

[Pino Toscano]

The following commit has been merged in the master branch:
commit 1938f8b336a7255532b8dc3992b33103dbb0096f
Author: Pino Toscano <pino at kde.org>
Date:   Wed Jun 29 14:06:08 2011 +0200

    smokegen_load_system_defines.diff: do not define IN_KDEVELOP_PARSER and IN_IDE_PARSER
    
    they are reserved for kdevelop usage, and they actually break when used in other contexts
---
 debian/patches/smokegen_load_system_defines.diff |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/patches/smokegen_load_system_defines.diff b/debian/patches/smokegen_load_system_defines.diff
index 4232fcf..f45acdd 100644
--- a/debian/patches/smokegen_load_system_defines.diff
+++ b/debian/patches/smokegen_load_system_defines.diff
@@ -21,7 +21,7 @@ support some setuphelpers calls.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,6 +22,8 @@ set(generator_SRC
+@@ -30,6 +30,8 @@ set(generator_SRC
      type_compiler.cpp
      name_compiler.cpp
      type.cpp
@@ -123,7 +123,7 @@ support some setuphelpers calls.
          exportMacro = new rpp::pp_macro;
 --- /dev/null
 +++ b/setuphelpers.cpp
-@@ -0,0 +1,170 @@
+@@ -0,0 +1,167 @@
 +/*
 +* This file is part of KDevelop
 +*
@@ -186,9 +186,6 @@ support some setuphelpers calls.
 +    //Used in several headers like sys/time.h
 +    insertMacro( macros, rpp::pp_macro("__restrict") );
 +    insertMacro( macros, rpp::pp_macro("__extension__") );
-+    //Add macros that allow special treatment when within kdevelop
-+    insertMacro( macros, rpp::pp_macro("IN_KDEVELOP_PARSER") );
-+    insertMacro( macros, rpp::pp_macro("IN_IDE_PARSER") );
 +    {
 +      //Used in several headers like sys/time.h
 +      rpp::pp_macro m("__const");

-- 
smokegen packaging