diff --git a/testing/qt5-qtwebengine/build b/testing/qt5-qtwebengine/build index abc9c474..4852b6c5 100755 --- a/testing/qt5-qtwebengine/build +++ b/testing/qt5-qtwebengine/build @@ -25,7 +25,7 @@ sed -i '/execinfo.h/d' \ sed -i '/use_udev/s/=.*/=false/' \ src/3rdparty/chromium/build/config/features.gni -qmake -- \ +qmake QMAKE_CXXFLAGS=-DQT_NO_ACCESSIBILITY -- \ -feature-webengine-system-ninja \ -feature-webengine-system-zlib \ -feature-webengine-system-harfbuzz \ @@ -38,7 +38,7 @@ qmake -- \ -no-feature-webengine-system-icu \ -no-feature-webengine-system-glib \ -no-feature-webengine-webrtc \ - -no-feature-webengine-proprietary-codecs \ + -no-feature-webengine-proprietary-codecs make make install INSTALL_ROOT="$1" diff --git a/testing/qt5-qtwebengine/checksums b/testing/qt5-qtwebengine/checksums index 57b3062e..cfd0e938 100644 --- a/testing/qt5-qtwebengine/checksums +++ b/testing/qt5-qtwebengine/checksums @@ -1,4 +1,5 @@ 74f8c11cc318612c8d9dc87cf791badb1efe7080c10d8b3ed5843b249a942d32 qtwebengine-everywhere-src-5.14.0.tar.xz +908735d4f7e4fc9307e177ac9da3419e5801a7740094073c03f9f33600b9767e 0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch 1be1f8e2851f6420f0676fb4f1562368125f93da8bff977be741f85bb453a9fe 0004-mkspecs-Allow-builds-with-libc-glibc.patch 9cd813f5a0b39795dd8f8822f30f9fd4fd4952bad4b4037cf0bf0f2918a56541 0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch 9d0b16939513f998da00834b1823743807b6aba04df732e83d42f15620359b35 0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch diff --git a/testing/qt5-qtwebengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/testing/qt5-qtwebengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch new file mode 100644 index 00000000..63a800e4 --- /dev/null +++ b/testing/qt5-qtwebengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -0,0 +1,37 @@ +From 312f6955af1dc6ea61bbd48bece794c1257822fa Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 12 Dec 2017 16:06:14 +0200 +Subject: [PATCH] musl: don't use pvalloc as it's not available on musl + +Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 +Signed-off-by: Samuli Piippo +--- + src/core/api/qtbug-61521.cpp | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp +index 002a1af2..8fd2da36 100644 +--- a/src/core/api/qtbug-61521.cpp ++++ b/src/core/api/qtbug-61521.cpp +@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); + void* __valloc(size_t size) + SHIM_ALIAS_SYMBOL(ShimValloc); + +-SHIM_SYMBOL_VERSION(pvalloc); +-void* __pvalloc(size_t size) +- SHIM_ALIAS_SYMBOL(ShimPvalloc); +- + SHIM_SYMBOL_VERSION(posix_memalign); + int __posix_memalign(void** r, size_t a, size_t s) + SHIM_ALIAS_SYMBOL(ShimPosixMemalign); +@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { + return valloc(size); + } + +-SHIM_HIDDEN void* ShimPvalloc(size_t size) { +- return pvalloc(size); +-} +- + SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { + return posix_memalign(r,a,s); + } diff --git a/testing/qt5-qtwebengine/sources b/testing/qt5-qtwebengine/sources index 7b029fbc..34136328 100644 --- a/testing/qt5-qtwebengine/sources +++ b/testing/qt5-qtwebengine/sources @@ -1,4 +1,5 @@ http://download.qt-project.org/official_releases/qt/5.14/5.14.0/submodules/qtwebengine-everywhere-src-5.14.0.tar.xz +patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch