diff -Nru qtbase-opensource-src-5.9.2+dfsg/debian/changelog qtbase-opensource-src-5.9.2+dfsg/debian/changelog --- qtbase-opensource-src-5.9.2+dfsg/debian/changelog 2017-12-04 12:31:27.000000000 +0000 +++ qtbase-opensource-src-5.9.2+dfsg/debian/changelog 2017-12-13 23:27:07.000000000 +0000 @@ -1,3 +1,13 @@ +qtbase-opensource-src (5.9.2+dfsg-6+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 Wed, 13 Dec 2017 23:27:07 +0000 + qtbase-opensource-src (5.9.2+dfsg-6) unstable; urgency=medium [ Lisandro Damián Nicanor Pérez Meyer ] diff -Nru qtbase-opensource-src-5.9.2+dfsg/debian/patches/modify-configure.json-to-disable-neon.patch qtbase-opensource-src-5.9.2+dfsg/debian/patches/modify-configure.json-to-disable-neon.patch --- qtbase-opensource-src-5.9.2+dfsg/debian/patches/modify-configure.json-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.9.2+dfsg/debian/patches/modify-configure.json-to-disable-neon.patch 2017-12-13 23:27:06.000000000 +0000 @@ -0,0 +1,19 @@ +From: Peter Michael Green +Date: Sun, 3 Sep 2017 22:55:28 +0000 +X-Dgit-Generated: 5.9.1+dfsg-9+rpi1 917f03417097d6e0bbeef4e626acce9d6030ba33 +Subject: Modify configure.json to disable neon. + + +--- + +--- qtbase-opensource-src-5.9.1+dfsg.orig/configure.json ++++ qtbase-opensource-src-5.9.1+dfsg/configure.json +@@ -896,7 +896,7 @@ + }, + "neon": { + "label": "NEON", +- "condition": "(arch.arm || arch.arm64) && tests.neon", ++ "condition": "(arch.arm64) && tests.neon", + "output": [ + "privateConfig", + { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 } diff -Nru qtbase-opensource-src-5.9.2+dfsg/debian/patches/series qtbase-opensource-src-5.9.2+dfsg/debian/patches/series --- qtbase-opensource-src-5.9.2+dfsg/debian/patches/series 2017-12-03 11:24:54.000000000 +0000 +++ qtbase-opensource-src-5.9.2+dfsg/debian/patches/series 2017-12-13 23:27:06.000000000 +0000 @@ -11,3 +11,4 @@ gnukfreebsd_cloexec.diff armv4.diff nonlinux_utime.diff +modify-configure.json-to-disable-neon.patch diff -Nru qtbase-opensource-src-5.9.2+dfsg/debian/rules qtbase-opensource-src-5.9.2+dfsg/debian/rules --- qtbase-opensource-src-5.9.2+dfsg/debian/rules 2017-12-04 12:31:13.000000000 +0000 +++ qtbase-opensource-src-5.9.2+dfsg/debian/rules 2017-12-13 23:27:06.000000000 +0000 @@ -190,6 +190,9 @@ # more leftovers rm -f .device.vars .qmake.vars + # yet more crap + rm -rf doc/q* + override_dh_auto_build-indep: dh_auto_build -- docs