[SCM] KDevelop packaging branch, master, updated. debian/4.7.1-1-3-g82598e3

[Sune Vuorela]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=82598e3

The following commit has been merged in the master branch:
commit 82598e3832ac32a5692b263f8e450785ad2e073a
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sat Sep 26 08:46:32 2015 +0200

    Backport patch from upstream to fix a crash when parsing bits/c++config.h.
---
 debian/changelog                                 |  1 +
 debian/patches/dont-use-removed-temporaries.diff | 31 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9cd5fc1..d246ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdevelop (4:4.7.1-2) unstable; urgency=medium
 
   * Add libkdevcompilerprovider to ensure that code navigation works.
+  * Backport patch from upstream to fix a crash when parsing bits/c++config.h.
 
  -- Sune Vuorela <sune at debian.org>  Sat, 26 Sep 2015 08:41:23 +0200
 
diff --git a/debian/patches/dont-use-removed-temporaries.diff b/debian/patches/dont-use-removed-temporaries.diff
new file mode 100644
index 0000000..1d9c957
--- /dev/null
+++ b/debian/patches/dont-use-removed-temporaries.diff
@@ -0,0 +1,31 @@
+commit 6ef7b373a2284e24753b6eb249ba68da5d9a2444
+Author: Sébastien Lambert <opensc at beonis.fr>
+Date:   Mon Jun 22 22:48:35 2015 +0200
+
+    Do not use function returning reference to temporary.
+    
+    REVIEW: 124126
+    BUG: 347178
+
+diff --git a/languages/cpp/cppduchain/cpppreprocessenvironment.cpp b/languages/cpp/cppduchain/cpppreprocessenvironment.cpp
+index 71babca..bb5f72e 100644
+--- a/languages/cpp/cppduchain/cpppreprocessenvironment.cpp
++++ b/languages/cpp/cppduchain/cpppreprocessenvironment.cpp
+@@ -117,7 +117,7 @@ void CppPreprocessEnvironment::merge( const Cpp::EnvironmentFile* file, bool mer
+       rpp::Environment::setMacro(const_cast<rpp::pp_macro*>(&it.ref())); //Do not use our overridden setMacro(..), because addDefinedMacro(..) is not needed(macro-sets should be merged separately)
+ 
+     for( Cpp::ReferenceCountedStringSet::Iterator it = file->definedMacroNames().iterator(); it; ++it ) {
+-      m_macroNameSet.insert(it.ref());
++      m_macroNameSet.insert(*it);
+     }
+ 
+     //We don't have to care about efficiency too much here, unDefinedMacros should be a rather small set
+@@ -126,7 +126,7 @@ void CppPreprocessEnvironment::merge( const Cpp::EnvironmentFile* file, bool mer
+         m->defined = false;
+         m->m_valueHashValid = false;
+         rpp::Environment::setMacro(m); //Do not use our overridden setMacro(..), because addDefinedMacro(..) is not needed(macro-sets should be merged separately)
+-        m_macroNameSet.remove(it.ref());
++        m_macroNameSet.remove(*it);
+     }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ae83830..f9a9241 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-parallel.diff
+dont-use-removed-temporaries.diff

-- 
KDevelop packaging