Pillow update blocks python build

[chickenandpork]

Build of python on multiple architectures breaks on build of cross/pillow due to batch patch patches/001-fix-paths.patch as follows:

make[6]: Leaving directory '/spksrc/spk/python/work-aarch64-6.1/jpeg-9c'
find /spksrc/spk/python/work-aarch64-6.1/install//var/packages/python/target/ \! -type d -printf '%P\n' | sort | \
  diff /spksrc/spk/python/work-aarch64-6.1/libjpeg.plist.tmp -  | grep '>' | cut -d' ' -f2- > /spksrc/spk/python/work-aarch64-6.1/libjpeg.plist
===>  Correcting pkg-config file lib/pkgconfig/libjpeg.pc
===>  Correcting libtool file lib/libjpeg.la
make[5]: Leaving directory '/spksrc/cross/libjpeg'
make[5]: Entering directory '/spksrc/cross/zlib'
make[5]: Nothing to be done for 'default'.
make[5]: Leaving directory '/spksrc/cross/zlib'
===>  Extracting for Pillow
tar -xzpf /spksrc/cross/pillow/../../distrib/Pillow-5.3.0.tar.gz -C /spksrc/spk/python/work-aarch64-6.1 
===>  Patching for Pillow
patch -p0 < patches/001-fix-paths.patch
patching file setup.py
Hunk #1 FAILED at 107.
Hunk #2 FAILED at 302.
Hunk #3 succeeded at 414 (offset 35 lines).
2 out of 3 hunks FAILED -- saving rejects to file setup.py.rej
../../mk/spksrc.patch.mk:49: recipe for target 'patch_target' failed
make[4]: *** [patch_target] Error 1
make[4]: Leaving directory '/spksrc/cross/pillow'

most likely related to an update of cross/pillow version in #3529 from 4.0.0 to 5.3.0 but might have only been tested with the build of python3 not python. Discovered in the testing for #3613 using automated discovery of SPKs which are affected by the change (build-affected-spks) -- note that python3 is not dependent on pillow so a build for that would not reveal the issue.

This issue needs to first be resolved, second be avoided through build logic.

Setup

Package Name: python
Package Version: 2.7.14

Affected Builds (thus far):
88f6281-6.1
aarch64-6.1
alpine-6.1
armada370-6.1
armada375-6.1
armada38x-6.1
armadaxp-6.1
avoton-6.1
comcerto2k-6.1
evansport-6.1
hi3535-6.1
ipq806x-1.1
monaco-6.1
northstarplus-1.1
ppc853x-5.2
qoriq-6.1

Expected behavior

patch patches/001-fix-paths.patch should apply without error

Actual behavior

Patch fails; the "rejects" files showing patch failure are identical, showing all are failing for identical reasons.

Steps to reproduce

1. make spk-python-avoton-6.1
2. build fails

Package log

n/a

Other logs

n/a

[chickenandpork]

Test-building on master to confirm it's resolved with these two merged.

[chickenandpork]

Yep, seems to be resolved:

1. checkout spksrc/master
2. docker run -it --rm -v $(pwd):/spksrc -w /spksrc synocommunity/spksrc:latest make clean spk-python-x64-6.1
3. build completes and packages a python spk