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

gdk-pixbuf: Fix 2.42.2 and add 2.42.6 (#27254)

Browse Source 
Starting with meson 0.60, unknown args produce errors and
the -Dx11 arg is only present in @:2.40
https://gitlab.gnome.org/GNOME/gtk-osx/-/issues/44

Add tiff variant: Default disabled since fails the tests in part.
Only libtiff@:3.9 pass, but these old versions have severe security issues.

Deprecate @:2.41 as they are affected by the high-severity CVE-2021-20240:
https://nvd.nist.gov/vuln/detail/CVE-2021-20240
This commit is contained in:
Joseph Wang 2021-11-28 08:30:14 +08:00 committed by GitHub
parent d5b243de14
commit 0ab5828d0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/gdk-pixbuf/package.py
View File

@ -18,13 +18,16 @@ class GdkPixbuf(Package):
list_url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/" list_url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/"
list_depth = 1 list_depth = 1
version('2.42.6', sha256='c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f')
version('2.42.2', sha256='83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15') version('2.42.2', sha256='83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15')
version('2.40.0', sha256='1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6') # https://nvd.nist.gov/vuln/detail/CVE-2021-20240
version('2.38.2', sha256='73fa651ec0d89d73dd3070b129ce2203a66171dfc0bd2caa3570a9c93d2d0781') version('2.40.0', sha256='1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6', deprecated=True)
version('2.38.0', sha256='dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47') version('2.38.2', sha256='73fa651ec0d89d73dd3070b129ce2203a66171dfc0bd2caa3570a9c93d2d0781', deprecated=True)
version('2.38.0', sha256='dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47', deprecated=True)
version('2.31.2', sha256='9e467ed09894c802499fb2399cd9a89ed21c81700ce8f27f970a833efb1e47aa', deprecated=True) version('2.31.2', sha256='9e467ed09894c802499fb2399cd9a89ed21c81700ce8f27f970a833efb1e47aa', deprecated=True)
variant('x11', default=False, description="Enable X11 support") variant('x11', default=False, description="Enable X11 support")
variant('tiff', default=False, description="Enable TIFF support(partially broken)")
# Man page creation was getting docbook errors, see issue #18853 # Man page creation was getting docbook errors, see issue #18853
variant('man', default=False, description="Enable man page creation") variant('man', default=False, description="Enable man page creation")
@ -43,7 +46,7 @@ class GdkPixbuf(Package):
depends_on('jpeg') depends_on('jpeg')
depends_on('libpng') depends_on('libpng')
depends_on('zlib') depends_on('zlib')
depends_on('libtiff') depends_on('libtiff', when='+tiff')
depends_on('gobject-introspection') depends_on('gobject-introspection')
depends_on('libx11', when='+x11') depends_on('libx11', when='+x11')
@ -73,11 +76,13 @@ def setup_dependent_run_environment(self, env, dependent_spec):
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
meson_args = std_meson_args meson_args = std_meson_args + ['-Dman={0}'.format('+man' in spec)]
meson_args += [ # Based on suggestion by luigi-calori and the fixup shown by lee218llnl:
'-Dx11={0}'.format('+x11' in spec), # https://github.com/spack/spack/pull/27254#issuecomment-974464174
'-Dman={0}'.format('+man' in spec), if '+x11' in spec:
] if self.version >= Version('2.42'):
raise InstallError('+x11 is not valid for {0}'.format(self.version))
meson_args += ['-Dx11=true']
meson('..', *meson_args) meson('..', *meson_args)
ninja('-v') ninja('-v')
if self.run_tests: if self.run_tests: