From 6d4950c42a8a65414750311d808c7527a88b31f0 Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Wed, 15 Nov 2006 19:51:10 +0000 Subject: [PATCH] Added patch to fix tests (bug #140235) Package-Manager: portage-2.1.2_rc1-r6 --- gnome-extra/at-spi/ChangeLog | 6 +- gnome-extra/at-spi/Manifest | 30 +++---- gnome-extra/at-spi/at-spi-1.7.12.ebuild | 15 +++- .../at-spi/files/at-spi-1.7.12-tests.patch | 80 +++++++++++++++++++ 4 files changed, 110 insertions(+), 21 deletions(-) create mode 100644 gnome-extra/at-spi/files/at-spi-1.7.12-tests.patch diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog index 374cc2d65a22..ccb5e78b2bf1 100644 --- a/gnome-extra/at-spi/ChangeLog +++ b/gnome-extra/at-spi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/at-spi # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.131 2006/11/01 23:26:42 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.132 2006/11/15 19:51:10 leonardop Exp $ + + 15 Nov 2006; Leonardo Boshell + +files/at-spi-1.7.12-tests.patch, at-spi-1.7.12.ebuild: + Added patch to fix tests (bug #140235). *at-spi-1.7.12 (01 Nov 2006) diff --git a/gnome-extra/at-spi/Manifest b/gnome-extra/at-spi/Manifest index d30b54fd0e22..dbde00a893b9 100644 --- a/gnome-extra/at-spi/Manifest +++ b/gnome-extra/at-spi/Manifest @@ -1,6 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX at-spi-1.7.12-tests.patch 3269 RMD160 351e5af3c656ad19609541ec9393ed3394599de0 SHA1 83288df820420517eae25cc2c9854f0dac25cb81 SHA256 5f2f861395576a07ddac1fed5b975620a887f16bb6266407a9ac6f4870bceb38 +MD5 d138d17f12280bb64adee7bfe79ff374 files/at-spi-1.7.12-tests.patch 3269 +RMD160 351e5af3c656ad19609541ec9393ed3394599de0 files/at-spi-1.7.12-tests.patch 3269 +SHA256 5f2f861395576a07ddac1fed5b975620a887f16bb6266407a9ac6f4870bceb38 files/at-spi-1.7.12-tests.patch 3269 DIST at-spi-1.6.4.tar.bz2 499226 RMD160 549f568911173773cc05a2f989ad01330343ac50 SHA256 82fafc0aa71ae32888dbdd13768bce9ecab169d48fb76dcf647e79004235de91 DIST at-spi-1.7.10.tar.bz2 743088 RMD160 9ce1185767afd2d0dfdf9e26f4d316075016c5b0 SHA1 b6162e841474485492ea7dd1c1eb4959848ce197 SHA256 73654daba6ffcee7c0b5d528705a125d077b023756856f52065e44a5418d0178 DIST at-spi-1.7.11.tar.bz2 757361 RMD160 52b3db7994fb455208e39bb034b615975d1513bd SHA1 ae0db88c91541686ea760bedeb6bf7479da2bce4 SHA256 165c5b9eced74b47ccb6fa59a42460501d73b2d6e69e28cdce18d13acebf1856 @@ -17,14 +18,14 @@ EBUILD at-spi-1.7.11.ebuild 955 RMD160 32b9f8064e10c35a7ee7ae70073979371e65fe1e MD5 4a43ab0f06ca2b2a8f1ae4fb1df2c009 at-spi-1.7.11.ebuild 955 RMD160 32b9f8064e10c35a7ee7ae70073979371e65fe1e at-spi-1.7.11.ebuild 955 SHA256 15cfd2eaa0e92530f5a5177207a2dfc2bf809c467f4a509ea2dc6fe0c3662909 at-spi-1.7.11.ebuild 955 -EBUILD at-spi-1.7.12.ebuild 962 RMD160 a96081723a24fab6650370b2a18946dca21ef0f3 SHA1 5ca7f2ad5863fcbeeca55c14642f3fb6d36d603a SHA256 b4d224cdb31255dd5d9e5797a8b91920b847a19897f455511b9d0e50bd985be3 -MD5 39f6ddfca60d98f24aea44ea266d3f7b at-spi-1.7.12.ebuild 962 -RMD160 a96081723a24fab6650370b2a18946dca21ef0f3 at-spi-1.7.12.ebuild 962 -SHA256 b4d224cdb31255dd5d9e5797a8b91920b847a19897f455511b9d0e50bd985be3 at-spi-1.7.12.ebuild 962 -MISC ChangeLog 14708 RMD160 685bf12384237b07d10b321fbadbf7d53a2c44f1 SHA1 31757572cabc1b6e002288f09045884d7969846e SHA256 e4a310daf0d3090224131f8b79b78eae36bbbcea91e457b3b9e05bb22e33c45f -MD5 956cdfb5e0ecd9a49e3cc725b3d8e59e ChangeLog 14708 -RMD160 685bf12384237b07d10b321fbadbf7d53a2c44f1 ChangeLog 14708 -SHA256 e4a310daf0d3090224131f8b79b78eae36bbbcea91e457b3b9e05bb22e33c45f ChangeLog 14708 +EBUILD at-spi-1.7.12.ebuild 1133 RMD160 1adb757b38c3bca9958e9cf12a71e3ad5bbe91d8 SHA1 4798382ad8a0a9cc71991ea9c9fb3f6ffb68ce60 SHA256 b4e33035f1d48f2ae01ca4fb1d51f396e28db0415fe15bbfad47e29bf4d384e9 +MD5 6a58c1b97ded09bafe407a1eb377bc88 at-spi-1.7.12.ebuild 1133 +RMD160 1adb757b38c3bca9958e9cf12a71e3ad5bbe91d8 at-spi-1.7.12.ebuild 1133 +SHA256 b4e33035f1d48f2ae01ca4fb1d51f396e28db0415fe15bbfad47e29bf4d384e9 at-spi-1.7.12.ebuild 1133 +MISC ChangeLog 14864 RMD160 f999067921959f7f5a7814c26e6551e7f8de94e3 SHA1 d125ddc7422ebc683780c6cc017c73088f9b482c SHA256 8319e443c2beb26231bf26542765400ad2e4ee00ed5c799ed6ab537d5f8067cb +MD5 7b75c707463d2d11db899f5fe4dc807c ChangeLog 14864 +RMD160 f999067921959f7f5a7814c26e6551e7f8de94e3 ChangeLog 14864 +SHA256 8319e443c2beb26231bf26542765400ad2e4ee00ed5c799ed6ab537d5f8067cb ChangeLog 14864 MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228 MD5 5253659a4a0e45baa9f1788dcb705895 metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 metadata.xml 172 @@ -41,10 +42,3 @@ SHA256 524a5b921b7e58b03315a3ca0b2ab8f36e915741645082fa7ed8caebbfd06294 files/di MD5 c52a248cc7684897a32c603edeabf4e2 files/digest-at-spi-1.7.12 244 RMD160 b2a51a68d237af99c31ebb8fe726a2b2b93f0476 files/digest-at-spi-1.7.12 244 SHA256 bd09bf4cefbbc958aa1771edcbf524c420e68ea6ed82a775cd85faab2bc67648 files/digest-at-spi-1.7.12 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFVqRmamhnQswr0vIRAiwnAJwLwsHkevVEapH9SIAl7GCjKHX9zACglivA -VV/lNe8+XmYlA+yLUrERVqo= -=Xxq8 ------END PGP SIGNATURE----- diff --git a/gnome-extra/at-spi/at-spi-1.7.12.ebuild b/gnome-extra/at-spi/at-spi-1.7.12.ebuild index ffb4e5a50a10..98b045d87919 100644 --- a/gnome-extra/at-spi/at-spi-1.7.12.ebuild +++ b/gnome-extra/at-spi/at-spi-1.7.12.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.7.12.ebuild,v 1.1 2006/11/01 23:26:42 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.7.12.ebuild,v 1.2 2006/11/15 19:51:10 leonardop Exp $ -inherit virtualx gnome2 +WANT_AUTOMAKE="1.9" + +inherit virtualx autotools eutils gnome2 DESCRIPTION="The Gnome Accessibility Toolkit" HOMEPAGE="http://developer.gnome.org/projects/gap/" @@ -38,6 +40,15 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog NEWS README TODO" +src_unpack() { + gnome2_src_unpack + + epatch "${FILESDIR}"/${P}-tests.patch + + cp aclocal.m4 old_macros.m4 + AT_M4DIR="." eautoreconf +} + src_test() { Xmake check || die "Testing phase failed" } diff --git a/gnome-extra/at-spi/files/at-spi-1.7.12-tests.patch b/gnome-extra/at-spi/files/at-spi-1.7.12-tests.patch new file mode 100644 index 000000000000..4009b7333ef6 --- /dev/null +++ b/gnome-extra/at-spi/files/at-spi-1.7.12-tests.patch @@ -0,0 +1,80 @@ +diff -NurdB at-spi-1.7.12/atk-bridge/bridge.c at-spi-1.7.12-patched/atk-bridge/bridge.c +--- at-spi-1.7.12/atk-bridge/bridge.c 2006-09-20 08:21:57.000000000 -0500 ++++ at-spi-1.7.12-patched/atk-bridge/bridge.c 2006-11-15 05:32:49.000000000 -0500 +@@ -353,10 +353,23 @@ + + if (ev._major != CORBA_NO_EXCEPTION) + { ++ gchar *err_desc = NULL; ++ const CORBA_char *id = CORBA_exception_id (&ev); ++ ++ if (strcmp(id, "IDL:Bonobo/GeneralError:1.0") == 0) ++ { ++ Bonobo_GeneralError* ge = CORBA_exception_value (&ev); ++ err_desc = g_strdup_printf ("bonobo activation problem: %s", ++ ge->description); ++ } ++ + g_error ("Accessibility app error: exception during " +- "registry activation from id: %s\n", +- CORBA_exception_id (&ev)); ++ "registry activation from id: %s\n" ++ "Error description: %s\n", id, err_desc == NULL ? "-" : err_desc); ++ + CORBA_exception_free (&ev); ++ if (err_desc != NULL) ++ g_free (err_desc); + } + + if (registry_died && registry) { +diff -NurdB at-spi-1.7.12/test/Makefile.am at-spi-1.7.12-patched/test/Makefile.am +--- at-spi-1.7.12/test/Makefile.am 2006-08-17 11:44:33.000000000 -0500 ++++ at-spi-1.7.12-patched/test/Makefile.am 2006-11-15 14:21:13.000000000 -0500 +@@ -37,11 +37,18 @@ + $(TESTS_CFLAGS) \ + $(DEBUG_CFLAGS) + +-LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) ++LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la ../atk-bridge/libatk-bridge.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) + + TESTS = test-simple + + TESTS_ENVIRONMENT = \ +- LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/ \ +- PATH=$(top_builddir)/registryd/.libs ++ BONOBO_ACTIVATION_PATH=$(top_builddir)/test ++ ++BUILT_SOURCES = Accessibility_Registry.server ++ ++Accessibility_Registry.server: ++ rm -f Accessibility_Registry.server ++ sed -e "s,@REGISTRYD_PATH\@,`which libtool` --mode=execute `pwd`/../registryd,g" \ ++ $(top_builddir)/registryd/Accessibility_Registry.server.in.in > \ ++ Accessibility_Registry.server + +diff -NurdB at-spi-1.7.12/test/test-simple.c at-spi-1.7.12-patched/test/test-simple.c +--- at-spi-1.7.12/test/test-simple.c 2005-11-02 13:01:24.000000000 -0500 ++++ at-spi-1.7.12-patched/test/test-simple.c 2006-11-14 10:37:29.000000000 -0500 +@@ -714,7 +714,7 @@ + key_listener = SPI_createAccessibleKeystrokeListener ( + key_listener_cb, &stroke); + +- test_keyset = SPI_createAccessibleKeySet (1, "=", NULL, NULL); ++ test_keyset = SPI_createAccessibleKeySet (1, "t", NULL, NULL); + + g_assert (SPI_registerAccessibleKeystrokeListener ( + key_listener, +@@ -725,11 +725,11 @@ + + for (i = 0; i < 3; i++) { + memset (&stroke, 0, sizeof (AccessibleKeystroke)); +- g_assert (SPI_generateKeyboardEvent ('=', NULL, SPI_KEY_SYM)); ++ g_assert (SPI_generateKeyboardEvent ('t', NULL, SPI_KEY_SYM)); + while (!(key_press_received)) + g_main_context_iteration (NULL, TRUE); + fprintf (stderr, "p [%s]", stroke.keystring); +- g_assert (!strcmp (stroke.keystring, "=")); ++ g_assert (!strcmp (stroke.keystring, "t")); + while (!(key_release_received)) + g_main_context_iteration (NULL, TRUE); + fprintf (stderr, "r [%s]", stroke.keystring); -- 2.26.2