diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-20 01:53:29 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-20 01:53:29 +0000 |
| commit | 54d0ccbac3b6fbd01dcd252ea006d4e9e62f8e6e (patch) | |
| tree | fc8f42b6568c9de11a72455118288dee202ce586 /dev-qt/qtbase/files | |
| parent | 3f0a9aff8dc766c410952343d02561aab3eda2b9 (diff) | |
gentoo auto-resync : 20:12:2023 - 01:53:29
Diffstat (limited to 'dev-qt/qtbase/files')
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch | 27 | ||||
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch | 18 |
2 files changed, 0 insertions, 45 deletions
diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch b/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch deleted file mode 100644 index 34cbec61895b..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch +++ /dev/null @@ -1,27 +0,0 @@ -Avoid crash that happens for some users in qsb, qmake, and -potentially other Qt tools when ran under sandbox leading -to build failures for qtdeclarative and other packages. - -Note that this is the initial (simple) version of the patch -to ensure no issues, a more proper fix should land upstream -eventually. - -https://bugs.gentoo.org/908809 -https://bugs.gentoo.org/908816 -https://bugs.gentoo.org/913493 -https://bugs.gentoo.org/915695 -https://codereview.qt-project.org/c/qt/qtbase/+/513140 -From: Huang Rui <vowstar@users.noreply.github.com> -Date: Fri, 20 Oct 2023 10:16:01 +0800 -Subject: [PATCH] folkfd_linux,c: set stack size to 8192 ---- a/src/3rdparty/forkfd/forkfd_linux.c -+++ b/src/3rdparty/forkfd/forkfd_linux.c -@@ -157,7 +157,7 @@ static int system_forkfd_pidfd_set_flags(int pidfd, int flags) - - int system_vforkfd(int flags, pid_t *ppid, int (*childFn)(void *), void *token, int *system) - { -- __attribute__((aligned(64))) char childStack[4096]; -+ __attribute__((aligned(64))) char childStack[8192]; - pid_t pid; - int pidfd; - unsigned long cloneflags = CLONE_PIDFD | CLONE_VFORK | CLONE_VM | SIGCHLD; diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch b/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch deleted file mode 100644 index bc0e0793d7e9..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch +++ /dev/null @@ -1,18 +0,0 @@ -These were removed in libxkbcommon-1.6.0[1] and were apparently -unnecesary. Usage results in build failure. - -Just a quick fix while waiting for what [2] comes up with. - -[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70 -[2] https://bugreports.qt.io/browse/QTBUG-117950 ---- a/src/gui/platform/unix/qxkbcommon.cpp -+++ b/src/gui/platform/unix/qxkbcommon.cpp -@@ -242,4 +242,4 @@ -- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, -- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, -- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, -- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, -+ Xkb2Qt<0xfe90, Qt::Key_Dead_Lowline>, -+ Xkb2Qt<0xfe91, Qt::Key_Dead_Aboveverticalline>, -+ Xkb2Qt<0xfe92, Qt::Key_Dead_Belowverticalline>, -+ Xkb2Qt<0xfe93, Qt::Key_Dead_Longsolidusoverlay>, |