diff options
| author | snehring <7978778+snehring@users.noreply.github.com> | 2024-10-19 10:17:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 17:17:31 +0200 |
| commit | bc75f23927b69fa35c1873b9591f265b35b7af72 (patch) | |
| tree | 9facbc6991ef92779e866f048fdc5a98a8a5ecee /var | |
| parent | b0f1a0eb7ca27a5432c69fe8bf2171a590318eb7 (diff) | |
| download | spack-bc75f23927b69fa35c1873b9591f265b35b7af72.tar.gz spack-bc75f23927b69fa35c1873b9591f265b35b7af72.tar.bz2 spack-bc75f23927b69fa35c1873b9591f265b35b7af72.tar.xz spack-bc75f23927b69fa35c1873b9591f265b35b7af72.zip | |
gtkplus: swap to at-spi2-core (#47026)
Signed-off-by: Shane Nehring <snehring@iastate.edu>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/at-spi2-atk/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gtkplus/package.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/at-spi2-atk/package.py b/var/spack/repos/builtin/packages/at-spi2-atk/package.py index 85233ec111..584d008a5d 100644 --- a/var/spack/repos/builtin/packages/at-spi2-atk/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-atk/package.py @@ -25,7 +25,7 @@ class AtSpi2Atk(MesonPackage): depends_on("c", type="build") # generated depends_on("pkgconfig", type="build") - depends_on("at-spi2-core@2.28.0:") + depends_on("at-spi2-core@2.28.0:2.45.1") depends_on("atk@2.28.1:") def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 0db55334b0..889a789cff 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -61,8 +61,10 @@ class Gtkplus(AutotoolsPackage, MesonPackage): depends_on("glib@2.57.2:") depends_on("pango@1.41.0:+X") depends_on("fribidi@0.19.7:") - depends_on("atk@2.35.1:") - depends_on("at-spi2-atk@2.15.1:", when="@3:") + # atk was also merged into at-spi2-core, but gtk3 doesn't want to build without it + depends_on("atk@2.35.1:", when="@:3") + # at-spi2-atk was merged into at-spi2-core, but gtk3 is picky + depends_on("at-spi2-core@2.46:2.48", when="@:3") depends_on("cairo@1.14.0:+X+pdf+gobject") depends_on("gdk-pixbuf@2.30.0:") depends_on("gobject-introspection@1.39.0:") |