diff --git a/AT_SPI2_ATK_2_38_0.tar.gz b/AT_SPI2_ATK_2_38_0.tar.gz deleted file mode 100644 index b785a653757fb20cbb985251f21916a43826ecf1..0000000000000000000000000000000000000000 Binary files a/AT_SPI2_ATK_2_38_0.tar.gz and /dev/null differ diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..0b850444338edf4a529c847a4b4887ddc7cf3832 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +Merged into at-spi2-core since Jan 2024. +- https://gitee.com/src-openeuler/at-spi2-core/pulls/28 +- https://gitee.com/openeuler/release-management/pulls/1875 diff --git a/at-spi2-atk.spec b/at-spi2-atk.spec deleted file mode 100644 index 7fc7377622c919556cc02e18888837691bb902c1..0000000000000000000000000000000000000000 --- a/at-spi2-atk.spec +++ /dev/null @@ -1,85 +0,0 @@ -Name: at-spi2-atk -Version: 2.38.0 -Release: 4 -Summary: GTK+ module for the Assistive Technology Service - -License: LGPLv2+ -URL: https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ -Source0: https://github.com/GNOME/at-spi2-atk/archive/AT_SPI2_ATK_2_38_0.tar.gz - -Patch6000: backport-fix-test-memory-leak.patch -Patch6001: backport-also-fix-ref-leak-in-try_get_root.patch - -BuildRequires: gtk2-devel dbus-devel dbus-glib-devel gcc -BuildRequires: libxml2-devel gettext glib2-devel meson -BuildRequires: atk-devel >= 2.29.2 dbus-x11 -BuildRequires: at-spi2-core-devel >= 2.33.2 -BuildRequires: gsettings-desktop-schemas - -Requires: atk >= 2.33.3 -Requires: at-spi2-core >= 2.33.2 - -%description -At-Spi2 is a protocol over DBus, toolkit widgets use it to provide -their content to screen readers such as Orca. - -The server side, implemented in atk and at-spi2-atk, is basically -the server implementation for all the RPC calls that one would make -with the client-side library. - -%package devel -Summary: The header files for %{name} -Requires: %{name} = %{version}-%{release} - -%description devel -%{name}-devel package bridges ATK to D-Bus at-spi - -%package_help - -%prep -%autosetup -n at-spi2-atk-AT_SPI2_ATK_2_38_0 -p1 - -%build -%meson -%meson_build - -%install -%meson_install - -%check -dbus-launch ninja -C %{_host} test - -%files -%doc AUTHORS -%license COPYING -%dir %{_libdir}/gtk-2.0 -%{_libdir}/libatk-bridge-2.0.so.* -%{_libdir}/gnome-settings-daemon-3.0/* -%{_libdir}/gtk-2.0/modules/libatk-bridge.so - -%files devel -%{_libdir}/pkgconfig/atk-bridge-2.0.pc -%{_libdir}/libatk-bridge-2.0.so -%{_includedir}/at-spi2-atk/2.0/atk-bridge.h - -%files help -%doc README - -%changelog -* Tue Apr 23 2024 lingsheng - 2.38.0-4 -- add gsettings-desktop-schemas to fix check fail - -* Fri Sep 15 2023 zhouwenpei - 2.38.0-3 -- enable make check - -* Sat Oct 22 2022 wangkerong - 2.38.0-2 -- fix memory leak in test - -* Tue Jan 28 2020 yanglu - 2.38.0-1 -- Version update - -* Mon Jul 20 2020 wangye - 2.34.2-1 -- Version update - -* Tue Sep 10 2019 openEuler Buildteam - 2.30.0-2 -- Package Init diff --git a/at-spi2-atk.yaml b/at-spi2-atk.yaml deleted file mode 100644 index dcc935c6e46b21e76e84b0801b8585be1586f077..0000000000000000000000000000000000000000 --- a/at-spi2-atk.yaml +++ /dev/null @@ -1,5 +0,0 @@ -git_url: https://gitlab.gnome.org/GNOME/at-spi2-atk.git -version_control: gitlab.gnome -src_repo: at-spi2-atk -tag_prefix: "AT_SPI2_ATK_" -seperator: "_" diff --git a/backport-also-fix-ref-leak-in-try_get_root.patch b/backport-also-fix-ref-leak-in-try_get_root.patch deleted file mode 100644 index 08ba406edcf83f349f5e9d74f4cf8850626f84e9..0000000000000000000000000000000000000000 --- a/backport-also-fix-ref-leak-in-try_get_root.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 65b22d16e5b81544672c8acf01f0a0388e1192a5 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Wed, 16 Dec 2020 08:52:30 -0600 -Subject: [PATCH] tests: also fix ref leak in try_get_root() - ---- - tests/atk_test_util.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/atk_test_util.c b/tests/atk_test_util.c -index 23735230..366725c4 100644 ---- a/tests/atk_test_util.c -+++ b/tests/atk_test_util.c -@@ -62,13 +62,16 @@ static AtspiAccessible *try_get_root_obj (AtspiAccessible *obj) - - for (i = 0; i < child_count; i++) { - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, i, NULL); -- if (child && name = atspi_accessible_get_name (child, NULL)) { -+ if (!child) -+ continue; -+ if ((name = atspi_accessible_get_name (child, NULL)) != NULL) { - if (!strcmp (name, "root_object")) { - g_free(name); - return child; - } - g_free(name); - } -+ g_object_unref (child); - } - - return NULL; --- -GitLab diff --git a/backport-fix-test-memory-leak.patch b/backport-fix-test-memory-leak.patch deleted file mode 100644 index 04a0eb8df754159bb7a18505a370948aef51aeb7..0000000000000000000000000000000000000000 --- a/backport-fix-test-memory-leak.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 87c898bcbde8452a349b0d472b850a0d7277c446 Mon Sep 17 00:00:00 2001 -From: Shinwoo Kim -Date: Tue, 15 Dec 2020 11:50:49 +0900 -Subject: [PATCH] tests: fix memory leak - -The return value of atspi_accessible_get_name should be released after using it. ---- - tests/atk_test_util.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/tests/atk_test_util.c b/tests/atk_test_util.c -index 3e3c08a2..23735230 100644 ---- a/tests/atk_test_util.c -+++ b/tests/atk_test_util.c -@@ -52,6 +52,7 @@ run_app (const char *file_name) - - static AtspiAccessible *try_get_root_obj (AtspiAccessible *obj) - { -+ gchar *name; - int i; - - gint child_count = atspi_accessible_get_child_count (obj, NULL); -@@ -59,10 +60,15 @@ static AtspiAccessible *try_get_root_obj (AtspiAccessible *obj) - return NULL; - } - -- for (i=0; i