[packages/qt5-qtwebengine] - remove compiler check that's not needed and doesn't work because we set QMAKE_COMPILER to <arch>-p
baggins
baggins at pld-linux.org
Sat Aug 11 23:37:29 CEST 2018
commit abfabd27b6448e0111c4f0df4b78dc3d39a5280d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Aug 11 23:36:29 2018 +0200
- remove compiler check that's not needed and doesn't work because we set QMAKE_COMPILER to <arch>-pld-linux-gcc
qt5-qtwebengine.spec | 2 ++
remove-compiler-check.patch | 14 ++++++++++++++
2 files changed, 16 insertions(+)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index c740b18..a042de6 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -16,6 +16,7 @@ License: LGPL v3 or GPL v2+ or commercial
Group: X11/Libraries
Source0: http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
# Source0-md5: 75d2ff31addba4ec41981b0f459cc587
+Patch0: remove-compiler-check.patch
URL: http://www.qt.io/
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
@@ -129,6 +130,7 @@ Przykłady do biblioteki Qt5 WebEngine.
%prep
%setup -q -n %{orgname}-everywhere-src-%{version}
+%patch0 -p1
%build
qmake-qt5
diff --git a/remove-compiler-check.patch b/remove-compiler-check.patch
new file mode 100644
index 0000000..d2635c2
--- /dev/null
+++ b/remove-compiler-check.patch
@@ -0,0 +1,14 @@
+--- qtwebengine-everywhere-src-5.11.1/mkspecs/features/platform.prf~ 2018-06-15 11:13:33.000000000 +0200
++++ qtwebengine-everywhere-src-5.11.1/mkspecs/features/platform.prf 2018-08-11 23:35:10.234741469 +0200
+@@ -12,11 +12,6 @@
+ defineTest(isPlatformSupported) {
+ QT_FOR_CONFIG += gui-private
+ linux {
+- if(!gcc:!clang)|intel_icc {
+- skipBuild("Qt WebEngine on Linux requires clang or GCC.")
+- return(false)
+- }
+- gcc:!clang:!isGCCVersionSupported(): return(false)
+ } else:win32 {
+ winrt {
+ skipBuild("WinRT is not supported.")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/abfabd27b6448e0111c4f0df4b78dc3d39a5280d
More information about the pld-cvs-commit
mailing list