New package: TexStudio (#12301)

* Poppler library: Add new versions

* Poppler library: Allow building with QT4

* Poppler library: Install header files

* Add patch to Poppler package

* Add new package: TexStudio

2 files changed, 44 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py
index 599c507105..b196fa6ef5 100644..100755
--- a/var/spack/repos/builtin/packages/poppler/package.py
+++ b/var/spack/repos/builtin/packages/poppler/package.py
@@ -12,11 +12,15 @@ class Poppler(CMakePackage):
     homepage = "https://poppler.freedesktop.org"
     url      = "https://poppler.freedesktop.org/poppler-0.77.0.tar.xz"
     list_url = "https://poppler.freedesktop.org/releases.html"
+    git      = "https://gitlab.freedesktop.org/poppler/poppler.git"
 
+    version('master', branch='master')
+    version('0.79.0', sha256='f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8')
     version('0.77.0', sha256='7267eb4cbccd64a58244b8211603c1c1b6bf32c7f6a4ced2642865346102f36b')
     version('0.72.0', sha256='c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51')
     version('0.65.0', 'b9a0af02e43deb26265f130343e90d78')
     version('0.64.0', 'f7f687ebb60004f8ad61994575018044')
+    version('0.61.1', sha256='1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9')
 
     variant('cms',      default=False, description='Use color management system')
     variant('cpp',      default=False, description='Compile poppler cpp wrapper')
@@ -24,7 +28,7 @@ class Poppler(CMakePackage):
     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('qt',       default=False, description='Compile poppler qt wrapper')
     variant('zlib',     default=False, description='Build with zlib')
     variant('iconv',    default=False, description='Search for Iconv package')
     variant('jpeg',     default=False, description='Search for JPEG package')
@@ -42,7 +46,7 @@ class Poppler(CMakePackage):
     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('qt@4.0:', when='+qt')
     depends_on('zlib', when='+zlib')
     depends_on('cairo@1.10.0:', when='+glib')
     depends_on('libiconv', when='+iconv')
@@ -50,6 +54,14 @@ class Poppler(CMakePackage):
     depends_on('libpng', when='+png')
     depends_on('libtiff', when='+tiff')
 
+    depends_on('qt@5.0:',      when='@0.62.0:+qt')
+    depends_on('qt@4.0:4.8.6', when='@:0.61.999+qt')
+
+    # Splash is unconditionally disabled. Unfortunately there's
+    # a small section of code in the QT5 wrappers that expects it
+    # to be present.
+    patch('poppler_page_splash.patch', when='@0.64.0: ^qt@5.0:')
+
     # Only needed to run `make test`
     resource(
         name='test',
@@ -68,6 +80,9 @@ class Poppler(CMakePackage):
             '-DWITH_NSS3=OFF',
         ]
 
+        # Install header files
+        args.append('-DENABLE_UNSTABLE_API_ABI_HEADERS=ON')
+
         if '+cms' in spec:
             args.append('-DENABLE_CMS=lcms2')
         else:
@@ -106,9 +121,14 @@ class Poppler(CMakePackage):
         else:
             args.append('-DENABLE_LIBOPENJPEG=none')
 
-        if '+qt5' in spec:
+        if '+qt' in spec and spec.satisfies('^qt@4.0:4.8.6'):
+            args.append('-DENABLE_QT4=ON')
+            args.append('-DENABLE_QT5=OFF')
+        elif '+qt' in spec and spec.satisfies('^qt@5.0:'):
             args.append('-DENABLE_QT5=ON')
+            args.append('-DENABLE_QT4=OFF')
         else:
+            args.append('-DENABLE_QT4=OFF')
             args.append('-DENABLE_QT5=OFF')
 
         if '+zlib' in spec:
diff --git a/var/spack/repos/builtin/packages/poppler/poppler_page_splash.patch b/var/spack/repos/builtin/packages/poppler/poppler_page_splash.patch
new file mode 100755
index 0000000000..21572d784c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/poppler/poppler_page_splash.patch
@@ -0,0 +1,21 @@
+diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
+index c4d00a6..e72c26b 100644
+--- a/qt5/src/poppler-page.cc
++++ b/qt5/src/poppler-page.cc
+@@ -103,6 +103,8 @@ public:
+   QVariant payload;
+ };
+ 
++#if defined(HAVE_SPLASH)
++
+ class Qt5SplashOutputDev : public SplashOutputDev, public OutputDevCallbackHelper
+ {
+ public:
+@@ -170,6 +172,7 @@ private:
+   bool ignorePaperColor;
+ };
+ 
++#endif
+ 
+ class QImageDumpingArthurOutputDev : public ArthurOutputDev, public OutputDevCallbackHelper
+ {