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

Fix gtkplus build by hardcoding X11 support (#6971)

Browse Source 
* Fix gtkplus build by hardcoding X11 support

* Remove +X variant from gtkplus dependents
This commit is contained in:
Federico Ficarelli 2018-01-24 00:24:20 +01:00 committed by Gregory Lee
parent dceb66741c
commit 8bdf7e6baa
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/dia/package.py
View File

@ -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')

2
var/spack/repos/builtin/packages/emacs/package.py
View File

@ -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')

16
var/spack/repos/builtin/packages/gtkplus/package.py
View File

@ -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')

4
var/spack/repos/builtin/packages/icedtea/package.py
View File

@ -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')

2
var/spack/repos/builtin/packages/py-pygtk/package.py
View File

@ -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'))

2
var/spack/repos/builtin/packages/slurm/package.py
View File

@ -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')

2
var/spack/repos/builtin/packages/wx/package.py
View File

@ -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):