diff -Nru qtbase-opensource-src-5.5.1+dfsg/debian/changelog qtbase-opensource-src-5.5.1+dfsg/debian/changelog --- qtbase-opensource-src-5.5.1+dfsg/debian/changelog 2015-11-17 13:20:28.000000000 +0000 +++ qtbase-opensource-src-5.5.1+dfsg/debian/changelog 2015-11-27 19:18:12.000000000 +0000 @@ -1,3 +1,10 @@ +qtbase-opensource-src (5.5.1+dfsg-8+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 5.3.2+dfsg-4+rpi1 by Peter Michael Green at Thu, 27 Nov 2014 01:56:58 +0000] + * Disable neon (-no-neon no longer seems to work, so edit configure instead) + + -- Raspbian forward porter Fri, 27 Nov 2015 19:18:11 +0000 + qtbase-opensource-src (5.5.1+dfsg-8) unstable; urgency=medium * Backport two upstream patches fix some issues with QNetworkAccessManager: diff -Nru qtbase-opensource-src-5.5.1+dfsg/debian/patches/disable-neon.patch qtbase-opensource-src-5.5.1+dfsg/debian/patches/disable-neon.patch --- qtbase-opensource-src-5.5.1+dfsg/debian/patches/disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.5.1+dfsg/debian/patches/disable-neon.patch 2015-11-27 19:18:12.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Disable neon + -no-neon no longer seems to work, so edit configure instead +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: qtbase-opensource-src-5.4.2+dfsg/configure +=================================================================== +--- qtbase-opensource-src-5.4.2+dfsg.orig/configure ++++ qtbase-opensource-src-5.4.2+dfsg/configure +@@ -677,7 +677,7 @@ CFG_AVX2=auto + CFG_REDUCE_RELOCATIONS=auto + CFG_ACCESSIBILITY=auto + CFG_ACCESSIBILITY_ATSPI_BRIDGE=no # will be enabled depending on dbus and accessibility being enabled +-CFG_NEON=auto ++CFG_NEON=no + CFG_MIPS_DSP=auto + CFG_MIPS_DSPR2=auto + CFG_CLOCK_GETTIME=auto diff -Nru qtbase-opensource-src-5.5.1+dfsg/debian/patches/series qtbase-opensource-src-5.5.1+dfsg/debian/patches/series --- qtbase-opensource-src-5.5.1+dfsg/debian/patches/series 2015-11-17 13:20:28.000000000 +0000 +++ qtbase-opensource-src-5.5.1+dfsg/debian/patches/series 2015-11-27 19:18:12.000000000 +0000 @@ -13,3 +13,4 @@ no_htmlinfo_example.diff remove_privacy_breachs.diff link_fbclient.diff +disable-neon.patch