From 8bdf7e6baab4ce682d0e779bf3c1b18b0f10425f Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Wed, 24 Jan 2018 00:24:20 +0100 Subject: Fix gtkplus build by hardcoding X11 support (#6971) * Fix gtkplus build by hardcoding X11 support * Remove +X variant from gtkplus dependents --- var/spack/repos/builtin/packages/dia/package.py | 2 +- var/spack/repos/builtin/packages/emacs/package.py | 2 +- var/spack/repos/builtin/packages/gtkplus/package.py | 16 +++++++--------- var/spack/repos/builtin/packages/icedtea/package.py | 4 ++-- var/spack/repos/builtin/packages/py-pygtk/package.py | 2 +- var/spack/repos/builtin/packages/slurm/package.py | 2 +- var/spack/repos/builtin/packages/wx/package.py | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 59abc88b15..03a1ca9df2 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -33,7 +33,7 @@ class Dia(Package): version('0.97.3', '0e744a0f6a6c4cb6a089e4d955392c3c') depends_on('intltool', type='build') - depends_on('gtkplus@2.6.0:+X') + depends_on('gtkplus@2.6.0:') depends_on('libxslt') depends_on('python') depends_on('swig') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index e654e9c9c7..73f557f96d 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -57,7 +57,7 @@ class Emacs(AutotoolsPackage): depends_on('giflib', when='+X') depends_on('libx11', when='+X') depends_on('libxaw', when='+X toolkit=athena') - depends_on('gtkplus+X', when='+X toolkit=gtk') + depends_on('gtkplus', when='+X toolkit=gtk') depends_on('gnutls', when='+tls') depends_on('libxpm ^gettext+libunistring', when='+tls') depends_on('ncurses+termlib', when='+tls') diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index cd9b420517..fa001a4a33 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -35,18 +35,16 @@ class Gtkplus(AutotoolsPackage): version('2.24.31', '68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658') version('2.24.25', '38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3') - variant('X', default=False, description="Enable an X toolkit") - depends_on('pkgconfig', type='build') - depends_on("atk") - depends_on("gdk-pixbuf") - depends_on("glib") - depends_on("pango") - depends_on("pango~X", when='~X') - depends_on("pango+X", when='+X') - depends_on('gobject-introspection', when='+X') + depends_on('atk') + depends_on('gdk-pixbuf') + depends_on('glib') depends_on('shared-mime-info') + # Hardcode X11 support (former +X variant), + # see #6940 for rationale: + depends_on('pango+X') + depends_on('gobject-introspection') patch('no-demos.patch') diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index c8c992d0f5..39a3084d00 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -58,7 +58,7 @@ class Icedtea(AutotoolsPackage): depends_on('libxcomposite', when='~X', type='build') depends_on('libxau', when='~X', type='build') depends_on('libxdmcp', when='~X', type='build') - depends_on('gtkplus+X', when='~X', type='build') + depends_on('gtkplus', when='~X', type='build') depends_on('libx11', when='+X') depends_on('xproto', when='+X') @@ -71,7 +71,7 @@ class Icedtea(AutotoolsPackage): depends_on('libxcomposite', when='+X') depends_on('libxau', when='+X') depends_on('libxdmcp', when='+X') - depends_on('gtkplus+X', when='+X') + depends_on('gtkplus', when='+X') depends_on('freetype@2:') depends_on('wget', type='build') diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index 5a05a3a402..7edda3dec0 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -38,7 +38,7 @@ class PyPygtk(AutotoolsPackage): depends_on('cairo') depends_on('glib') # for GTK 3.X use pygobject 3.X instead of pygtk - depends_on('gtkplus+X@2.24:2.99') + depends_on('gtkplus@2.24:2.99') depends_on('py-pygobject@2.28:2.99', type=('build', 'run')) depends_on('py-py2cairo', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index a6f5fc59b5..06f30730e9 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -68,7 +68,7 @@ class Slurm(AutotoolsPackage): depends_on('readline', when='+readline') depends_on('zlib') - depends_on('gtkplus+X', when='+gtk') + depends_on('gtkplus', when='+gtk') depends_on('hdf5', when='+hdf5') depends_on('hwloc', when='+hwloc') depends_on('mariadb', when='+mariadb') diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index 4aa1e2f16a..2799dd2e21 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -47,7 +47,7 @@ class Wx(AutotoolsPackage): patch('math_include.patch', when='@3.0.1:3.0.2') depends_on('pkgconfig', type='build') - depends_on('gtkplus+X') + depends_on('gtkplus') @when('@:3.0.2') def build(self, spec, prefix): -- cgit v1.2.3-70-g09d2