From eb8606348fe338cd8cef7538b1440e8a67887845 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:35 +0200 Subject: [PATCH] package/qt5/qt5base: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../qt5base/0006-Fix-build-on-riscv32.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch index 5561acb9ae..ff24fbff83 100644 --- a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch +++ b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch @@ -1,7 +1,7 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 +From 25a0057e8d7afaab3492e03efb3f85581f1cf9b2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 +Subject: [PATCH] Fix build on riscv32 riscv32 fails to build because __NR_futex is not defined on this architecture: @@ -21,15 +21,17 @@ Reviewed-by: Thiago Macieira [Retrieved from: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/corelib/thread/qfutex_p.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 +index f287b752d75f..fd7d09ac8572 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE +@@ -81,6 +81,11 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 @@ -38,9 +40,9 @@ index 40482b6fc1..037207a5c0 100644 +# define __NR_futex __NR_futex_time64 +# endif + - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } + # if __has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__) + # include + inline void _q_tsan_acquire(void *addr, void *addr2) -- -cgit v1.2.1 +2.43.0