commit: 0db57c9c51ad559648e3db5e85675cb2edc6f822
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Mon Jul 25 20:13:16 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 16:08:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0db57c9c
dev-qt/qtwebengine: Conditionally apply canonic...
This patch conditionally applies the CANONICALIZE_FILENAME patch.
Generally it's a bad idea but in this case it's just an alternative
to fixing this in the build system. Done because of the CMake switch
in Qt6.
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index ebdc15b3..1585df1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -117,7 +117,6 @@ PATCHES=(
# for musl libc
"${FILESDIR}"/${PN}-5.15.5_p20220618-qmake-remove-glibc-check.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-fix-sys-queue.h.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mallinfo.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mojo-strncpy.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-resolv-compat.patch
@@ -182,6 +181,10 @@ src_unpack() {
}
src_prepare() {
+ # Using a conditional patch here since QMake is deprecated
+ # by CMake in Qt6. A build system change would be prettier but
+ # this works just as well right now.
+ use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch )
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git
directories.
mkdir -p .git src/3rdparty/chromium/.git || die
