[neon/qt/qtbase/Neon/testing] debian/patches: refresh patch

[Jonathan Riddell]

Git commit ade813cc74cfe510c671e9c7b4b29fc22e6bc282 by Jonathan Riddell.
Committed on 21/10/2020 at 14:48.
Pushed by jriddell into branch 'Neon/testing'.

refresh patch

M  +5    -3    debian/patches/gnukfreebsd_linker_warnings.diff
M  +9    -5    debian/patches/nonlinux_utime.diff
M  +5    -3    debian/patches/path_max.diff
M  +0    -9    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/ade813cc74cfe510c671e9c7b4b29fc22e6bc282

diff --git a/debian/patches/gnukfreebsd_linker_warnings.diff b/debian/patches/gnukfreebsd_linker_warnings.diff
index 6698b71..37e9aa4 100644
--- a/debian/patches/gnukfreebsd_linker_warnings.diff
+++ b/debian/patches/gnukfreebsd_linker_warnings.diff
@@ -12,8 +12,10 @@ Last-Update: 2019-03-02
  src/corelib/configure.json |    3 +++
  1 file changed, 3 insertions(+)
 
---- a/src/corelib/configure.json
-+++ b/src/corelib/configure.json
+Index: qtbase-everywhere-src-5.15.1/src/corelib/configure.json
+===================================================================
+--- qtbase-everywhere-src-5.15.1.orig/src/corelib/configure.json
++++ qtbase-everywhere-src-5.15.1/src/corelib/configure.json
 @@ -331,6 +331,7 @@
              "label": "O_CLOEXEC",
              "type": "compile",
@@ -30,7 +32,7 @@ Last-Update: 2019-03-02
                      "# Block futimens() on Apple platforms unless it's available on ALL",
                      "# deployment targets. This simplifies the logic at the call site",
                      "# dramatically, as it isn't strictly needed compared to futimes().",
-@@ -413,6 +415,7 @@
+@@ -414,6 +416,7 @@
              "label": "getentropy()",
              "type": "compile",
              "test": {
diff --git a/debian/patches/nonlinux_utime.diff b/debian/patches/nonlinux_utime.diff
index f0c382f..1176234 100644
--- a/debian/patches/nonlinux_utime.diff
+++ b/debian/patches/nonlinux_utime.diff
@@ -9,8 +9,10 @@ Last-Update: 2018-02-22
  src/corelib/io/qfilesystemengine_unix.cpp |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
---- a/qmake/library/ioutils.cpp
-+++ b/qmake/library/ioutils.cpp
+Index: qtbase-everywhere-src-5.15.1/qmake/library/ioutils.cpp
+===================================================================
+--- qtbase-everywhere-src-5.15.1.orig/qmake/library/ioutils.cpp
++++ qtbase-everywhere-src-5.15.1/qmake/library/ioutils.cpp
 @@ -228,7 +228,7 @@ bool IoUtils::touchFile(const QString &t
          *errorString = fL1S("Cannot stat() reference file %1: %2.").arg(referenceFileName, fL1S(strerror(errno)));
          return false;
@@ -20,9 +22,11 @@ Last-Update: 2018-02-22
      const struct timespec times[2] = { { 0, UTIME_NOW }, st.st_mtim };
      const bool utimeError = utimensat(AT_FDCWD, targetFileName.toLocal8Bit().constData(), times, 0) < 0;
  #    else
---- a/src/corelib/io/qfilesystemengine_unix.cpp
-+++ b/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -1375,7 +1375,7 @@ bool QFileSystemEngine::setFileTime(int
+Index: qtbase-everywhere-src-5.15.1/src/corelib/io/qfilesystemengine_unix.cpp
+===================================================================
+--- qtbase-everywhere-src-5.15.1.orig/src/corelib/io/qfilesystemengine_unix.cpp
++++ qtbase-everywhere-src-5.15.1/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -1595,7 +1595,7 @@ bool QFileSystemEngine::setFileTime(int
          return false;
      }
  
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 0479dfe..17b2a8d 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -5,9 +5,11 @@ Description: Avoid unconditional PATH_MAX usage
 Forwarded: no
 Last-Update: 2020-04-19
 
---- a/src/corelib/io/qfilesystemengine_unix.cpp
-+++ b/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -684,7 +684,11 @@ QFileSystemEntry QFileSystemEngine::cano
+Index: qtbase-everywhere-src-5.15.1/src/corelib/io/qfilesystemengine_unix.cpp
+===================================================================
+--- qtbase-everywhere-src-5.15.1.orig/src/corelib/io/qfilesystemengine_unix.cpp
++++ qtbase-everywhere-src-5.15.1/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -689,7 +689,11 @@ QFileSystemEntry QFileSystemEngine::cano
      Q_UNUSED(data);
      return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
  #else
diff --git a/debian/patches/series b/debian/patches/series
index 99d1664..17a775c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,3 @@
-# Backported from upstream.
-enable_a11y_on_linux.diff
-fix_qlibrary_deadlock.diff
-moc_handle_includes.diff
-no_isystem.diff
-clarify_pic_message.diff
-CVE-2020-17507.diff
-CVE-2020-13962.diff
-
 # Debian specific.
 gnukfreebsd.diff
 no_htmlinfo_example.diff