From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] qt5: version bump 5.15.0 -> 5.15.1
Date: Tue, 06 Oct 2020 10:18:49 +0200 [thread overview]
Message-ID: <E1kPiBN-0005UC-U7@dude02.hi.pengutronix.de> (raw)
In-Reply-To: <20200922142016.8350-1-p.zabel@pengutronix.de>
Thanks, applied as 386c88e270c81d3aadad93f18d01fe16cb37de89.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:49 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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>
>
> 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 <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
> 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 := \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2020-10-06 8:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 14:20 [ptxdist] [PATCH v2] " Philipp Zabel
2020-10-06 8:18 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1kPiBN-0005UC-U7@dude02.hi.pengutronix.de \
--to=mol@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox