[SCM] smokegen packaging branch, master, updated. debian/4.7.0-2-3-g5bef0b4

[Pino Toscano]

The following commit has been merged in the master branch:
commit 88f92dea89459411e54d781a0dcf8f5e884158b2
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 23 20:02:39 2011 +0200

    smokegen_load_system_defines.diff: update to the upstream sources
---
 debian/changelog                                 |    6 +-
 debian/patches/series                            |    3 +-
 debian/patches/smokegen_load_system_defines.diff |   57 ++++++++++++++++-----
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c396da9..b80e601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 smokegen (4:4.7.1-1) UNRELEASED; urgency=low
 
-  * New release.
+  * New upstream release.
 
-  [ David Palacio ]
-  * Disable patch smokegen_load_system_defines.diff. Pending update.
+  [ Pino Toscano ]
+  * Update patch smokegen_load_system_defines.diff to the upstream sources.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 10 Aug 2011 23:49:23 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 5a75cd3..ca7c26c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 fix_segfault_in_generator_on_armel.diff
-#need updating
-#smokegen_load_system_defines.diff
+smokegen_load_system_defines.diff
 version_cppparser_library.diff
diff --git a/debian/patches/smokegen_load_system_defines.diff b/debian/patches/smokegen_load_system_defines.diff
index f45acdd..91551ef 100644
--- a/debian/patches/smokegen_load_system_defines.diff
+++ b/debian/patches/smokegen_load_system_defines.diff
@@ -1,8 +1,9 @@
 From: Modestas Vainius <modax at debian.org>
+From: Pino Toscano <pino at debian.org>
 Subject: get system #defines from current compiler
 Bug-Debian: http://bugs.debian.org/626631
 Forwarded: no
-Last-Update: 2011-05-13
+Last-Update: 2011-09-23
 Origin: vendor
 
 Steal and port some setuphelpers code from the latest kdevelop (b3104e25) which
@@ -40,10 +41,11 @@ support some setuphelpers calls.
  
  #include <rpp/pp-environment.h>
  #include <rpp/pp-macro.h>
-@@ -38,74 +39,18 @@ Preprocessor::Preprocessor(const QList<Q
+@@ -39,94 +40,8 @@ Preprocessor::Preprocessor(const QList<Q
+     m_topBlock = new rpp::MacroBlock(0);
      
      // some basic definitions
-     rpp::pp_macro* exportMacro = new rpp::pp_macro;
+-    rpp::pp_macro* exportMacro = new rpp::pp_macro;
 -    exportMacro->name = IndexedString("__cplusplus");
 -    exportMacro->definition.append(IndexedString('1'));
 -    exportMacro->function_like = false;
@@ -59,12 +61,11 @@ support some setuphelpers calls.
 -
 -    exportMacro = new rpp::pp_macro;
 -    exportMacro->name = IndexedString("__GNUC_MINOR__");
-+    exportMacro->name = IndexedString("__SMOKEGEN_RUN__");
-     exportMacro->definition.append(IndexedString('1'));
-     exportMacro->function_like = false;
-     exportMacro->variadics = false;
-     m_topBlock->setMacro(exportMacro);
- 
+-    exportMacro->definition.append(IndexedString('1'));
+-    exportMacro->function_like = false;
+-    exportMacro->variadics = false;
+-    m_topBlock->setMacro(exportMacro);
+-
 -    exportMacro = new rpp::pp_macro;
 -#if defined(Q_OS_LINUX)
 -    exportMacro->name = IndexedString("__linux__");
@@ -99,8 +100,7 @@ support some setuphelpers calls.
 -    exportMacro->variadics = false;
 -    m_topBlock->setMacro(exportMacro);
 -#endif
-+    CppTools::setupStandardMacros(*m_topBlock);
- 
+-
 -    // ansidecl.h will define macros for keywords if we don't define __STDC__
 -    exportMacro = new rpp::pp_macro;
 -    exportMacro->name = IndexedString("__STDC__");
@@ -108,19 +108,48 @@ support some setuphelpers calls.
 -    exportMacro->variadics = false;
 -    m_topBlock->setMacro(exportMacro);
 -
+-    // the following macros are gcc specialties
 -    exportMacro = new rpp::pp_macro;
--    exportMacro->name = IndexedString("__SMOKEGEN_RUN__");
--    exportMacro->definition.append(IndexedString('1'));
+-    exportMacro->name = IndexedString("__extension__");
+-    exportMacro->function_like = false;
+-    exportMacro->variadics = false;
+-    m_topBlock->setMacro(exportMacro);
+-
+-    exportMacro = new rpp::pp_macro;
+-    exportMacro->name = IndexedString("__restrict");
 -    exportMacro->function_like = false;
 -    exportMacro->variadics = false;
 -    m_topBlock->setMacro(exportMacro);
+-
+-    exportMacro = new rpp::pp_macro;
+-    exportMacro->name = IndexedString("__const");
+-    exportMacro->definition.append(IndexedString("const"));
+-    exportMacro->function_like = false;
+-    exportMacro->variadics = false;
+-    m_topBlock->setMacro(exportMacro);
+-
+-    exportMacro = new rpp::pp_macro;
+-    exportMacro->name = IndexedString("__attribute__");
+-    exportMacro->function_like = true;
+-    exportMacro->variadics = false;
+-    m_topBlock->setMacro(exportMacro);
++    rpp::pp_macro* exportMacro = 0;
++    CppTools::setupStandardMacros(*m_topBlock);
+ 
+     exportMacro = new rpp::pp_macro;
+     exportMacro->name = IndexedString("__SMOKEGEN_RUN__");
+@@ -135,6 +50,11 @@ Preprocessor::Preprocessor(const QList<Q
+     exportMacro->variadics = false;
+     m_topBlock->setMacro(exportMacro);
+ 
 +    // Do not add standard include paths
 +//    foreach (QString dir, CppTools::setupStandardIncludePaths()) {
 +//        m_includeDirs << QDir(dir);
 +//    }
- 
++
      foreach (QString define, defines) {
          exportMacro = new rpp::pp_macro;
+         exportMacro->name = IndexedString(define);
 --- /dev/null
 +++ b/setuphelpers.cpp
 @@ -0,0 +1,167 @@

-- 
smokegen packaging