diff --git a/.gitignore b/.gitignore index bb2ef9a..f3bec15 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /kdevelop-4.6.90.tar.xz /kdevelop-4.7.0.tar.xz /kdevelop-4.7.1.tar.xz +/kdevelop-4.7.2.tar.xz diff --git a/kdevelop-4.7.1-fix-temporary-abuse-1.patch b/kdevelop-4.7.1-fix-temporary-abuse-1.patch deleted file mode 100644 index 288e72d..0000000 --- a/kdevelop-4.7.1-fix-temporary-abuse-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Sébastien Lambert -Date: Mon, 22 Jun 2015 20:48:35 +0000 -Subject: Do not use function returning reference to temporary. -X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=6ef7b373a2284e24753b6eb249ba68da5d9a2444 ---- -Do not use function returning reference to temporary. - -REVIEW: 124126 -BUG: 347178 ---- - - ---- a/languages/cpp/cppduchain/cpppreprocessenvironment.cpp -+++ b/languages/cpp/cppduchain/cpppreprocessenvironment.cpp -@@ -117,7 +117,7 @@ - rpp::Environment::setMacro(const_cast(&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 @@ - 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/kdevelop.spec b/kdevelop.spec index 77a8bcd..2811013 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -4,8 +4,8 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 4.7.1 -Release: 10%{?dist} +Version: 4.7.2 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -18,8 +18,6 @@ Patch0: kdevelop-4.5.0-no-rpath.patch # upstream patches # Backport upstream crash fixes (abuse of temporaries) (#1266259, kde#347178): -# 1. Do not use function returning reference to temporary. (Sébastien Lambert) -Patch100: kdevelop-4.7.1-fix-temporary-abuse-1.patch # 2. Remove ConvenientIterator::ref usage from oldcpp codebase. (Milian Wolff) Patch101: kdevelop-4.7.1-fix-temporary-abuse-2.patch @@ -94,7 +92,6 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} %prep %setup -q -n kdevelop-%{version} %patch0 -p1 -b .no-rpath -%patch100 -p1 -b .temp-abuse-1 %patch101 -p1 -b .temp-abuse-2 %build @@ -163,6 +160,9 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : %changelog +* Mon Oct 12 2015 Jan Grulich - 9:4.7.2-1 +- Update to 4.7.2 + * Thu Sep 24 2015 Kevin Kofler - 9:4.7.1-10 - Backport upstream crash fixes (abuse of temporaries) (#1266259, kde#347178) diff --git a/sources b/sources index 23aca7e..c7e847f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc7e6259a999bd34ce644ffea4727e76 kdevelop-4.7.1.tar.xz +40d508a963a0cf82086e4c0c0ba2ee47 kdevelop-4.7.2.tar.xz