Wed Jun 13 11:49:37 2012 UTC ()
Update at-spi2-atk from 2.3.5 -> 2.5.2 with extra patch to avoid conflict
with at-spi-atk. It makes the assumption that at-spi2-atk is used with
gtk3 only.

2.5.2:
* Fix for bug 677211 - The collection interface's MATCH_ANY fails for states

2.3.91:
* Have GetIndexInParent() return a signed int, per the spec.
* Send a DoAction reply message before invoking atk (works around
  atk_action_do_action potentially not returning right away for gtk).

2.3.90:
* Have GrabFocus return a bool, per the spec, rather than a uint32.
* Fix a potential crash when emitting a signal if the ATK implementor
  misbehaves.

New/updated Khmer, Malayalam, Norwegian Nynorsk, Hindi translations


(prlw1)
diff -r1.2 -r1.3 pkgsrc/devel/at-spi2-atk/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/at-spi2-atk/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/devel/at-spi2-atk/distinfo
diff -r0 -r1.1 pkgsrc/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
cvs diff -r1.2 -r1.3 pkgsrc/devel/at-spi2-atk/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/at-spi2-atk/Makefile 2012/03/03 00:12:53 1.2
+++ pkgsrc/devel/at-spi2-atk/Makefile 2012/06/13 11:49:37 1.3
@@ -1,31 +1,28 @@ @@ -1,31 +1,28 @@
1# $NetBSD: Makefile,v 1.2 2012/03/03 00:12:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2012/06/13 11:49:37 prlw1 Exp $
2# 2#
3 3
4DISTNAME= at-spi2-atk-2.3.5 4DISTNAME= at-spi2-atk-2.5.2
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/at-spi2-atk/2.3/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/at-spi2-atk/2.5/}
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= prlw1@cam.ac.uk 9MAINTAINER= prlw1@cam.ac.uk
11HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/accessibility/atk/at-spi/at-spi_on_d-bus 10HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/accessibility/atk/at-spi/at-spi_on_d-bus
12COMMENT= Assistive Technology Service Provider Interface A11y Toolkit 11COMMENT= Assistive Technology Service Provider Interface A11y Toolkit
13LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_TOOLS+= gmake intltool msgfmt pkg-config 17USE_TOOLS+= gmake intltool msgfmt pkg-config
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
21 20
22CONFLICTS= at-spi-[0-9]* 
23 
24BUILDLINK_API_DEPENDS.atk+= atk>=2.1.5 21BUILDLINK_API_DEPENDS.atk+= atk>=2.1.5
25.include "../../devel/atk/buildlink3.mk" 22.include "../../devel/atk/buildlink3.mk"
26.include "../../devel/at-spi2-core/buildlink3.mk" 23.include "../../devel/at-spi2-core/buildlink3.mk"
27.include "../../devel/glib2/buildlink3.mk" 24.include "../../devel/glib2/buildlink3.mk"
28.include "../../sysutils/dbus/buildlink3.mk" 25.include "../../sysutils/dbus/buildlink3.mk"
29.include "../../x11/libX11/buildlink3.mk" 26.include "../../x11/libX11/buildlink3.mk"
30 27
31.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/at-spi2-atk/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/at-spi2-atk/PLIST 2012/02/10 17:28:16 1.1.1.1
+++ pkgsrc/devel/at-spi2-atk/PLIST 2012/06/13 11:49:37 1.2
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2012/02/10 17:28:16 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/06/13 11:49:37 prlw1 Exp $
2lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop 2lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
3lib/gtk-2.0/modules/libatk-bridge.la 
4lib/gtk-3.0/modules/libatk-bridge.la 3lib/gtk-3.0/modules/libatk-bridge.la
5share/glib-2.0/schemas/org.a11y.atspi.gschema.xml 4share/glib-2.0/schemas/org.a11y.atspi.gschema.xml
6share/locale/an/LC_MESSAGES/at-spi2-atk.mo 5share/locale/an/LC_MESSAGES/at-spi2-atk.mo
7share/locale/ar/LC_MESSAGES/at-spi2-atk.mo 6share/locale/ar/LC_MESSAGES/at-spi2-atk.mo
8share/locale/as/LC_MESSAGES/at-spi2-atk.mo 7share/locale/as/LC_MESSAGES/at-spi2-atk.mo
9share/locale/ast/LC_MESSAGES/at-spi2-atk.mo 8share/locale/ast/LC_MESSAGES/at-spi2-atk.mo
10share/locale/be/LC_MESSAGES/at-spi2-atk.mo 9share/locale/be/LC_MESSAGES/at-spi2-atk.mo
11share/locale/bg/LC_MESSAGES/at-spi2-atk.mo 10share/locale/bg/LC_MESSAGES/at-spi2-atk.mo
12share/locale/bn/LC_MESSAGES/at-spi2-atk.mo 11share/locale/bn/LC_MESSAGES/at-spi2-atk.mo
13share/locale/bn_IN/LC_MESSAGES/at-spi2-atk.mo 12share/locale/bn_IN/LC_MESSAGES/at-spi2-atk.mo
14share/locale/ca/LC_MESSAGES/at-spi2-atk.mo 13share/locale/ca/LC_MESSAGES/at-spi2-atk.mo
15share/locale/ca@valencia/LC_MESSAGES/at-spi2-atk.mo 14share/locale/ca@valencia/LC_MESSAGES/at-spi2-atk.mo
16share/locale/cs/LC_MESSAGES/at-spi2-atk.mo 15share/locale/cs/LC_MESSAGES/at-spi2-atk.mo
@@ -27,45 +26,48 @@ share/locale/et/LC_MESSAGES/at-spi2-atk. @@ -27,45 +26,48 @@ share/locale/et/LC_MESSAGES/at-spi2-atk.
27share/locale/eu/LC_MESSAGES/at-spi2-atk.mo 26share/locale/eu/LC_MESSAGES/at-spi2-atk.mo
28share/locale/fa/LC_MESSAGES/at-spi2-atk.mo 27share/locale/fa/LC_MESSAGES/at-spi2-atk.mo
29share/locale/fi/LC_MESSAGES/at-spi2-atk.mo 28share/locale/fi/LC_MESSAGES/at-spi2-atk.mo
30share/locale/fr/LC_MESSAGES/at-spi2-atk.mo 29share/locale/fr/LC_MESSAGES/at-spi2-atk.mo
31share/locale/fy/LC_MESSAGES/at-spi2-atk.mo 30share/locale/fy/LC_MESSAGES/at-spi2-atk.mo
32share/locale/gl/LC_MESSAGES/at-spi2-atk.mo 31share/locale/gl/LC_MESSAGES/at-spi2-atk.mo
33share/locale/gu/LC_MESSAGES/at-spi2-atk.mo 32share/locale/gu/LC_MESSAGES/at-spi2-atk.mo
34share/locale/he/LC_MESSAGES/at-spi2-atk.mo 33share/locale/he/LC_MESSAGES/at-spi2-atk.mo
35share/locale/hi/LC_MESSAGES/at-spi2-atk.mo 34share/locale/hi/LC_MESSAGES/at-spi2-atk.mo
36share/locale/hu/LC_MESSAGES/at-spi2-atk.mo 35share/locale/hu/LC_MESSAGES/at-spi2-atk.mo
37share/locale/id/LC_MESSAGES/at-spi2-atk.mo 36share/locale/id/LC_MESSAGES/at-spi2-atk.mo
38share/locale/it/LC_MESSAGES/at-spi2-atk.mo 37share/locale/it/LC_MESSAGES/at-spi2-atk.mo
39share/locale/ja/LC_MESSAGES/at-spi2-atk.mo 38share/locale/ja/LC_MESSAGES/at-spi2-atk.mo
 39share/locale/km/LC_MESSAGES/at-spi2-atk.mo
40share/locale/kn/LC_MESSAGES/at-spi2-atk.mo 40share/locale/kn/LC_MESSAGES/at-spi2-atk.mo
41share/locale/ko/LC_MESSAGES/at-spi2-atk.mo 41share/locale/ko/LC_MESSAGES/at-spi2-atk.mo
42share/locale/lt/LC_MESSAGES/at-spi2-atk.mo 42share/locale/lt/LC_MESSAGES/at-spi2-atk.mo
43share/locale/lv/LC_MESSAGES/at-spi2-atk.mo 43share/locale/lv/LC_MESSAGES/at-spi2-atk.mo
 44share/locale/ml/LC_MESSAGES/at-spi2-atk.mo
44share/locale/mr/LC_MESSAGES/at-spi2-atk.mo 45share/locale/mr/LC_MESSAGES/at-spi2-atk.mo
45share/locale/ms/LC_MESSAGES/at-spi2-atk.mo 46share/locale/ms/LC_MESSAGES/at-spi2-atk.mo
46share/locale/nb/LC_MESSAGES/at-spi2-atk.mo 47share/locale/nb/LC_MESSAGES/at-spi2-atk.mo
47share/locale/nl/LC_MESSAGES/at-spi2-atk.mo 48share/locale/nl/LC_MESSAGES/at-spi2-atk.mo
48share/locale/nn/LC_MESSAGES/at-spi2-atk.mo 49share/locale/nn/LC_MESSAGES/at-spi2-atk.mo
49share/locale/or/LC_MESSAGES/at-spi2-atk.mo 50share/locale/or/LC_MESSAGES/at-spi2-atk.mo
50share/locale/pa/LC_MESSAGES/at-spi2-atk.mo 51share/locale/pa/LC_MESSAGES/at-spi2-atk.mo
51share/locale/pl/LC_MESSAGES/at-spi2-atk.mo 52share/locale/pl/LC_MESSAGES/at-spi2-atk.mo
52share/locale/pt/LC_MESSAGES/at-spi2-atk.mo 53share/locale/pt/LC_MESSAGES/at-spi2-atk.mo
53share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo 54share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo
54share/locale/ro/LC_MESSAGES/at-spi2-atk.mo 55share/locale/ro/LC_MESSAGES/at-spi2-atk.mo
55share/locale/ru/LC_MESSAGES/at-spi2-atk.mo 56share/locale/ru/LC_MESSAGES/at-spi2-atk.mo
56share/locale/sk/LC_MESSAGES/at-spi2-atk.mo 57share/locale/sk/LC_MESSAGES/at-spi2-atk.mo
57share/locale/sl/LC_MESSAGES/at-spi2-atk.mo 58share/locale/sl/LC_MESSAGES/at-spi2-atk.mo
58share/locale/sq/LC_MESSAGES/at-spi2-atk.mo 59share/locale/sq/LC_MESSAGES/at-spi2-atk.mo
59share/locale/sr/LC_MESSAGES/at-spi2-atk.mo 60share/locale/sr/LC_MESSAGES/at-spi2-atk.mo
60share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo 61share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo
61share/locale/sv/LC_MESSAGES/at-spi2-atk.mo 62share/locale/sv/LC_MESSAGES/at-spi2-atk.mo
62share/locale/ta/LC_MESSAGES/at-spi2-atk.mo 63share/locale/ta/LC_MESSAGES/at-spi2-atk.mo
63share/locale/te/LC_MESSAGES/at-spi2-atk.mo 64share/locale/te/LC_MESSAGES/at-spi2-atk.mo
64share/locale/th/LC_MESSAGES/at-spi2-atk.mo 65share/locale/th/LC_MESSAGES/at-spi2-atk.mo
65share/locale/tr/LC_MESSAGES/at-spi2-atk.mo 66share/locale/tr/LC_MESSAGES/at-spi2-atk.mo
66share/locale/ug/LC_MESSAGES/at-spi2-atk.mo 67share/locale/ug/LC_MESSAGES/at-spi2-atk.mo
67share/locale/uk/LC_MESSAGES/at-spi2-atk.mo 68share/locale/uk/LC_MESSAGES/at-spi2-atk.mo
 69share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-atk.mo
68share/locale/vi/LC_MESSAGES/at-spi2-atk.mo 70share/locale/vi/LC_MESSAGES/at-spi2-atk.mo
69share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo 71share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo
70share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo 72share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo
71share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo 73share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/at-spi2-atk/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/at-spi2-atk/distinfo 2012/02/10 17:28:16 1.1.1.1
+++ pkgsrc/devel/at-spi2-atk/distinfo 2012/06/13 11:49:37 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/02/10 17:28:16 drochner Exp $ 1$NetBSD: distinfo,v 1.2 2012/06/13 11:49:37 prlw1 Exp $
2 2
3SHA1 (at-spi2-atk-2.3.5.tar.xz) = 66348ce7a5af71a4efc175f1b0168c4461702776 3SHA1 (at-spi2-atk-2.5.2.tar.xz) = cea7e3c48acc266c5718a2af8c717790ae804d18
4RMD160 (at-spi2-atk-2.3.5.tar.xz) = 1954b8bec7095c755cb823946d5922ea8f6397e2 4RMD160 (at-spi2-atk-2.5.2.tar.xz) = 8c7bab12059637492b092c4c1efa14f8316cf2ff
5Size (at-spi2-atk-2.3.5.tar.xz) = 303588 bytes 5Size (at-spi2-atk-2.5.2.tar.xz) = 304452 bytes
 6SHA1 (patch-atk-adaptor_Makefile.in) = 521de1429b942a8967b838221b41b4b251b5bf04
File Added: pkgsrc/devel/at-spi2-atk/patches/Attic/patch-atk-adaptor_Makefile.in
$NetBSD: patch-atk-adaptor_Makefile.in,v 1.1 2012/06/13 11:49:37 prlw1 Exp $

Don't install lib/gtk-2.0/modules/libatk-bridge.la so that
we don't conflict with at-spi. (Reasonable to assume that
at-spi2 goes with gtk3, at-spi with gtk2.)

--- atk-adaptor/Makefile.in.orig	2012-02-06 23:09:55.000000000 +0000
+++ atk-adaptor/Makefile.in
@@ -252,7 +252,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = adaptors gtk-2.0 gtk-3.0
+SUBDIRS = adaptors gtk-3.0
 EXTRA_DIST = Makefile.include
 all: all-recursive