Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-mkspecs_features_configure.prf
| --- mkspecs/features/configure.prf.orig 2017-04-19 08:37:44 UTC | --- mkspecs/features/configure.prf.orig 2018-11-27 04:10:38 UTC | ||||
| +++ mkspecs/features/configure.prf | +++ mkspecs/features/configure.prf | ||||
| @@ -4,7 +4,7 @@ load(functions) | @@ -22,7 +22,7 @@ defineTest(runConfigure) { | ||||
| return(false) | |||||
| } | |||||
| defineTest(runConfigure) { | |||||
| webengine_successfully_configured: return(true) | |||||
| - linux:contains(QT_CONFIG,no-pkg-config) { | - linux:contains(QT_CONFIG,no-pkg-config) { | ||||
| + unix:contains(QT_CONFIG,no-pkg-config) { | + unix:contains(QT_CONFIG,no-pkg-config) { | ||||
| skipBuild("pkg-config is required") | skipBuild("pkg-config is required") | ||||
| return(false) | return(false) | ||||
| } | } | ||||
| @@ -53,7 +53,7 @@ defineTest(runConfigure) { | @@ -64,17 +64,17 @@ defineTest(runConfigure) { | ||||
| qtConfig(embedded): WEBENGINE_CONFIG += reduce_binary_size | return(false); | ||||
| } | } | ||||
| - linux { | - linux { | ||||
| + unix { | + unix { | ||||
| !qtConfig(webengine-host-pkg-config) { | |||||
| skipBuild("Host pkg-config is required") | |||||
| return(false) | |||||
| } | |||||
| - !qtConfig(webengine-system-glibc) { | |||||
| - skipBuild("A suitable version of libc could not be found. See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898") | |||||
| - return(false) | |||||
| - } | |||||
| + #!qtConfig(webengine-system-glibc) { | |||||
| + # skipBuild("A suitable version of libc could not be found. See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898") | |||||
| + # return(false) | |||||
| + #} | |||||
| QT_FOR_CONFIG += gui-private | QT_FOR_CONFIG += gui-private | ||||
| !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") | |||||