Accepting request 405105 from KDE:Extra

- Add fix-build-with-newer-kconfig.diff: build (backwards-compatible)
  with newer KConfig from frameworks

This should fix the failures seen in Staging:E

OBS-URL: https://build.opensuse.org/request/show/405105
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=103

fix-build-with-newer-kconfig.diff

@@ -0,0 +1,94 @@
+diff --git a/ktorrent/dialogs/pastedialog.cpp b/ktorrent/dialogs/pastedialog.cpp
+index d0f08e9..4708bca 100644
+--- a/ktorrent/dialogs/pastedialog.cpp
++++ b/ktorrent/dialogs/pastedialog.cpp
+@@ -73,14 +73,14 @@ namespace kt
+         m_groups->addItems(grps);
+     }
+ 
+-    void PasteDialog::loadState(KSharedConfigPtr cfg)
++    void PasteDialog::loadState(KSharedConfig::Ptr cfg)
+     {
+         KConfigGroup g = cfg->group("PasteDlg");
+         m_silently->setChecked(g.readEntry("silently", false));
+         m_groups->setCurrentIndex(g.readEntry("group", 0));
+     }
+ 
+-    void PasteDialog::saveState(KSharedConfigPtr cfg)
++    void PasteDialog::saveState(KSharedConfig::Ptr cfg)
+     {
+         KConfigGroup g = cfg->group("PasteDlg");
+         g.writeEntry("silently", m_silently->isChecked());
+diff --git a/ktorrent/dialogs/pastedialog.h b/ktorrent/dialogs/pastedialog.h
+index 2446848..0c9a65b 100644
+--- a/ktorrent/dialogs/pastedialog.h
++++ b/ktorrent/dialogs/pastedialog.h
+@@ -22,6 +22,7 @@
+ #define PASTEDIALOG_H
+ 
+ #include <KDialog>
++#include <KSharedConfig>
+ #include "ui_pastedlgbase.h"
+ 
+ 
+@@ -43,12 +44,12 @@ namespace kt
+         /**
+         * Load the state of the dialog
+         */
+-        void loadState(KSharedConfigPtr cfg);
++        void loadState(KSharedConfig::Ptr cfg);
+ 
+         /**
+         * Save the state of the dialog
+         */
+-        void saveState(KSharedConfigPtr cfg);
++        void saveState(KSharedConfig::Ptr cfg);
+ 
+     public slots:
+         virtual void accept();
+diff --git a/plugins/mediaplayer/mediaview.cpp b/plugins/mediaplayer/mediaview.cpp
+index d805c4b..0cbd901 100644
+--- a/plugins/mediaplayer/mediaview.cpp
++++ b/plugins/mediaplayer/mediaview.cpp
+@@ -146,7 +146,7 @@ namespace kt
+         filter->setShowIncomplete(on);
+     }
+ 
+-    void MediaView::loadState(KSharedConfigPtr cfg)
++    void MediaView::loadState(KSharedConfig::Ptr cfg)
+     {
+         KConfigGroup g = cfg->group("MediaView");
+         show_incomplete->setChecked(g.readEntry("show_incomplete", false));
+@@ -154,7 +154,7 @@ namespace kt
+ 
+     }
+ 
+-    void MediaView::saveState(KSharedConfigPtr cfg)
++    void MediaView::saveState(KSharedConfig::Ptr cfg)
+     {
+         KConfigGroup g = cfg->group("MediaView");
+         g.writeEntry("show_incomplete", show_incomplete->isChecked());
+diff --git a/plugins/mediaplayer/mediaview.h b/plugins/mediaplayer/mediaview.h
+index 2b9a7e6..ba2e027 100644
+--- a/plugins/mediaplayer/mediaview.h
++++ b/plugins/mediaplayer/mediaview.h
+@@ -25,7 +25,7 @@
+ #include <QListView>
+ #include <QCheckBox>
+ #include <QSortFilterProxyModel>
+-#include <KSharedConfigPtr>
++#include <KSharedConfig>
+ #include "mediafile.h"
+ 
+ 
+@@ -68,8 +68,8 @@ namespace kt
+         MediaView(MediaModel* model, QWidget* parent);
+         virtual ~MediaView();
+ 
+-        void saveState(KSharedConfigPtr cfg);
+-        void loadState(KSharedConfigPtr cfg);
++        void saveState(KSharedConfig::Ptr cfg);
++        void loadState(KSharedConfig::Ptr cfg);
+ 
+     signals:
+         void doubleClicked(const MediaFileRef& mf);

ktorrent.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 27 22:57:41 UTC 2016 - lbeltrame@kde.org
+
+- Add fix-build-with-newer-kconfig.diff: build (backwards-compatible)
+  with newer KConfig from frameworks
+
 -------------------------------------------------------------------
 Sat Apr 16 11:37:50 UTC 2016 - tittiatcoke@gmail.com
 

ktorrent.spec

@@ -32,6 +32,8 @@ Patch0:         remove-links.diff
 Patch1:         suse-dht-warning.diff
 # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader
 Patch2:         initial-preference.diff
+# PATCH-FIX-UPSTREAM fix-build-with-newer-kconfig.diff -- Fix build with newer KConfig
+Patch3:         fix-build-with-newer-kconfig.diff
 BuildRequires:  boost-devel
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -79,6 +81,7 @@ for BitTorrent.
 %patch1
 %endif
 %patch2
+%patch3 -p1
 
 %build
 %cmake_kf5 -d build