[kdesvn] Add patch to compile with gcc 4.7
Orion Poplawski
orion at fedoraproject.org
Sat Jan 14 17:27:01 UTC 2012
commit a5c177001b1c9632924912d9af012204a9d1ddcb
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Sat Jan 14 10:26:59 2012 -0700
Add patch to compile with gcc 4.7
kdesvn-gcc47.patch | 11 +++++++++++
kdesvn.spec | 4 ++++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/kdesvn-gcc47.patch b/kdesvn-gcc47.patch
new file mode 100644
index 0000000..a1c2feb
--- /dev/null
+++ b/kdesvn-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up kdesvn-1.5.5/src/svnfrontend/maintreewidget.cpp.gcc47 kdesvn-1.5.5/src/svnfrontend/maintreewidget.cpp
+--- kdesvn-1.5.5/src/svnfrontend/maintreewidget.cpp.gcc47 2010-03-25 16:04:55.000000000 -0600
++++ kdesvn-1.5.5/src/svnfrontend/maintreewidget.cpp 2012-01-14 10:25:17.289604638 -0700
+@@ -55,6 +55,7 @@
+ #include <kio/copyjob.h>
+ #include <kfiledialog.h>
+ #include <knotification.h>
++#include <unistd.h>
+
+ #include <QSortFilterProxyModel>
+ #include <QEvent>
diff --git a/kdesvn.spec b/kdesvn.spec
index 55cdb10..dd598e9 100644
--- a/kdesvn.spec
+++ b/kdesvn.spec
@@ -11,6 +11,8 @@ Source0: http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz
Patch0: kdesvn-1.5.3-kdex.patch
# Remove problematic virtual inheritance
Patch1: kdesvn-virtual.patch
+# Compile with gcc 4.7
+Patch2: kdesvn-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
@@ -44,6 +46,7 @@ developing applications that use the %{name} subversion wrapper library.
%setup -q
%patch0 -p1 -b .kdex
%patch1 -p1 -b .virtual
+%patch2 -p1 -b .gcc47
%build
@@ -116,6 +119,7 @@ xdg-icon-resource forceupdate --theme hicolor
%changelog
* Sat Jan 14 2012 - Orion Poplawski <orion at cora.nwra.com> - 1.5.5-5
- Add patch to fix offending virtual inheritance
+- Add patch to compile with gcc 4.7
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list