[SCM] kio packaging branch, master, updated. debian/5.28.0-2-17-gebb6ced
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Jul 8 07:21:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=55d66ea
The following commit has been merged in the master branch:
commit 55d66ead377c99471ed49b107a6cfc48d2c7c70e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Jun 29 23:26:04 2017 +0200
Refresh patches
---
debian/patches/fix_hurd_build.patch | 14 +++++---------
debian/patches/fix_kfreebsd_build | 6 ++----
debian/patches/kubuntu_kdelibs4-docs-path.diff | 4 +---
debian/patches/report_error_removing_dirs | 12 +++++-------
debian/patches/return_on_ACCESS_DENIED | 4 +---
5 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index 00c5f3f..36c4b30 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -12,11 +12,9 @@ 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 b4fd7f20..db48b295 100644
--- a/src/ioslaves/file/file.cpp
+++ b/src/ioslaves/file/file.cpp
-@@ -340,7 +340,7 @@ void FileProtocol::get(const QUrl &url)
+@@ -342,7 +342,7 @@
return;
}
@@ -25,11 +23,9 @@ index b4fd7f20..db48b295 100644
//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 d901a63d..ed86549f 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
-@@ -128,7 +128,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
+@@ -128,7 +128,7 @@
return;
}
@@ -38,9 +34,9 @@ index d901a63d..ed86549f 100644
posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
-@@ -144,7 +144,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
- return;
- }
+@@ -147,7 +147,7 @@
+ // nobody shall be allowed to peek into the file during creation
+ dest_file.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner);
-#if HAVE_FADVISE
+#if HAVE_FADVISE && !defined(__GNU__)
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index c1d3bff..b0838e2 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -7,11 +7,9 @@ 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 18c8479b..d246b056 100644
--- a/src/widgets/kpropertiesdialog.cpp
+++ b/src/widgets/kpropertiesdialog.cpp
-@@ -81,6 +81,10 @@
+@@ -85,6 +85,10 @@
extern "C" {
# include <errno.h>
# include <sys/xattr.h>
@@ -22,7 +20,7 @@ index 18c8479b..d246b056 100644
}
#endif
-@@ -1933,7 +1937,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
+@@ -1937,7 +1941,7 @@
static bool fileSystemSupportsACL(const QByteArray &path)
{
bool fileSystemSupportsACLs = false;
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index 226307b..30b8df3 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -9,11 +9,9 @@ Forwarded: no, kdelibs4 path was set in debian/kubuntu packages
src/ioslaves/help/kio_help.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp
-index f5558405..9a7b2fc9 100644
--- a/src/ioslaves/help/kio_help.cpp
+++ b/src/ioslaves/help/kio_help.cpp
-@@ -50,7 +50,8 @@ QString HelpProtocol::langLookup(const QString &fname)
+@@ -51,7 +51,8 @@
QStringList search;
// assemble the local search paths
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index 0734991..fc70ee8 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -7,19 +7,17 @@ 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 12bf4092..7dbafee4 100644
--- a/src/core/copyjob.cpp
+++ b/src/core/copyjob.cpp
-@@ -151,6 +151,7 @@ public:
+@@ -154,6 +154,7 @@
, m_bOverwriteAllFiles(false)
, m_bOverwriteAllDirs(false)
, m_conflictError(0)
+ , m_dirsFailedError(0)
- , m_reportTimer(0)
+ , m_reportTimer(nullptr)
{
}
-@@ -205,6 +206,8 @@ public:
+@@ -208,6 +209,8 @@
bool m_bOverwriteAllFiles;
bool m_bOverwriteAllDirs;
int m_conflictError;
@@ -28,7 +26,7 @@ index 12bf4092..7dbafee4 100644
QTimer *m_reportTimer;
-@@ -1716,6 +1719,10 @@ void CopyJobPrivate::setNextDirAttribute()
+@@ -1740,6 +1743,10 @@
--m_processedFiles; // undo the "start at 1" hack
slotReport(); // display final numbers, important if progress dialog stays up
@@ -39,7 +37,7 @@ index 12bf4092..7dbafee4 100644
q->emitResult();
}
}
-@@ -1785,12 +1792,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
+@@ -1809,12 +1816,14 @@
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 8603513..0ce1f9c 100644
--- a/debian/patches/return_on_ACCESS_DENIED
+++ b/debian/patches/return_on_ACCESS_DENIED
@@ -7,11 +7,9 @@ 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 f2b67ce5..d901a63d 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
-@@ -536,8 +536,8 @@ void FileProtocol::del(const QUrl &url, bool isfile)
+@@ -552,8 +552,8 @@
} else {
// qDebug() << "could not rmdir " << perror;
error(KIO::ERR_CANNOT_RMDIR, path);
--
kio packaging
More information about the pkg-kde-commits
mailing list