haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix missing memrchr function (#13950)

Browse Source
This commit is contained in:
Schrijvers Luc
2026-04-13 16:34:59 +02:00
committed by GitHub
parent b5b7bdddf9
commit 628c6d5ef8
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
dev-qt/qt6-base/patches/qt6_base-6.10.3.patchset
View File

@@ -1,4 +1,4 @@
From cdb9160efc391110db421746463d3855d85468fa Mon Sep 17 00:00:00 2001
From aca918e6c771388bad4473d63da56b2f9264567c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 10:16:14 +1000
Subject: Make sure libs are searched in the develop/ dir by CMake
@@ -22,7 +22,7 @@ index 24ed125..52f637e 100644
2.52.0
From 1a008a6d4e66179f0ea4434544e019d9054b1ed8 Mon Sep 17 00:00:00 2001
From ebbe56cc4c9ee2bbec45a79b65f3f72061a89ef6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 10:16:34 +1000
Subject: Fix QStandartPaths for Haiku
@@ -84,7 +84,7 @@ index f473ebe..2560722 100644
2.52.0
From 60880d19f2daa1ae7c633de8c1357c55ae982adf Mon Sep 17 00:00:00 2001
From 10940c9d06e10195e86e349815a0674f0727f35e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 10:16:55 +1000
Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku.
@@ -106,7 +106,7 @@ index 46859a2..7be4dd0 100644
2.52.0
From e4de41f3ea44b835d1d18a1a6ccada30f84e5cb3 Mon Sep 17 00:00:00 2001
From e313ee421d568e9b045c0296d08c945c9b3aa149 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 10:45:27 +1000
Subject: Fix build for Haiku platform
@@ -129,7 +129,7 @@ index 13bf7f1..aaa22ee 100644
2.52.0
From 8be1c1f0d069d02d53fe282b0660388a57725843 Mon Sep 17 00:00:00 2001
From 7b52d12df220ba3e863192d790becc51f421157e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 10:45:56 +1000
Subject: Fix endian detection
@@ -156,7 +156,7 @@ index 0baac93..1d48cbc 100644
2.52.0
From d1c907b8390e9ffdd5592ec711a11eadc45621ac Mon Sep 17 00:00:00 2001
From 185de4e1a57428f3cdf00e954351e56b8ea777f3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:11:52 +1000
Subject: Disable LibResolv for Haiku
@@ -179,7 +179,7 @@ index 1883f41..1e10854 100644
2.52.0
From 94de49493058ab45eee4eb329175d35fdbaee278 Mon Sep 17 00:00:00 2001
From a369a6a5e3f87cecfec793e02c574296af29e219 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:15:38 +1000
Subject: Don't use ifaddrs for Haiku
@@ -202,7 +202,7 @@ index 5313e17..03bb881 100644
2.52.0
From 5c46fdadfe4592f0662bd28d65bddfc671d3bd6c Mon Sep 17 00:00:00 2001
From a37fa9ca1403d1420b2df25c3ecb6b54b5d2eb02 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:15:58 +1000
Subject: Disable sharedmemory feature for bootstrap
@@ -224,7 +224,7 @@ index 4ed8169..bbfc3d6 100644
2.52.0
From 9b86f177028ada3dde8d10f06bac0f6cdeb717c8 Mon Sep 17 00:00:00 2001
From 292d2c08004325941457efd91d49dc3a4c1eef58 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:16:20 +1000
Subject: Fix build for x86_gcc2
@@ -247,7 +247,7 @@ index 465258e..4cb6b0c 100644
2.52.0
From d6cd1d09876f3554a98d5893d3ed58eee1048183 Mon Sep 17 00:00:00 2001
From 89d11d7cded303e340e062e47977b6fe68cd8287 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:17:49 +1000
Subject: Implement QFilesystemWatcher for Haiku
@@ -645,7 +645,7 @@ index 0000000..0ae4bdf
2.52.0
From 38f4fbc946e49f87e2e34c71724f66979f27cd12 Mon Sep 17 00:00:00 2001
From fbebe66dfc4f822927f38e71a08c9193173ecb73 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:18:17 +1000
Subject: Don't use AF_INET6 for new sockets
@@ -672,7 +672,7 @@ index 6d49943..8b12671 100644
2.52.0
From 4c84631a4ffbbdc3868eb147ab1358ebafd2ff8b Mon Sep 17 00:00:00 2001
From 2f134aa158a9d22933da577b881a57b5a7e7006a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:18:41 +1000
Subject: Disable Haswell CPU feature for plugins
@@ -695,7 +695,7 @@ index f03eba3..0a21b64 100644
2.52.0
From 4a2c85d7ca15dacf32e65075bc2339d3add08a20 Mon Sep 17 00:00:00 2001
From f5e7f7fbe1a922671f255fcdc8a018c202741e96 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:19:25 +1000
Subject: Haiku build setup
@@ -748,7 +748,7 @@ index da6c871..bd085e2 100644
2.52.0
From 2474d8d6f1785259167ec79981975363e8e71c39 Mon Sep 17 00:00:00 2001
From 02f9359cd258af84e502997f4ef3ad3759026a15 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:21:18 +1000
Subject: Haiku: link against libnetwork
@@ -774,7 +774,7 @@ index 1112f10..1bc87a5 100644
2.52.0
From 2afce775118f117dface16620f902c83f9a87431 Mon Sep 17 00:00:00 2001
From 5cb3efe692ccf1558c2e758a3658ae778e6eac4e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:28:46 +1000
Subject: Fix elf parser for Haiku
@@ -861,7 +861,7 @@ index 78c9be0..6cc9db8 100644
2.52.0
From b4c70257b4bd6681f7e8dadc249812f2d4ce65f6 Mon Sep 17 00:00:00 2001
From 7cc6468b8415b0cd2b9391c78ef29ba4cb17d695 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:29:03 +1000
Subject: Don't use nl_langinfo
@@ -884,7 +884,7 @@ index 310b011..9dff974 100644
2.52.0
From 98c58243b785c71dde4624f6cea80fca0f066610 Mon Sep 17 00:00:00 2001
From d2b76b23c7537c247e513255afc4b2ed751578d2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 12:30:12 +1000
Subject: Workaround for shm_open
@@ -909,7 +909,7 @@ index fa215c3..7a0978c 100644
2.52.0
From dd889490d9d768e027e98b63a2953181f0a78f1e Mon Sep 17 00:00:00 2001
From fa2f55ce45389c2b3edec09f43489eaedc718112 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 14 Apr 2024 12:20:21 +1000
Subject: Disable DisconnectControllingTerminal
@@ -939,7 +939,7 @@ index 32c0851..ad1b87f 100644
2.52.0
From d121ce7de54acfbff100152b1cff952704e57b62 Mon Sep 17 00:00:00 2001
From ef3533ea614d9d577e52d785a055bbdc990f28f9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 4 Oct 2024 18:22:17 +1000
Subject: Use ICU backend for QTimeZone
@@ -962,7 +962,7 @@ index 7b43aab..0061b1e 100644
2.52.0
From 9743c627c4450a31b63a247e11a7e1b147b68b79 Mon Sep 17 00:00:00 2001
From d4f024f59e53f3cdcfb5003af5cf5e08caba1cd8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 5 Oct 2024 19:48:13 +1000
Subject: Use ICU backend for ianaId
@@ -985,7 +985,7 @@ index 0061b1e..542f54c 100644
2.52.0
From e4e000b8ac08fabc25a082c5eb9c277b37c7665a Mon Sep 17 00:00:00 2001
From 9bb3a7e3b0cd7bb7d02daa48c6e657eb359dba84 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 5 Oct 2024 19:48:35 +1000
Subject: Disable tz backend for Haiku
@@ -1008,7 +1008,7 @@ index 0e101c4..c88104b 100644
2.52.0
From 47c01d5ecf816367a1b9a8ed5305c4566a1694c3 Mon Sep 17 00:00:00 2001
From e80158369cd39f200326d89aa5b19f3de6f255d3 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 29 Jun 2025 09:30:39 +0200
Subject: Build fix*
@@ -1032,7 +1032,7 @@ index d66a542..81ccaaf 100644
2.52.0
From cb943532066d152391c5db9357ae4d75b99cdc0e Mon Sep 17 00:00:00 2001
From bbc29bd220863bda48eb1178000a936abec3d962 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 9 Oct 2025 10:52:56 +0200
Subject: Include Qt warning
@@ -1064,7 +1064,7 @@ index 0ae4bdf..0339487 100644
2.52.0
From 47433559987d0a63ad6c8ddc463e94a5c051f504 Mon Sep 17 00:00:00 2001
From 6f96d33e4669acbd235c9bbc058e9ce843858855 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Fri, 13 Feb 2026 16:08:03 +0100
Subject: Fix error for static_assert
@@ -1087,25 +1087,25 @@ index a7e6505..a40f266 100644
2.52.0
From 90f77b7744b3174a527930dd0f72c7f2bca48e07 Mon Sep 17 00:00:00 2001
From b60b6a91c853a0877c4df08035d3a0c932aed41d Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Mon, 13 Apr 2026 15:23:27 +0200
Subject: define _GNU_SOURCE, for memrchr()
Date: Mon, 13 Apr 2026 16:21:10 +0200
Subject: Fix* missing function for memrchr
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 71a7799..ff7960a 100644
index 71a7799..72347f5 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
// Qt-Security score:critical reason:data-parser
@@ -72,6 +72,8 @@ static constexpr inline uchar asciiLower(uchar c)
+#define _GNU_SOURCE /* for memrchr() */
Used in QByteArrayView::lastIndexOf() overload for a single char.
*/
+extern void *memrchr(const void *source, int value, size_t length);
+
#include "qbytearray.h"
#include "qbytearraymatcher.h"
#include "private/qtools_p.h"
const void *qmemrchr(const void *s, int needle, size_t size) noexcept
{
#if QT_CONFIG(memrchr)
--
2.52.0