Signed-off-by: Philipp Zabel <[email protected]> --- Changes since v1: - Update patches --- ...qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch | 0 .../0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch | 0 .../0003-qt3d-link-with-latomic-if-necessary.patch | 0 .../0004-eglfs_kms-device-ordering-robustness.patch | 0 ...0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch | 0 ...0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch | 2 +- ...-HACK-qtwebengine-workaround-for-too-long-file-names.patch | 0 .../series | 2 +- rules/qt5.make | 4 ++-- 9 files changed, 4 insertions(+), 4 deletions(-) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch (100%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch (100%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0003-qt3d-link-with-latomic-if-necessary.patch (100%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0004-eglfs_kms-device-ordering-robustness.patch (100%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch (100%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch (96%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch (100%) rename patches/{qt-everywhere-src-5.15.0 => qt-everywhere-src-5.15.1}/series (88%)
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 similarity index 100% rename from patches/qt-everywhere-src-5.15.0/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch rename to 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 similarity index 100% rename from patches/qt-everywhere-src-5.15.0/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch rename to 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 similarity index 100% rename from patches/qt-everywhere-src-5.15.0/0003-qt3d-link-with-latomic-if-necessary.patch rename to 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 similarity index 100% rename from patches/qt-everywhere-src-5.15.0/0004-eglfs_kms-device-ordering-robustness.patch rename to 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 similarity index 100% rename from patches/qt-everywhere-src-5.15.0/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch rename to 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 similarity index 96% rename from patches/qt-everywhere-src-5.15.0/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch rename to patches/qt-everywhere-src-5.15.1/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch index 92db08485667..ebbb05a242f9 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 <[email protected]> 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 similarity index 100% rename from patches/qt-everywhere-src-5.15.0/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch rename to 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 similarity index 88% rename from patches/qt-everywhere-src-5.15.0/series rename to patches/qt-everywhere-src-5.15.1/series index c8ba9e8f2659..68b5075b33b2 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 06777ec200da..fe0216293a73 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 := \ -- 2.20.1 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
