[SCM] KDevelop packaging branch, master, updated. debian/4.7.1-1-6-g945bc8d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit d9dfc269903d22bf33b7fa31a483961089065a2c
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jan 21 21:40:11 2016 +0100

    dont-use-removed-temporaries.diff: drop, backported from upstream
---
 debian/changelog                                 |  2 ++
 debian/patches/dont-use-removed-temporaries.diff | 31 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de22f67..7534fd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kdevelop (4:4.7.2-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - dont-use-removed-temporaries.diff: drop, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 21 Jan 2016 21:36:40 +0100
 
diff --git a/debian/patches/dont-use-removed-temporaries.diff b/debian/patches/dont-use-removed-temporaries.diff
deleted file mode 100644
index 1d9c957..0000000
--- a/debian/patches/dont-use-removed-temporaries.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-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 f9a9241..ae83830 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-parallel.diff
-dont-use-removed-temporaries.diff

-- 
KDevelop packaging