diff options
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch | 100 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch (renamed from patches/qt-everywhere-src-5.12.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch (renamed from patches/qt-everywhere-src-5.12.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch (renamed from patches/qt-everywhere-src-5.12.2/0003-qt3d-link-with-latomic-if-necessary.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0103-eglfs_kms-device-ordering-robustness.patch (renamed from patches/qt-everywhere-src-5.12.2/0004-eglfs_kms-device-ordering-robustness.patch) | 6 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch (renamed from patches/qt-everywhere-src-5.12.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch) | 16 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch (renamed from patches/qt-everywhere-src-5.12.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch (renamed from patches/qt-everywhere-src-5.12.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/0107-HACK-don-t-resolv-library-paths.patch (renamed from patches/qt-everywhere-src-5.12.2/0008-HACK-don-t-resolv-library-paths.patch) | 4 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.12.2/series | 21 |
10 files changed, 124 insertions, 23 deletions
diff --git a/patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch b/patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch new file mode 100644 index 000000000..983d8e5bf --- /dev/null +++ b/patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch @@ -0,0 +1,100 @@ +From: Joerg Bornemann <joerg.bornemann@qt.io> +Date: Mon, 13 May 2019 11:04:42 +0200 +Subject: [PATCH] Fix detection of the webengine-arm-thumb feature + +Configure tests must run in a clean environment. That's why functions +that are defined below the mkspecs directory are discarded during the +configure run. As a result, extractCFlag could not be found when +running qtConftest_hasThumbFlag. + +This patch moves extractCFlag to src/core/config/functions.pri. Also, +extractCFlag gets a qtwebengine_ prefix to avoid collisions with +functions defined in other modules. The alias extractCFlag in +functions.prf lets us use the old function within QtWebEngine itself. + +Fixes: QTBUG-75748 +Change-Id: I6be613fbc569d5f7b3c145ef44b9a7be8e2ecb9d +Reviewed-by: Kai Koehne <kai.koehne@qt.io> +--- + qtwebengine/configure.pri | 8 +++++--- + qtwebengine/mkspecs/features/functions.prf | 9 --------- + qtwebengine/src/core/config/functions.pri | 8 ++++++++ + qtwebengine/src/core/config/linux.pri | 6 ++++++ + 4 files changed, 19 insertions(+), 12 deletions(-) + create mode 100644 qtwebengine/src/core/config/functions.pri + +diff --git a/qtwebengine/configure.pri b/qtwebengine/configure.pri +index 26c57ce61fbe..897bea54098f 100644 +--- a/qtwebengine/configure.pri ++++ b/qtwebengine/configure.pri +@@ -1,3 +1,5 @@ ++include(src/core/config/functions.pri) ++ + # this must be done outside any function + QTWEBENGINE_SOURCE_TREE = $$PWD + +@@ -297,12 +299,12 @@ defineTest(qtConfTest_isWindowsHostCompiler64) { + + # Fixme QTBUG-71772 + defineTest(qtConfTest_hasThumbFlag) { +- FLAG = $$extractCFlag("-mthumb") ++ FLAG = $$qtwebengine_extractCFlag("-mthumb") + !isEmpty(FLAG): return(true) +- FLAG = $$extractCFlag("-marm") ++ FLAG = $$qtwebengine_extractCFlag("-marm") + !isEmpty(FLAG): return(false) + +- MARCH = $$extractCFlag("-march=.*") ++ MARCH = $$qtwebengine_extractCFlag("-march=.*") + MARMV = $$replace(MARCH, "armv",) + !isEmpty(MARMV) { + MARMV = $$split(MARMV,) +diff --git a/qtwebengine/mkspecs/features/functions.prf b/qtwebengine/mkspecs/features/functions.prf +index f6aeea21a79f..9efa8958f9c6 100644 +--- a/qtwebengine/mkspecs/features/functions.prf ++++ b/qtwebengine/mkspecs/features/functions.prf +@@ -10,15 +10,6 @@ defineReplace(getChromiumSrcDir) { + return($$git_chromium_src_dir) + } + +-defineReplace(extractCFlag) { +- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS +- OPTION = $$find(CFLAGS, $$1) +- OPTION = $$split(OPTION, =) +- PARAM = $$member(OPTION, 1) +- !isEmpty(PARAM): return ($$PARAM) +- return ($$OPTION) +-} +- + defineReplace(which) { + out = $$1 + win32 { +diff --git a/qtwebengine/src/core/config/functions.pri b/qtwebengine/src/core/config/functions.pri +new file mode 100644 +index 000000000000..8c11faa16ad2 +--- /dev/null ++++ b/qtwebengine/src/core/config/functions.pri +@@ -0,0 +1,8 @@ ++defineReplace(qtwebengine_extractCFlag) { ++ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS ++ OPTION = $$find(CFLAGS, $$1) ++ OPTION = $$split(OPTION, =) ++ PARAM = $$member(OPTION, 1) ++ !isEmpty(PARAM): return ($$PARAM) ++ return ($$OPTION) ++} +diff --git a/qtwebengine/src/core/config/linux.pri b/qtwebengine/src/core/config/linux.pri +index 85b948db2527..fe5fe6d76346 100644 +--- a/qtwebengine/src/core/config/linux.pri ++++ b/qtwebengine/src/core/config/linux.pri +@@ -1,4 +1,10 @@ + include(common.pri) ++include(functions.pri) ++ ++defineReplace(extractCFlag) { ++ return($$qtwebengine_extractCFlag($$1)) ++} ++ + QT_FOR_CONFIG += gui-private webenginecore-private + + gn_args += \ diff --git a/patches/qt-everywhere-src-5.12.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch b/patches/qt-everywhere-src-5.12.2/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch index 1872c83ad..1872c83ad 100644 --- a/patches/qt-everywhere-src-5.12.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch +++ b/patches/qt-everywhere-src-5.12.2/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch diff --git a/patches/qt-everywhere-src-5.12.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch b/patches/qt-everywhere-src-5.12.2/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch index c3935b413..c3935b413 100644 --- a/patches/qt-everywhere-src-5.12.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch +++ b/patches/qt-everywhere-src-5.12.2/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch diff --git a/patches/qt-everywhere-src-5.12.2/0003-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch index 6445dc4f4..6445dc4f4 100644 --- a/patches/qt-everywhere-src-5.12.2/0003-qt3d-link-with-latomic-if-necessary.patch +++ b/patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch diff --git a/patches/qt-everywhere-src-5.12.2/0004-eglfs_kms-device-ordering-robustness.patch b/patches/qt-everywhere-src-5.12.2/0103-eglfs_kms-device-ordering-robustness.patch index d466e32b3..24721e479 100644 --- a/patches/qt-everywhere-src-5.12.2/0004-eglfs_kms-device-ordering-robustness.patch +++ b/patches/qt-everywhere-src-5.12.2/0103-eglfs_kms-device-ordering-robustness.patch @@ -12,7 +12,7 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de> 1 file changed, 20 insertions(+) diff --git a/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp b/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp -index 402338197d0f..227f6fe3e9fb 100644 +index f1545206691d..1866407087b6 100644 --- a/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp +++ b/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp @@ -47,6 +47,7 @@ @@ -23,7 +23,7 @@ index 402338197d0f..227f6fe3e9fb 100644 #include <QtGui/QScreen> #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h> -@@ -129,6 +130,20 @@ void QEglFSKmsGbmIntegration::presentBuffer(QPlatformSurface *surface) +@@ -130,6 +131,20 @@ void QEglFSKmsGbmIntegration::presentBuffer(QPlatformSurface *surface) screen->flip(); } @@ -44,7 +44,7 @@ index 402338197d0f..227f6fe3e9fb 100644 QKmsDevice *QEglFSKmsGbmIntegration::createDevice() { QString path = screenConfig()->devicePath(); -@@ -144,6 +159,11 @@ QKmsDevice *QEglFSKmsGbmIntegration::createDevice() +@@ -145,6 +160,11 @@ QKmsDevice *QEglFSKmsGbmIntegration::createDevice() qFatal("Could not find DRM device!"); path = devices.first(); diff --git a/patches/qt-everywhere-src-5.12.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-src-5.12.2/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch index c7292d4c1..0a33b37a5 100644 --- a/patches/qt-everywhere-src-5.12.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch +++ b/patches/qt-everywhere-src-5.12.2/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch @@ -4,17 +4,15 @@ Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdist Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - qtwebengine/mkspecs/features/functions.prf | 3 ++- + qtwebengine/src/core/config/functions.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/qtwebengine/mkspecs/features/functions.prf b/qtwebengine/mkspecs/features/functions.prf -index f433de3b278f..e7e4955c8292 100644 ---- a/qtwebengine/mkspecs/features/functions.prf -+++ b/qtwebengine/mkspecs/features/functions.prf -@@ -11,7 +11,8 @@ defineReplace(getChromiumSrcDir) { - } - - defineReplace(extractCFlag) { +diff --git a/qtwebengine/src/core/config/functions.pri b/qtwebengine/src/core/config/functions.pri +index 8c11faa16ad2..876da9bcfb9e 100644 +--- a/qtwebengine/src/core/config/functions.pri ++++ b/qtwebengine/src/core/config/functions.pri +@@ -1,5 +1,6 @@ + defineReplace(qtwebengine_extractCFlag) { - CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS + PTX_QMAKE_CFLAGS = $$(PTX_QMAKE_CFLAGS) + CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$split(PTX_QMAKE_CFLAGS, " ") diff --git a/patches/qt-everywhere-src-5.12.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch b/patches/qt-everywhere-src-5.12.2/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch index 58de4fe78..58de4fe78 100644 --- a/patches/qt-everywhere-src-5.12.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch +++ b/patches/qt-everywhere-src-5.12.2/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch diff --git a/patches/qt-everywhere-src-5.12.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch b/patches/qt-everywhere-src-5.12.2/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch index bef3dfc2f..bef3dfc2f 100644 --- a/patches/qt-everywhere-src-5.12.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch +++ b/patches/qt-everywhere-src-5.12.2/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch diff --git a/patches/qt-everywhere-src-5.12.2/0008-HACK-don-t-resolv-library-paths.patch b/patches/qt-everywhere-src-5.12.2/0107-HACK-don-t-resolv-library-paths.patch index 962acdbb2..f6a3bb4cf 100644 --- a/patches/qt-everywhere-src-5.12.2/0008-HACK-don-t-resolv-library-paths.patch +++ b/patches/qt-everywhere-src-5.12.2/0107-HACK-don-t-resolv-library-paths.patch @@ -16,10 +16,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase/mkspecs/features/qt_configure.prf b/qtbase/mkspecs/features/qt_configure.prf -index c45439c3ef1d..1a0368bc5481 100644 +index 7ca65c92b3f1..5ce57b979617 100644 --- a/qtbase/mkspecs/features/qt_configure.prf +++ b/qtbase/mkspecs/features/qt_configure.prf -@@ -561,7 +561,7 @@ defineTest(qtConfResolveLibs) { +@@ -573,7 +573,7 @@ defineTest(qtConfResolveLibs) { out += $$l } } diff --git a/patches/qt-everywhere-src-5.12.2/series b/patches/qt-everywhere-src-5.12.2/series index 3dab08f03..86e873397 100644 --- a/patches/qt-everywhere-src-5.12.2/series +++ b/patches/qt-everywhere-src-5.12.2/series @@ -1,11 +1,14 @@ # generated by git-ptx-patches #tag:base --start-number 1 -0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch -0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch -0003-qt3d-link-with-latomic-if-necessary.patch -0004-eglfs_kms-device-ordering-robustness.patch -0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch -0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch -0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch -0008-HACK-don-t-resolv-library-paths.patch -# 70ad5e6c28ffb057886e0363cdb43ef6 - git-ptx-patches magic +#tag:upstream --start-number 1 +0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch +#tag:ptx --start-number 100 +0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch +0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch +0102-qt3d-link-with-latomic-if-necessary.patch +0103-eglfs_kms-device-ordering-robustness.patch +0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch +0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch +0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch +0107-HACK-don-t-resolv-library-paths.patch +# 74dfb52d93d8860fef3c4bb8daefbdaa - git-ptx-patches magic |