gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-qt/qtbase: forward qcontiguouscache patch to <=6.8

Browse Source 
Upstreamed but currently is only in dev branch, and unclear if it will
make it in 6.7.3 or 6.8.0 before release (-rc is not far for 6.8). Not
to forget, add in 6.7.9999 and 6.8.9999 until it fails to apply.

Also scrub & add links.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2024-09-03 02:39:34 -04:00
parent df482aab00
commit daf905fe1f
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
View File

@@ -1,11 +1,8 @@
diff '--color=auto' -ruN qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h my/src/corelib/tools/qcontiguouscache.h
--- qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h 2024-05-07 01:06:44.000000000 +0200
+++ my/src/corelib/tools/qcontiguouscache.h 2024-08-25 18:20:13.958793266 +0200
@@ -8,6 +8,7 @@
#include <QtCore/qassert.h>
#include <QtCore/qtclasshelpermacros.h>
https://bugs.gentoo.org/938475
Older version of https://codereview.qt-project.org/c/qt/qtbase/+/585668 for 6.7
--- a/src/corelib/tools/qcontiguouscache.h
+++ b/src/corelib/tools/qcontiguouscache.h
@@ -10,2 +10,3 @@
#include <QtCore/qtcoreexports.h>
+#include <QtCore/qglobal.h>
#include <QtCore/qtypeinfo.h>
#include <climits>

14
dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch Normal file
View File

@@ -0,0 +1,14 @@
https://bugs.gentoo.org/938475
https://codereview.qt-project.org/c/qt/qtbase/+/585668
From: Sam James <sam@gentoo.org>
Date: Sun, 25 Aug 2024 17:34:22 +0100
Subject: [PATCH] QContiguousCache: fix include for qMin
Include `<QtCore/qminmax.h>` for `qMin`. This came up downstream
in Gentoo at https://bugs.gentoo.org/938475.
--- a/src/corelib/tools/qcontiguouscache.h
+++ b/src/corelib/tools/qcontiguouscache.h
@@ -10,2 +10,3 @@
#include <QtCore/qtcoreexports.h>
+#include <QtCore/qminmax.h>
#include <QtCore/qttypetraits.h>

1
dev-qt/qtbase/qtbase-6.7.9999.ebuild
View File

@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
"${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch
)
src_prepare() {

1
dev-qt/qtbase/qtbase-6.8.9999.ebuild
View File

@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
)
src_prepare() {