[SCM] KTorrent Debian packaging. branch, master, updated. debian/5.1.0-2

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/ktorrent.git;a=commitdiff;h=32cb320

The following commit has been merged in the master branch:
commit 32cb320bf8e97933f35a8fa48842b8716493625f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 3 08:06:17 2016 +0200

    fix build
    
    backport upstream commit f48acc22f0105ce6bac63294d248873ae231c6cc
---
 debian/changelog                                   |   2 +
 debian/patches/series                              |   1 +
 ...am_Remove-improper-KSharedConfigPtr-usage.patch | 112 +++++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d1c1c9c..61e1f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ ktorrent (5.0.1-0r1) UNRELEASED; urgency=medium
     - switch from kde to kf5 dh addon
     - bump the pkg-kde-tools build dependency to >= 0.15.16
   * Bump the libktorrent-dev build dependency to >= 2.0.0.
+  * Backport upstream commit f48acc22f0105ce6bac63294d248873ae231c6cc to fix
+    build; patch upstream_Remove-improper-KSharedConfigPtr-usage.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 02 Jul 2016 23:36:56 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..32c8d3a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Remove-improper-KSharedConfigPtr-usage.patch
diff --git a/debian/patches/upstream_Remove-improper-KSharedConfigPtr-usage.patch b/debian/patches/upstream_Remove-improper-KSharedConfigPtr-usage.patch
new file mode 100644
index 0000000..c0d5f3c
--- /dev/null
+++ b/debian/patches/upstream_Remove-improper-KSharedConfigPtr-usage.patch
@@ -0,0 +1,112 @@
+From f48acc22f0105ce6bac63294d248873ae231c6cc Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame at kde.org>
+Date: Tue, 28 Jun 2016 00:56:11 +0200
+Subject: [PATCH] Remove (improper?) KSharedConfigPtr usage
+
+1f47df5074e041cad803863e5ef04cb082faf601 in kconfig removed
+KSharedConfigPtr. Use KSharedConfig::Ptr instead, as used in kconfig
+itself.
+---
+ ktorrent/dialogs/pastedialog.cpp  | 4 ++--
+ ktorrent/dialogs/pastedialog.h    | 5 +++--
+ plugins/mediaplayer/mediaview.cpp | 4 ++--
+ plugins/mediaplayer/mediaview.h   | 6 +++---
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
+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);
+-- 
+2.8.1
+

-- 
KTorrent Debian packaging.