[neon/kde/kio/Neon/unstable] debian/patches: refresh patches and remove one which no longer applies but is not relevant to neon
Jonathan Riddell
null at kde.org
Wed Oct 27 15:37:12 BST 2021
Git commit ae355ccd062a3c318fb9825e96ba1a8b2695ca90 by Jonathan Riddell.
Committed on 27/10/2021 at 14:37.
Pushed by jriddell into branch 'Neon/unstable'.
refresh patches and remove one which no longer applies but is not relevant to neon
D +0 -49 debian/patches/fix_hurd_build.patch
M +15 -15 debian/patches/libexec_from_env.patch
M +5 -5 debian/patches/report_error_removing_dirs
M +0 -1 debian/patches/series
https://invent.kde.org/neon/kde/kio/commit/ae355ccd062a3c318fb9825e96ba1a8b2695ca90
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
deleted file mode 100644
index 09e0d84..0000000
--- a/debian/patches/fix_hurd_build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Tobias Frost <tobi at debian.org>
-Date: Thu, 22 Feb 2018 12:23:56 +0100
-Subject: fix_hurd_build
-
-posix_fadvise64 is not available on hurd, will yield to an compiler warning and
-aborting the build through --fatal-warnings
-
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799619
-Forwarded: no
----
- src/ioslaves/file/file.cpp | 2 +-
- src/ioslaves/file/file_unix.cpp | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: kio/src/ioslaves/file/file.cpp
-===================================================================
---- kio.orig/src/ioslaves/file/file.cpp
-+++ kio/src/ioslaves/file/file.cpp
-@@ -303,7 +303,7 @@ void FileProtocol::get(const QUrl &url)
- }
- }
-
--#if HAVE_FADVISE
-+#if HAVE_FADVISE && !defined(__GNU__)
- // TODO check return code
- posix_fadvise(f.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
- #endif
-Index: kio/src/ioslaves/file/file_unix.cpp
-===================================================================
---- 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
- }
- }
-
--#if HAVE_FADVISE
-+#if HAVE_FADVISE && !defined(__GNU__)
- posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
- #endif
-
-@@ -783,7 +783,7 @@ void FileProtocol::copy(const QUrl &srcU
- }
- }
-
--#if HAVE_FADVISE
-+#if HAVE_FADVISE && !defined(__GNU__)
- posix_fadvise(dest_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
- #endif
-
diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
index cdbbdea..5372d71 100644
--- a/debian/patches/libexec_from_env.patch
+++ b/debian/patches/libexec_from_env.patch
@@ -13,21 +13,21 @@ Index: kio/src/core/slave.cpp
===================================================================
--- kio.orig/src/core/slave.cpp
+++ kio/src/core/slave.cpp
-@@ -506,9 +506,14 @@ Slave *Slave::createSlave(const QString
- const QString qlibexecKF5 = QDir(qlibexec).filePath(QStringLiteral("kf5"));
+@@ -438,9 +438,14 @@ Slave *Slave::createSlave(const QString
+ const QString qlibexecKF5 = QDir(qlibexec).filePath(QStringLiteral("kf5"));
- // search paths
-- const QStringList searchPaths = QStringList() << QCoreApplication::applicationDirPath() // then look where our application binary is located
-- << qlibexec << qlibexecKF5
-- << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
-+ QStringList searchPaths = QStringList();
+ // search paths
+- const QStringList searchPaths = QStringList() << QCoreApplication::applicationDirPath() // then look where our application binary is located
+- << qlibexec << qlibexecKF5
+- << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
++ QStringList searchPaths = QStringList();
+
-+ if (qEnvironmentVariableIsSet("KF5_LIBEXEC_DIR")) {
-+ searchPaths << QTextCodec::codecForLocale()->toUnicode(qgetenv("KF5_LIBEXEC_DIR"));
-+ }
++ if (qEnvironmentVariableIsSet("KF5_LIBEXEC_DIR")) {
++ searchPaths << QTextCodec::codecForLocale()->toUnicode(qgetenv("KF5_LIBEXEC_DIR"));
++ }
+
-+ searchPaths << QCoreApplication::applicationDirPath(); // then look where our application binary is located
-+ searchPaths << qlibexec << qlibexecKF5 << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
- QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave5"), searchPaths);
- if (kioslaveExecutable.isEmpty()) {
- // Fallback to PATH. On win32 we install to bin/ which tests outside
++ searchPaths << QCoreApplication::applicationDirPath(); // then look where our application binary is located
++ searchPaths << qlibexec << qlibexecKF5 << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
+ QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave5"), searchPaths);
+ if (kioslaveExecutable.isEmpty()) {
+ // Fallback to PATH. On win32 we install to bin/ which tests outside
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index c3be87e..f09c1c4 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -11,7 +11,7 @@ Index: kio/src/core/copyjob.cpp
===================================================================
--- kio.orig/src/core/copyjob.cpp
+++ kio/src/core/copyjob.cpp
-@@ -185,6 +185,7 @@ public:
+@@ -227,6 +227,7 @@ public:
, m_bOverwriteAllDirs(false)
, m_bOverwriteWhenOlder(false)
, m_conflictError(0)
@@ -19,8 +19,8 @@ Index: kio/src/core/copyjob.cpp
, m_reportTimer(nullptr)
{
}
-@@ -247,6 +248,8 @@ public:
- bool m_autoReplaceInvalidChars = false;
+@@ -301,6 +302,8 @@ public:
+ };
int m_conflictError;
+ int m_dirsFailedError;
@@ -28,7 +28,7 @@ Index: kio/src/core/copyjob.cpp
QTimer *m_reportTimer;
-@@ -2093,6 +2096,10 @@ void CopyJobPrivate::setNextDirAttribute
+@@ -2185,6 +2188,10 @@ void CopyJobPrivate::setNextDirAttribute
m_reportTimer->stop();
}
@@ -39,7 +39,7 @@ Index: kio/src/core/copyjob.cpp
q->emitResult();
}
}
-@@ -2164,12 +2171,14 @@ void CopyJobPrivate::slotTotalSize(KJob
+@@ -2256,12 +2263,14 @@ void CopyJobPrivate::slotTotalSize(KJob
void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
{
Q_Q(CopyJob);
diff --git a/debian/patches/series b/debian/patches/series
index ee59363..61b000d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
report_error_removing_dirs
wait_for_a_bit_longer
-fix_hurd_build.patch
Disable-flaky-test.patch
Disable-baloo-dependant-tests.patch
#Disable-flaky-test-1.patch
More information about the Neon-commits
mailing list