Permalink
Browse files
py-Pillow: roll back py34 subport to previous working version 5.4.1
Fixes build failure caused by the removal of support for python 3.4 in version 6.0.0. See python-pillow/Pillow@6eab984
- Loading branch information
Showing
with
59 additions
and 0 deletions.
| @@ -0,0 +1,47 @@ | ||
| --- setup.py.orig 2019-01-05 09:33:50.000000000 -0800 | ||
| +++ setup.py 2019-04-10 22:38:03.000000000 -0700 | ||
| @@ -373,42 +373,8 @@ | ||
| sys.version[:3], "config")) | ||
|
|
||
| elif sys.platform == "darwin": | ||
| - # attempt to make sure we pick freetype2 over other versions | ||
| - _add_directory(include_dirs, "/sw/include/freetype2") | ||
| - _add_directory(include_dirs, "/sw/lib/freetype2/include") | ||
| - # fink installation directories | ||
| - _add_directory(library_dirs, "/sw/lib") | ||
| - _add_directory(include_dirs, "/sw/include") | ||
| - # darwin ports installation directories | ||
| - _add_directory(library_dirs, "/opt/local/lib") | ||
| - _add_directory(include_dirs, "/opt/local/include") | ||
| - | ||
| - # if Homebrew is installed, use its lib and include directories | ||
| - try: | ||
| - prefix = subprocess.check_output(['brew', '--prefix']).strip( | ||
| - ).decode('latin1') | ||
| - except Exception: | ||
| - # Homebrew not installed | ||
| - prefix = None | ||
| - | ||
| - ft_prefix = None | ||
| - | ||
| - if prefix: | ||
| - # add Homebrew's include and lib directories | ||
| - _add_directory(library_dirs, os.path.join(prefix, 'lib')) | ||
| - _add_directory(include_dirs, os.path.join(prefix, 'include')) | ||
| - ft_prefix = os.path.join(prefix, 'opt', 'freetype') | ||
| - | ||
| - if ft_prefix and os.path.isdir(ft_prefix): | ||
| - # freetype might not be linked into Homebrew's prefix | ||
| - _add_directory(library_dirs, os.path.join(ft_prefix, 'lib')) | ||
| - _add_directory(include_dirs, | ||
| - os.path.join(ft_prefix, 'include')) | ||
| - else: | ||
| - # fall back to freetype from XQuartz if | ||
| - # Homebrew's freetype is missing | ||
| - _add_directory(library_dirs, "/usr/X11/lib") | ||
| - _add_directory(include_dirs, "/usr/X11/include") | ||
| + _add_directory(library_dirs, "@prefix@/lib") | ||
| + _add_directory(include_dirs, "@prefix@/include") | ||
|
|
||
| elif sys.platform.startswith("linux") or \ | ||
| sys.platform.startswith("gnu") or \ |