[kdesvn] Add patch to fix offending virtual inheritance

[Orion Poplawski]

commit 0d4710b87bf6e24c1ad16ea085f2043c0c09cbed
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Jan 14 10:07:10 2012 -0700

    Add patch to fix offending virtual inheritance

 kdesvn-virtual.patch |   12 ++++++++++++
 kdesvn.spec          |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/kdesvn-virtual.patch b/kdesvn-virtual.patch
new file mode 100644
index 0000000..b74a576
--- /dev/null
+++ b/kdesvn-virtual.patch
@@ -0,0 +1,12 @@
+diff -up kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h.virtual kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
+--- kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h.virtual	2009-12-03 04:45:43.000000000 -0700
++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h	2012-01-14 09:23:30.237225184 -0700
+@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
+ /**
+ 	@author Rajko Albrecht <ral at alwins-world.de>
+ */
+-class RevGraphView : virtual public QGraphicsView
++class RevGraphView : public QGraphicsView
+ {
+     Q_OBJECT
+ public:
diff --git a/kdesvn.spec b/kdesvn.spec
index c0c7b1a..55cdb10 100644
--- a/kdesvn.spec
+++ b/kdesvn.spec
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        1.5.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
 Group:          Development/Tools
@@ -9,6 +9,8 @@ URL:            http://kdesvn.alwins-world.de/
 Source0:        http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
 #Update kdex.dtd title
 Patch0:         kdesvn-1.5.3-kdex.patch
+# Remove problematic virtual inheritance
+Patch1:         kdesvn-virtual.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
@@ -41,6 +43,7 @@ developing applications that use the %{name} subversion wrapper library.
 %prep
 %setup -q
 %patch0 -p1 -b .kdex
+%patch1 -p1 -b .virtual
 
 
 %build
@@ -111,6 +114,9 @@ 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
+
 * 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