diff options
| author | iarspider <iarspider@gmail.com> | 2020-02-18 00:41:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 17:41:07 -0600 |
| commit | 1d7fc47672ccdbc8665ed4799bdc854ed35fb74c (patch) | |
| tree | 21292b02a916595f6063e96675481f7c77a64951 | |
| parent | 80123e0d1a5adf580a388f2adce870eac5988249 (diff) | |
| download | spack-1d7fc47672ccdbc8665ed4799bdc854ed35fb74c.tar.gz spack-1d7fc47672ccdbc8665ed4799bdc854ed35fb74c.tar.bz2 spack-1d7fc47672ccdbc8665ed4799bdc854ed35fb74c.tar.xz spack-1d7fc47672ccdbc8665ed4799bdc854ed35fb74c.zip | |
Add new version of cairo (#14941)
* Add new version of cairo
* Update var/spack/repos/builtin/packages/cairo/package.py
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/cairo/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 829bb0866b..0092d0bfb1 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -13,7 +13,9 @@ class Cairo(AutotoolsPackage): homepage = "https://www.cairographics.org/" url = "https://www.cairographics.org/releases/cairo-1.16.0.tar.xz" - version('1.16.0', sha256='5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331') + version('1.17.2', sha256='6b70d4655e2a47a22b101c666f4b29ba746eda4aa8a0f7255b32b2e9408801df', + url='https://cairographics.org/snapshots/cairo-1.17.2.tar.xz') # Snapshot + version('1.16.0', sha256='5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331', preferred=True) version('1.14.12', sha256='8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16') version('1.14.8', sha256='d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20') version('1.14.0', sha256='2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7') @@ -34,6 +36,7 @@ class Cairo(AutotoolsPackage): depends_on('libpng', when='+png') depends_on('librsvg', when='+svg') depends_on('glib') + depends_on('pixman@0.36.0:', when='@1.17.2:') depends_on('pixman') depends_on('automake', type='build') depends_on('autoconf', type='build') @@ -47,7 +50,7 @@ class Cairo(AutotoolsPackage): conflicts('+svg', when='platform=darwin') # patch from https://gitlab.freedesktop.org/cairo/cairo/issues/346 - patch('fontconfig.patch', when='@1.16.0') + patch('fontconfig.patch', when='@1.16.0:1.17.2') def setup_build_environment(self, env): env.set('NOCONFIGURE', "1") |