diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-11-27 11:14:40 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-03 17:25:17 +0100 |
commit | d3ed8a71264e6a136e6a3a48b39baa7e69335855 (patch) | |
tree | c3ecc6d6be1c2494082ebbd0b453a9526f8a818c | |
parent | 4a49aae7d660bce408f61bb7f35ecc7a21011730 (diff) | |
download | ptxdist-d3ed8a71264e6a136e6a3a48b39baa7e69335855.tar.gz ptxdist-d3ed8a71264e6a136e6a3a48b39baa7e69335855.tar.xz |
qt5: version bump 5.15.1 -> 5.15.2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch (renamed from patches/qt-everywhere-src-5.15.1/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch (renamed from patches/qt-everywhere-src-5.15.1/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0003-qt3d-link-with-latomic-if-necessary.patch (renamed from patches/qt-everywhere-src-5.15.1/0003-qt3d-link-with-latomic-if-necessary.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0004-eglfs_kms-device-ordering-robustness.patch (renamed from patches/qt-everywhere-src-5.15.1/0004-eglfs_kms-device-ordering-robustness.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch (renamed from patches/qt-everywhere-src-5.15.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch (renamed from patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch (renamed from patches/qt-everywhere-src-5.15.1/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch) | 0 | ||||
-rw-r--r-- | patches/qt-everywhere-src-5.15.2/series (renamed from patches/qt-everywhere-src-5.15.1/series) | 0 | ||||
-rw-r--r-- | rules/qt5.make | 5 |
9 files changed, 2 insertions, 3 deletions
diff --git a/patches/qt-everywhere-src-5.15.1/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch b/patches/qt-everywhere-src-5.15.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch index 218dc7e79..218dc7e79 100644 --- a/patches/qt-everywhere-src-5.15.1/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch +++ b/patches/qt-everywhere-src-5.15.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch diff --git a/patches/qt-everywhere-src-5.15.1/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch b/patches/qt-everywhere-src-5.15.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch index f17db71aa..f17db71aa 100644 --- a/patches/qt-everywhere-src-5.15.1/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch +++ b/patches/qt-everywhere-src-5.15.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch diff --git a/patches/qt-everywhere-src-5.15.1/0003-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-src-5.15.2/0003-qt3d-link-with-latomic-if-necessary.patch index 6445dc4f4..6445dc4f4 100644 --- a/patches/qt-everywhere-src-5.15.1/0003-qt3d-link-with-latomic-if-necessary.patch +++ b/patches/qt-everywhere-src-5.15.2/0003-qt3d-link-with-latomic-if-necessary.patch diff --git a/patches/qt-everywhere-src-5.15.1/0004-eglfs_kms-device-ordering-robustness.patch b/patches/qt-everywhere-src-5.15.2/0004-eglfs_kms-device-ordering-robustness.patch index 0532aa660..0532aa660 100644 --- a/patches/qt-everywhere-src-5.15.1/0004-eglfs_kms-device-ordering-robustness.patch +++ b/patches/qt-everywhere-src-5.15.2/0004-eglfs_kms-device-ordering-robustness.patch diff --git a/patches/qt-everywhere-src-5.15.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-src-5.15.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch index ce0652dc7..ce0652dc7 100644 --- a/patches/qt-everywhere-src-5.15.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch +++ b/patches/qt-everywhere-src-5.15.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch diff --git a/patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch b/patches/qt-everywhere-src-5.15.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch index ebbb05a24..ebbb05a24 100644 --- a/patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch +++ b/patches/qt-everywhere-src-5.15.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch diff --git a/patches/qt-everywhere-src-5.15.1/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch b/patches/qt-everywhere-src-5.15.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch index be6f6378d..be6f6378d 100644 --- a/patches/qt-everywhere-src-5.15.1/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch +++ b/patches/qt-everywhere-src-5.15.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch diff --git a/patches/qt-everywhere-src-5.15.1/series b/patches/qt-everywhere-src-5.15.2/series index 68b5075b3..68b5075b3 100644 --- a/patches/qt-everywhere-src-5.15.1/series +++ b/patches/qt-everywhere-src-5.15.2/series diff --git a/rules/qt5.make b/rules/qt5.make index fe0216293..ab7f34a8d 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5 # # Paths and names # -QT5_VERSION := 5.15.1 -QT5_MD5 := ab16c28f4f9e6db8299096312decdbc4 +QT5_VERSION := 5.15.2 +QT5_MD5 := e1447db4f06c841d8947f0a6ce83a7b5 QT5 := qt-everywhere-src-$(QT5_VERSION) QT5_SUFFIX := tar.xz QT5_URL := \ @@ -399,7 +399,6 @@ QT5_LIBS-$(PTXCONF_QT5_MODULE_QT3D_QUICK) += Qt53DQuick Qt53DQuickAnimation Qt QT5_QML-$(PTXCONF_QT5_MODULE_QT3D_QUICK) += Qt3D QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += geometryloaders/libdefaultgeometryloader QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += geometryloaders/libgltfgeometryloader -QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += sceneparsers/libassimpsceneimport QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += sceneparsers/libgltfsceneexport QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += sceneparsers/libgltfsceneimport QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D_QUICK) += renderplugins/libscene2d |