fixed conflicts in python package
This commit is contained in:
parent
76d950b103
commit
4041f45b6c
@ -34,6 +34,7 @@ class Cairo(Package):
|
||||
depends_on("libpng")
|
||||
depends_on("glib")
|
||||
depends_on("pixman")
|
||||
depends_on("freetype")
|
||||
depends_on("fontconfig@2.10.91:") # Require newer version of fontconfig.
|
||||
|
||||
def install(self, spec, prefix):
|
||||
|
@ -34,7 +34,7 @@ class Freetype(Package):
|
||||
depends_on('libpng')
|
||||
|
||||
def install(self, spec, prefix):
|
||||
configure("--prefix=%s" % prefix)
|
||||
configure("--prefix=%s" % prefix, "--with-harfbuzz=no")
|
||||
|
||||
make()
|
||||
make("install")
|
||||
|
@ -34,6 +34,8 @@ class Harfbuzz(Package):
|
||||
depends_on("glib")
|
||||
depends_on("icu")
|
||||
depends_on("freetype")
|
||||
depends_on("cairo")
|
||||
depends_on("zlib")
|
||||
|
||||
def patch(self):
|
||||
change_sed_delimiter('@', ';', 'src/Makefile.in')
|
||||
|
@ -203,8 +203,11 @@ def python_ignore(self, ext_pkg, args):
|
||||
r'site-packages/site[^/]*\.pyc?$',
|
||||
r'site-packages/__pycache__/site[^/]*\.pyc?$'
|
||||
])
|
||||
if ext_pkg.name != 'py-pygments':
|
||||
patterns.append(r'bin/pygmentize$')
|
||||
if ext_pkg.name != 'py-numpy':
|
||||
patterns.append(r'bin/f2py$')
|
||||
patterns.append(r'bin/f2py3$')
|
||||
|
||||
return match_predicate(ignore_arg, patterns)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user