commit: ede63e4dc96ec24cd9285ea2470024f4a2740f3d
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 07:39:46 2025 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri May 30 07:41:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede63e4d
app-accessibility/accerciser: add 3.46.2
Also include multiple ipython9 compatibility upstream fixes.
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
app-accessibility/accerciser/Manifest | 1 +
.../accerciser/accerciser-3.46.2.ebuild | 57 ++++++++++++++++++++++
...erciser-3.46.2-ipython9-KeyboardInterrupt.patch | 26 ++++++++++
.../accerciser-3.46.2-ipython9-ansi-color.patch | 29 +++++++++++
...ccerciser-3.46.2-ipython9-pre_prompt_hook.patch | 29 +++++++++++
5 files changed, 142 insertions(+)
diff --git a/app-accessibility/accerciser/Manifest
b/app-accessibility/accerciser/Manifest
index 4fd17f68a62e..468051c4fba6 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1 +1,2 @@
DIST accerciser-3.44.1.tar.xz 1784476 BLAKE2B
e4bb24cf13b54ee15f400db78b55bc091edfa7c75b7bd0fb775c32c8c0a77fb0d50962c99d777f45a131fb904c1cc8e667739b41fb51aef52cbebce746c9622b
SHA512
5b1db506260a459c01e6245de76b18c90ed4dd7a325c63a692cb9f31daf125986b50555e2577ccbcaa85f21d5bfce4c275adcd0710c4f1ff697c356ba9198684
+DIST accerciser-3.46.2.tar.xz 1788944 BLAKE2B
c9a549b1870d7695bac0583bdc89e74058fe67808bb76310e87964cde6274f91d0979ccf4c46898d7475b91fe89f01a80cb7a5e9c51f559c32733c5ee102c2f5
SHA512
d57d62df6c6329a1e50fa03208988f2696e8b7066a541fbc0fd92985158b08c354459992666d44488b54609b568ed0fe553fa8a7619fbc896c492cd3b7bc2792
diff --git a/app-accessibility/accerciser/accerciser-3.46.2.ebuild
b/app-accessibility/accerciser/accerciser-3.46.2.ebuild
new file mode 100644
index 000000000000..ab23ae11d4b2
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.46.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/accerciser";
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ >=app-accessibility/at-spi2-core-2.5.2:2
+ >=x11-libs/gtk+-3.24.0:3[introspection]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+ >=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+ >=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/python-xlib[${PYTHON_USEDEP}]
+ ')
+
+ dev-libs/atk[introspection]
+ >=dev-libs/glib-2.28:2
+ dev-libs/gobject-introspection:=
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/libwnck:3[introspection]
+ x11-libs/pango[introspection]
+ gnome-base/librsvg[introspection]
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-ipython9-pre_prompt_hook.patch"
+ "${FILESDIR}/${P}-ipython9-KeyboardInterrupt.patch"
+ "${FILESDIR}/${P}-ipython9-ansi-color.patch"
+)
+
+src_install() {
+ meson_src_install
+ gnome2_src_install
+ python_fix_shebang "${ED}"
+ python_optimize
+}
diff --git
a/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-KeyboardInterrupt.patch
b/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-KeyboardInterrupt.patch
new file mode 100644
index 000000000000..27ae26b47ea7
--- /dev/null
+++
b/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-KeyboardInterrupt.patch
@@ -0,0 +1,26 @@
+From eebe0199de8120c3383730a398a544d5d2839f7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
+Date: Tue, 25 Mar 2025 23:53:49 +0000
+Subject: [PATCH] ipython: Fix writing to output
+
+This fixes an exception when KeyboardInterrupt happens.
+---
+ plugins/ipython_view.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/ipython_view.py b/plugins/ipython_view.py
+index 3160b2c..acd676e 100755
+--- a/plugins/ipython_view.py
++++ b/plugins/ipython_view.py
+@@ -190,7 +190,7 @@ class IterableIPShell:
+ try:
+ line = self.IP.raw_input(self.prompt)
+ except KeyboardInterrupt:
+- self.IP.write('\nKeyboardInterrupt\n')
++ self.write('\nKeyboardInterrupt\n')
+ if self.no_input_splitter:
+ self.lines = []
+ else:
+--
+GitLab
+
diff --git
a/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-ansi-color.patch
b/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-ansi-color.patch
new file mode 100644
index 000000000000..0a90f9f13ae4
--- /dev/null
+++
b/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-ansi-color.patch
@@ -0,0 +1,29 @@
+From 55462e60b520746e4265c9165164cbb467ec3162 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <[email protected]>
+Date: Tue, 25 Mar 2025 21:23:41 +0100
+Subject: [PATCH] ipython: Defaut to black on white on unknown ansi color
+
+This avoids breaking whenever a newer IPython starts using a new
+combination.
+
+Fixes #65
+---
+ plugins/ipython_view.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/ipython_view.py b/plugins/ipython_view.py
+index 91be14e..3160b2c 100755
+--- a/plugins/ipython_view.py
++++ b/plugins/ipython_view.py
+@@ -481,6 +481,8 @@ class ConsoleView(gtk.TextView):
+ ansi_tags = self.color_pat.findall(text)
+ for tag in ansi_tags:
+ i = segments.index(tag)
++ if tag not in self.ANSI_COLORS:
++ tag = '0;30'
+
self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(),
+ segments[i+1], tag)
+ segments.pop(i)
+--
+GitLab
+
diff --git
a/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-pre_prompt_hook.patch
b/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-pre_prompt_hook.patch
new file mode 100644
index 000000000000..4e92cba84432
--- /dev/null
+++
b/app-accessibility/accerciser/files/accerciser-3.46.2-ipython9-pre_prompt_hook.patch
@@ -0,0 +1,29 @@
+From ea5b2dfedcbf79ba1492f7cd0bd3c0a53ebec733 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <[email protected]>
+Date: Tue, 25 Mar 2025 17:04:16 +0100
+Subject: [PATCH] Fix compatibility with ipython 9
+
+They dropped the pre_prompt_hook
+
+Fixes #65
+---
+ plugins/ipython_view.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/ipython_view.py b/plugins/ipython_view.py
+index 016c6b7..91be14e 100755
+--- a/plugins/ipython_view.py
++++ b/plugins/ipython_view.py
+@@ -177,7 +177,8 @@ class IterableIPShell:
+
+ self.prompt = self.generatePrompt(self.iter_more)
+
+- self.IP.hooks.pre_prompt_hook()
++ if IPython.version_info < (9,):
++ self.IP.hooks.pre_prompt_hook()
+ if self.iter_more:
+ try:
+ self.prompt = self.generatePrompt(True)
+--
+GitLab
+
