[SCM] kio packaging branch, master, updated. debian/5.42.0-1-2-g38cb389

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=5891595

The following commit has been merged in the master branch:
commit 589159582270e8dea61e0899dbc269a9f197b318
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 9 19:38:01 2018 +0100

    Add upstream patch: Uri-Filter-Search-Provider-Avoid-double-delete.patch
    
    Fixes segfault in the web shortcuts kcm (systemsettings)
    
    Gbp-Dch: Full
---
 ...ilter-Search-Provider-Avoid-double-delete.patch | 26 ++++++++++++++++++++++
 debian/patches/fix_hurd_build.patch                |  4 ++--
 debian/patches/fix_kfreebsd_build                  |  6 ++---
 debian/patches/report_error_removing_dirs          | 10 ++++-----
 debian/patches/series                              |  1 +
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/debian/patches/Uri-Filter-Search-Provider-Avoid-double-delete.patch b/debian/patches/Uri-Filter-Search-Provider-Avoid-double-delete.patch
new file mode 100644
index 0000000..645e16c
--- /dev/null
+++ b/debian/patches/Uri-Filter-Search-Provider-Avoid-double-delete.patch
@@ -0,0 +1,26 @@
+From: Kai Uwe Broulik <kde at privat.broulik.de>
+Date: Wed, 17 Jan 2018 09:51:34 +0100
+Subject: [Uri Filter Search Provider] Avoid double delete
+
+Since 6246cc48067845208cf5acd8b798abd68349cf18 the SearchProviderRegistry does that leading to a double delete on KCM destruction.
+
+BUG: 388983
+
+Differential Revision: https://phabricator.kde.org/D9938
+---
+ src/urifilters/ikws/ikwsopts.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/urifilters/ikws/ikwsopts.cpp b/src/urifilters/ikws/ikwsopts.cpp
+index 59c29c8..fa7d222 100644
+--- a/src/urifilters/ikws/ikwsopts.cpp
++++ b/src/urifilters/ikws/ikwsopts.cpp
+@@ -40,7 +40,7 @@
+ 
+ ProvidersModel::~ProvidersModel()
+ {
+-  qDeleteAll(m_providers);
++
+ }
+ 
+ QVariant ProvidersModel::headerData(int section, Qt::Orientation orientation, int role ) const
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index 8245e89..788e465 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -13,10 +13,10 @@ Forwarded: no
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/ioslaves/file/file.cpp b/src/ioslaves/file/file.cpp
-index 47fb0a5..cbffea6 100644
+index 6c52885..196bd22 100644
 --- a/src/ioslaves/file/file.cpp
 +++ b/src/ioslaves/file/file.cpp
-@@ -342,7 +342,7 @@ void FileProtocol::get(const QUrl &url)
+@@ -347,7 +347,7 @@ void FileProtocol::get(const QUrl &url)
          return;
      }
  
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index b555224..8ba116c 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -8,10 +8,10 @@ Subject: fix_kfreebsd_build
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 392958d..7aef442 100644
+index 6b42a3f..34834f9 100644
 --- a/src/widgets/kpropertiesdialog.cpp
 +++ b/src/widgets/kpropertiesdialog.cpp
-@@ -85,6 +85,10 @@
+@@ -86,6 +86,10 @@
  extern "C" {
  #  include <errno.h>
  #  include <sys/xattr.h>
@@ -22,7 +22,7 @@ index 392958d..7aef442 100644
  }
  #endif
  
-@@ -1937,7 +1941,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
+@@ -1938,7 +1942,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
  static bool fileSystemSupportsACL(const QByteArray &path)
  {
      bool fileSystemSupportsACLs = false;
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index e1fe052..21f0c96 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -8,10 +8,10 @@ Subject: report_error_removing_dirs
  1 file changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
-index 22b3b4d..5e9a0ff 100644
+index b33302a..1a87ae4 100644
 --- a/src/core/copyjob.cpp
 +++ b/src/core/copyjob.cpp
-@@ -154,6 +154,7 @@ public:
+@@ -150,6 +150,7 @@ public:
          , m_bOverwriteAllFiles(false)
          , m_bOverwriteAllDirs(false)
          , m_conflictError(0)
@@ -19,7 +19,7 @@ index 22b3b4d..5e9a0ff 100644
          , m_reportTimer(nullptr)
      {
      }
-@@ -208,6 +209,8 @@ public:
+@@ -204,6 +205,8 @@ public:
      bool m_bOverwriteAllFiles;
      bool m_bOverwriteAllDirs;
      int m_conflictError;
@@ -28,7 +28,7 @@ index 22b3b4d..5e9a0ff 100644
  
      QTimer *m_reportTimer;
  
-@@ -1741,6 +1744,10 @@ void CopyJobPrivate::setNextDirAttribute()
+@@ -1735,6 +1738,10 @@ void CopyJobPrivate::setNextDirAttribute()
          --m_processedFiles; // undo the "start at 1" hack
          slotReport(); // display final numbers, important if progress dialog stays up
  
@@ -39,7 +39,7 @@ index 22b3b4d..5e9a0ff 100644
          q->emitResult();
      }
  }
-@@ -1810,12 +1817,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
+@@ -1804,12 +1811,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
  void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
  {
      Q_Q(CopyJob);
diff --git a/debian/patches/series b/debian/patches/series
index d1a69d5..820d1ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ report_error_removing_dirs
 wait_for_a_bit_longer
 fix_kfreebsd_build
 fix_hurd_build.patch
+Uri-Filter-Search-Provider-Avoid-double-delete.patch

-- 
kio packaging