Update at-spi2-atk to 2.33.2

Unstable branch chosen for:
* Add support for ROLE_CONTENT_DELETION and ROLE_CONTENT_INSERTION

ChangeLog:
* Add support for ROLE_CONTENT_DELETION and ROLE_CONTENT_INSERTION
* Fix a build issue where libgobject might not have been linked, resulting in
  undefined symbols.

What's new in at-spi2-atk 2.33.1:
* Document atk_bridge_adaptor_init error messages.
* Add atk_bridge_set_event_context.
* Add AccessibleId property.

What's new in at-spi2-atk 2.31.92:
* Fix a crash when retrieveing headers from table cells.

What's new in at-spi2-atk 2.31.2:
* Add ScrollSubstringTo and ScrollSubstringToPoint interfaces.

What's new in at-spi2-atk 2.29.1:
* Fix a case where we could return without unlocking a mutex (bgo#793625).
* Add ScrollTo and ScrollToPoint interfaces.
* Fix various compiler warnings and build issues.

6 files changed, 57 insertions, 34 deletions

diff --git a/devel/at-spi2-atk/Makefile b/devel/at-spi2-atk/Makefile
index 104617ea3ac..3f983901a43 100644
--- a/devel/at-spi2-atk/Makefile
+++ b/devel/at-spi2-atk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2017/11/23 17:19:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/07/18 15:03:51 prlw1 Exp $
 
-DISTNAME=	at-spi2-atk-2.26.1
-PKGREVISION=	1
+DISTNAME=	at-spi2-atk-2.33.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-atk/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -11,21 +10,20 @@ HOMEPAGE=	http://www.linuxfoundation.org/collaborate/workgroups/accessibility/at
 COMMENT=	Assistive Technology Service Provider Interface A11y Toolkit
 LICENSE=	gnu-lgpl-v2
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake intltool msgfmt pkg-config
-GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
 
-PKGCONFIG_OVERRIDE+=	atk-bridge-2.0.pc.in
+PKGCONFIG_OVERRIDE=	output/meson-private/atk-bridge-2.0.pc
+PKGCONFIG_OVERRIDE_STAGE=pre-install
 
-CHECK_PORTABILITY_SKIP+=	config/test-driver
-
-BUILDLINK_API_DEPENDS.atk+=	atk>=2.25.2
+BUILDLINK_API_DEPENDS.atk+=	atk>=2.33.3
 .include "../../devel/atk/buildlink3.mk"
-BUILDLINK_API_DEPENDS.at-spi2-core+=	at-spi2-core>=2.17.90
+BUILDLINK_API_DEPENDS.at-spi2-core+=	at-spi2-core>=2.33.2
 .include "../../devel/at-spi2-core/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.32.0
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus+=	dbus>=1.5
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+
+.include "../../devel/py-meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/at-spi2-atk/PLIST b/devel/at-spi2-atk/PLIST
index 69f37fe1c0c..5491e43381e 100644
--- a/devel/at-spi2-atk/PLIST
+++ b/devel/at-spi2-atk/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2013/05/18 21:56:03 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/07/18 15:03:51 prlw1 Exp $
 include/at-spi2-atk/2.0/atk-bridge.h
 lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
-lib/libatk-bridge-2.0.la
+lib/libatk-bridge-2.0.so
+lib/libatk-bridge-2.0.so.0
+lib/libatk-bridge-2.0.so.0.0.0
 lib/pkgconfig/atk-bridge-2.0.pc
diff --git a/devel/at-spi2-atk/distinfo b/devel/at-spi2-atk/distinfo
index 8b22c86c85d..b94d8c1bfdb 100644
--- a/devel/at-spi2-atk/distinfo
+++ b/devel/at-spi2-atk/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2017/11/23 15:19:14 wiz Exp $
+$NetBSD: distinfo,v 1.20 2019/07/18 15:03:51 prlw1 Exp $
 
-SHA1 (at-spi2-atk-2.26.1.tar.xz) = 577f4e67bcda8fecd71ed4893c9b675670519bf5
-RMD160 (at-spi2-atk-2.26.1.tar.xz) = c0eacbb1ea6522b886ee89ebebf77ca05cb19a8d
-SHA512 (at-spi2-atk-2.26.1.tar.xz) = 2922ce0429901e00729e05a4fd67860a601917a683160ce123d281426e91074258ae70e8a4a67c2aff5e225290e59f99417a37914b039cab2481f7d1c2c64c5d
-Size (at-spi2-atk-2.26.1.tar.xz) = 322760 bytes
-SHA1 (patch-atk-adaptor_Makefile.in) = 91ea0570a8a99dfa8c06005cb8c26b161b93731c
+SHA1 (at-spi2-atk-2.33.2.tar.xz) = 877df50bc16e78067704ebd287906e7f7e15da5c
+RMD160 (at-spi2-atk-2.33.2.tar.xz) = 8c98ebf74214234a8383b5dd4f2175a54a9a5d17
+SHA512 (at-spi2-atk-2.33.2.tar.xz) = 90973259c918e1694b84ee15624b654399f3ac806923217e56b00e683d145a3cae2829195e302a76a7d156254311dd9d2d97a3d7d0ca9f36de045aaee37fd26c
+Size (at-spi2-atk-2.33.2.tar.xz) = 95336 bytes
+SHA1 (patch-atk-adaptor_meson.build) = fc7f93cf52b3b7429208bc25819ca2aead86a6ef
+SHA1 (patch-meson.build) = 2a505175189424945277383b7e168bcdabd51e6e
diff --git a/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in b/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
deleted file mode 100644
index ef574a0c838..00000000000
--- a/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-atk-adaptor_Makefile.in,v 1.3 2012/10/08 20:31:27 prlw1 Exp $
-
-Assume that anyone wanting the gtk2 module will use devel/at-spi.
-
---- atk-adaptor/Makefile.in.orig	2012-10-07 14:22:51.000000000 +0000
-+++ atk-adaptor/Makefile.in
-@@ -339,7 +339,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = adaptors . gtk-2.0
-+SUBDIRS = adaptors .
- lib_LTLIBRARIES = libatk-bridge-2.0.la
- libatk_bridge_2_0_la_CFLAGS = \
- 	$(DBUS_CFLAGS)    \
diff --git a/devel/at-spi2-atk/patches/patch-atk-adaptor_meson.build b/devel/at-spi2-atk/patches/patch-atk-adaptor_meson.build
new file mode 100644
index 00000000000..1ce00619dec
--- /dev/null
+++ b/devel/at-spi2-atk/patches/patch-atk-adaptor_meson.build
@@ -0,0 +1,26 @@
+$NetBSD: patch-atk-adaptor_meson.build,v 1.1 2019/07/18 15:03:51 prlw1 Exp $
+
+Assume that anyone wanting the gtk2 module will use devel/at-spi.
+
+--- atk-adaptor/meson.build.orig	2019-06-18 11:14:23.000000000 +0000
++++ atk-adaptor/meson.build
+@@ -36,19 +36,6 @@ libatk_bridge_dep = declare_dependency(l
+                                          include_directories('.')
+                                        ])
+ 
+-atk_bridge_module = shared_module('atk-bridge', 'gtk-2.0/module.c',
+-                                  include_directories: root_inc,
+-                                  dependencies: [
+-                                    libatk_bridge_dep,
+-                                    libdbus_dep,
+-                                    atk_dep,
+-                                    atspi_dep,
+-                                    gmodule_dep,
+-                                  ],
+-                                  c_args: p2p_cflags,
+-                                  install: true,
+-                                  install_dir: join_paths(get_option('libdir'), 'gtk-2.0', 'modules'))
+-
+ pkgconfig = import('pkgconfig')
+ pkgconfig.generate(
+   name: 'atk-bridge-2.0',
diff --git a/devel/at-spi2-atk/patches/patch-meson.build b/devel/at-spi2-atk/patches/patch-meson.build
new file mode 100644
index 00000000000..26d61eab408
--- /dev/null
+++ b/devel/at-spi2-atk/patches/patch-meson.build
@@ -0,0 +1,11 @@
+$NetBSD: patch-meson.build,v 1.1 2019/07/18 15:03:51 prlw1 Exp $
+
+Avoid libxml2 dependency by dropping tests.
+
+--- meson.build.orig	2019-06-18 11:14:23.000000000 +0000
++++ meson.build
+@@ -61,4 +61,3 @@ install_data('at-spi2-atk.desktop',
+ 
+ subdir('droute')
+ subdir('atk-adaptor')
+-subdir('tests')