From bcd65906c953ec344f550b2a75ad549cd1563b58 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 17 Dec 2018 13:04:40 -0600 Subject: Add latest version of gdk-pixbuf (#10126) --- .../repos/builtin/packages/gdk-pixbuf/package.py | 49 +++++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 044bdabe40..dca7afa611 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -6,26 +6,37 @@ from spack import * -class GdkPixbuf(AutotoolsPackage): +class GdkPixbuf(Package): """The Gdk Pixbuf is a toolkit for image loading and pixel buffer manipulation. It is used by GTK+ 2 and GTK+ 3 to load and manipulate images. In the past it was distributed as part of GTK+ 2 but it was split off into a separate package in preparation for the change to GTK+ 3.""" + homepage = "https://developer.gnome.org/gdk-pixbuf/" - url = "http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.2.tar.xz" - list_url = "http://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/" - list_depth = 2 + url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/2.38/gdk-pixbuf-2.38.0.tar.xz" + list_url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/" + list_depth = 1 + version('2.38.0', sha256='dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47') version('2.31.2', '6be6bbc4f356d4b79ab4226860ab8523') - depends_on("pkgconfig", type="build") - depends_on("gettext") - depends_on("glib") - depends_on("jpeg") - depends_on("libpng") - depends_on("libtiff") - depends_on("gobject-introspection") + depends_on('meson@0.46.0:', type='build', when='@2.37.92:') + depends_on('meson@0.45.0:', type='build', when='@2.37.0:') + depends_on('ninja', type='build', when='@2.37.0:') + depends_on('shared-mime-info', type='build', when='@2.36.8: platform=linux') + depends_on('shared-mime-info', type='build', when='@2.36.8: platform=cray') + depends_on('pkgconfig', type='build') + depends_on('gettext') + depends_on('glib') + depends_on('jpeg') + depends_on('libpng') + depends_on('libtiff') + depends_on('gobject-introspection') + + def url_for_version(self, version): + url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/{0}/gdk-pixbuf-{1}.tar.xz" + return url.format(version.up_to(2), version) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): spack_env.prepend_path("XDG_DATA_DIRS", @@ -33,6 +44,12 @@ class GdkPixbuf(AutotoolsPackage): run_env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + def install(self, spec, prefix): + with working_dir('spack-build', create=True): + meson('..', *std_meson_args) + ninja('-v') + ninja('install') + def configure_args(self): args = [] # disable building of gtk-doc files following #9771 @@ -43,3 +60,13 @@ class GdkPixbuf(AutotoolsPackage): args.append('GTKDOC_MKPDF={0}'.format(true)) args.append('GTKDOC_REBASE={0}'.format(true)) return args + + @when('@:2.36') + def install(self, spec, prefix): + configure('--prefix={0}'.format(prefix), *self.configure_args()) + make() + if self.run_tests: + make('check') + make('install') + if self.run_tests: + make('installcheck') -- cgit v1.2.3-60-g2f50