From 01c6068791f44074e189e1a5d945cf50b02f4dcc Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Sat, 16 Dec 2023 07:55:23 +0000
Subject: [PATCH] qt: add another patch "consistent_shader_order_for_qsb2" from
 upstream qt6.5

for reproducible builds
---
 pythonforandroid/recipes/hostqt6/__init__.py  |  3 ++-
 ...=> consistent_shader_order_for_qsb1.patch} |  0
 .../consistent_shader_order_for_qsb2.patch    | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 rename pythonforandroid/recipes/hostqt6/{consistent_shader_order_for_qsb.patch => consistent_shader_order_for_qsb1.patch} (100%)
 create mode 100644 pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb2.patch

diff --git a/pythonforandroid/recipes/hostqt6/__init__.py b/pythonforandroid/recipes/hostqt6/__init__.py
index 65516803a5..2c3d09d2ee 100644
--- a/pythonforandroid/recipes/hostqt6/__init__.py
+++ b/pythonforandroid/recipes/hostqt6/__init__.py
@@ -21,7 +21,8 @@ class HostQt6Recipe(Recipe):
 
     patches = [
         'qml_codegen_stable_localvars.patch',
-        'consistent_shader_order_for_qsb.patch',  # see https://bugreports.qt.io/browse/QTBUG-101923
+        'consistent_shader_order_for_qsb1.patch',  # see https://bugreports.qt.io/browse/QTBUG-101923
+        'consistent_shader_order_for_qsb2.patch',  # follow-up to above, from https://codereview.qt-project.org/c/qt/qtbase/+/427477
     ]
 
     build_subdir = 'native-build'
diff --git a/pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb.patch b/pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb1.patch
similarity index 100%
rename from pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb.patch
rename to pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb1.patch
diff --git a/pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb2.patch b/pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb2.patch
new file mode 100644
index 0000000000..495299621a
--- /dev/null
+++ b/pythonforandroid/recipes/hostqt6/consistent_shader_order_for_qsb2.patch
@@ -0,0 +1,19 @@
+--- a/qtbase/src/gui/rhi/qshader_p.h	2023-12-16 07:50:16.320737300 +0000
++++ b/qtbase/src/gui/rhi/qshader_p.h	2023-12-16 07:52:12.791845200 +0000
+@@ -17,6 +17,7 @@
+
+ #include <QtGui/qtguiglobal.h>
+ #include <QtCore/qhash.h>
++#include <QtCore/qmap.h>
+ #include <private/qshaderdescription_p.h>
+
+ QT_BEGIN_NAMESPACE
+@@ -127,7 +128,7 @@
+     QByteArray serialized() const;
+     static QShader fromSerialized(const QByteArray &data);
+
+-    using NativeResourceBindingMap = QHash<int, QPair<int, int> >; // binding -> native_binding[, native_binding]
++    using NativeResourceBindingMap = QMap<int, QPair<int, int> >; // binding -> native_binding[, native_binding]
+     NativeResourceBindingMap nativeResourceBindingMap(const QShaderKey &key) const;
+     void setResourceBindingMap(const QShaderKey &key, const NativeResourceBindingMap &map);
+     void removeResourceBindingMap(const QShaderKey &key);