Bug/make dia build (#4045)

* Make dia build w/ Spack's X bits (and misc)

X related

- need to depend on the +X variant of gtkplus
- need to depend on freetype

misc

- fix path to tarball

* Make freetype a "build" dependency

* Freetype is not just a build dep
This commit is contained in:
George Hartzell 2017-04-28 13:30:09 -07:00 committed by Adam J. Stewart
parent 6814842814
commit 2cfc5eebb5

View file

@ -33,7 +33,7 @@ class Dia(Package):
version('0.97.3', '0e744a0f6a6c4cb6a089e4d955392c3c') version('0.97.3', '0e744a0f6a6c4cb6a089e4d955392c3c')
depends_on('intltool', type='build') depends_on('intltool', type='build')
depends_on('gtkplus@2.6.0:') depends_on('gtkplus@2.6.0:+X')
depends_on('libxslt') depends_on('libxslt')
depends_on('python') depends_on('python')
depends_on('swig') depends_on('swig')
@ -42,6 +42,7 @@ class Dia(Package):
depends_on('libxinerama') depends_on('libxinerama')
depends_on('libxrender') depends_on('libxrender')
depends_on('libxml2') depends_on('libxml2')
depends_on('freetype')
# TODO: Optional dependencies, not yet supported by Spack # TODO: Optional dependencies, not yet supported by Spack
# depends_on('libart') # depends_on('libart')
@ -49,7 +50,7 @@ class Dia(Package):
def url_for_version(self, version): def url_for_version(self, version):
"""Handle Dia's version-based custom URLs.""" """Handle Dia's version-based custom URLs."""
return 'https://ftp.gnome.org/pub/gnome/source/dia/%s/dia-%s.tar.xz' % (version.up_to(2), version) return 'https://ftp.gnome.org/pub/gnome/sources/dia/%s/dia-%s.tar.xz' % (version.up_to(2), version)
def install(self, spec, prefix): def install(self, spec, prefix):