Add missing dependencies to poppler package (#8220)

2 files changed, 162 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/poppler-data/package.py b/var/spack/repos/builtin/packages/poppler-data/package.py
new file mode 100644
index 0000000000..76052bc530
--- /dev/null
+++ b/var/spack/repos/builtin/packages/poppler-data/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2018, 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/spack/spack
+# Please also see the NOTICE and LICENSE files 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 PopplerData(CMakePackage):
+    """This package consists of encoding files for use with poppler. The
+    encoding files are optional and poppler will automatically read them if
+    they are present.  When installed, the encoding files enables poppler to
+    correctly render CJK and Cyrrilic properly.  While poppler is licensed
+    under the GPL, these encoding files have different license, and thus
+    distributed separately."""
+
+    homepage = "https://poppler.freedesktop.org/"
+    url      = "https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz"
+
+    version('0.4.9', '35cc7beba00aa174631466f06732be40')
+
+    depends_on('cmake@2.6:', type='build')
diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py
index 8a8f9d3cf9..3feb832778 100644
--- a/var/spack/repos/builtin/packages/poppler/package.py
+++ b/var/spack/repos/builtin/packages/poppler/package.py
@@ -28,9 +28,127 @@ from spack import *
 class Poppler(CMakePackage):
     """Poppler is a PDF rendering library based on the xpdf-3.0 code base."""
 
-    homepage = "http://poppler.freedesktop.org"
-    url      = "https://poppler.freedesktop.org/poppler-0.64.0.tar.xz"
+    homepage = "https://poppler.freedesktop.org"
+    url      = "https://poppler.freedesktop.org/poppler-0.65.0.tar.xz"
+    list_url = "https://poppler.freedesktop.org/releases.html"
 
+    version('0.65.0', 'b9a0af02e43deb26265f130343e90d78')
     version('0.64.0', 'f7f687ebb60004f8ad61994575018044')
 
-    depends_on('openjpeg', type=('build', 'run'))
+    variant('cms',      default=False, description='Use color management system')
+    variant('glib',     default=False, description='Compile poppler glib wrapper')
+    variant('gobject',  default=False, description='Generate GObject introspection')
+    variant('libcurl',  default=False, description='Build libcurl based HTTP support')
+    variant('openjpeg', default=False, description='Use libopenjpeg for JPX streams')
+    variant('qt5',      default=False, description='Compile poppler qt5 wrapper')
+    variant('zlib',     default=False, description='Build with zlib')
+    variant('cairo',    default=False, description='Search for Cairo package')
+    variant('iconv',    default=False, description='Search for Iconv package')
+    variant('jpeg',     default=False, description='Search for JPEG package')
+    variant('png',      default=False, description='Search for PNG package')
+    variant('tiff',     default=False, description='Search for TIFF package')
+
+    depends_on('cmake@3.1.0:', type='build')
+    depends_on('pkgconfig', type='build')
+    depends_on('poppler-data', type=('build', 'run'))
+    depends_on('fontconfig')
+    depends_on('freetype')
+
+    depends_on('lcms', when='+cms')
+    depends_on('glib', when='+glib')
+    depends_on('gobject-introspection', when='+gobject')
+    depends_on('curl', when='+libcurl')
+    depends_on('openjpeg', when='+openjpeg')
+    depends_on('qt@5.0:5.999', when='+qt5')
+    depends_on('zlib', when='+zlib')
+    depends_on('cairo', when='+cairo')
+    depends_on('libiconv', when='+iconv')
+    depends_on('jpeg', when='+jpeg')
+    depends_on('libpng', when='+png')
+    depends_on('libtiff', when='+tiff')
+
+    # Only needed to run `make test`
+    resource(
+        name='test',
+        git='git://git.freedesktop.org/git/poppler/test',
+        placement='testdata'
+    )
+
+    def cmake_args(self):
+        spec = self.spec
+
+        args = [
+            '-DTESTDATADIR={0}'.format(
+                join_path(self.stage.source_path, 'testdata')),
+            # TODO: Add packages for these missing dependencies
+            '-DENABLE_SPLASH=OFF',
+            '-DWITH_NSS3=OFF',
+        ]
+
+        if '+cms' in spec:
+            args.append('-DENABLE_CMS=lcms2')
+        else:
+            args.append('-DENABLE_CMS=none')
+
+        if '+glib' in spec:
+            args.append('-DENABLE_GLIB=ON')
+        else:
+            args.append('-DENABLE_GLIB=OFF')
+
+        if '+gobject' in spec:
+            args.append('-DENABLE_GOBJECT_INTROSPECTION=ON')
+        else:
+            args.append('-DENABLE_GOBJECT_INTROSPECTION=OFF')
+
+        if '+libcurl' in spec:
+            args.append('-DENABLE_LIBCURL=ON')
+        else:
+            args.append('-DENABLE_LIBCURL=OFF')
+
+        if '+openjpeg' in spec:
+            args.append('-DENABLE_LIBOPENJPEG=openjpeg2')
+        else:
+            args.append('-DENABLE_LIBOPENJPEG=none')
+
+        if '+qt5' in spec:
+            args.append('-DENABLE_QT5=ON')
+        else:
+            args.append('-DENABLE_QT5=OFF')
+
+        if '+zlib' in spec:
+            args.append('-DENABLE_ZLIB=ON')
+        else:
+            args.append('-DENABLE_ZLIB=OFF')
+
+        if '+cairo' in spec:
+            args.append('-DWITH_Cairo=ON')
+        else:
+            args.append('-DWITH_Cairo=OFF')
+
+        if '+iconv' in spec:
+            args.append('-DWITH_Iconv=ON')
+        else:
+            args.append('-DWITH_Iconv=OFF')
+
+        if '+jpeg' in spec:
+            args.extend([
+                '-DENABLE_DCTDECODER=libjpeg',
+                '-DWITH_JPEG=ON'
+            ])
+        else:
+            args.extend([
+                '-DENABLE_DCTDECODER=none',
+                '-DWITH_JPEG=OFF'
+            ])
+
+        if '+png' in spec:
+            args.append('-DWITH_PNG=ON')
+        else:
+            args.append('-DWITH_PNG=OFF')
+
+        if '+tiff' in spec:
+            args.append('-DWITH_TIFF=ON')
+        else:
+            args.append('-DWITH_TIFF=OFF')
+
+        return args