summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2020-09-22 16:20:16 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-09-24 15:50:08 +0200
commit386c88e270c81d3aadad93f18d01fe16cb37de89 (patch)
treeb721e1889a118c0693ad28e3135d86521eae4aa3
parent8e2e6b628b535a8aec3eb14851d6521824e59442 (diff)
downloadptxdist-386c88e270c81d3aadad93f18d01fe16cb37de89.tar.gz
ptxdist-386c88e270c81d3aadad93f18d01fe16cb37de89.tar.xz
qt5: version bump 5.15.0 -> 5.15.1
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Message-Id: <20200922142016.8350-1-p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/qt-everywhere-src-5.15.1/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch (renamed from patches/qt-everywhere-src-5.15.0/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch)0
-rw-r--r--patches/qt-everywhere-src-5.15.1/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch (renamed from patches/qt-everywhere-src-5.15.0/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch)0
-rw-r--r--patches/qt-everywhere-src-5.15.1/0003-qt3d-link-with-latomic-if-necessary.patch (renamed from patches/qt-everywhere-src-5.15.0/0003-qt3d-link-with-latomic-if-necessary.patch)0
-rw-r--r--patches/qt-everywhere-src-5.15.1/0004-eglfs_kms-device-ordering-robustness.patch (renamed from patches/qt-everywhere-src-5.15.0/0004-eglfs_kms-device-ordering-robustness.patch)0
-rw-r--r--patches/qt-everywhere-src-5.15.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch (renamed from patches/qt-everywhere-src-5.15.0/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch)0
-rw-r--r--patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch (renamed from patches/qt-everywhere-src-5.15.0/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch)2
-rw-r--r--patches/qt-everywhere-src-5.15.1/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch (renamed from patches/qt-everywhere-src-5.15.0/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch)0
-rw-r--r--patches/qt-everywhere-src-5.15.1/series (renamed from patches/qt-everywhere-src-5.15.0/series)2
-rw-r--r--rules/qt5.make4
9 files changed, 4 insertions, 4 deletions
diff --git a/patches/qt-everywhere-src-5.15.0/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch b/patches/qt-everywhere-src-5.15.1/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.0/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
+++ b/patches/qt-everywhere-src-5.15.1/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
diff --git a/patches/qt-everywhere-src-5.15.0/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch b/patches/qt-everywhere-src-5.15.1/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.0/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
+++ b/patches/qt-everywhere-src-5.15.1/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
diff --git a/patches/qt-everywhere-src-5.15.0/0003-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-src-5.15.1/0003-qt3d-link-with-latomic-if-necessary.patch
index 6445dc4f4..6445dc4f4 100644
--- a/patches/qt-everywhere-src-5.15.0/0003-qt3d-link-with-latomic-if-necessary.patch
+++ b/patches/qt-everywhere-src-5.15.1/0003-qt3d-link-with-latomic-if-necessary.patch
diff --git a/patches/qt-everywhere-src-5.15.0/0004-eglfs_kms-device-ordering-robustness.patch b/patches/qt-everywhere-src-5.15.1/0004-eglfs_kms-device-ordering-robustness.patch
index 0532aa660..0532aa660 100644
--- a/patches/qt-everywhere-src-5.15.0/0004-eglfs_kms-device-ordering-robustness.patch
+++ b/patches/qt-everywhere-src-5.15.1/0004-eglfs_kms-device-ordering-robustness.patch
diff --git a/patches/qt-everywhere-src-5.15.0/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-src-5.15.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
index ce0652dc7..ce0652dc7 100644
--- a/patches/qt-everywhere-src-5.15.0/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
+++ b/patches/qt-everywhere-src-5.15.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
diff --git a/patches/qt-everywhere-src-5.15.0/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch b/patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
index 92db08485..ebbb05a24 100644
--- a/patches/qt-everywhere-src-5.15.0/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
+++ b/patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
@@ -10,7 +10,7 @@ Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qtwebengine/src/core/gn_run.pro b/qtwebengine/src/core/gn_run.pro
-index 8b16d7c59c71..f8c3aaac4b84 100644
+index 3d6fda80eaa3..73b15dd15731 100644
--- a/qtwebengine/src/core/gn_run.pro
+++ b/qtwebengine/src/core/gn_run.pro
@@ -51,7 +51,7 @@ build_pass|!debug_and_release {
diff --git a/patches/qt-everywhere-src-5.15.0/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch b/patches/qt-everywhere-src-5.15.1/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
index be6f6378d..be6f6378d 100644
--- a/patches/qt-everywhere-src-5.15.0/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
+++ b/patches/qt-everywhere-src-5.15.1/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
diff --git a/patches/qt-everywhere-src-5.15.0/series b/patches/qt-everywhere-src-5.15.1/series
index c8ba9e8f2..68b5075b3 100644
--- a/patches/qt-everywhere-src-5.15.0/series
+++ b/patches/qt-everywhere-src-5.15.1/series
@@ -7,4 +7,4 @@
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
-# 85e8487516c840c5070cab838ec88d9f - git-ptx-patches magic
+# 4b456a724e88b1f3c6125e3941898e96 - git-ptx-patches magic
diff --git a/rules/qt5.make b/rules/qt5.make
index 06777ec20..fe0216293 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5
#
# Paths and names
#
-QT5_VERSION := 5.15.0
-QT5_MD5 := 610a228dba6ef469d14d145b71ab3b88
+QT5_VERSION := 5.15.1
+QT5_MD5 := ab16c28f4f9e6db8299096312decdbc4
QT5 := qt-everywhere-src-$(QT5_VERSION)
QT5_SUFFIX := tar.xz
QT5_URL := \