Source: kdesvn
Version: 1.5.5-3
Tags: patch
User: debian-qt-...@lists.debian.org
Usertags: qt48-transition
Hi,
Your package fails to build against Qt 4.8 which is currently in experimental.
The transition to unstable/testing is tracked in bug #653903.
I'm attaching a patch that contains the necessary changes.
It can be applied even before Qt 4.8 enters unstable.
Build log:
> [ 73%] Building CXX object
> src/svnfrontend/CMakeFiles/svnfrontend.dir/graphtree/revgraphview.o
> cd /tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src/svnfrontend &&
> /usr/bin/c++ -D_BSD_SOURCE
> -DKDE_DEFAULT_DEBUG_AREA=9510 -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef
> -Wcast-align
> -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security
> -DQT_NO_EXCEPTIONS -fno-check-new
> -fno-common -Woverloaded-virtual -fno-threadsafe-statics -fvisibility=hidden
> -Werror=return-type
> -fvisibility-inlines-hidden -fexceptions -O2 -g -DNDEBUG -DQT_NO_DEBUG
> -I/tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src/svnfrontend
> -I/tmp/buildd/kdesvn-1.5.5/src/svnfrontend
> -I/tmp/buildd/kdesvn-1.5.5/src/svnqt
> -I/tmp/buildd/kdesvn-1.5.5 -I/tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu
> -I/tmp/buildd/kdesvn-1.5.5/src
> -I/tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src
> -I/tmp/buildd/kdesvn-1.5.5/src/svnfrontend/fronthelpers
> -I/tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src/svnqt
> -I/tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src/ksvnwidgets
> -I/usr/include/KDE
> -I/usr/include/qt4/phonon -I/usr/include/qt4/QtXmlPatterns -I/usr/include/
> qt4/QtXml -I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtTest
> -I/usr/include/qt4/QtSvg
> -I/usr/include/qt4/QtSql -I/usr/include/qt4/QtScriptTools
> -I/usr/include/qt4/QtScript
> -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtHelp
> -I/usr/include/qt4/QtDesigner
> -I/usr/include/qt4/QtDeclarative -I/usr/include/qt4/QtDBus
> -I/usr/include/qt4/Qt3Support
> -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/usr/include/qt4/Qt
> -I/usr/share/qt4/mkspecs/default -I/usr/include/qt4 -I/usr/include/apr-1.0
> -I/usr/include/subversion-1 -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -fPIC -o
> CMakeFiles/svnfrontend.dir/graphtree/revgraphview.o -c
> /tmp/buildd/kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.cpp
> In file included from
> /tmp/buildd/kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.cpp:962:0:
> /tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src/svnfrontend/revgraphview.moc:
> In static member
> function 'static void RevGraphView::qt_static_metacall(QObject*,
> QMetaObject::Call, int, void**)':
> /tmp/buildd/kdesvn-1.5.5/obj-x86_64-linux-gnu/src/svnfrontend/revgraphview.moc:64:58:
> error:
> cannot convert from base 'QObject' to derived type 'RevGraphView' via virtual
> base 'QGraphicsView'
> make[3]: ***
> [src/svnfrontend/CMakeFiles/svnfrontend.dir/graphtree/revgraphview.o] Error 1
Regards,
Felix
--- 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 <r...@alwins-world.de>
*/
-class RevGraphView : virtual public QGraphicsView
+class RevGraphView : public QGraphicsView
{
Q_OBJECT
public:
