From 12550e53a9dc01328beb152f87fc7223f834d2e0 Mon Sep 17 00:00:00 2001 From: Joanmarie Diggs Date: Fri, 23 Jan 2015 09:56:04 -0500 Subject: [PATCH 01/16] Add new roles for fractions, roots, subscripts, and superscripts https://bugzilla.gnome.org/show_bug.cgi?id=743403 --- atspi/atspi-constants.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/atspi/atspi-constants.h b/atspi/atspi-constants.h index 0637aa8..6095fb4 100644 --- a/atspi/atspi-constants.h +++ b/atspi/atspi-constants.h @@ -1173,6 +1173,14 @@ typedef enum { * @ATSPI_ROLE_LABEL. For text views, see @ATSPI_ROLE_TEXT. For generic * containers, see @ATSPI_ROLE_PANEL. For objects whose role is not known by the * implementor, see @ATSPI_ROLE_UNKNOWN. @Since: 2.16. + *@ATSPI_ROLE_MATH_FRACTION: An object that represents a mathematical fraction. + * @Since: 2.16. + *@ATSPI_ROLE_MATH_ROOT: An object that represents a mathematical expression + * displayed with a radical. @Since: 2.16. + *@ATSPI_ROLE_SUBSCRIPT: An object that contains text that is displayed as a + * subscript. @Since: 2.16. + *@ATSPI_ROLE_SUPERSCRIPT: An object that contains text that is displayed as a + * superscript. @Since: 2.16. * @ATSPI_ROLE_LAST_DEFINED: Not a valid role, used for finding end of * enumeration. * @@ -1298,6 +1306,10 @@ typedef enum { ATSPI_ROLE_RATING, ATSPI_ROLE_TIMER, ATSPI_ROLE_STATIC, + ATSPI_ROLE_MATH_FRACTION, + ATSPI_ROLE_MATH_ROOT, + ATSPI_ROLE_SUBSCRIPT, + ATSPI_ROLE_SUPERSCRIPT, ATSPI_ROLE_LAST_DEFINED, } AtspiRole; @@ -1306,7 +1318,7 @@ typedef enum { * * One higher than the highest valid value of #AtspiRole. */ -#define ATSPI_ROLE_COUNT (90+1) +#define ATSPI_ROLE_COUNT (121+1) typedef enum { -- 2.7.4 From c333267cf3d2cc72fabca9ef11e8d7fcc19d60c3 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 16 Feb 2015 11:43:36 -0600 Subject: [PATCH 02/16] Release v2.15.90 --- NEWS | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f018533..55d816e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +What's new in at-spi2-core 2.15.90: + +* Deprecate atspi_text_get_text_{before,at,after}_offset() (bgo#697969) + +* Add roles for fractions, roots, subscripts, and superscripts (bgo#743403). + What's new in at-spi2-core 2.15.4: * Add names to every timeout (bgo#710644). diff --git a/configure.ac b/configure.ac index 7ddc544..9bb6fa9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-core], [2.15.5], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-core], [2.15.90], [accessibility-atspi@lists.linux-foundation.org]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) -- 2.7.4 From 758fafd592c5b530b575bada29d1f23538d181e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Du=C5=A1an=20Kazik?= Date: Sat, 28 Feb 2015 12:16:27 +0000 Subject: [PATCH 03/16] Updated Slovak translation --- po/sk.po | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/po/sk.po b/po/sk.po index 216dc85..dea424f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,17 +8,22 @@ msgstr "" "Project-Id-Version: at-spi2-core\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=at-" "spi&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-10-17 14:37+0000\n" -"PO-Revision-Date: 2012-10-20 16:34+0100\n" -"Last-Translator: Peter Mráz \n" +"POT-Creation-Date: 2015-02-28 03:49+0000\n" +"PO-Revision-Date: 2015-02-28 13:16+0100\n" +"Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"X-Generator: Poedit 1.7.4\n" -#: ../atspi/atspi-component.c:313 ../atspi/atspi-misc.c:997 +#: ../atspi/atspi-component.c:326 ../atspi/atspi-misc.c:1037 #: ../atspi/atspi-value.c:111 msgid "The application no longer exists" msgstr "Aplikácia už neexistuje" + +#: ../atspi/atspi-misc.c:1795 +msgid "Attempted synchronous call where prohibited" +msgstr "Pokus o synchrónne volanie tam, kde je zakázané" -- 2.7.4 From 18d8c91ba9adc32c626679cd5489ebbbb10bdfbd Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Mon, 9 Mar 2015 19:17:20 +0200 Subject: [PATCH 04/16] Updated Bulgarian translation --- po/bg.po | 109 ++++++--------------------------------------------------------- 1 file changed, 10 insertions(+), 99 deletions(-) diff --git a/po/bg.po b/po/bg.po index 27677cb..44cc7f1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,116 +1,27 @@ # Bulgarian translation of at-spi2-core po-file. -# Copyright (C) 2011 Free Software Foundation +# Copyright (C) 2011, 2015 Free Software Foundation # This file is distributed under the same license as the at-spi2-core package. -# Alexander Shopov , 2011. +# Alexander Shopov , 2011, 2015. # msgid "" msgstr "" "Project-Id-Version: at-spi2-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-22 22:56+0200\n" -"PO-Revision-Date: 2011-02-22 22:56+0200\n" +"POT-Creation-Date: 2015-03-09 19:17+0200\n" +"PO-Revision-Date: 2015-03-09 19:17+0200\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../atspi/atspi-misc.c:290 -#, c-format -msgid "AT-SPI: Unknown signature %s for RemoveAccessible" -msgstr "AT-SPI: Непознат подпис %s за функцията RemoveAccessible" - -#: ../atspi/atspi-misc.c:327 -#, c-format -msgid "AT-SPI: Error calling getRoot for %s: %s" -msgstr "AT-SPI: Грешка при извикване на getRoot за %s: %s" - -#: ../atspi/atspi-misc.c:485 -#, c-format -msgid "AT-SPI: Error in GetItems, sender=%s, error=%s" -msgstr "AT-SPI: Грешка в GetItems, подател — %s, грешка — %s" - -#: ../atspi/atspi-misc.c:587 -#, c-format -msgid "" -"AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange " -"signature %s" -msgstr "" -"AT-SPI: Извикана е функцията _atspi_dbus_return_accessible_from_message с " -"непознат подпис %s" - -#: ../atspi/atspi-misc.c:616 -#, c-format -msgid "" -"AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange " -"signature %s" -msgstr "" -"AT-SPI: Извикана е функцията _atspi_dbus_return_hyperlink_from_message с " -"непознат подпис %s" - -#: ../atspi/atspi-misc.c:641 -#, c-format -msgid "AT-SPI: AddAccessible with unknown signature %s\n" -msgstr "AT-SPI: AddAccessible с непознат подпис %s\n" - -#: ../atspi/atspi-misc.c:826 -msgid "AT-SPI: Could not get the display\n" -msgstr "AT-SPI: Екранът не може да бъде получен\n" - -#: ../atspi/atspi-misc.c:844 -msgid "AT-SPI: Accessibility bus not found - Using session bus.\n" -msgstr "AT-SPI: Шината за достъпност липсва, ще се използва сесийната.\n" - -#: ../atspi/atspi-misc.c:848 ../atspi/atspi-misc.c:857 -#, c-format -msgid "AT-SPI: Couldn't connect to bus: %s\n" -msgstr "AT-SPI: Неуспешно свързване към шината: %s\n" - -#: ../atspi/atspi-misc.c:864 -#, c-format -msgid "AT-SPI: Couldn't register with bus: %s\n" -msgstr "AT-SPI: Неуспешно регистриране към шината: %s\n" - -#: ../atspi/atspi-misc.c:1002 ../atspi/atspi-misc.c:1053 -#: ../atspi/atspi-misc.c:1094 +#: ../atspi/atspi-component.c:326 ../atspi/atspi-misc.c:1037 +#: ../atspi/atspi-value.c:111 msgid "The application no longer exists" msgstr "Програмата вече не съществува" -#: ../atspi/atspi-misc.c:1130 -#, c-format -msgid "AT-SPI: expected a variant when fetching %s from interface %s; got %s\n" -msgstr "" -"AT-SPI: Очаква се вариант при получаването на %s от интерфейса %s, а не %s\n" - -#: ../atspi/atspi-misc.c:1136 -#, c-format -msgid "atspi_dbus_get_property: Wrong type: expected %s, got %c\n" -msgstr "atspi_dbus_get_property: Неправилен вид, очаква се %s, а не %c\n" - -#: ../atspi/atspi-misc.c:1279 -#, c-format -msgid "AT-SPI: Unknown interface %s" -msgstr "AT-SPI: Непознат интерфейс %s" - -#: ../atspi/atspi-misc.c:1299 -#, c-format -msgid "AT-SPI: expected 2 values in states array; got %d\n" -msgstr "AT-SPI: трябва да има 2 стойности в масива за състояния, а не %d\n" - -#: ../atspi/atspi-accessible.c:997 -msgid "Streamable content not implemented" -msgstr "Поточното съдържание не е реализирано" - -#: ../atspi/atspi-event-listener.c:510 -msgid "" -"called atspi_event_listener_register_from_callback with a NULL event_type" -msgstr "" -"Функцията atspi_event_listener_register_from_callback е извикана с аргумент " -"NULL за вида събитие" - -#: ../atspi/atspi-event-listener.c:777 -#, c-format -msgid "Got invalid signature %s for signal %s from interface %s\n" -msgstr "Получен е неправилен подпис %s на сигнала %s от интерфейса %s\n" +#: ../atspi/atspi-misc.c:1795 +msgid "Attempted synchronous call where prohibited" +msgstr "Заявеното асинхронно действие е забранено" -- 2.7.4 From 4fbf425f249673b5471cc8c08a06cd8d8e527d1a Mon Sep 17 00:00:00 2001 From: Samir Ribic Date: Fri, 13 Mar 2015 20:57:20 +0000 Subject: [PATCH 05/16] Added Bosnian translation --- po/LINGUAS | 1 + po/bs.po | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 po/bs.po diff --git a/po/LINGUAS b/po/LINGUAS index 706bb3c..7358eac 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -4,6 +4,7 @@ ast be bg bn_IN +bs ca ca@valencia cs diff --git a/po/bs.po b/po/bs.po new file mode 100644 index 0000000..bc864e8 --- /dev/null +++ b/po/bs.po @@ -0,0 +1,29 @@ +# Bosnian translation for bosnianuniversetranslation +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the bosnianuniversetranslation package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: bosnianuniversetranslation\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=at-" +"spi&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-02-27 03:49+0000\n" +"PO-Revision-Date: 2015-02-05 01:25+0000\n" +"Last-Translator: Samir Ribić \n" +"Language-Team: Bosnian \n" +"Language: bs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2015-02-05 07:02+0000\n" +"X-Generator: Launchpad (build 17331)\n" + +#: ../atspi/atspi-component.c:326 ../atspi/atspi-misc.c:1037 +#: ../atspi/atspi-value.c:111 +msgid "The application no longer exists" +msgstr "Program više ne postoji" + +#: ../atspi/atspi-misc.c:1795 +msgid "Attempted synchronous call where prohibited" +msgstr "Pokušan sinhroni poziv kada je zabranjen" -- 2.7.4 From 898de723a8c6ad09605bf21b821432978bbf18c1 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Mon, 2 Sep 2013 17:26:18 +0200 Subject: [PATCH 06/16] Fix GTK-Doc comment blocks https://bugs.freedesktop.org/show_bug.cgi?id=89678 --- atspi/atspi-component.c | 8 ++++---- atspi/atspi-constants.h | 4 ++-- atspi/atspi-misc.c | 32 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/atspi/atspi-component.c b/atspi/atspi-component.c index a375567..0ab552b 100644 --- a/atspi/atspi-component.c +++ b/atspi/atspi-component.c @@ -362,9 +362,9 @@ atspi_component_set_extents (AtspiComponent *obj, * @ctype: the coordinate system in which the position is specified. * (e.g. ATSPI_COORD_TYPE_WINDOW, ATSPI_COORD_TYPE_SCREEN). * - * Returns: #TRUE if successful; #FALSE otherwise. - * * Moves the component to the specified position. + * + * Returns: #TRUE if successful; #FALSE otherwise. **/ gboolean atspi_component_set_position (AtspiComponent *obj, @@ -391,9 +391,9 @@ atspi_component_set_position (AtspiComponent *obj, * @width: the width to which the component should be resized. * @height: the height to which the component should be resized. * - * Returns: #TRUE if successful; #FALSE otherwise. - * * Resizes the specified component to the given coordinates. + * + * Returns: #TRUE if successful; #FALSE otherwise. **/ gboolean atspi_component_set_size (AtspiComponent *obj, diff --git a/atspi/atspi-constants.h b/atspi/atspi-constants.h index 6095fb4..838adc7 100644 --- a/atspi/atspi-constants.h +++ b/atspi/atspi-constants.h @@ -1120,9 +1120,9 @@ typedef enum { * particular application. * @ATSPI_ROLE_INFO_BAR: An object designed to present a message to the user * within an existing window. - *@ATSPI_ROLE_LEVEL_BAR: A bar that serves as a level indicator to, for + * @ATSPI_ROLE_LEVEL_BAR: A bar that serves as a level indicator to, for * instance, show the strength of a password or the state of a battery. - * Since: 2.8 + * Since: 2.8 *@ATSPI_ROLE_TITLE_BAR: A bar that serves as the title of a window or a * dialog. @Since: 2.12 *@ATSPI_ROLE_BLOCK_QUOTE: An object which contains a text section diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index 3404873..4cf7732 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -1586,23 +1586,23 @@ atspi_get_a11y_bus (void) /** * atspi_set_timeout: - * @val: The timeout value, in milliseconds, or -1 to disable the timeout. - * @startup_time: The amount of time, in milliseconds, to allow to pass - * before enforcing timeouts on an application. Can be used to prevent - * timeout exceptions if an application is likely to block for an extended - * period of time on initialization. -1 can be passed to disable this - * behavior. + * @val: The timeout value, in milliseconds, or -1 to disable the timeout. + * @startup_time: The amount of time, in milliseconds, to allow to pass + * before enforcing timeouts on an application. Can be used to prevent + * timeout exceptions if an application is likely to block for an extended + * period of time on initialization. -1 can be passed to disable this + * behavior. * - * Set the timeout used for method calls. If this is not set explicitly, - * a default of 0.8 ms is used. - * Note that at-spi2-registryd currently uses a timeout of 3 seconds when - * sending a keyboard event notification. This means that, if an AT makes - * a call in response to the keyboard notification and the application - * being called does not respond before the timeout is reached, - * at-spi2-registryd will time out on the keyboard event notification and - * pass the key onto the application (ie, reply to indicate that the key - * was not consumed), so this may make it undesirable to set a timeout - * larger than 3 seconds. + * Set the timeout used for method calls. If this is not set explicitly, + * a default of 0.8 ms is used. + * Note that at-spi2-registryd currently uses a timeout of 3 seconds when + * sending a keyboard event notification. This means that, if an AT makes + * a call in response to the keyboard notification and the application + * being called does not respond before the timeout is reached, + * at-spi2-registryd will time out on the keyboard event notification and + * pass the key onto the application (ie, reply to indicate that the key + * was not consumed), so this may make it undesirable to set a timeout + * larger than 3 seconds. * * By default, the normal timeout is set to 800 ms, and the application startup * timeout is set to 15 seconds. -- 2.7.4 From 9fc5e230f8d229329820ae9d7e409824769102ac Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 23 Mar 2015 18:30:45 -0500 Subject: [PATCH 07/16] 2.16.0 --- NEWS | 4 ++++ configure.ac | 2 +- doc/libatspi/tmpl/atspi-constants.sgml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 55d816e..1fe33be 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +What's new in at-spi2-core 2.16.0: + +* Fix a couple of gtk-doc warnings (fdo#89678). + What's new in at-spi2-core 2.15.90: * Deprecate atspi_text_get_text_{before,at,after}_offset() (bgo#697969) diff --git a/configure.ac b/configure.ac index 9bb6fa9..e90411a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-core], [2.15.90], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-core], [2.16.0], [accessibility-atspi@lists.linux-foundation.org]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/libatspi/tmpl/atspi-constants.sgml b/doc/libatspi/tmpl/atspi-constants.sgml index 967c6a1..5565e24 100644 --- a/doc/libatspi/tmpl/atspi-constants.sgml +++ b/doc/libatspi/tmpl/atspi-constants.sgml @@ -454,6 +454,10 @@ Constant definitions needed by multiple interfaces. @ATSPI_ROLE_RATING: @ATSPI_ROLE_TIMER: @ATSPI_ROLE_STATIC: +@ATSPI_ROLE_MATH_FRACTION: +@ATSPI_ROLE_MATH_ROOT: +@ATSPI_ROLE_SUBSCRIPT: +@ATSPI_ROLE_SUPERSCRIPT: @ATSPI_ROLE_LAST_DEFINED: -- 2.7.4 From b7d9e48f2141985f255bff3bba0c759c61a7b247 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20P=C3=B5ldaru?= Date: Wed, 8 Apr 2015 20:19:37 +0300 Subject: [PATCH 08/16] [l10n] Updated Estonian translation --- po/et.po | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/po/et.po b/po/et.po index 5693224..e1f67bd 100644 --- a/po/et.po +++ b/po/et.po @@ -1,23 +1,26 @@ # Estonian translation for at-spi2-core. # Copyright (C) 2012 at-spi2-core's COPYRIGHT HOLDER # This file is distributed under the same license as the at-spi2-core package. -# FIRST AUTHOR , YEAR. -# Mattias Põldaru , 2012. +# Mattias Põldaru , 2012, 2015. # msgid "" msgstr "" "Project-Id-Version: at-spi2-core master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=at-" "spi&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-02-28 20:29+0000\n" -"PO-Revision-Date: 2012-03-01 19:40+0200\n" +"POT-Creation-Date: 2015-03-15 03:48+0000\n" +"PO-Revision-Date: 2015-03-15 09:52+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian <>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Poedit 1.5.4\n" msgid "The application no longer exists" msgstr "Seda rakendust pole enam olemas" + +msgid "Attempted synchronous call where prohibited" +msgstr "Üritati teha sünkroonne kutse, kuid see keelati" -- 2.7.4 From bd1855e2852bf5afde27b48e07ad6321cc0c119a Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarek Date: Tue, 31 Mar 2015 13:06:51 +0200 Subject: [PATCH 09/16] Bus rules for tizen updated --- bus/accessibility.conf.in | 21 ++++++++++++++++++--- registryd/org.a11y.atspi.Registry.service.in | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/bus/accessibility.conf.in b/bus/accessibility.conf.in index 31b6a79..77f12f8 100644 --- a/bus/accessibility.conf.in +++ b/bus/accessibility.conf.in @@ -8,17 +8,32 @@ unix:tmpdir=/tmp - + owner + + - - + + + + + + + + + + + + + + + 1000000000 1000000000 1000000000 diff --git a/registryd/org.a11y.atspi.Registry.service.in b/registryd/org.a11y.atspi.Registry.service.in index 5561175..204ca27 100644 --- a/registryd/org.a11y.atspi.Registry.service.in +++ b/registryd/org.a11y.atspi.Registry.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.a11y.atspi.Registry -Exec=@LIBEXECDIR@/at-spi2-registryd --use-gnome-session +Exec=@LIBEXECDIR@/at-spi2-registryd -- 2.7.4 From ee99ef51e981c4fecde47ea4861f68536ec1ccf0 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarek Date: Tue, 31 Mar 2015 13:09:57 +0200 Subject: [PATCH 10/16] spec file, manifest and gbs.conf adapted for Tizen --- .gbs.conf | 2 + packaging/at-spi2-core.manifest | 5 ++ packaging/at-spi2-core.spec | 117 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 .gbs.conf create mode 100644 packaging/at-spi2-core.manifest create mode 100644 packaging/at-spi2-core.spec diff --git a/.gbs.conf b/.gbs.conf new file mode 100644 index 0000000..4d4d1fb --- /dev/null +++ b/.gbs.conf @@ -0,0 +1,2 @@ +[general] +upstream_tag = AT_SPI2_CORE_${upstreamversion} diff --git a/packaging/at-spi2-core.manifest b/packaging/at-spi2-core.manifest new file mode 100644 index 0000000..c976359 --- /dev/null +++ b/packaging/at-spi2-core.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec new file mode 100644 index 0000000..7223067 --- /dev/null +++ b/packaging/at-spi2-core.spec @@ -0,0 +1,117 @@ +%define debug_package %{nil} + +Name: at-spi2-core +Version: 2_12_0 +Release: 0 +Summary: Assistive Technology Service Provider Interface - D-Bus based implementation +License: LGPL-2.0+ +Group: System/Libraries +Url: http://www.gnome.org/ +Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.12/%{name}-%{version}.tar.xz +Source1001: %{name}.manifest +Requires: dbus +BuildRequires: python-devel +BuildRequires: python-xml +BuildRequires: intltool +BuildRequires: dbus-devel +BuildRequires: glib2-devel +BuildRequires: libX11-devel +BuildRequires: libXtst-devel +BuildRequires: libXi-devel +BuildRequires: gettext +BuildRequires: gtk-doc + +%description +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +This package contains the AT-SPI registry daemon. It provides a +mechanism for all assistive technologies to discover and interact +with applications running on the desktop. + +%package -n libatspi0 +Summary: An Accessibility ToolKit -- Library +Group: System/Libraries + +%description -n libatspi0 +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +%package -n typelib-1_0-Atspi-2_0 +Summary: An Accessibility ToolKit -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Atspi-2_0 +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +This package provides the GObject Introspection bindings for the +libatspi library. + +%package devel +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: libatspi0 = %{version} +Requires: typelib-1_0-Atspi-2_0 = %{version} + +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + +%prep +%setup -q +cp %{SOURCE1001} . + +%build +%autogen --libexecdir=%{_libexecdir}/at-spi2 \ + --with-dbus-daemondir=%{_bindir} \ + --disable-static +%__make %{?_smp_flags} + +%install +rm -rf %{buildroot} +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f +%make_install +%find_lang %{name} + +%check +mkdir -p %{buildroot}/usr/share/license +cp -f COPYING %{buildroot}/usr/share/license/%{name} + +%clean +rm -fr %{buildroot} + +%post -n libatspi0 -p /sbin/ldconfig + +%postun -n libatspi0 -p /sbin/ldconfig + +%files -f %{name}.lang +%manifest %{name}.manifest +%defattr(-,root,root) +%doc AUTHORS README +%license COPYING +%{_libexecdir}/at-spi2/at-spi-bus-launcher +%{_libexecdir}/at-spi2/at-spi2-registryd +%config %{_sysconfdir}/at-spi2/accessibility.conf +%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop +%{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service +%{_datadir}/dbus-1/services/org.a11y.Bus.service + + +%files -n libatspi0 +%manifest %{name}.manifest +%defattr(-, root, root) +%{_libdir}/libatspi.so.0* + +%files -n typelib-1_0-Atspi-2_0 +%manifest %{name}.manifest +%defattr(-, root, root) + +%files devel +%manifest %{name}.manifest +%defattr(-, root, root) +%{_includedir}/at-spi-2.0 +%{_libdir}/libatspi.so +%{_libdir}/pkgconfig/atspi-2.pc + -- 2.7.4 From 86bc322d3cb4982231a07a9ccee55706faf67803 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarek Date: Tue, 31 Mar 2015 19:24:53 +0200 Subject: [PATCH 11/16] condition added to exclusive build on wayland Change-Id: I0b0e12b4a83636db86db3dc23e5074605d53696a --- packaging/at-spi2-core.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec index 7223067..4a861ba 100644 --- a/packaging/at-spi2-core.spec +++ b/packaging/at-spi2-core.spec @@ -1,4 +1,5 @@ %define debug_package %{nil} +%bcond_with x Name: at-spi2-core Version: 2_12_0 @@ -15,11 +16,14 @@ BuildRequires: python-xml BuildRequires: intltool BuildRequires: dbus-devel BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: gtk-doc +%if !%{with x} +ExclusiveArch: +%endif BuildRequires: libX11-devel BuildRequires: libXtst-devel BuildRequires: libXi-devel -BuildRequires: gettext -BuildRequires: gtk-doc %description AT-SPI is a general interface for applications to make use of the -- 2.7.4 From a06a8764c33f64e9c1b4e286e8d2cf9ed6e68b8c Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarek Date: Mon, 20 Apr 2015 12:46:28 +0200 Subject: [PATCH 12/16] Bump package version to 2.16 Change-Id: I1573d7c304e1d2e8fc1ed2ae405402727ea725eb Signed-off-by: Patryk Kaczmarek --- .gbs.conf | 2 +- packaging/at-spi2-core.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gbs.conf b/.gbs.conf index 4d4d1fb..00a849f 100644 --- a/.gbs.conf +++ b/.gbs.conf @@ -1,2 +1,2 @@ [general] -upstream_tag = AT_SPI2_CORE_${upstreamversion} +upstream_tag = AT_SPI2_CORE_2_16_0 diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec index 4a861ba..a88d987 100644 --- a/packaging/at-spi2-core.spec +++ b/packaging/at-spi2-core.spec @@ -2,13 +2,13 @@ %bcond_with x Name: at-spi2-core -Version: 2_12_0 +Version: 2.16.0 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: LGPL-2.0+ Group: System/Libraries Url: http://www.gnome.org/ -Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.12/%{name}-%{version}.tar.xz +Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.16/%{name}-%{version}.tar.xz Source1001: %{name}.manifest Requires: dbus BuildRequires: python-devel @@ -99,7 +99,7 @@ rm -fr %{buildroot} %{_libexecdir}/at-spi2/at-spi2-registryd %config %{_sysconfdir}/at-spi2/accessibility.conf %{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop -%{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service +%{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service %{_datadir}/dbus-1/services/org.a11y.Bus.service -- 2.7.4 From 959fde8f992372805c855f7f4caf30a690bdc137 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarek Date: Thu, 23 Apr 2015 19:46:22 +0200 Subject: [PATCH 13/16] Some conditions added to build also on wayland Change-Id: Iae18df02994af3db06d333339f087a183efcdde2 Signed-off-by: Patryk Kaczmarek --- configure.ac | 4 ++-- packaging/at-spi2-core.spec | 8 +++++--- registryd/deviceeventcontroller.c | 16 ++++++++++++++++ registryd/keymasks.h | 3 +++ registryd/ucs2keysym.c | 3 ++- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e90411a..ebbeb3f 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,7 @@ save_LIBS="$LIBS" LIBS="" CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[ - AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])], + AC_MSG_WARN([Couldn't find the Xtst library. Check config.log])], $X_LIBS) AC_SUBST(XTST_LIBS) LIBS="$LIBS $save_LIBS" @@ -117,7 +117,7 @@ if test "x$have_xinput" = "xmaybe"; then LIBS="$save_LIBS" fi if test "x$have_xinput" != "xyes"; then - AC_MSG_ERROR([Couldn't find the XInput library. Check config.log for details]) + AC_MSG_WARN([Couldn't find the XInput library. Check config.log for details]) fi XINPUT_LIBS="-lXi" AC_SUBST(XINPUT_LIBS) diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec index a88d987..e8808ea 100644 --- a/packaging/at-spi2-core.spec +++ b/packaging/at-spi2-core.spec @@ -18,12 +18,11 @@ BuildRequires: dbus-devel BuildRequires: glib2-devel BuildRequires: gettext BuildRequires: gtk-doc -%if !%{with x} -ExclusiveArch: -%endif +%if %{with x} BuildRequires: libX11-devel BuildRequires: libXtst-devel BuildRequires: libXi-devel +%endif %description AT-SPI is a general interface for applications to make use of the @@ -70,6 +69,9 @@ cp %{SOURCE1001} . %build %autogen --libexecdir=%{_libexecdir}/at-spi2 \ --with-dbus-daemondir=%{_bindir} \ +%if !%{with x} + --disable-x11 \ +%endif --disable-static %__make %{?_smp_flags} diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 8279a1d..62cd706 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -42,8 +42,10 @@ #include "keymasks.h" #include "de-types.h" #include "de-marshaller.h" +#ifdef HAVE_X11 #include "display.h" #include "event-source.h" +#endif #include "deviceeventcontroller.h" #include "reentrant-list.h" @@ -65,9 +67,14 @@ struct _SpiPoint { }; typedef struct _SpiPoint SpiPoint; static unsigned int mouse_mask_state = 0; +#ifdef HAVE_X11 static unsigned int key_modifier_mask = Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask | ShiftMask | LockMask | ControlMask | SPI_KEYMASK_NUMLOCK; static unsigned int _numlock_physical_mask = Mod2Mask; /* a guess, will be reset */ +#else +static unsigned int key_modifier_mask = 255; +static unsigned int _numlock_physical_mask = (1<<4); +#endif static gboolean have_mouse_listener = FALSE; static gboolean have_mouse_event_listener = FALSE; @@ -632,7 +639,12 @@ handle_keygrab (SpiDEController *controller, grab_mask.mod_mask = key_listener->mask; if (g_slist_length (key_listener->keys) == 0) /* special case means AnyKey/AllKeys */ { +#ifdef HAVE_X11 grab_mask.key_val = AnyKey; +#else + grab_mask.key_val = 0L; +#endif + #ifdef SPI_DEBUG fprintf (stderr, "AnyKey grab!"); #endif @@ -1749,7 +1761,11 @@ impl_generate_keyboard_event (DBusConnection *bus, DBusMessage *message, void *u * in our arg list; it can contain either * a keycode or a keysym. */ +#ifdef HAVE_X11 spi_dec_synth_keysym (controller, (KeySym) keycode); +#else + spi_dec_synth_keysym (controller, (long) keycode); +#endif break; case Accessibility_KEY_STRING: if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring)) diff --git a/registryd/keymasks.h b/registryd/keymasks.h index 6dc95ad..8000448 100644 --- a/registryd/keymasks.h +++ b/registryd/keymasks.h @@ -24,7 +24,10 @@ #ifndef SPI_KEYMASKS_H_ #define SPI_KEYMASKS_H_ + +#ifdef HAVE_X11 #include +#endif #include G_BEGIN_DECLS diff --git a/registryd/ucs2keysym.c b/registryd/ucs2keysym.c index b4967be..539685c 100644 --- a/registryd/ucs2keysym.c +++ b/registryd/ucs2keysym.c @@ -30,8 +30,9 @@ * This software is in the public domain. Share and enjoy! * */ - +#ifdef HAVE_X11 #include +#endif #include "deviceeventcontroller.h" /* for prototype */ struct codepair { -- 2.7.4 From 8b37292698e8765c4141c19b3e5d14b7ec579c80 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Mon, 27 Apr 2015 10:55:14 +0200 Subject: [PATCH 14/16] bus-launcher: integrate launcher with tizen platform. at-spi-bus-launcher is now registered on vconf "db/menu/accessbiility/screen_reader" changes and launches applications registered on "read_screen" operation in application service. Change-Id: I7264004c3358654073829faaebb06f24b0a9b4d7 --- bus/Makefile.am | 4 +- bus/at-spi-bus-launcher.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 ++++++ packaging/at-spi2-core.spec | 4 ++ 4 files changed, 106 insertions(+), 2 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 530d231..574e0ad 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -7,8 +7,8 @@ libexec_PROGRAMS = at-spi-bus-launcher at_spi_bus_launcher_SOURCES = at-spi-bus-launcher.c at_spi_bus_launcher_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \ -DDBUS_DAEMON=\"$(DBUS_DAEMON)\" -at_spi_bus_launcher_CFLAGS = $(GIO_CFLAGS) -at_spi_bus_launcher_LDADD = $(GIO_LIBS) $(X_LIBS) +at_spi_bus_launcher_CFLAGS = $(GIO_CFLAGS) $(APPSVC_CFLAGS) $(VCONF_CFLAGS) $(AUL_CFLAGS) +at_spi_bus_launcher_LDADD = $(GIO_LIBS) $(X_LIBS) $(APPSVC_LIBS) $(VCONF_LIBS) $(AUL_LIBS) default_sessiondir = $(sysconfdir)/xdg/autostart default_session_DATA = at-spi-dbus-bus.desktop diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c index b6bd8e8..67e8bed 100644 --- a/bus/at-spi-bus-launcher.c +++ b/bus/at-spi-bus-launcher.c @@ -35,6 +35,12 @@ #include #endif +#define APP_CONTROL_OPERATION_SCREEN_READ "http://tizen.org/appcontrol/operation/read_screen" +#include +#include +#include +#include + typedef enum { A11Y_BUS_STATE_IDLE = 0, A11Y_BUS_STATE_READING_ADDRESS, @@ -51,7 +57,11 @@ typedef struct { GSettings *a11y_schema; GSettings *interface_schema; + gboolean screen_reader_needed; + int pid; + A11yBusState state; + /* -1 == error, 0 == pending, > 0 == running */ int a11y_bus_pid; char *a11y_bus_address; @@ -565,6 +575,70 @@ gsettings_key_changed (GSettings *gsettings, const gchar *key, void *user_data) handle_screen_reader_enabled_change (_global_app, new_val, FALSE); } +static gboolean +_launch_screen_reader(A11yBusLauncher *bl) +{ + bundle *kb = NULL; + gboolean ret = FALSE; + + kb = bundle_create(); + if (kb == NULL) + return FALSE; + + appsvc_set_operation(kb, APP_CONTROL_OPERATION_SCREEN_READ); + + bl->pid = appsvc_usr_run_service(kb, 0, NULL, NULL, getuid()); + if (bl->pid >= 0) { + ret = TRUE; + } + + bundle_free(kb); + return ret; +} + +static gboolean +_terminate_screen_reader(A11yBusLauncher *bl) +{ + int ret; + if (bl->pid <= 0) + return FALSE; + + LOGD("terminate process with pid %d", bl->pid); + if (!aul_terminate_pid(bl->pid)) + { + bl->pid = 0; + return TRUE; + } + + LOGD("Unable to terminate process using aul api. Sending SIGTERM signal"); + ret = kill(bl->pid, SIGTERM); + if (!ret) + { + bl->pid = 0; + return TRUE; + } + + LOGD("Unable to terminate process: %d with api or signal.", bl->pid); + return FALSE; +} + +void screen_reader_cb(keynode_t *node, void *user_data) +{ + A11yBusLauncher *bl = user_data; + int ret; + + ret = vconf_keynode_get_bool(node); + if (ret < 0) + return; + + bl->screen_reader_needed = ret; + + if (!bl->screen_reader_needed && (bl->pid > 0)) + _terminate_screen_reader(bl); + else if (bl->screen_reader_needed && (bl->pid <= 0)) + _launch_screen_reader(bl); +} + int main (int argc, char **argv) @@ -637,6 +711,21 @@ main (int argc, _global_app, NULL); + int ret = vconf_get_bool("db/menu/accessibility/screen_reader", &_global_app->screen_reader_needed); + if (ret != 0) + { + LOGD("Could not read 'db/menu/accessibility/screen_reader' key value.\n"); + return FALSE; + } + ret = vconf_notify_key_changed("db/menu/accessibility/screen_reader", screen_reader_cb, _global_app); + if(ret != 0) + { + LOGD("Could not add information level callback\n"); + return FALSE; + } + if (_global_app->screen_reader_needed) + _launch_screen_reader(_global_app); + g_main_loop_run (_global_app->loop); if (_global_app->a11y_bus_pid > 0) diff --git a/configure.ac b/configure.ac index ebbeb3f..bea395d 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,17 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.28]) AC_SUBST(GIO_LIBS) AC_SUBST(GIO_CFLAGS) +PKG_CHECK_MODULES(APPSVC, [appsvc]) +AC_SUBST(APPSVC_LIBS) +AC_SUBST(APPSVC_CFLAGS) + +PKG_CHECK_MODULES(VCONF, [vconf]) +AC_SUBST(VCONF_LIBS) +AC_SUBST(VCONF_CFLAGS) + +PKG_CHECK_MODULES(AUL, [aul]) +AC_SUBST(AUL_LIBS) +AC_SUBST(AUL_CFLAGS) # -------------------------------------------------------------------- # Find DL functionality diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec index e8808ea..a3ecd8e 100644 --- a/packaging/at-spi2-core.spec +++ b/packaging/at-spi2-core.spec @@ -23,6 +23,10 @@ BuildRequires: libX11-devel BuildRequires: libXtst-devel BuildRequires: libXi-devel %endif +BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(appsvc) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(aul) %description AT-SPI is a general interface for applications to make use of the -- 2.7.4 From d296b0504c3e2db54934e5b9bb37d88532d8bdc3 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Thu, 9 Jul 2015 17:40:06 +0900 Subject: [PATCH 15/16] Following security policy Change-Id: Ie15d6985ebdad7b8bd7b26a81012727387f4317a --- packaging/at-spi2-core.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/at-spi2-core.manifest b/packaging/at-spi2-core.manifest index c976359..017d22d 100644 --- a/packaging/at-spi2-core.manifest +++ b/packaging/at-spi2-core.manifest @@ -1,5 +1,5 @@ - + -- 2.7.4 From 77598a4ad1f4486ac50429448230d679f4ddd856 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Mon, 13 Jul 2015 20:16:39 +0900 Subject: [PATCH 16/16] Using proper vconf key - VCONFKEY_SETAPPL_ACCESSIBILITY_TTS Change-Id: I90e2144132d6c940f94249fdf1d3359ecfa82237 --- bus/at-spi-bus-launcher.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c index 67e8bed..98a0098 100644 --- a/bus/at-spi-bus-launcher.c +++ b/bus/at-spi-bus-launcher.c @@ -711,13 +711,13 @@ main (int argc, _global_app, NULL); - int ret = vconf_get_bool("db/menu/accessibility/screen_reader", &_global_app->screen_reader_needed); + int ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &_global_app->screen_reader_needed); if (ret != 0) { - LOGD("Could not read 'db/menu/accessibility/screen_reader' key value.\n"); + LOGD("Could not read VCONFKEY_SETAPPL_ACCESSIBILITY_TTS key value.\n"); return FALSE; } - ret = vconf_notify_key_changed("db/menu/accessibility/screen_reader", screen_reader_cb, _global_app); + ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, screen_reader_cb, _global_app); if(ret != 0) { LOGD("Could not add information level callback\n"); -- 2.7.4