From 11fb0e17b0b923c999b060e4c3f4023f201f8c76 Mon Sep 17 00:00:00 2001 From: Andrew W Elble Date: Tue, 3 Nov 2020 13:29:59 -0500 Subject: [PATCH] py-pygobject: new version 3.38.0 (#19709) fix to allow Gtk and others work from 'import gi' etc. --- .../repos/builtin/packages/at-spi2-core/package.py | 12 ++++++++++++ var/spack/repos/builtin/packages/atk/package.py | 8 ++++++++ .../repos/builtin/packages/gdk-pixbuf/package.py | 8 ++++++++ .../packages/gobject-introspection/package.py | 8 ++++++++ var/spack/repos/builtin/packages/gtkplus/package.py | 8 ++++++++ var/spack/repos/builtin/packages/pango/package.py | 8 ++++++++ .../repos/builtin/packages/py-pygobject/package.py | 1 + 7 files changed, 53 insertions(+) diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py index e7480e26a23..fef0afe8484 100644 --- a/var/spack/repos/builtin/packages/at-spi2-core/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -37,6 +37,18 @@ def url_for_version(self, version): url = 'http://ftp.gnome.org/pub/gnome/sources/at-spi2-core' return url + '/%s/at-spi2-core-%s.tar.xz' % (version.up_to(2), version) + def setup_run_environment(self, env): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + + def setup_dependent_build_environment(self, env, dependent_spec): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + + def setup_dependent_run_environment(self, env, dependent_spec): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + def setup_build_environment(self, env): # this avoids an "import site" error in the build env.unset('PYTHONHOME') diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index a28b053f01a..94e4676315e 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -36,11 +36,19 @@ def url_for_version(self, version): url = 'http://ftp.gnome.org/pub/gnome/sources/atk' return url + '/%s/atk-%s.tar.xz' % (version.up_to(2), version) + def setup_run_environment(self, env): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def setup_dependent_run_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def install(self, spec, prefix): with working_dir('spack-build', create=True): diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 585bd2de815..51def3b6e9c 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -51,11 +51,19 @@ 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_run_environment(self, env): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def setup_dependent_run_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def install(self, spec, prefix): with working_dir('spack-build', create=True): diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index f31442f1f40..54bb3c08441 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -57,11 +57,19 @@ def url_for_version(self, version): url = 'http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/{0}/gobject-introspection-{1}.tar.xz' return url.format(version.up_to(2), version) + def setup_run_environment(self, env): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def setup_dependent_run_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def install(self, spec, prefix): configure("--prefix=%s" % prefix) diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 619879ea0ac..608bcec294e 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -48,11 +48,19 @@ def patch(self): filter_file(r'CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"', '', 'configure', string=True) + def setup_run_environment(self, env): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def setup_dependent_run_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index 7d7ef787cec..850c3f8bed3 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -64,8 +64,16 @@ def configure_args(self): def install(self, spec, prefix): make("install", parallel=False) + def setup_run_environment(self, env): + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) + def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path('XDG_DATA_DIRS', self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) def setup_dependent_run_environment(self, env, dependent_spec): env.prepend_path('XDG_DATA_DIRS', self.prefix.share) + env.prepend_path("GI_TYPELIB_PATH", + join_path(self.prefix.lib, 'girepository-1.0')) diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 66dcb743711..27b41f6c9cc 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -12,6 +12,7 @@ class PyPygobject(PythonPackage): homepage = "https://pypi.python.org/pypi/pygobject" + version('3.38.0', sha256='0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5') version('3.28.3', sha256='3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0') version('2.28.6', sha256='fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8') version('2.28.3', sha256='7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6',