summaryrefslogtreecommitdiff
path: root/dev-qt/qtbase
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-09-19 05:07:58 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-09-19 05:07:58 +0100
commitca517256fa4afe5b579e64e267ebbc7beb8a888f (patch)
treeb2e8529e997fc6e3e936f205f8b6b5ad4873b594 /dev-qt/qtbase
parent4eeee822487f780361d7d47b4c1b999f93e15b27 (diff)
gentoo auto-resync : 19:09:2023 - 05:07:58
Diffstat (limited to 'dev-qt/qtbase')
-rw-r--r--dev-qt/qtbase/Manifest9
-rw-r--r--dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch28
-rw-r--r--dev-qt/qtbase/qtbase-6.5.2-r2.ebuild12
-rw-r--r--dev-qt/qtbase/qtbase-6.5.9999.ebuild12
-rw-r--r--dev-qt/qtbase/qtbase-6.6.9999.ebuild12
-rw-r--r--dev-qt/qtbase/qtbase-6.9999.ebuild12
6 files changed, 77 insertions, 8 deletions
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index e9bfb43b9fe0..ca0e6df5acb8 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,9 +1,10 @@
AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a570773c9987474f9977f1dad9a849b8ed18dad6ef966997c0293adaee92fd2fcdb24a79a6bd05a71874c548722bfca64d960f12e3 SHA512 0ee7d66a0894879816454fdfd4c9feb958d82e87f4287935704216330e74135709b23cba7a5c084a6b2617b16c54a96eb6eff785d85f0d79b15ef6ccd9da51c6
+AUX qtbase-6.5.2-hppa-forkfd-grow-stack.patch 1001 BLAKE2B 21fabd37d44ad496d2e114351c52bb56ed311f4939e243efc8c0e61b9090bc2dacf29590fa7b5ec21244df7d7f37960fdc2446079609fc7f38d450c0b3afd420 SHA512 4619902ea198a3565e9520206f88632e1c06518b42edfc7e0d2656b0593404bdc96fe0673ca56703858dc0697ee77593eac44cac9108fef4a5147ed7ab1470ca
AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba
DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
-EBUILD qtbase-6.5.2-r2.ebuild 9030 BLAKE2B 432be15389f1a87db6c4a1a4549e7f957f8155bff0c7177d3c74ba75d55e8960bd04f27cbbd592e6b0d67addf728a54850916934e2b18f60a942d97d0473b592 SHA512 c52414cb62de920fd729e8fbd2299ba4db931d01d3030939155221bb626eb306131110d12dcf3635c190a92aee4321cb914b046b7cf3d2783ca4a853a29b9553
-EBUILD qtbase-6.5.9999.ebuild 8935 BLAKE2B 5e2086c80bf056f24d432b17f2e1b6ad55ff5490feaa62eb0560968ebe9f3770110364786c469990b47cc9de345aed23f98cb9bcaae24deae020143b9c1162f7 SHA512 122b821d3e6ecb804291628c383c0e68528b4183dae2a556bfaafdac0bf139fd60176eba99eec983fbafb7d08792f988c25e342a3ac1b50a0063033dfe2f5e06
-EBUILD qtbase-6.6.9999.ebuild 8912 BLAKE2B 62b6d45080cf7bf6a58740e5cb8a4b4a363ad8b8c9a308fb5afb9a7563dee11794914b313caa121525c461691f825d41f160d88b99fadf5656cb675944f60762 SHA512 b02cc8b0cd4fff7a10ff42ebdb5099414b640b2feb4b2ce8493ba44b989117cfb3b4843a90e6457e09f65312f40ce69626e932acf5193827910c3c47198b3f16
-EBUILD qtbase-6.9999.ebuild 9026 BLAKE2B 4923211453eb8d6e9c97cc1eb6299c7ccfab43566a4fba2683307f05550114375ab9880fe0b8daab80ed46c8fdff85b0d4fb403c01798077d2a47b0322da2495 SHA512 f0642ecb0d1552b4f2545707bc57103c584f1a9a37cbe709672e149f14dcb38538ea38965912a407f24e45af3f5dab278c15d0c801c1df11ea22615e206ce7b6
+EBUILD qtbase-6.5.2-r2.ebuild 9364 BLAKE2B c04a47d79a720ef317f6c321753df3edceb992bc40bb416e9f07d5501d03499ffda1075eeefd283909711a59dba8d7df32d438e8981c4227c971296dfbf9049e SHA512 4efa5ba2891196682a210c36abb5905fab40e4b3287875b6d7d357e6da318fbf9c15102c807e6d448fa8542f99bfa297a2a6f334fa0f30026f635bbe15d06642
+EBUILD qtbase-6.5.9999.ebuild 9269 BLAKE2B 5acfa35c0c4535dae45737ec1373f40093d8a581c0728d0768f6743abfe4118623c6ac53fc273341ff38b75cf5b00e483f926eeb93ccd353f9fd0c2e6ee8dc73 SHA512 5303af5c65cadb7b1686a7a5c894f52e7794e8e5a99713c828e895abf2eb1794cc2cbbb20abd37d48c4a9530b80f80c433e71aece2892fc9beb4ce831c702da4
+EBUILD qtbase-6.6.9999.ebuild 9246 BLAKE2B 3335da821b64254a84059cd5bdd8cbbcd8e5cacd742a6ea3b83ff243c140d49259196b98bed018e12b4b51eda553ec659eb70e81e59d3fbe3005fe3897e6aaa9 SHA512 12ad61dd6e97d663f121626a495a840ee85396456bee7978e490c371718f84de30867ea703b44c6ede6c6b5b650b36800a457f561f35baf238884d51495f7b4b
+EBUILD qtbase-6.9999.ebuild 9360 BLAKE2B c795f48c0b121eaa4cb04f4324314faad70007fe981cba83f1d78675b611d371548eef86abdd62b59b95443acbf83a3d5e8c8e70f861fa7098a52ad375b8a5f5 SHA512 eb3e0d240e096a51d4733287ec33c4cb457647ff90cc7243836f324731097fe9a235c305c1eca9fcb2ae4d510f43223dbbd8931e41376348e590370d2adec5e6
MISC metadata.xml 1724 BLAKE2B 958a60a43b45b9d79102633d818a57e697dc8180d1ffdea15ae064b659d19d099e6edf0c0583614cea1451375fec5163b8140efa530e9295a8a33e2165da1f01 SHA512 a11523095d1d6bb8443c8198315098c2c3b2e3e17cabcfd7260e2322c8542825605cc8e71eb8144c6dfe469abb2ed834d04350e80ccd9d6ee544a15099bde8b8
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch b/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch
new file mode 100644
index 000000000000..ccada9f80e34
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch
@@ -0,0 +1,28 @@
+Patch taken from Debian[1], largely broken on HPPA without and several
+tests give segmentation faults[2].
+
+Needs upstreaming if someone familiar with HPPA wants to give this
+attention. Note forkfd is essentially maintained in qtbase's repo[3]
+rather than truly third party.
+
+[1] https://bugs.debian.org/1042018
+[2] https://bugs.gentoo.org/914371
+[3] https://code.qt.io/cgit/qt/qtbase.git/tree/src/3rdparty/forkfd
+
+Description: Change how stack grows on HPPA.
+ On HPPA stack grows upwards. This patch introduces this change for
+ this 3rd party code.
+Author: John David Anglin <dave.anglin@bell.net>
+--- a/src/3rdparty/forkfd/forkfd_linux.c
++++ b/src/3rdparty/forkfd/forkfd_linux.c
+@@ -170,5 +170,10 @@
+ *system = 1;
+
++#if defined(__hppa__)
++ /* Stack grows up */
++ pid = clone(childFn, childStack, cloneflags, token, &pidfd, NULL, NULL);
++#else
+ pid = clone(childFn, childStack + sizeof(childStack), cloneflags, token, &pidfd, NULL, NULL);
++#endif
+ if (pid < 0)
+ return pid;
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 63c5ac446ad4..add31f2972ab 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -130,6 +130,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${P}-CVE-2023-38197.patch
"${FILESDIR}"/${P}-tests-gcc13.patch
@@ -296,9 +297,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (like above, rest of dev-qt is fine)
$(usev elibc_musl '
@@ -307,6 +312,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index c6249d69533c..9511c2c54404 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -130,6 +130,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
)
@@ -294,9 +295,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (like above, rest of dev-qt is fine)
$(usev elibc_musl '
@@ -305,6 +310,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 8502d419a9b4..87e7e43c198a 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -130,6 +130,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
)
@@ -294,9 +295,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (like above, rest of dev-qt is fine)
$(usev elibc_musl '
@@ -305,6 +310,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 5f0ad59133f0..0df3665e86a0 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -132,6 +132,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
)
@@ -297,9 +298,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (like above, rest of dev-qt is fine)
$(usev elibc_musl '
@@ -308,6 +313,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 02:27:37 +0000