summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2023-06-17 16:23:59 +0200
committerMartin Väth <martin@mvath.de>2023-06-17 16:23:59 +0200
commitec88d50634203a127c2ef4698e5d537537c356a0 (patch)
tree62441e004a061edfb558886b093175aebe5252c2
parentsys-kernel/kconfig-hardened-check: Version bump. Bump python3 deps to 10..12 (diff)
downloadmv-ec88d50634203a127c2ef4698e5d537537c356a0.tar.gz
mv-ec88d50634203a127c2ef4698e5d537537c356a0.tar.bz2
mv-ec88d50634203a127c2ef4698e5d537537c356a0.zip
x11-libs/gtk+: An attempt to fix atk dependency
Signed-off-by: Martin Väth <martin@mvath.de>
-rw-r--r--x11-libs/gtk+/gtk+-2.24.33-r3.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.24.35.ebuild4
-rw-r--r--x11-libs/gtk+/gtk+-3.24.38.ebuild3
3 files changed, 5 insertions, 4 deletions
diff --git a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
index a57cab80..bc5a2a5d 100644
--- a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
RESTRICT="test"
COMMON_DEPEND="
- >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+ >=app-accessibility/at-spi2-core-2.46.0[introspection(+)?,${MULTILIB_USEDEP}]
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
virtual/libintl[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtk+/gtk+-3.24.35.ebuild b/x11-libs/gtk+/gtk+-3.24.35.ebuild
index b4a6a02d..dbf41cdd 100644
--- a/x11-libs/gtk+/gtk+-3.24.35.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2023 Gentoo Authors and Martin V\"ath
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,7 +27,7 @@ RESTRICT="test"
# FIXME: introspection data is built against system installation of gtk+:3,
# bug #????
COMMON_DEPEND="
- atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] )
+ atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection(+)?,${MULTILIB_USEDEP}] )
>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtk+/gtk+-3.24.38.ebuild b/x11-libs/gtk+/gtk+-3.24.38.ebuild
index 4698e44f..0afcff6e 100644
--- a/x11-libs/gtk+/gtk+-3.24.38.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.38.ebuild
@@ -22,7 +22,6 @@ RESTRICT="!test? ( test )"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
- atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] )
>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
@@ -59,6 +58,7 @@ COMMON_DEPEND="
)
"
DEPEND="${COMMON_DEPEND}
+ >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
test? (
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
@@ -66,6 +66,7 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-base/xorg-proto )
"
RDEPEND="${COMMON_DEPEND}
+ atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection(+)?,${MULTILIB_USEDEP}] )
>=dev-util/gtk-update-icon-cache-3
"
# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710