RHEL/Fedora: updates kdevelop for GCC 4.7

pull/3/head
Francois Andriot 13 years ago
parent a1ed0f8df1
commit bd0db9f635

@ -0,0 +1,22 @@
--- kdevelop/languages/cpp/cppcodecompletion.cpp.gcc47 2011-08-13 07:59:50.000000000 +0200
+++ kdevelop/languages/cpp/cppcodecompletion.cpp 2012-04-26 20:33:55.645135959 +0200
@@ -3892,15 +3892,15 @@
ArgumentList fArgs = ( *it ) ->argumentList();
if ( fArgs.count() != args.count() )
continue;
- ArgumentList::iterator it = args.begin();
+ ArgumentList::iterator it3 = args.begin();
ArgumentList::iterator it2 = fArgs.begin();
bool hit = true;
- while ( it != args.end() ) {
- if ( ( *it ) ->type() != ( *it2 ) ->type() ) {
+ while ( it3 != args.end() ) {
+ if ( ( *it3 ) ->type() != ( *it2 ) ->type() ) {
hit = false;
break;
}
- ++it;
+ ++it3;
++it2;
}
if ( hit ) {

@ -45,7 +45,8 @@ Patch1: c_cpp_reference-2.0.2-config.patch
# TDE 3.5.13 patches # TDE 3.5.13 patches
## RHEL / Fedora RPM specific patches ## RHEL / Fedora RPM specific patches
Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
# Fix compilation with GCC 4.7
Patch3: kdevelop-3.5.13-gcc47.patch
Provides: kdevelop3 = %{version}-%{release} Provides: kdevelop3 = %{version}-%{release}
@ -126,12 +127,13 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n kdevelop -a1 %setup -q -n kdevelop -a1
%patch1 -p0 -b .config %patch1 -p0 -b .config
%patch2 -p1 %patch2 -p1
%patch3 -p1 -b .gcc47
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin %__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin

Loading…
Cancel
Save