Fix Fuzz patch with qt5-creator

Task-number: QTBUG-96439
Change-Id: I920de6a5924a258b02de9ea6a594c3fce14e9d95
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

5 files changed, 24 insertions, 23 deletions

diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
index d1faaab4..28fe7844 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
@@ -1,4 +1,4 @@
-From da429a57a077183d86fe9a4adcb453c07d11e812 Mon Sep 17 00:00:00 2001
+From aa1f4a5dc09d8ded55384bd2172bea431ffa479c Mon Sep 17 00:00:00 2001
 From: Jani Suonpera <jani.suonpera@qt.io>
 Date: Wed, 15 Sep 2021 13:54:30 +0300
 Subject: [PATCH] Fix interface of propertyNameListForWritablePropertie
@@ -12,6 +12,7 @@ Compiling error:
 This is cause of interface changes. There are drop out parameters
 baseName and inspectedObjects from
 QQuickDesignerSupportProperties::propertyNameListForWritableProperties.
+
 ---
  .../qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h | 4 +---
  .../qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp      | 6 ++----
@@ -33,11 +34,11 @@ index b0b68907ed..e600db3c60 100644
                                        const PropertyName &baseName = PropertyName(),
                                        QObjectList *inspectedObjects = nullptr);
 diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
-index d41323e310..52a3f5fb28 100644
+index 7e5af01944..b9d6b75596 100644
 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
 +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
-@@ -65,11 +65,9 @@ PropertyNameList allPropertyNames(QObject *object,
-     return QQuickDesignerSupportProperties::allPropertyNames(object, baseName, inspectedObjects);
+@@ -149,11 +149,9 @@ PropertyNameList allPropertyNames(QObject *object,
+ #endif
  }
  
 -PropertyNameList propertyNameListForWritableProperties(QObject *object,
diff --git a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
index 25d1ae90..99a34ae5 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
@@ -1,21 +1,27 @@
-From 33299724b8719d53b26c9055a76a61c358270110 Mon Sep 17 00:00:00 2001
+From 0701dd54b228e58b913d09e5a87f70de77575cc7 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 +
- 1 file changed, 1 insertion(+)
+ src/plugins/debugger/debugger.pro             | 1 +
+ src/plugins/qmldesigner/qmldesignerplugin.pro | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
+diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
+index 6c38efaca8..ba86639d72 100644
 --- a/src/plugins/debugger/debugger.pro
 +++ b/src/plugins/debugger/debugger.pro
-@@ -140,3 +140,4 @@ include(console/console.pri)
+@@ -137,3 +137,4 @@ include(console/console.pri)
  include(analyzer/analyzer.pri)
  
  include(shared/shared.pri)
 +LIBS  *= -lexecinfo
+diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
+index 85a7685da5..d69cabcaaf 100644
 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro
 +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
 @@ -4,7 +4,7 @@ CONFIG += exceptions
diff --git a/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch b/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch
index 6ee5b7b5..5a3ce4db 100644
--- a/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch
@@ -1,4 +1,4 @@
-From 46ec546fdc4427019184f84f24efe3e145b7e40f Mon Sep 17 00:00:00 2001
+From 79c3b7761bc63f42bdfbcc94b9cc6cca58b8a4a4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 11 Aug 2020 21:19:22 -0700
 Subject: [PATCH] app: Use malloc_trim only on glibc
@@ -7,15 +7,16 @@ musl does not implement it
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  src/app/main.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/app/main.cpp b/src/app/main.cpp
-index 419b9b362a..9e150e7613 100644
+index 248fa8efef..12980f3b37 100644
 --- a/src/app/main.cpp
 +++ b/src/app/main.cpp
-@@ -719,7 +719,11 @@ int main(int argc, char **argv)
+@@ -791,7 +791,11 @@ int main(int argc, char **argv)
              m_trimTimer.setSingleShot(true);
              m_trimTimer.setInterval(60000);
              // glibc may not actually free memory in free().
@@ -27,6 +28,3 @@ index 419b9b362a..9e150e7613 100644
          }
  
          bool eventFilter(QObject *, QEvent *e) override
--- 
-2.28.0
-
diff --git a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch
index e03ef5b7..71b671c9 100644
--- a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch
+++ b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch
@@ -1,4 +1,4 @@
-From 14eb5b382cabf90352634393c19bf87a4c15766a Mon Sep 17 00:00:00 2001
+From ec82db9b97aa77c499d7f0bf70b130c242fb3c2b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de>
 Date: Mon, 8 Mar 2021 21:56:06 +0100
 Subject: [PATCH] clangformat: Fix build with LLVM 13
@@ -7,6 +7,7 @@ Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee
 Reviewed-by: David Schulz <david.schulz@qt.io>
 
 Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a]
+
 ---
  src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++
  src/plugins/clangformat/clangformatutils.cpp        | 4 ++++
@@ -44,6 +45,3 @@ index a249327d0e..770e75908c 100644
      style.SortUsingDeclarations = true;
      style.SpaceAfterCStyleCast = true;
      style.SpaceAfterTemplateKeyword = false;
--- 
-2.31.1
-
diff --git a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch
index 33761797..7c0e6d50 100644
--- a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch
+++ b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch
@@ -1,4 +1,4 @@
-From 55b91a76172a3235b4879daf0b675519d5b02db7 Mon Sep 17 00:00:00 2001
+From d13fc5742cb3afc876218fab303880a5da124c8a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de>
 Date: Wed, 16 Jun 2021 20:59:29 +0200
 Subject: [PATCH] clangformat: Fix build with LLVM 13
@@ -7,12 +7,13 @@ Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c
 Reviewed-by: David Schulz <david.schulz@qt.io>
 
 Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7]
+
 ---
  src/plugins/clangformat/clangformatutils.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
-index 2f9a306b99..3905ae5f6a 100644
+index 770e75908c..8017411fb3 100644
 --- a/src/plugins/clangformat/clangformatutils.cpp
 +++ b/src/plugins/clangformat/clangformatutils.cpp
 @@ -157,7 +157,11 @@ static clang::format::FormatStyle qtcStyle()
@@ -27,6 +28,3 @@ index 2f9a306b99..3905ae5f6a 100644
      style.SpacesInContainerLiterals = false;
      style.SpacesInCStyleCastParentheses = false;
      style.SpacesInParentheses = false;
--- 
-2.31.1
-