diff -Nru qtbase-opensource-src-5.3.2+dfsg/debian/changelog qtbase-opensource-src-5.3.2+dfsg/debian/changelog --- qtbase-opensource-src-5.3.2+dfsg/debian/changelog 2015-04-27 08:56:43.000000000 +0000 +++ qtbase-opensource-src-5.3.2+dfsg/debian/changelog 2015-06-12 23:38:44.000000000 +0000 @@ -1,3 +1,9 @@ +qtbase-opensource-src (5.3.2+dfsg-5+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, 12 Jun 2015 23:38:18 +0000 + qtbase-opensource-src (5.3.2+dfsg-5) unstable; urgency=medium [ Lisandro Damián Nicanor Pérez Meyer ] diff -Nru qtbase-opensource-src-5.3.2+dfsg/debian/patches/disable-neon.patch qtbase-opensource-src-5.3.2+dfsg/debian/patches/disable-neon.patch --- qtbase-opensource-src-5.3.2+dfsg/debian/patches/disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.3.2+dfsg/debian/patches/disable-neon.patch 2015-06-12 23:38:44.000000000 +0000 @@ -0,0 +1,28 @@ +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: + +--- qtbase-opensource-src-5.3.0+dfsg.orig/configure ++++ qtbase-opensource-src-5.3.0+dfsg/configure +@@ -683,7 +683,7 @@ CFG_REDUCE_RELOCATIONS=auto + CFG_ACCESSIBILITY=auto + CFG_ACCESSIBILITY_ATSPI_BRIDGE=no # will be enabled depending on dbus and accessibility being enabled + CFG_IWMMXT=no +-CFG_NEON=auto ++CFG_NEON=no + CFG_MIPS_DSP=auto + CFG_MIPS_DSPR2=auto + CFG_CLOCK_GETTIME=auto diff -Nru qtbase-opensource-src-5.3.2+dfsg/debian/patches/series qtbase-opensource-src-5.3.2+dfsg/debian/patches/series --- qtbase-opensource-src-5.3.2+dfsg/debian/patches/series 2015-04-27 08:56:44.000000000 +0000 +++ qtbase-opensource-src-5.3.2+dfsg/debian/patches/series 2015-06-12 23:38:44.000000000 +0000 @@ -12,3 +12,4 @@ # Debian specific. remove_google_adsense.patch revert_upstream_bsymbolic_change.patch +disable-neon.patch