From: Raspbian forward pporter Date: Wed, 28 Nov 2018 00:58:37 +0000 (+0000) Subject: Merge version 5.11.2+dfsg-4+rpi1 and 5.11.2+dfsg-7 to produce 5.11.2+dfsg-7+rpi1 X-Git-Tag: archive/raspbian/5.11.2+dfsg-7+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=30f9178a48951a6693151ea40fddf0948b92cc96;p=qtbase-opensource-src.git Merge version 5.11.2+dfsg-4+rpi1 and 5.11.2+dfsg-7 to produce 5.11.2+dfsg-7+rpi1 --- 30f9178a48951a6693151ea40fddf0948b92cc96 diff --cc debian/changelog index f2b3e9890,778c4b238..823bf6ebd --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,43 +1,53 @@@ - qtbase-opensource-src (5.11.2+dfsg-4+rpi1) buster-staging; urgency=medium ++qtbase-opensource-src (5.11.2+dfsg-7+rpi1) buster-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 Sun, 04 Nov 2018 12:08:16 +0000 ++ -- Raspbian forward porter Wed, 28 Nov 2018 00:58:36 +0000 ++ + qtbase-opensource-src (5.11.2+dfsg-7) unstable; urgency=medium + + * Change the fix for #913499 to not break FindQHelpGenerator.cmake + that is shipped by extra-cmake-modules (closes: #914045). + + -- Dmitry Shachnev Mon, 19 Nov 2018 00:36:29 +0300 + + qtbase-opensource-src (5.11.2+dfsg-6) unstable; urgency=medium + + [ Dmitry Shachnev ] + * Stop patching mkspecs/qmodule.pri in override_dh_auto_configure. + The condition has changed to !host_build|!cross_compile in Qt 5.9, + which is always true for us. + * Strip -fdebug-prefix-map=${BUILDDIR} flag from generated qmodule.pri. + This flag was unwantedly leaking to builds of other Qt modules. + Thanks to Helmut Grohne for noticing it! + * Build corelib and gui without -O3 on ia64 as a workaround for GCC bug + (PR rtl-optimization/85412). + * Update symbols files with buildds’ logs (alpha and kfreebsd-i386). + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Backport remove_need_for_glXGetProcAddressARB.patch. This removes the + need for using dlopen() and thus libGL.so.1 should be used instead of + libGL.so (Closes: #913287). + * Include /usr/share/dpkg/pkg-info.mk and replace the call to + dpkg-parsechangelog with DEB_VERSION_UPTREAM. According to lintian this + should handle more corner cases. + + -- Lisandro Damián Nicanor Pérez Meyer Sat, 17 Nov 2018 19:24:49 -0300 + + qtbase-opensource-src (5.11.2+dfsg-5) unstable; urgency=medium + + * Add a patch to use qstrncpy instead of strlcpy on GNU/kFreeBSD + (kfreebsd_qstrncpy.diff). + * Add a patch to fix ambiguous definition of atime/mtime/ctime + on alpha, thanks Michael Cree (closes: #896658). + * debian/rules: Use qmake cross wrapper in Qt5CoreConfigExtras.cmake + (closes: #913499). + + -- Dmitry Shachnev Mon, 12 Nov 2018 10:08:10 +0300 qtbase-opensource-src (5.11.2+dfsg-4) unstable; urgency=medium diff --cc debian/patches/series index 349f53984,15b390e66..08c96450b --- a/debian/patches/series +++ b/debian/patches/series @@@ -14,4 -15,5 +15,6 @@@ nonlinux_utime.dif no_arc4random_buf.diff ssl_max_version.diff qdoc_default_incdirs.diff + kfreebsd_qstrncpy.diff + alpha_atimensec.diff +modify-configure.json-to-disable-neon.patch