qtbase, qtwebengine: address issues introduced in latest upstream merge

* Replace faulty qtbase patch "0018-input-Make-use-of-timeval-portable-
  for-64bit-time_t.patch" with fixed version
* Remove obsolete webengine patch "0004-mkspecs-Allow-builds-with-libc-
  glibc.patch"

Change-Id: I02ecbb09a04313b0f68bce8083b5c0a6e0b0c035
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 21 insertions, 42 deletions

diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
index 76b4671c..0d3b48ff 100644
--- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From e06ac2e26c8490a7b8702e9462d1f38244ac3f0f Mon Sep 17 00:00:00 2001
+From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 25 Nov 2019 08:27:39 -0800
 Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
@@ -9,15 +9,14 @@ and keeps old input.h implementation functional as well.
 
 See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
 
-Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
 ---
  .../input/evdevkeyboard/qevdevkeyboardhandler.cpp      | 10 +++++++++-
- .../input/evdevtouch/qevdevtouchhandler.cpp            |  2 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
+ .../input/evdevtouch/qevdevtouchhandler.cpp            |  7 ++++++-
+ 2 files changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-index 666613f09d..0e3e0ea0de 100644
+index 3555763b89..e7dc57c027 100644
 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
 +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
 @@ -58,6 +58,11 @@
@@ -32,8 +31,8 @@ index 666613f09d..0e3e0ea0de 100644
  QT_BEGIN_NAMESPACE
  
  Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
-@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
-     qCDebug(qLcEvdevKey) << "switchLed" << led << state;
+@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
+     qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
  
      struct ::input_event led_ie;
 -    ::gettimeofday(&led_ie.time, 0);
@@ -45,10 +44,22 @@ index 666613f09d..0e3e0ea0de 100644
      led_ie.code = led;
      led_ie.value = state;
 diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-index f86f80785e..3914698f2a 100644
+index 78728ef4ce..1d65f9b9f7 100644
 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-@@ -568,7 +568,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
+@@ -58,6 +58,11 @@
+ #include <linux/input.h>
+ #endif
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #include <math.h>
+ 
+ #if QT_CONFIG(mtdev)
+@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
  
          // update timestamps
          m_lastTimeStamp = m_timeStamp;
@@ -57,6 +68,3 @@ index f86f80785e..3914698f2a 100644
  
          m_lastTouchPoints = m_touchPoints;
          m_touchPoints.clear();
--- 
-2.24.0
-
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
deleted file mode 100644
index 73ef469f..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a5c8d833ffb8b54626b7b670b2782a6cf9a45075 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 12 Nov 2019 19:53:59 -0800
-Subject: [PATCH] mkspecs: Allow builds with libc != glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- mkspecs/features/configure.prf | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index cc84182b..c278ffae 100644
---- a/mkspecs/features/configure.prf
-+++ b/mkspecs/features/configure.prf
-@@ -75,11 +75,6 @@ defineTest(runConfigure) {
-             return(false)
-         }
- 
--        !qtConfig(webengine-system-glibc) {
--            skipBuild("A suitable version >= 2.27 of libc could not be found.")
--            return(false)
--        }
--
-         QT_FOR_CONFIG += gui-private
- 
-         !qtConfig(webengine-system-khr) {
--- 
-2.24.0
-