commit: 602466dc009c9cab64eae4874ca0579a44a5c061 Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org> AuthorDate: Thu Jul 21 20:16:20 2022 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Jul 22 20:19:12 2022 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=602466dc
dev-qt/qtwebengine: Add links to some patches Many patches are from Alpine. Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> .../files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch | 2 ++ .../files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch | 2 ++ dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks.patch | 2 -- .../qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch | 2 ++ .../qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch | 2 ++ .../qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch | 2 ++ .../files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch | 2 ++ 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch index 1e827e59..88e5565c 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch @@ -1,3 +1,5 @@ +https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-execinfo.patch + The backtrace api is not available in musl libc. This can be added with libexecinfo but that needs changes in the build system. As qmake is being swapped for CMake in Qt6 it makes sense to just check for glibc diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch index 1d58af61..9a27db6d 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch @@ -1,3 +1,5 @@ +https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/nasm.patch + diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h index 7eb7c20ff..3bdc2eb39 100644 --- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks.patch index 74908d6c..49912a22 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks.patch @@ -1,7 +1,5 @@ https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/musl-hacks.patch - - --- src/3rdparty/chromium/net/socket/udp_socket_posix.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch index eea2db90..4f8e5ce6 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch @@ -1,3 +1,5 @@ +https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-mallinfo.patch + musl does not support mallinfo, this patch changes OS_LINUX check to include checking for glibc too. diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch index d56fa40a..e0d877e0 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch @@ -1,3 +1,5 @@ +https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/musl-sandbox.patch + This should be fine for all non-Android platforms. TODO: not okay for upstreaming. diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch index 991d08fc..a5126127 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch @@ -1,3 +1,5 @@ +https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-pvalloc.patch + The obsolete function pvalloc() is similar to valloc(), but rounds the size of the allocation up to the next multiple of the system page size. (https://linux.die.net/man/3/pvalloc) See: https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-pvalloc.patch?id=65f58742e6e669c7d0f5b23c0764f4f73661980b diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch index 01dddd98..13989724 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch @@ -1,3 +1,5 @@ +https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/remove-glibc-check.patch + Qt checks if glibc is available and if not disables large part of Qt5WebEngine and thus cripples functionality. However these parts work fine with Musl so there is no need to disable them. - Alpine
