From a2f95e5e5a4194a048719620701586b69bb21319 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mar 02 2009 13:05:50 +0000 Subject: fix build problem with gcc-4.4 --- diff --git a/kdevelop-3.5.4-gcc-44.patch b/kdevelop-3.5.4-gcc-44.patch new file mode 100644 index 0000000..55b31e0 --- /dev/null +++ b/kdevelop-3.5.4-gcc-44.patch @@ -0,0 +1,13 @@ +diff -up kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp.orig kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp +--- kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp.orig 2009-03-02 13:50:12.000000000 +0100 ++++ kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp 2009-03-02 13:51:48.000000000 +0100 +@@ -12,6 +12,8 @@ + + #include + ++#include ++ + #ifdef HAS_NOT_CCTYPE_H + #include + #else +diff -up kdevelop-3.5.4/lib/antlr/src/String.cpp.orig kdevelop-3.5.4/lib/antlr/src/String.cpp diff --git a/kdevelop.spec b/kdevelop.spec index 80d6cd5..dd2b336 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -20,7 +20,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 3.5.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -32,6 +32,7 @@ Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch +Patch3: kdevelop-3.5.4-gcc-44.patch # improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora Patch4: kdevelop-3.5.2-kde4template.patch @@ -146,6 +147,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q -a1 %patch1 -p0 -b .config %patch2 -p1 -b .doc +%patch3 -p1 -b .gcc44 %patch4 -p1 -b .kde4template %if %{make_cvs} @@ -256,6 +258,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 02 2009 Than Ngo - 3.5.4-3 +- fix build problem with gcc-4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 9:3.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild