Skip to content

Commit

Permalink
dev-qt/qtwebengine: update 6.7 and 6.8 patchsets
Browse files Browse the repository at this point in the history 
6.7-10 -> 6.7-11, and 6.8-2 -> 6.8-3 changes:
  Added:
  * clang19.patch (imported from files/)
  * musl-no-settls.patch (wrt bug #937875)

6.7-10 -> 6.7-11 specific changes:
  Added:
  * QTBUG-113574.patch (imported from files/)

6.7-11 -> 6.7-12 changes (in preparation for 6.7.3):
  Removed:
  * ninja1.12.patch (upstreamed)

Technically needs a revbump for bug #937875 (runtime issue), but
do not wish for every users to rebuild over a musl fix. musl users
reading this are invited to `emerge -1 qtwebengine:6`. Stable users
are not believed to be affected, and there's to hope 6.7.3 releases
& is stabilized before musl-1.2.5 is (or a := forces a rebuild first).

Closes: https://bugs.gentoo.org/937875
Signed-off-by: Ionen Wolkens <[email protected]>
  • Loading branch information
@ionenwks
ionenwks committed Aug 14, 2024
1 parent 1a20903 commit 4e57d2b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 128 deletions.
5 changes: 3 additions & 2 deletions dev-qt/qtwebengine/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
DIST qtwebengine-6.7-patchset-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47
DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3
DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f
DIST qtwebengine-6.7-patchset-12.tar.xz 9788 BLAKE2B 2465c43fe859ea6edbb1c14d82f9bd41e5bda5a32a9412e25a5eac385d2125d81e72a9f80f83b4c41da82b3fb96c31ad4603ad061077a927882d165ba5f3d7e4 SHA512 a50823e486106da69de7c6010cfdfd92d3312c574d00616ae83fe54de187ea3bd6d41310a9a3951c876432542ddea23a8391580beddf1b096fdf7c7dbab37e72
DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d4483268e81f0d9a9cb2a351a46cd93b9103a6cedd478f3004a67380f364523db9c7c152eb4b5cb39046edaf52b223490e32d9022a2 SHA512 10982a896e61b18153fd8b38431cfba6956dacda2efd3d08d89e9617a2c1fb2d1286d32213b50ccc25046bf539862b3ba4379824526e021a5e793df986888881
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
41 changes: 0 additions & 41 deletions dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch
View file

This file was deleted.

76 changes: 0 additions & 76 deletions dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch
View file

This file was deleted.

4 changes: 1 addition & 3 deletions dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs

DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-11.tar.xz
"

if [[ ${QT6_BUILD_TYPE} == release ]]; then
Expand Down Expand Up @@ -110,8 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )

PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch
"${FILESDIR}"/${PN}-6.7.2-clang19.patch
)

python_check_deps() {
Expand Down
4 changes: 1 addition & 3 deletions dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs

DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-12.tar.xz
"

if [[ ${QT6_BUILD_TYPE} == release ]]; then
Expand Down Expand Up @@ -110,8 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )

PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch
"${FILESDIR}"/${PN}-6.7.2-clang19.patch
)

python_check_deps() {
Expand Down
3 changes: 1 addition & 2 deletions dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs

DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz
"

if [[ ${QT6_BUILD_TYPE} == release ]]; then
Expand Down Expand Up @@ -110,7 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )

PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.7.2-clang19.patch
)

python_check_deps() {
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs

DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz
https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz
"

if [[ ${QT6_BUILD_TYPE} == release ]]; then
Expand Down

0 comments on commit 4e57d2b

Please sign in to comment.