Fix test suite build (note: test suite itself still doesn't quite run), bug #552346, thanks to Patrick Lauer. Reduce logspam at runtime.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

6 files changed, 210 insertions, 6 deletions

diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog
index 69eacd161bd6..ca1bc63f38d2 100644
--- a/app-accessibility/at-spi2-atk/ChangeLog
+++ b/app-accessibility/at-spi2-atk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/at-spi2-atk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.73 2015/06/09 09:52:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.74 2015/06/18 04:29:20 tetromino Exp $
+
+*at-spi2-atk-2.16.0-r1 (18 Jun 2015)
+
+  18 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +at-spi2-atk-2.16.0-r1.ebuild, +files/at-spi2-atk-2.16.0-atk_suite.h,
+  +files/at-spi2-atk-2.16.0-null-gobject.patch,
+  +files/at-spi2-atk-2.16.0-out-of-source.patch:
+  Fix test suite build (note: test suite itself still doesn't quite run), bug
+  #552346, thanks to Patrick Lauer. Reduce logspam at runtime.
 
 *at-spi2-atk-2.16.0 (09 Jun 2015)
 
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 9a01ab6bcff8..b5ee45f53051 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,19 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX at-spi2-atk-2.16.0-atk_suite.h 1297 SHA256 fea01c461bc64ab9a9d1b908990dbf90adb89129ec92554458b116eb30fe9b11 SHA512 3b99eebf112e49ea6f404ec3a0d30eb62be0c0de410c5af8dea6f60c5da2dd7cb42c34155ce9e3e61e206489017879fce6d6005e33fdb66670e079f33db524a6 WHIRLPOOL 0370eaeb04e065352f8199f0dd3e445bf069ded1b379e4440df9cbaaf60ddf207bdbf08d253b8c8eb08454c265616d180bccee9d02f9eb16e9a52347e7b988d3
+AUX at-spi2-atk-2.16.0-null-gobject.patch 861 SHA256 c3096185112a99f268713d1c068ffd8c5bfd917566a8fcbcf3427821f695f874 SHA512 325d5682898dab8697056ee753a7d4b6b28c9432e14ecd2e8d7bf18a2912a9c8b88ca8471a6c53b7bd400d5c2c949418746e7ecf556d200fba3ec02241348f93 WHIRLPOOL fbfd48d99007f69a8a34989fff084ad19600c48db5d4b31c56790d6b6fae5b916216e3a7d7ab5e86732229ef8b5b3259c93f2b1f7e72356672d84f6af80a300b
+AUX at-spi2-atk-2.16.0-out-of-source.patch 2306 SHA256 6a4ba81735f95cebba042627cd9847aa9d2509b6a9b566af78ec54873e49d9b9 SHA512 847dea8a6c25c88067a039c8c9ccbf87234548eb6e4736f82f4435d44e893446c008ad7ddd3900c39656f87463e842b52a92d74b34bd20a03396fc4793a4c4f7 WHIRLPOOL a5cc129dc916a6df716238862ec188bd1f0a61522e0715a001d42d6ec6784d471495ae1d1038d08297c82cf5b55d2ac60383b74a8e350003ca98af6b4e4c0093
 DIST at-spi2-atk-2.12.1.tar.xz 280568 SHA256 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336 SHA512 a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2 WHIRLPOOL dc84563059d24ae56029989853d9e5a9a8cca5eecbed1227c4e36cd760aed4035beefbb71668221646cbd03057f1e30e44128081e2a6b32cfe48baabf4a631e5
 DIST at-spi2-atk-2.14.1.tar.xz 280952 SHA256 058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb SHA512 1daee942d3c477444aaa42fb6ede6d821ff9b613f0686dd4a545406c97ceb819a3544419e0cb5d2e661f3a1b6fc92af9394801f3c51377db0ab77620e5c3d437 WHIRLPOOL 75d7e4569eed83df842e363c6203571b7bc26dbfdd71555ead0c1656eb61923817673ce18f8042c4a989a45af956ad9fd85aee5386c8aafb121bf71de99c04c6
 DIST at-spi2-atk-2.16.0.tar.xz 286668 SHA256 78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9 SHA512 fcd40693e5ef55c640a52158996dc8bc66f53ef211c343cd5401c4bcd1669110ea836e0550eb41caee9c9f3a4f9670095a7dd8252600af943ddcb374bf50f011 WHIRLPOOL 0865cb8bfd62449bf345938a382c2a7d8efd425154e7e674c8097702e6873d98b8d2be8ac841858ba7dce166c2be4e18be1b1daf4fed43f667430ac3eeccebe2
 EBUILD at-spi2-atk-2.12.1-r1.ebuild 1341 SHA256 ff8d4d5637ed0575c33d802d6b49426fe310e04127e648db0c65cc62aea25b4a SHA512 7e487cf43833c4bcda3ff61bd028f639b2696551e71d63733edf1737338fe072f8a861e3e54eda4ac5fefd8b4805ec88d11473a9ab9dbc41eeacabaa5ce683a1 WHIRLPOOL 7325cc21bf3a80db2f0bc1f897e311cbd7a2a27733f489b7d66c8c909ab493c6ab992e8886544dc0ccf1350a62cf92443fec6d1d23da8d6860d6b05dc9d15b45
 EBUILD at-spi2-atk-2.12.1.ebuild 950 SHA256 981b48c4ab2910c56e5f1134dbfd823a3e61b571b1f7e3a821c6d767acc807cb SHA512 75dcf63577c37332f18c3d15def5bc678f4983f6b2485056ce499549535f8dc5e55cf1004882148fe45ccb5aea6fd88c9389a080d84b83cbc526f4a909d0dde4 WHIRLPOOL f743f2677d2693b34e91b93ee695b132212b846b2862d378b3fd19b82e009f0fa1d0a4944f94a40dc95de60a5ece3e9b0fbb674af503396a58c56f9fdc263bf1
 EBUILD at-spi2-atk-2.14.1.ebuild 1342 SHA256 2c7cd8ecc35f48b3e80908f962c9daa5ac0ef841ef1b7af5ce462ac94cbdcfa4 SHA512 af41a49ac267354d6973f40a3f6e96650612bd4699920d2fe62dfc899e081a2157545ecfcb83ab834e8d9a67236dd01ca2bbd76ebfe26264daae905b653141f7 WHIRLPOOL 424eb0354d4ab27ea440f8f16214531874787d75323ec6ca2b3589f586e0c8d1abe154dd7ee1f26e38b161284d28f8614a0ed680ec6712025163871691aae438
+EBUILD at-spi2-atk-2.16.0-r1.ebuild 1873 SHA256 20909648462abfffc03fa28e940b8c811a21307e4dde62dbeaac348d5ad2d78f SHA512 364b9101a287af0bb5cb847a4d43950840335e06c5957f38c531bb06cee95801d023712dc8a4fc0298e612057be1c457191a74e7a4c4b6c806262cb3884197b5 WHIRLPOOL 997ca6c0e0910161c71e3d67439e6ad7c3a2ff00415fd2ce5d2665fbad972bfa66f7e2af1b14418e2b9cc87cd956fa61f44851767da3e578a5df7d3a49016305
 EBUILD at-spi2-atk-2.16.0.ebuild 1406 SHA256 e47d2f0913b3a69dc687ac400b545427eeb5dc3394fb0ef03524ebfcd940d4ef SHA512 ee85a255a96e677f30c76ef13be1be034a5f23ba83915673ea0e8a25553462f8705422dd6b5e5bc50340e9f98d5f79d7e552b603a977dd0cde1f77d581cf4e77 WHIRLPOOL 46662d53f5cdf0c3c0424b1894d4fe596b666296e3abcc166de1e64f37c1d8a06668fdda51669dca2d6200a4a4e7dbb7f9b005e7fe8442a2b02c7093253fd76a
-MISC ChangeLog 10038 SHA256 169429378475e27a9ad2a76607ddcfc5d606e75735adeb4f66c33bdf8ccb496c SHA512 43114b6cf275c486d8576aa95ceb11311042c0c5a73184ebe6d2d1a25be0ab16ce48652e6b4d275d909e997eb58917149046fd16b4af47fee2d9a0a1112cdc88 WHIRLPOOL 96f72b98f2f1c40d7c0e7e76b61263044a10ad2f8834a50991d21a134c416742afcfcfd6724baf025ffd55f85b96956644c03494069c606679f76017189d85d8
+MISC ChangeLog 10452 SHA256 1826c8ce9b20ce3678eafd6e5da0aa89371f256a902473432e82b0001687c80b SHA512 e2dd6c928fa3157189f364c3f931455405075d72e8ef451ccae35667416ea69933210c215a71ef8cbb70e6cfdcc4270f80fe01251ad73cbed2924cf5824d0bc2 WHIRLPOOL fc9bbf9b2f2c5df736627e54cb4e2e74cf59899a24d524cbb614b304cad1fb41d2ba4c209c05fb0109a22356617149049d9e9505e26373c24ed29bf4f1b53d5d
 MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV2t3AACgkQ1fmVwcYIWAb2ZgCdHH+Qy80myLk7I96tMuBN3jkN
-RokAoJ+SoR2lDmpM+poxbWupcWWs6HiG
-=DC24
+iQJ8BAEBCABmBQJVgkkhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNwIAP/RcxaLAGwpbI2liAClHCwpfJ
+6kAUOY5pXliVVELr2N1kQtv/xOpDZtOPodGu8tcnCEZyRVZvLNf3R1glBN74psLI
+SZJqyUSzur7gLcv3WfzXaqdCYGMlmYDkv08TT9UryghluV2fmk+LYJ0UPcNYrJuT
+QyxEYJbH36iF1sHzd3hFLp8Og3FAiSzOVKInjrUDNpWh+PIRCPVI0489fs0Y652s
+xJWXfvd73j2cUFW8s6YysMGBVpNzEf1ud4jrfFgJd+OMVihnnKsgeXJWkeRreavp
+JaEDhmfZpLRcbifNHk/FGRGcZ4ibe4ejkAjQ51zjIQPIfyjupvYRTA87aYNg1xgy
+2Ni35MlQq3xZprxUscmly4ZiBzcpRZ457BSfLeDMyc0HjtW67V009B9IMLunyyJh
+ihy1t/ZJHnpfA41xcBCxHqbiJA2NxI41cQUkDALWDzmTBNMi+T/cAKNJBK3i86Ey
+fHYhuZbQ+r05HcCyfhl8BMTk9T2Omp7AWxz1xTLCihfAYdHjL6NoAZxdnHIJOhL3
+os2mKmiV/PhLdzOZjCNyQ8e7asMM6rlftiYGCvAS1SXVAX4EqOkQKFk5C2xQDmWU
+2TfV26JsOUs8Zr/JNmIx/eXHTtWxZASol6PZ5bHyVgjUiSikWLWz4qPIStYwvRxp
+BZnUhKYK0Eyn/ppzWtE0
+=4E9P
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..b87fc74b2d31
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild,v 1.1 2015/06/18 04:29:20 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.15.5[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751137
+	epatch "${FILESDIR}"/${PN}-2.16.0-out-of-source.patch
+	# Fixed in upstream git
+	epatch "${FILESDIR}"/${P}-null-gobject.patch
+	# Upstream forgot to put this in tarball :/
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751138
+	cp -n "${FILESDIR}"/${PN}-2.16.0-atk_suite.h tests/atk_suite.h || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p $(use_with test tests)
+}
+
+multilib_src_test() {
+	# droute test requires session bus; ignore it
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-atk_suite.h b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-atk_suite.h
new file mode 100644
index 000000000000..17aefcdd03d7
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-atk_suite.h
@@ -0,0 +1,36 @@
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; https://wiki.gnome.org/Accessibility)
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _ATK_SUITE_H
+#define _ATK_SUITE_H
+
+#include <atspi/atspi.h>
+
+#define ATK_TEST_PATH_ACCESSIBLE (const char *)"/Accessible"
+#define ATK_TEST_PATH_ACTION (const char *)"/Action"
+#define ATK_TEST_PATH_COMP (const char *)"/Component"
+
+void atk_test_accessible (void);
+void atk_test_action (void);
+void atk_test_component (void);
+
+#endif /* _ATK_SUITE_H */
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-null-gobject.patch b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-null-gobject.patch
new file mode 100644
index 000000000000..a8f02a0eae1f
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-null-gobject.patch
@@ -0,0 +1,26 @@
+From 72220192a31df6b297312d82f059e9824e8a4dc3 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <christian@hergert.me>
+Date: Fri, 15 May 2015 13:07:18 -0700
+Subject: [PATCH] atk-adapter: be careful with potential NULL GObjects
+
+I've been seeing warnings in my Gtk application for a while due to this.
+---
+ atk-adaptor/accessible-stateset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atk-adaptor/accessible-stateset.c b/atk-adaptor/accessible-stateset.c
+index f82910b..82820de 100644
+--- a/atk-adaptor/accessible-stateset.c
++++ b/atk-adaptor/accessible-stateset.c
+@@ -185,7 +185,7 @@ spi_atk_state_to_dbus_array (AtkObject * object, dbus_uint32_t * array)
+ {
+   AtkStateSet *set = atk_object_ref_state_set (object);
+   spi_atk_state_set_to_dbus_array (set, array);
+-  g_object_unref (set);
++  g_clear_object (&set);
+ }
+ 
+ void
+-- 
+2.4.3
+
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-out-of-source.patch b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-out-of-source.patch
new file mode 100644
index 000000000000..df9f006350d4
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-out-of-source.patch
@@ -0,0 +1,55 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 6d388c9..b05b9bd 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -9,15 +9,15 @@ atk_test_CFLAGS = $(DBUS_CFLAGS) \
+                   $(ATSPI_CFLAGS) \
+                   -I$(top_builddir)\
+                   -I$(top_srcdir)/tests/dummyatk/ \
+-                  -I$(top_srcdir)/tests/dummyatk/.libs \
+-                  -I$(top_srcdir)/tests/dummyatk/.deps \
++                  -I$(top_builddir)/tests/dummyatk/.libs \
++                  -I$(top_builddir)/tests/dummyatk/.deps \
+                   -I$(top_srcdir)
+ 
+-atk_test_LDFLAGS  = libxmlloader.la \
+-                    libtestutils.la \
+-                    $(GLIB_LIBS) \
+-                    $(ATSPI_LIBS) \
+-                    $(top_srcdir)/tests/dummyatk/libdummyatk.la
++atk_test_LDADD = libxmlloader.la \
++                 libtestutils.la \
++                 $(GLIB_LIBS) \
++                 $(ATSPI_LIBS) \
++                 $(top_builddir)/tests/dummyatk/libdummyatk.la
+ 
+ atk_test_CPPFLAGS = -DTESTS_BUILD_DIR=\"$(top_builddir)/tests\" \
+                     -DTESTS_SRC_DIR=\"$(top_srcdir)/tests\" \
+@@ -34,12 +34,12 @@ app_test_CFLAGS = -I$(top_builddir) \
+                    -I$(top_srcdir)/tests/dummyatk \
+                    -I$(top_srcdir)/atk-adaptor
+ 
+-app_test_LDFLAGS = libxmlloader.la \
+-                   libtestutils.la \
+-                   $(GLIB_LIBS) \
+-                   $(ATK_LIBS) \
+-                   $(top_srcdir)/tests/dummyatk/libdummyatk.la \
+-                   $(top_srcdir)/atk-adaptor/libatk-bridge-2.0.la
++app_test_LDADD = libxmlloader.la \
++                 libtestutils.la \
++                 $(GLIB_LIBS) \
++                 $(ATK_LIBS) \
++                 $(top_builddir)/tests/dummyatk/libdummyatk.la \
++                 $(top_builddir)/atk-adaptor/libatk-bridge-2.0.la
+ 
+ app_test_SOURCES = test-application.c
+ 
+@@ -52,7 +52,7 @@ libxmlloader_la_CFLAGS = $(GLIB_CFLAGS) \
+ libxmlloader_la_LIBADD = $(GLIB_LIBS) \
+                          $(XML_LIBS) \
+                          $(GOBJ_LIBS) \
+-                         $(top_srcdir)/tests/dummyatk/libdummyatk.la \
++                         $(top_builddir)/tests/dummyatk/libdummyatk.la \
+                          $(ATK_LIBS)
+ 
+ libxmlloader_la_SOURCES = atk-object-xml-loader.c\