Hello community, here is the log from the commit of package kdesvn for openSUSE:Factory checked in at 2011-12-01 17:37:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesvn (Old) and /work/SRC/openSUSE:Factory/.kdesvn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesvn", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesvn/kdesvn.changes 2011-09-23 02:06:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesvn.new/kdesvn.changes 2011-12-01 17:37:55.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 12:50:11 UTC 2011 - idoen...@suse.de + +- Fix build with Qt 4.8 + +------------------------------------------------------------------- New: ---- kdesvn-virtual-inheritance.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesvn.spec ++++++ --- /var/tmp/diff_new_pack.eb8ocR/_old 2011-12-01 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.eb8ocR/_new 2011-12-01 17:37:56.000000000 +0100 @@ -28,6 +28,7 @@ Source: %{name}-%{version}.tar.bz2 Patch0: kdesvn.diff Patch2: remove-nl.diff +Patch3: kdesvn-virtual-inheritance.patch BuildRequires: fdupes BuildRequires: libkde4-devel BuildRequires: openldap2-devel @@ -75,6 +76,7 @@ %setup -q %patch0 %patch2 +%patch3 -p1 %build %cmake_kde4 -d build @@ -89,9 +91,6 @@ %fdupes -s %{buildroot}%{_datadir} %kde_post_install -%clean -rm -rf %{buildroot} - %post -n libsvnqt6 -p /sbin/ldconfig %postun -n libsvnqt6 -p /sbin/ldconfig ++++++ kdesvn-virtual-inheritance.patch ++++++ Index: kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h =================================================================== --- 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: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org