From 88bab5314fee6e4f8c7bc4ec815776b23662e48a7a7153d888ed669ff16c1d98 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 13 Sep 2010 10:29:50 +0000 Subject: [PATCH] Accepting request 47587 from KDE:Distro:Factory Copy from KDE:Distro:Factory/krusader based on submit request 47587 from user llunak OBS-URL: https://build.opensuse.org/request/show/47587 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=28 --- krusader-gcc44.diff | 32 ++++++++++++++++++++++++++++++-- krusader.changes | 5 +++++ krusader.spec | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/krusader-gcc44.diff b/krusader-gcc44.diff index 6d070be..a81ee70 100644 --- a/krusader-gcc44.diff +++ b/krusader-gcc44.diff @@ -1,5 +1,7 @@ ---- krusader/VFS/kiojobwrapper.cpp -+++ krusader/VFS/kiojobwrapper.cpp +Index: krusader/VFS/kiojobwrapper.cpp +=================================================================== +--- krusader/VFS/kiojobwrapper.cpp.orig 2009-04-11 21:40:15.000000000 +0200 ++++ krusader/VFS/kiojobwrapper.cpp 2010-09-09 11:11:42.176303083 +0200 @@ -28,6 +28,7 @@ * * ***************************************************************************/ @@ -8,3 +10,29 @@ #include "kiojobwrapper.h" #include #include +Index: krusader/MountMan/kmountmangui.h +=================================================================== +--- krusader/MountMan/kmountmangui.h.orig 2009-04-11 21:40:19.000000000 +0200 ++++ krusader/MountMan/kmountmangui.h 2010-09-09 11:12:48.538260441 +0200 +@@ -112,7 +112,7 @@ private: + ///////////////////////////////////////////////////////////////// + class fsData { + public: +- fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ), ++ fsData() : TotalBlks( 0 ), + FreeBlks( 0 ), Mounted( false ) {} + + // get information +Index: krusader/Search/krsearchdialog.h +=================================================================== +--- krusader/Search/krsearchdialog.h.orig 2009-04-11 21:40:24.000000000 +0200 ++++ krusader/Search/krsearchdialog.h 2010-09-09 11:17:15.776260233 +0200 +@@ -62,7 +62,7 @@ class QTreeWidgetItem; + class KrSearchDialog : public QDialog { + Q_OBJECT + public: +- KrSearchDialog(QString profile = 0, QWidget* parent = 0 ); ++ KrSearchDialog(QString profile = QString::null, QWidget* parent = 0 ); + + void prepareGUI(); + diff --git a/krusader.changes b/krusader.changes index dc06cab..9910050 100644 --- a/krusader.changes +++ b/krusader.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 9 09:21:02 UTC 2010 - coolo@novell.com + +- fix compilation with latest libqt4 + ------------------------------------------------------------------- Mon Apr 19 18:19:51 UTC 2010 - javier@opensuse.org diff --git a/krusader.spec b/krusader.spec index 9e1ff82..260dd90 100644 --- a/krusader.spec +++ b/krusader.spec @@ -21,7 +21,7 @@ Name: krusader Version: 2.0.0 -Release: 7 +Release: 14 License: GPLv2+ Group: Productivity/File utilities Url: http://krusader.sourceforge.net/