From bc75f23927b69fa35c1873b9591f265b35b7af72 Mon Sep 17 00:00:00 2001 From: snehring <7978778+snehring@users.noreply.github.com> Date: Sat, 19 Oct 2024 10:17:31 -0500 Subject: gtkplus: swap to at-spi2-core (#47026) Signed-off-by: Shane Nehring --- var/spack/repos/builtin/packages/at-spi2-atk/package.py | 2 +- 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:") -- cgit v1.2.3-70-g09d2