qt: refresh remaining patches and tags in meta-qt5 repos

* update tag name to match the patches in meta-qt5 repository
  where the meta-qt5 .patch files are maintained, so that it's
  more clear from where these changes are exported (with:
  git format-patch --no-numbered --no-signature)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 37 insertions, 34 deletions

diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
index 3ed8bc45..c4ee34bf 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
@@ -1,7 +1,7 @@
-From 748174788b318c6316e6d41ce323306120223e02 Mon Sep 17 00:00:00 2001
+From 056bc88a15df06443a4a6bdea2b1ead045f89bf6 Mon Sep 17 00:00:00 2001
 From: Greg Nietsky <gregory@distrotech.co.za>
 Date: Tue, 4 Mar 2014 11:33:40 +0200
-Subject: [PATCH 1/2] Fix: Allow qt-creator to build on arm aarch32 and aarch64
+Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64
 
 Botan is imported hardwired for x86 this small patch allows it
 too operate on arm other platforms could be added.
@@ -14,7 +14,7 @@ Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
-index b7a9ddf..c5b9826 100644
+index e6a5f22..7b625ac 100644
 --- a/src/libs/3rdparty/botan/botan.cpp
 +++ b/src/libs/3rdparty/botan/botan.cpp
 @@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
@@ -76,10 +76,10 @@ index b7a9ddf..c5b9826 100644
  * Helper Macros for x86 Assembly
  */
 diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
-index 2981d2c..1c8d828 100644
+index 2caa4a3..39b8079 100644
 --- a/src/libs/3rdparty/botan/botan.h
 +++ b/src/libs/3rdparty/botan/botan.h
-@@ -82,7 +82,9 @@
+@@ -85,7 +85,9 @@
  #endif
  
  #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
@@ -89,6 +89,3 @@ index 2981d2c..1c8d828 100644
  #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
  
  #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
--- 
-1.8.3.1
-
diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch b/recipes-qt/qt5/qt5-creator/0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch
index 9e90bab7..8d953c99 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch
+++ b/recipes-qt/qt5/qt5-creator/0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch
@@ -1,4 +1,4 @@
-From 429347dda56a4d45dc03fee2362eb02294161bfd Mon Sep 17 00:00:00 2001
+From fbae8e85e74976b79308c203d38839b364757302 Mon Sep 17 00:00:00 2001
 From: Eike Ziller <eike.ziller@qt.io>
 Date: Fri, 24 Jun 2016 10:23:24 +0200
 Subject: [PATCH] Fix compilation with QT_NO_ACCESSIBILITY
@@ -33,6 +33,3 @@ index 9477f17..1ee425f 100644
  
          setActive(false);
  
--- 
-2.13.2
-
diff --git a/recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch b/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch
index 8c1311e4..e64b6d9a 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch
+++ b/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch
@@ -1,4 +1,4 @@
-From 51088a424416a8ca5cdf5161b792ac5e8a01f749 Mon Sep 17 00:00:00 2001
+From 896624d715e20e658344ac85db91cd55d25e7211 Mon Sep 17 00:00:00 2001
 From: Marco Benelli <marco.benelli@qt.io>
 Date: Thu, 6 Jul 2017 09:31:41 +0200
 Subject: [PATCH] Qmlpuppet: add missing includes
@@ -36,6 +36,3 @@ index 5a9342f..bacbc12 100644
  #include <QEvent>
  #include <QQmlContext>
  #include <QQmlError>
--- 
-2.13.2
-
diff --git a/recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch
new file mode 100644
index 00000000..59687e55
--- /dev/null
+++ b/recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch
@@ -0,0 +1,30 @@
+From 7fb65b82d247123c7fdb61436183f1d76067b66b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 16 Jan 2018 13:26:57 +0000
+Subject: [PATCH] Link with libexecinfo on musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/plugins/debugger/debugger.pro  | 1 +
+ src/plugins/qmldesigner/config.pri | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
+index c40bd63..96ab542 100644
+--- a/src/plugins/debugger/debugger.pro
++++ b/src/plugins/debugger/debugger.pro
+@@ -148,3 +148,4 @@ include(qml/qml.pri)
+ include(namedemangler/namedemangler.pri)
+ 
+ include(shared/shared.pri)
++LIBS  *= -lexecinfo
+diff --git a/src/plugins/qmldesigner/config.pri b/src/plugins/qmldesigner/config.pri
+index 1b559b2..b485b63 100644
+--- a/src/plugins/qmldesigner/config.pri
++++ b/src/plugins/qmldesigner/config.pri
+@@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFINES += QT_NO_DEBUG_OUTPUT \
+ DEFINES += ENABLE_TEXT_VIEW
+ 
+ isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS
++LIBS  *= -lexecinfo
diff --git a/recipes-qt/qt5/qt5-creator/musl-backtrace.patch b/recipes-qt/qt5/qt5-creator/musl-backtrace.patch
deleted file mode 100644
index fc7f86c2..00000000
--- a/recipes-qt/qt5/qt5-creator/musl-backtrace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro
-===================================================================
---- qt-creator-opensource-src-3.5.1.orig/src/plugins/debugger/debugger.pro
-+++ qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro
-@@ -148,3 +148,4 @@ include(qml/qml.pri)
- include(namedemangler/namedemangler.pri)
- 
- include(shared/shared.pri)
-+LIBS  *= -lexecinfo
-Index: qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri
-===================================================================
---- qt-creator-opensource-src-3.5.1.orig/src/plugins/qmldesigner/config.pri
-+++ qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri
-@@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFI
- DEFINES += ENABLE_TEXT_VIEW
- 
- isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS
-+LIBS  *= -lexecinfo