zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphviz: add poppler support (#16331)

Browse Source 
* graphviz: add poppler support

* graphviz: actually needs poppler+glib

* poopler: fix glib build, new version
This commit is contained in:
Christoph Junghans 2020-04-27 15:18:03 -06:00 committed by GitHub
parent 08e53b67f8
commit 8060bc6523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/graphviz/package.py
View File

@ -55,6 +55,8 @@ class Graphviz(AutotoolsPackage):
description='Build with libgd support (more output formats)') description='Build with libgd support (more output formats)')
variant('pangocairo', default=False, variant('pangocairo', default=False,
description='Build with pango+cairo support (more output formats)') description='Build with pango+cairo support (more output formats)')
variant('poppler', default=False,
description='Build with poppler support (pdf formats)')
variant('qt', default=False, variant('qt', default=False,
description='Build with Qt support') description='Build with Qt support')
variant('quartz', default=(MACOS_VERSION is not None), variant('quartz', default=(MACOS_VERSION is not None),
@ -99,6 +101,7 @@ class Graphviz(AutotoolsPackage):
depends_on('glib', when='+pangocairo') depends_on('glib', when='+pangocairo')
depends_on('libpng', when='+pangocairo') depends_on('libpng', when='+pangocairo')
depends_on('pango', when='+pangocairo') depends_on('pango', when='+pangocairo')
depends_on('poppler+glib', when='+poppler')
depends_on('zlib') depends_on('zlib')
depends_on('qt', when='+qt') depends_on('qt', when='+qt')
depends_on('libx11', when="+x") depends_on('libx11', when="+x")
@ -147,7 +150,7 @@ def configure_args(self):
args.append('--{0}-swig'.format('enable' if use_swig else 'disable')) args.append('--{0}-swig'.format('enable' if use_swig else 'disable'))
for var in ["expat", "gts", "ghostscript", "libgd", "pangocairo", for var in ["expat", "gts", "ghostscript", "libgd", "pangocairo",
"qt", "quartz", "x"]: "poppler", "qt", "quartz", "x"]:
args += self.with_or_without(var) args += self.with_or_without(var)
args.append('--{0}-gtk'.format( args.append('--{0}-gtk'.format(

3
var/spack/repos/builtin/packages/poppler/package.py
View File

@ -15,6 +15,7 @@ class Poppler(CMakePackage):
git = "https://gitlab.freedesktop.org/poppler/poppler.git" git = "https://gitlab.freedesktop.org/poppler/poppler.git"
version('master', branch='master') version('master', branch='master')
version('0.87.0', sha256='6f602b9c24c2d05780be93e7306201012e41459f289b8279a27a79431ad4150e')
version('0.79.0', sha256='f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8') version('0.79.0', sha256='f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8')
version('0.77.0', sha256='7267eb4cbccd64a58244b8211603c1c1b6bf32c7f6a4ced2642865346102f36b') version('0.77.0', sha256='7267eb4cbccd64a58244b8211603c1c1b6bf32c7f6a4ced2642865346102f36b')
version('0.72.0', sha256='c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51') version('0.72.0', sha256='c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51')
@ -48,7 +49,7 @@ class Poppler(CMakePackage):
depends_on('openjpeg', when='+openjpeg') depends_on('openjpeg', when='+openjpeg')
depends_on('qt@4.0:', when='+qt') depends_on('qt@4.0:', when='+qt')
depends_on('zlib', when='+zlib') depends_on('zlib', when='+zlib')
depends_on('cairo@1.10.0:', when='+glib') depends_on('cairo+ft@1.10.0:', when='+glib')
depends_on('iconv', when='+iconv') depends_on('iconv', when='+iconv')
depends_on('jpeg', when='+jpeg') depends_on('jpeg', when='+jpeg')
depends_on('libpng', when='+png') depends_on('libpng', when='+png')