Skip to content
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
dbevans authored and stromnov committed Apr 11, 2019
1 parent 6181043 commit 4c8514f07b90a15545a9a418c0ebcfb49e53b483
Showing with 59 additions and 0 deletions.
  1. +12 −0 python/py-Pillow/Portfile
  2. +47 −0 python/py-Pillow/files/patch-setup-5.4.1.py.diff
@@ -40,6 +40,16 @@ if {${name} ne ${subport}} {
size 10814666
}

if {[lsearch {34} ${python.version}] != -1} {
version 5.4.1
revision 1
master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
distname Pillow-${version}
checksums rmd160 457ab4a946c80d739faba6af822258f2fd962014 \
sha256 5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f \
size 16016153
}

depends_build-append \
port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-tkinter \
@@ -54,6 +64,8 @@ if {${name} ne ${subport}} {

if {[lsearch {26 33} ${python.version}] != -1} {
patchfiles patch-setup-3.4.2.py.diff
} elseif {[lsearch {34} ${python.version}] != -1} {
patchfiles patch-setup-5.4.1.py.diff
} else {
patchfiles patch-setup.py.diff
}
@@ -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 \

0 comments on commit 4c8514f

Please sign in to comment.
You can’t perform that action at this time.