[komparator] Fix FTBFS with g++ 4.7
Kevin Kofler
kkofler at fedoraproject.org
Tue Jul 31 21:46:37 UTC 2012
commit c19270cd01a3bc40725816ca5238f64488fd8c89
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Tue Jul 31 23:46:15 2012 +0200
Fix FTBFS with g++ 4.7
* Tue Jul 31 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9-8
- Fix FTBFS with g++ 4.7
komparator-0.9-gcc47.patch | 12 ++++++++++++
komparator.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/komparator-0.9-gcc47.patch b/komparator-0.9-gcc47.patch
new file mode 100644
index 0000000..cd83167
--- /dev/null
+++ b/komparator-0.9-gcc47.patch
@@ -0,0 +1,12 @@
+diff -ur komparator-0.9/src/kfileitemext.cpp komparator-0.9-gcc47/src/kfileitemext.cpp
+--- komparator-0.9/src/kfileitemext.cpp 2008-02-17 17:15:59.000000000 +0100
++++ komparator-0.9-gcc47/src/kfileitemext.cpp 2012-07-31 23:42:24.000000000 +0200
+@@ -18,6 +18,8 @@
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
++#include <unistd.h>
++
+ #include <qfile.h>
+
+ #include <kapplication.h>
diff --git a/komparator.spec b/komparator.spec
index 06111cc..9c59eb1 100644
--- a/komparator.spec
+++ b/komparator.spec
@@ -1,12 +1,14 @@
Name: komparator
Version: 0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Kompare and merge two folders
Group: Development/Tools
License: GPLv2
URL: http://komparator.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/komparator/%{name}-%{version}.tar.bz2
+# fix FTBFS with g++ 4.7
+Patch0: komparator-0.9-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -18,6 +20,7 @@ They will be searched for duplicate files and empty folders.
%prep
%setup -q
+%patch0 -p1 -b .gcc47
%{__sed} -i "s|\%u \%u|\%u|" src/%{name}.desktop
%build
@@ -83,6 +86,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
%changelog
+* Tue Jul 31 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9-8
+- Fix FTBFS with g++ 4.7
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list