rev 19138 - in kde-extras/kdesvn/trunk/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2012-03-07 07:00:58 +0000 (Wed, 07 Mar 2012)
New Revision: 19138

Added:
   kde-extras/kdesvn/trunk/debian/patches/virtual_inheritance.patch
Modified:
   kde-extras/kdesvn/trunk/debian/changelog
   kde-extras/kdesvn/trunk/debian/patches/series
Log:
* debian/patches/virtual_inheritance.patch
  - Fix build failures with Qt 4.8. Thanks Felix Geyer for the patch.
    Closes: #662767

Modified: kde-extras/kdesvn/trunk/debian/changelog
===================================================================
--- kde-extras/kdesvn/trunk/debian/changelog	2012-03-06 18:46:05 UTC (rev 19137)
+++ kde-extras/kdesvn/trunk/debian/changelog	2012-03-07 07:00:58 UTC (rev 19138)
@@ -1,3 +1,11 @@
+kdesvn (1.5.5-4) UNRELEASED; urgency=low
+
+  * debian/patches/virtual_inheritance.patch
+    - Fix build failures with Qt 4.8. Thanks Felix Geyer for the patch.
+      Closes: #662767
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 07 Mar 2012 07:59:34 +0100
+
 kdesvn (1.5.5-3) unstable; urgency=low
 
   * debian/patches/doctype_version.patch

Modified: kde-extras/kdesvn/trunk/debian/patches/series
===================================================================
--- kde-extras/kdesvn/trunk/debian/patches/series	2012-03-06 18:46:05 UTC (rev 19137)
+++ kde-extras/kdesvn/trunk/debian/patches/series	2012-03-07 07:00:58 UTC (rev 19138)
@@ -1,2 +1,3 @@
 # Patches for kdesvn
 doctype_version.patch
+virtual_inheritance.patch

Added: kde-extras/kdesvn/trunk/debian/patches/virtual_inheritance.patch
===================================================================
--- kde-extras/kdesvn/trunk/debian/patches/virtual_inheritance.patch	                        (rev 0)
+++ kde-extras/kdesvn/trunk/debian/patches/virtual_inheritance.patch	2012-03-07 07:00:58 UTC (rev 19138)
@@ -0,0 +1,11 @@
+--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
+@@ -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: