summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Salmond <js947@users.noreply.github.com>2016-09-02 18:41:35 +0100
committerTodd Gamblin <tgamblin@llnl.gov>2016-09-02 10:41:35 -0700
commit5146c64dfc5096ce4320270354acb62135fc63e7 (patch)
treeff15a094f05ed535b0012cb5f4156d990183f267
parentc7bb523c8f2b01774315cebcb4f552d830ef021c (diff)
downloadspack-5146c64dfc5096ce4320270354acb62135fc63e7.tar.gz
spack-5146c64dfc5096ce4320270354acb62135fc63e7.tar.bz2
spack-5146c64dfc5096ce4320270354acb62135fc63e7.tar.xz
spack-5146c64dfc5096ce4320270354acb62135fc63e7.zip
Fixes for the ImageMagick package. (#1709)
* add pango dependency * add new package ghostscript-fonts & add to ImageMagick as dependency also tell ImageMagick's configure where the font dir is! * refactor to fix flake8 * add homepage to ghostscript-fonts * use install_tree * remove unneeded import
-rw-r--r--var/spack/repos/builtin/packages/ImageMagick/package.py7
-rw-r--r--var/spack/repos/builtin/packages/ghostscript-fonts/package.py37
2 files changed, 42 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/ImageMagick/package.py b/var/spack/repos/builtin/packages/ImageMagick/package.py
index 61d4cc0cb4..0b474285ce 100644
--- a/var/spack/repos/builtin/packages/ImageMagick/package.py
+++ b/var/spack/repos/builtin/packages/ImageMagick/package.py
@@ -36,19 +36,22 @@ class Imagemagick(Package):
version('7.0.2-6', 'aa5689129c39a5146a3212bf5f26d478')
depends_on('jpeg')
+ depends_on('pango')
depends_on('libtool', type='build')
depends_on('libpng')
depends_on('freetype')
depends_on('fontconfig')
depends_on('libtiff')
depends_on('ghostscript')
+ depends_on('ghostscript-fonts')
def url_for_version(self, version):
return "https://github.com/ImageMagick/ImageMagick/archive/{0}.tar.gz".format(version)
def install(self, spec, prefix):
- configure('--prefix={0}'.format(prefix))
-
+ gs_font_dir = join_path(spec['ghostscript-fonts'].prefix.share, "font")
+ configure('--prefix={0}'.format(prefix),
+ '--with-gs-font-dir={0}'.format(gs_font_dir))
make()
make('check')
make('install')
diff --git a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py
new file mode 100644
index 0000000000..0f82ed5fb6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py
@@ -0,0 +1,37 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class GhostscriptFonts(Package):
+ """Ghostscript Fonts"""
+
+ homepage = "http://ghostscript.com/"
+ url = "ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ghostscript-fonts-std-8.11.tar.gz"
+
+ version('8.11', '6865682b095f8c4500c54b285ff05ef6')
+
+ def install(self, spec, prefix):
+ install_tree('.', join_path(prefix.share, 'font'))