From: Raspbian automatic forward porter Date: Tue, 28 Sep 2021 14:44:34 +0000 (+0100) Subject: Merge version 5.15.2+dfsg-10+rpi1 and 5.15.2+dfsg-12 to produce 5.15.2+dfsg-12+rpi1 X-Git-Tag: archive/raspbian/5.15.2+dfsg-12+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ec95ce822f4fab806ccb33fc5ae24a5a0a5572f;p=qtbase-opensource-src.git Merge version 5.15.2+dfsg-10+rpi1 and 5.15.2+dfsg-12 to produce 5.15.2+dfsg-12+rpi1 --- 2ec95ce822f4fab806ccb33fc5ae24a5a0a5572f diff --cc debian/changelog index 0fc75e3d2,9f235cddd..ae36b6b5f --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,21 +1,31 @@@ - qtbase-opensource-src (5.15.2+dfsg-10+rpi1) bookworm-staging; urgency=medium ++qtbase-opensource-src (5.15.2+dfsg-12+rpi1) bookworm-staging; urgency=medium + + [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green] + * Partially fix clean target. + + [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green] + * Disable neon (-no-neon no longer seems to work, so edit configure.json instead) + - -- Raspbian forward porter Tue, 24 Aug 2021 13:28:22 +0000 ++ -- Raspbian forward porter Tue, 28 Sep 2021 14:44:33 +0000 ++ + qtbase-opensource-src (5.15.2+dfsg-12) unstable; urgency=medium + + * Add a patch to properly cast types for EGL X11 tests (Closes: #994906). + + -- Lisandro Damián Nicanor Pérez Meyer Thu, 23 Sep 2021 10:02:33 -0300 + + qtbase-opensource-src (5.15.2+dfsg-11) unstable; urgency=medium + + * Apply multi-arch hints. + + qtbase5-doc, qtbase5-doc-dev, qtbase5-doc-html: Add Multi-Arch: foreign. + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Backport upstream patch + xcb_add_a_timeout_control_when_reading_INCR_property.diff in order to fix + timestamp issue on QXcbConnection, + https://bugreports.qt.io/browse/QTBUG-56595 + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 22 Sep 2021 15:07:55 -0300 qtbase-opensource-src (5.15.2+dfsg-10) unstable; urgency=medium diff --cc debian/patches/series index 424834556,d1f97ab63..72501bcf0 --- a/debian/patches/series +++ b/debian/patches/series @@@ -23,4 -24,4 +24,5 @@@ qdoc_default_incdirs.dif path_max.diff qstorageinfo_linux.diff cross_build_mysql.diff + cast_types_for_egl_x11_test.diff +modify-configure.json-to-disable-neon.patch