[gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/files/, app-accessibility/at-spi2-core/

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/files/, app-accessibility/at-spi2-core/

[Mart Raudsepp]

commit:     eda35dffdf535b4013ade7f587a95cfcddbe2efe
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 15:20:55 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 15:55:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda35dff

app-accessibility/at-spi2-core: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-accessibility/at-spi2-core/Manifest            |  1 -
 .../at-spi2-core/at-spi2-core-2.26.2.ebuild        | 55 ----------------------
 .../files/2.26.2-fix-inverted-logic.patch          | 28 -----------
 3 files changed, 84 deletions(-)

diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index a2132eaf7ae..a454af54eed 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1,2 @@
-DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
 DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca
 DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8

diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
deleted file mode 100644
index a6c098a39df..00000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-	"${FILESDIR}/${PV}-fix-inverted-logic.patch"
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }

diff --git a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch b/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
deleted file mode 100644
index 7aa10f8bfc2..00000000000
--- a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001
-From: Maya Rashish <maya@NetBSD.org>
-Date: Sat, 2 Dec 2017 13:24:29 +0200
-Subject: [PATCH] Fix inverted logic.
-
-Don't write more into a buffer than it can hold.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791124
----
- bus/at-spi-bus-launcher.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
-index 261353f..eb2b8e3 100644
---- a/bus/at-spi-bus-launcher.c
-+++ b/bus/at-spi-bus-launcher.c
-@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int      fd,
- {
-   ssize_t bytes_read;
- 
--  while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
-+  while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1))))
-     {
-       if (bytes_read < 0)
-         return FALSE;
--- 
-2.18.0
-

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/files/, app-accessibility/at-spi2-core/

[Sam James]

commit:     2ebe3d962d7f083ec7726f5d239d153f272bbdf9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 21:13:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 21:16:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebe3d96

app-accessibility/at-spi2-core: fix build with USE=-X

Closes: https://bugs.gentoo.org/829591
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../at-spi2-core/at-spi2-core-2.42.0.ebuild        |  2 ++
 .../at-spi2-core-2.42.0-fix-disabling-x11.patch    | 36 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
index 015d93ad1499..bc190c2de667 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
@@ -38,6 +38,8 @@ BDEPEND="
 PATCHES=(
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	"${FILESDIR}/${PN}-2.42.0-fix-disabling-x11.patch"
 )
 
 multilib_src_configure() {

diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch
new file mode 100644
index 000000000000..3bf32724e691
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/829591
+https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/2175d89198440d948075f3268aec5f45430afb3d
+
+From 2175d89198440d948075f3268aec5f45430afb3d Mon Sep 17 00:00:00 2001
+From: Tim Orling <ticotimo@gmail.com>
+Date: Fri, 15 Oct 2021 12:44:39 -0700
+Subject: [PATCH] Ensure x11_dep is defined
+
+bus/meson.build checks if x11_dep.found(), but this fails when
+-Dx11=no
+
+References:
+  https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42
+  https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency
+
+Signed-off-by: Tim Orling <ticotimo@gmail.com>
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index b5104c8c..cfd2e091 100644
+--- a/meson.build
++++ b/meson.build
+@@ -62,6 +62,8 @@ endif
+ 
+ x11_deps = []
+ x11_option = get_option('x11')
++# ensure x11_dep is defined for use elsewhere, such as bus/meson.build
++x11_dep = dependency('', required: false)
+ if x11_option != 'no'
+   x11_dep = dependency('x11', required: false)
+ 
+-- 
+GitLab
+