[kdevelop] Fix with g++ 4.7 (missing include unistd.h)

Radek Novacek rnovacek at fedoraproject.org
Tue Jan 24 15:17:53 UTC 2012


commit 7f0f0982f616e387f6246c8aab06afa4a40f5949
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Jan 24 16:17:45 2012 +0100

    Fix with g++ 4.7 (missing include unistd.h)

 kdevelop-4.2.81-include-unistd-h.patch |   11 +++++++++++
 kdevelop.spec                          |    4 ++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/kdevelop-4.2.81-include-unistd-h.patch b/kdevelop-4.2.81-include-unistd-h.patch
new file mode 100644
index 0000000..c9ef58e
--- /dev/null
+++ b/kdevelop-4.2.81-include-unistd-h.patch
@@ -0,0 +1,11 @@
+diff -up kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp.include-unistd-h kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp
+--- kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp.include-unistd-h	2012-01-24 16:12:16.774396190 +0100
++++ kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp	2012-01-24 16:12:49.058279966 +0100
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <iostream>
++#include <unistd.h>
+ 
+ void foo() {
+     static int i=0;
diff --git a/kdevelop.spec b/kdevelop.spec
index e3ccdf8..b0e6b88 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -15,6 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
 Patch0:  kdevelop-4.2.81-no-rpath.patch
+# Include unistd.h (gcc 4.7 issue)
+Patch1:  kdevelop-4.2.81-include-unistd-h.patch
 
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
@@ -79,6 +81,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
 %prep
 %setup -q -n kdevelop-%{version}
 %patch0 -p1 -b .no-rpath
+%patch1 -p1 -b .include-unistd-h
 
 
 %build
@@ -153,6 +156,7 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 - Update to 4.2.81 (1.3 beta)
 - Drop upstreamed patch
 - Rebase rpath patch
+- Fix with g++ 4.7 (missing include unistd.h)
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9:4.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list