[neon/kde/kio/Neon/unstable] debian/patches: refresh patches
Jonathan Riddell
null at kde.org
Tue Sep 21 12:53:53 BST 2021
Git commit b1c9364c31f00b59848f99a9be4585c42efd238d by Jonathan Riddell.
Committed on 21/09/2021 at 11:53.
Pushed by jriddell into branch 'Neon/unstable'.
refresh patches
M +4 -4 debian/patches/Disable-flaky-test.patch
M +11 -11 debian/patches/fix_hurd_build.patch
D +0 -33 debian/patches/fix_kfreebsd_build
M +1 -1 debian/patches/libexec_from_env.patch
M +9 -9 debian/patches/report_error_removing_dirs
M +0 -1 debian/patches/series
M +4 -4 debian/patches/wait_for_a_bit_longer
https://invent.kde.org/neon/kde/kio/commit/b1c9364c31f00b59848f99a9be4585c42efd238d
diff --git a/debian/patches/Disable-flaky-test.patch b/debian/patches/Disable-flaky-test.patch
index 2b30fd3..30b1003 100644
--- a/debian/patches/Disable-flaky-test.patch
+++ b/debian/patches/Disable-flaky-test.patch
@@ -6,11 +6,11 @@ Subject: Disable flaky test
autotests/kdirlistertest.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
-Index: kio-5.82.0/autotests/kdirlistertest.cpp
+Index: kio/autotests/kdirlistertest.cpp
===================================================================
---- kio-5.82.0.orig/autotests/kdirlistertest.cpp
-+++ kio-5.82.0/autotests/kdirlistertest.cpp
-@@ -1337,12 +1337,12 @@ void KDirListerTest::testRemoveWatchedDi
+--- kio.orig/autotests/kdirlistertest.cpp
++++ kio/autotests/kdirlistertest.cpp
+@@ -1347,12 +1347,12 @@ void KDirListerTest::testRemoveWatchedDi
QVERIFY(QDir().rmdir(path + "abc"));
// This should trigger an update.
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index 8fa82b9..09e0d84 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -12,11 +12,11 @@ Forwarded: no
src/ioslaves/file/file_unix.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
-Index: kio-5.82.0/src/ioslaves/file/file.cpp
+Index: kio/src/ioslaves/file/file.cpp
===================================================================
---- kio-5.82.0.orig/src/ioslaves/file/file.cpp
-+++ kio-5.82.0/src/ioslaves/file/file.cpp
-@@ -308,7 +308,7 @@ void FileProtocol::get(const QUrl &url)
+--- kio.orig/src/ioslaves/file/file.cpp
++++ kio/src/ioslaves/file/file.cpp
+@@ -303,7 +303,7 @@ void FileProtocol::get(const QUrl &url)
}
}
@@ -25,11 +25,11 @@ Index: kio-5.82.0/src/ioslaves/file/file.cpp
// TODO check return code
posix_fadvise(f.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
-Index: kio-5.82.0/src/ioslaves/file/file_unix.cpp
+Index: kio/src/ioslaves/file/file_unix.cpp
===================================================================
---- kio-5.82.0.orig/src/ioslaves/file/file_unix.cpp
-+++ kio-5.82.0/src/ioslaves/file/file_unix.cpp
-@@ -793,7 +793,7 @@ void FileProtocol::copy(const QUrl &srcU
+--- kio.orig/src/ioslaves/file/file_unix.cpp
++++ kio/src/ioslaves/file/file_unix.cpp
+@@ -747,7 +747,7 @@ void FileProtocol::copy(const QUrl &srcU
}
}
@@ -38,9 +38,9 @@ Index: kio-5.82.0/src/ioslaves/file/file_unix.cpp
posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
-@@ -817,7 +817,7 @@ void FileProtocol::copy(const QUrl &srcU
- // Note that error handling is omitted for this call, we don't want to error on e.g. VFAT
- dest_file.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner);
+@@ -783,7 +783,7 @@ void FileProtocol::copy(const QUrl &srcU
+ }
+ }
-#if HAVE_FADVISE
+#if HAVE_FADVISE && !defined(__GNU__)
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
deleted file mode 100644
index 2d66993..0000000
--- a/debian/patches/fix_kfreebsd_build
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 31 Mar 2016 15:38:43 +0200
-Subject: fix_kfreebsd_build
-
-===================================================================
----
- src/widgets/kpropertiesdialog.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: kio-5.82.0/src/widgets/kpropertiesdialog.cpp
-===================================================================
---- kio-5.82.0.orig/src/widgets/kpropertiesdialog.cpp
-+++ kio-5.82.0/src/widgets/kpropertiesdialog.cpp
-@@ -120,6 +120,10 @@
- #if HAVE_POSIX_ACL
- extern "C" {
- #include <sys/xattr.h>
-+#if defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
-+# include <sys/vfs.h>
-+# include <sys/mount.h>
-+#endif
- }
- #include "kacleditwidget.h"
- #endif
-@@ -2054,7 +2058,7 @@ KFilePermissionsPropsPlugin::KFilePermis
- static bool fileSystemSupportsACL(const QByteArray &path)
- {
- bool fileSystemSupportsACLs = false;
--#ifdef Q_OS_FREEBSD
-+#if defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
- struct statfs buf;
- fileSystemSupportsACLs = (statfs(path.data(), &buf) == 0) && (buf.f_flags & MNT_ACLS);
- #elif defined Q_OS_MACOS
diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
index 1f1d163..cdbbdea 100644
--- a/debian/patches/libexec_from_env.patch
+++ b/debian/patches/libexec_from_env.patch
@@ -13,7 +13,7 @@ Index: kio/src/core/slave.cpp
===================================================================
--- kio.orig/src/core/slave.cpp
+++ kio/src/core/slave.cpp
-@@ -493,9 +493,14 @@ Slave *Slave::createSlave(const QString
+@@ -506,9 +506,14 @@ Slave *Slave::createSlave(const QString
const QString qlibexecKF5 = QDir(qlibexec).filePath(QStringLiteral("kf5"));
// search paths
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index a5ab2fe..c3be87e 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -7,11 +7,11 @@ Subject: report_error_removing_dirs
src/core/copyjob.cpp | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
-Index: kio-5.82.0/src/core/copyjob.cpp
+Index: kio/src/core/copyjob.cpp
===================================================================
---- kio-5.82.0.orig/src/core/copyjob.cpp
-+++ kio-5.82.0/src/core/copyjob.cpp
-@@ -161,6 +161,7 @@ public:
+--- kio.orig/src/core/copyjob.cpp
++++ kio/src/core/copyjob.cpp
+@@ -185,6 +185,7 @@ public:
, m_bOverwriteAllDirs(false)
, m_bOverwriteWhenOlder(false)
, m_conflictError(0)
@@ -19,16 +19,16 @@ Index: kio-5.82.0/src/core/copyjob.cpp
, m_reportTimer(nullptr)
{
}
-@@ -217,6 +218,8 @@ public:
- bool m_bOverwriteAllDirs;
- bool m_bOverwriteWhenOlder;
+@@ -247,6 +248,8 @@ public:
+ bool m_autoReplaceInvalidChars = false;
+
int m_conflictError;
+ int m_dirsFailedError;
+ QString m_dirsFailedErrorText;
QTimer *m_reportTimer;
-@@ -1882,6 +1885,10 @@ void CopyJobPrivate::setNextDirAttribute
+@@ -2093,6 +2096,10 @@ void CopyJobPrivate::setNextDirAttribute
m_reportTimer->stop();
}
@@ -39,7 +39,7 @@ Index: kio-5.82.0/src/core/copyjob.cpp
q->emitResult();
}
}
-@@ -1949,12 +1956,14 @@ void CopyJobPrivate::slotTotalSize(KJob
+@@ -2164,12 +2171,14 @@ void CopyJobPrivate::slotTotalSize(KJob
void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
{
Q_Q(CopyJob);
diff --git a/debian/patches/series b/debian/patches/series
index f49df91..ee59363 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
report_error_removing_dirs
wait_for_a_bit_longer
-fix_kfreebsd_build
fix_hurd_build.patch
Disable-flaky-test.patch
Disable-baloo-dependant-tests.patch
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index f7e60ef..25f45a5 100644
--- a/debian/patches/wait_for_a_bit_longer
+++ b/debian/patches/wait_for_a_bit_longer
@@ -7,11 +7,11 @@ Subject: wait_for_a_bit_longer
autotests/kdirlistertest.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: kio-5.82.0/autotests/kdirlistertest.cpp
+Index: kio/autotests/kdirlistertest.cpp
===================================================================
---- kio-5.82.0.orig/autotests/kdirlistertest.cpp
-+++ kio-5.82.0/autotests/kdirlistertest.cpp
-@@ -1337,7 +1337,7 @@ void KDirListerTest::testRemoveWatchedDi
+--- kio.orig/autotests/kdirlistertest.cpp
++++ kio/autotests/kdirlistertest.cpp
+@@ -1347,7 +1347,7 @@ void KDirListerTest::testRemoveWatchedDi
QVERIFY(QDir().rmdir(path + "abc"));
// This should trigger an update.
More information about the Neon-commits
mailing list