diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-04-28 12:45:33 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-04-28 12:45:33 +0200 |
| commit | bd0db9f63504d679c55f4b2700d45a809530c7d7 (patch) | |
| tree | a0fd824ea751b7a6da13a170d754da7b4e2e3d63 | |
| parent | a1ed0f8df1f57a436617c83e0d17a010033fd172 (diff) | |
| download | tde-packaging-bd0db9f63504d679c55f4b2700d45a809530c7d7.tar.gz tde-packaging-bd0db9f63504d679c55f4b2700d45a809530c7d7.zip | |
RHEL/Fedora: updates kdevelop for GCC 4.7
| -rw-r--r-- | redhat/kdevelop/kdevelop-3.5.13-gcc47.patch | 22 | ||||
| -rw-r--r-- | redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 8 |
2 files changed, 27 insertions, 3 deletions
diff --git a/redhat/kdevelop/kdevelop-3.5.13-gcc47.patch b/redhat/kdevelop/kdevelop-3.5.13-gcc47.patch new file mode 100644 index 000000000..6d5814210 --- /dev/null +++ b/redhat/kdevelop/kdevelop-3.5.13-gcc47.patch @@ -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 ) { diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index ca27fc19f..e47bc717e 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -45,7 +45,8 @@ Patch1: c_cpp_reference-2.0.2-config.patch # TDE 3.5.13 patches ## RHEL / Fedora RPM specific patches 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} @@ -126,12 +127,13 @@ Requires: %{name} = %{version}-%{release} %setup -q -n kdevelop -a1 %patch1 -p0 -b .config %patch2 -p1 +%patch3 -p1 -b .gcc47 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin |