[SCM] kio packaging branch, master, updated. debian/5.28.0-2-24-g86815df

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ab5d770cdac7630ebd256e81bc4e13cadb7197cb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jul 9 13:05:52 2017 +0200

    Refresh patches
---
 debian/patches/fix_hurd_build.patch       | 10 +++++++---
 debian/patches/fix_kfreebsd_build         |  4 +++-
 debian/patches/report_error_removing_dirs | 10 ++++++----
 debian/patches/return_on_ACCESS_DENIED    |  4 +++-
 debian/patches/wait_for_a_bit_longer      |  2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index 36c4b30..8245e89 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -12,9 +12,11 @@ Forwarded: no
  src/ioslaves/file/file_unix.cpp | 4 ++--
  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
 --- a/src/ioslaves/file/file.cpp
 +++ b/src/ioslaves/file/file.cpp
-@@ -342,7 +342,7 @@
+@@ -342,7 +342,7 @@ void FileProtocol::get(const QUrl &url)
          return;
      }
  
@@ -23,9 +25,11 @@ Forwarded: no
      //TODO check return code
      posix_fadvise(f.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index b89a090..2fc70ee 100644
 --- a/src/ioslaves/file/file_unix.cpp
 +++ b/src/ioslaves/file/file_unix.cpp
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
          return;
      }
  
@@ -34,7 +38,7 @@ Forwarded: no
      posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
  
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
      // nobody shall be allowed to peek into the file during creation
      dest_file.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner);
  
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index b0838e2..b555224 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -7,6 +7,8 @@ Subject: fix_kfreebsd_build
  src/widgets/kpropertiesdialog.cpp | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
+index 392958d..7aef442 100644
 --- a/src/widgets/kpropertiesdialog.cpp
 +++ b/src/widgets/kpropertiesdialog.cpp
 @@ -85,6 +85,10 @@
@@ -20,7 +22,7 @@ Subject: fix_kfreebsd_build
  }
  #endif
  
-@@ -1937,7 +1941,7 @@
+@@ -1937,7 +1941,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 fc70ee8..e1fe052 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -7,9 +7,11 @@ Subject: report_error_removing_dirs
  src/core/copyjob.cpp | 17 +++++++++++++----
  1 file changed, 13 insertions(+), 4 deletions(-)
 
+diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
+index 22b3b4d..5e9a0ff 100644
 --- a/src/core/copyjob.cpp
 +++ b/src/core/copyjob.cpp
-@@ -154,6 +154,7 @@
+@@ -154,6 +154,7 @@ public:
          , m_bOverwriteAllFiles(false)
          , m_bOverwriteAllDirs(false)
          , m_conflictError(0)
@@ -17,7 +19,7 @@ Subject: report_error_removing_dirs
          , m_reportTimer(nullptr)
      {
      }
-@@ -208,6 +209,8 @@
+@@ -208,6 +209,8 @@ public:
      bool m_bOverwriteAllFiles;
      bool m_bOverwriteAllDirs;
      int m_conflictError;
@@ -26,7 +28,7 @@ Subject: report_error_removing_dirs
  
      QTimer *m_reportTimer;
  
-@@ -1740,6 +1743,10 @@
+@@ -1741,6 +1744,10 @@ void CopyJobPrivate::setNextDirAttribute()
          --m_processedFiles; // undo the "start at 1" hack
          slotReport(); // display final numbers, important if progress dialog stays up
  
@@ -37,7 +39,7 @@ Subject: report_error_removing_dirs
          q->emitResult();
      }
  }
-@@ -1809,12 +1816,14 @@
+@@ -1810,12 +1817,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
  void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
  {
      Q_Q(CopyJob);
diff --git a/debian/patches/return_on_ACCESS_DENIED b/debian/patches/return_on_ACCESS_DENIED
index 0ce1f9c..0d2bfe3 100644
--- a/debian/patches/return_on_ACCESS_DENIED
+++ b/debian/patches/return_on_ACCESS_DENIED
@@ -7,9 +7,11 @@ Subject: return_on_ACCESS_DENIED
  src/ioslaves/file/file_unix.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 3c1b992..b89a090 100644
 --- a/src/ioslaves/file/file_unix.cpp
 +++ b/src/ioslaves/file/file_unix.cpp
-@@ -552,8 +552,8 @@
+@@ -552,8 +552,8 @@ void FileProtocol::del(const QUrl &url, bool isfile)
              } else {
                  // qDebug() << "could not rmdir " << perror;
                  error(KIO::ERR_CANNOT_RMDIR, path);
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index 15f3278..d422668 100644
--- a/debian/patches/wait_for_a_bit_longer
+++ b/debian/patches/wait_for_a_bit_longer
@@ -8,7 +8,7 @@ Subject: wait_for_a_bit_longer
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/autotests/kdirlistertest.cpp b/autotests/kdirlistertest.cpp
-index a91988f5..e0a616bf 100644
+index 36932a6..184ec85 100644
 --- a/autotests/kdirlistertest.cpp
 +++ b/autotests/kdirlistertest.cpp
 @@ -1186,7 +1186,7 @@ void KDirListerTest::testRemoveWatchedDirectory()

-- 
kio packaging