Hello community, here is the log from the commit of package at-spi2-atk for openSUSE:Factory checked in at 2017-09-13 21:54:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-atk (Old) and /work/SRC/openSUSE:Factory/.at-spi2-atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi2-atk" Wed Sep 13 21:54:22 2017 rev:73 rq:523656 version:2.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-atk/at-spi2-atk.changes 2017-05-31 12:12:52.242599256 +0200 +++ /work/SRC/openSUSE:Factory/.at-spi2-atk.new/at-spi2-atk.changes 2017-09-13 21:54:23.979046578 +0200 @@ -1,0 +2,35 @@ +Tue Sep 12 00:01:14 UTC 2017 - luc1...@linuxmail.org + +- Update to version 2.26.0: + + Single commit. + +------------------------------------------------------------------- +Fri Sep 8 13:29:30 UTC 2017 - jeng...@inai.de + +- Update summaries, RPM groups and old macros. + +------------------------------------------------------------------- +Tue Jun 20 12:03:43 UTC 2017 - dims...@opensuse.org + +- Update to version 2.25.3: + + Add error-message, error-for, details, and details-for relation + types. + + Add Meson build system. + +------------------------------------------------------------------- +Tue May 23 11:46:53 UTC 2017 - zai...@opensuse.org + +- Update to version 2.25.2: + + Fix use after free when returned objects hold only one ref + (bgo#781716). + + Add some missing roles to correspond with atk (description + list, description term, description value, and footnote). + +------------------------------------------------------------------- +Sat May 20 11:55:00 UTC 2017 - zai...@opensuse.org + +- Update to version 2.25.1: + + Fix memory corruption when deleting an event from the list of + events for which there are registered listeners (bgo#781658). + +------------------------------------------------------------------- Old: ---- at-spi2-atk-2.24.1.tar.xz New: ---- at-spi2-atk-2.26.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-atk.spec ++++++ --- /var/tmp/diff_new_pack.FCXhj3/_old 2017-09-13 21:54:24.534968361 +0200 +++ /var/tmp/diff_new_pack.FCXhj3/_new 2017-09-13 21:54:24.538967798 +0200 @@ -17,18 +17,18 @@ Name: at-spi2-atk -Version: 2.24.1 +Version: 2.26.0 Release: 0 -Summary: Assistive Technology Service Provider Interface - GTK+ module +Summary: GTK+ module for the Assistive Technology Service Provider Interface License: LGPL-2.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/at-spi2-atk/2.24/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/at-spi2-atk/2.26/%{name}-%{version}.tar.xz Source98: baselibs.conf Source99: %{name}-rpmlintrc BuildRequires: fdupes -BuildRequires: pkgconfig(atk) >= 2.15.4 -BuildRequires: pkgconfig(atspi-2) >= 2.17.90 +BuildRequires: pkgconfig(atk) >= 2.25.2 +BuildRequires: pkgconfig(atspi-2) >= 2.25.3 BuildRequires: pkgconfig(dbus-1) >= 1.5 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gmodule-2.0) >= 2.0.0 @@ -40,8 +40,7 @@ accessibility toolkit. This version is based on dbus. %package common - -Summary: Assistive Technology Service Provider Interface - Common Files for GTK+ Modules +Summary: Comon files for the AT-SPI GTK+ module # The GTK+ module is useful only if the at-spi registry is running. But it's # not a strict runtime dependency. Group: System/Libraries @@ -64,7 +63,7 @@ for at-spi. %package gtk2 -Summary: Assistive Technology Service Provider Interface - GTK+ 2 Module +Summary: GTK+2 module for the Assistive Technology Service Provider Interface Group: System/Libraries Requires: %{name}-common = %{version} # We want to have this package installed if the user has gtk2 and the at-spi @@ -89,7 +88,7 @@ The package contains a ATK/D-Bus bridge library. %package devel -Summary: Assistive Technology Service Provider Interface - Developent files +Summary: Development files for the Assistive Technology Service Provider Interface Group: Development/Languages/C and C++ Requires: libatk-bridge-2_0-0 = %{version} @@ -105,7 +104,7 @@ make %{?_smp_mflags} %install -%makeinstall +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n libatk-bridge-2_0-0 -p /sbin/ldconfig ++++++ at-spi2-atk-2.24.1.tar.xz -> at-spi2-atk-2.26.0.tar.xz ++++++ ++++ 22344 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/Makefile.am new/at-spi2-atk-2.26.0/Makefile.am --- old/at-spi2-atk-2.24.1/Makefile.am 2017-04-25 00:43:15.000000000 +0200 +++ new/at-spi2-atk-2.26.0/Makefile.am 2017-06-21 22:39:19.000000000 +0200 @@ -12,6 +12,8 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atk-bridge-2.0.pc -EXTRA_DIST = $(gtk_modules_DATA) atk-bridge-2.0.pc.in +EXTRA_DIST = $(gtk_modules_DATA) atk-bridge-2.0.pc.in \ + meson.build \ + meson_options.txt DISTCHECK_CONFIGURE_FLAGS = --with-tests=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/NEWS new/at-spi2-atk-2.26.0/NEWS --- old/at-spi2-atk-2.24.1/NEWS 2017-05-09 00:29:06.000000000 +0200 +++ new/at-spi2-atk-2.26.0/NEWS 2017-06-21 22:39:19.000000000 +0200 @@ -1,11 +1,23 @@ -What's new in at-spi2-atk 2.24.1: +What's new in at-spi2-atk 2.25.3: -* Fix position getter for table cells. +* Add error-message, error-for, details, and details-for relation types + +* Add Meson build system (thanks to Emmanuele Bassi). -* atk-adaptor/bridge: Fix GList handling resulting in memory corruption (bgo#781658). +What's new in at-spi2-atk 2.25.2: * Fix use after free when returned objects hold only one ref (bgo#781716). +* Add some missing roles to correspond with atk (description list, + description term, description value, and footnote). + +What's new in at-spi2-atk 2.25.1: + +* Fix position getter for table cells. + +* Fix memory corruption when deleting an event from the list of events + for which there are registered listeners (bgo#781658). + What's new in at-spi2-atk 2.24.0: * test: remove atk_table_cell_get_column_index test, as the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/atk-adaptor/Makefile.am new/at-spi2-atk-2.26.0/atk-adaptor/Makefile.am --- old/at-spi2-atk-2.24.1/atk-adaptor/Makefile.am 2017-04-25 00:43:15.000000000 +0200 +++ new/at-spi2-atk-2.26.0/atk-adaptor/Makefile.am 2017-06-21 22:39:19.000000000 +0200 @@ -50,4 +50,5 @@ $(AM_LDFLAGS) EXTRA_DIST = Makefile.include \ - atkbridge.symbols + atkbridge.symbols \ + meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/atk-adaptor/adaptors/accessible-adaptor.c new/at-spi2-atk-2.26.0/atk-adaptor/adaptors/accessible-adaptor.c --- old/at-spi2-atk-2.24.1/atk-adaptor/adaptors/accessible-adaptor.c 2017-05-09 00:29:06.000000000 +0200 +++ new/at-spi2-atk-2.26.0/atk-adaptor/adaptors/accessible-adaptor.c 2017-05-31 18:03:13.000000000 +0200 @@ -265,6 +265,10 @@ types[ATK_RELATION_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR; types[ATK_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY; + types[ATK_RELATION_DETAILS] = ATSPI_RELATION_DETAILS; + types[ATK_RELATION_DETAILS_FOR] = ATSPI_RELATION_DETAILS_FOR; + types[ATK_RELATION_ERROR_MESSAGE] = ATSPI_RELATION_ERROR_MESSAGE; + types[ATK_RELATION_ERROR_FOR] = ATSPI_RELATION_ERROR_FOR; types[ATK_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF; return TRUE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/atk-adaptor/meson.build new/at-spi2-atk-2.26.0/atk-adaptor/meson.build --- old/at-spi2-atk-2.24.1/atk-adaptor/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.26.0/atk-adaptor/meson.build 2017-06-21 22:39:19.000000000 +0200 @@ -0,0 +1,49 @@ +subdir('adaptors') + +atk_bridge_sources = [ + 'accessible-leasing.c', + 'accessible-cache.c', + 'accessible-register.c', + 'accessible-stateset.c', + 'introspection.c', + 'bridge.c', + 'object.c', + 'event.c', + 'spi-dbus.c', +] + +install_headers([ 'atk-bridge.h' ], subdir: join_paths(meson.project_name(), '2.0')) + +libatk_bridge = shared_library('atk-bridge-2.0', atk_bridge_sources, + include_directories: root_inc, + dependencies: [ + libatk_bridge_adaptors_dep, + libdroute_dep, + libdbus_dep, + gmodule_dep, + atk_dep, + atspi_dep, + ], + c_args: p2p_cflags, + version: atk_bridge_libversion, + soversion: atk_bridge_soversion, + install: true) + +libatk_bridge_dep = declare_dependency(link_with: libatk_bridge, + include_directories: [ + root_inc, + 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')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/atk-adaptor/object.c new/at-spi2-atk-2.26.0/atk-adaptor/object.c --- old/at-spi2-atk-2.24.1/atk-adaptor/object.c 2017-04-25 00:43:15.000000000 +0200 +++ new/at-spi2-atk-2.26.0/atk-adaptor/object.c 2017-05-31 18:03:13.000000000 +0200 @@ -479,6 +479,10 @@ role_table[ATK_ROLE_MATH_ROOT] = ATSPI_ROLE_MATH_ROOT; role_table[ATK_ROLE_SUBSCRIPT] = ATSPI_ROLE_SUBSCRIPT; role_table[ATK_ROLE_SUPERSCRIPT] = ATSPI_ROLE_SUPERSCRIPT; + role_table[ATK_ROLE_DESCRIPTION_LIST] = ATSPI_ROLE_DESCRIPTION_LIST; + role_table[ATK_ROLE_DESCRIPTION_TERM] = ATSPI_ROLE_DESCRIPTION_TERM; + role_table[ATK_ROLE_DESCRIPTION_VALUE] = ATSPI_ROLE_DESCRIPTION_VALUE; + role_table[ATK_ROLE_FOOTNOTE] = ATSPI_ROLE_FOOTNOTE; return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/config/compile new/at-spi2-atk-2.26.0/config/compile --- old/at-spi2-atk-2.24.1/config/compile 2017-04-25 00:48:11.000000000 +0200 +++ new/at-spi2-atk-2.26.0/config/compile 2017-09-11 22:08:59.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/config/missing new/at-spi2-atk-2.26.0/config/missing --- old/at-spi2-atk-2.24.1/config/missing 2017-04-25 00:48:11.000000000 +0200 +++ new/at-spi2-atk-2.26.0/config/missing 2017-09-11 22:08:59.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/config/test-driver new/at-spi2-atk-2.26.0/config/test-driver --- old/at-spi2-atk-2.24.1/config/test-driver 2017-04-25 00:48:11.000000000 +0200 +++ new/at-spi2-atk-2.26.0/config/test-driver 2017-09-11 22:08:59.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -148,6 +148,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/config.h.in new/at-spi2-atk-2.26.0/config.h.in --- old/at-spi2-atk-2.24.1/config.h.in 2017-05-09 00:29:16.000000000 +0200 +++ new/at-spi2-atk-2.26.0/config.h.in 2017-09-11 22:08:59.000000000 +0200 @@ -30,8 +30,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/configure.ac new/at-spi2-atk-2.26.0/configure.ac --- old/at-spi2-atk-2.24.1/configure.ac 2017-05-09 00:29:06.000000000 +0200 +++ new/at-spi2-atk-2.26.0/configure.ac 2017-09-11 21:56:20.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-atk], [2.24.1], [accessibility-at...@lists.linux-foundation.org]) +AC_INIT([at-spi2-atk], [2.26.0], [accessibility-at...@lists.linux-foundation.org]) AC_CONFIG_AUX_DIR(config) AT_SPI_ATK_MAJOR_VERSION=0 @@ -51,11 +51,11 @@ AC_SUBST(GMODULE_LIBS) AC_SUBST(GMODULE_CFLAGS) -PKG_CHECK_MODULES(ATK, [atk >= 2.15.4]) +PKG_CHECK_MODULES(ATK, [atk >= 2.25.2]) AC_SUBST(ATK_LIBS) AC_SUBST(ATK_CFLAGS) -PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.17.90]) +PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.25.3]) AC_SUBST(ATSPI_LIBS) AC_SUBST(ATSPI_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/droute/Makefile.am new/at-spi2-atk-2.26.0/droute/Makefile.am --- old/at-spi2-atk-2.24.1/droute/Makefile.am 2017-04-25 00:43:15.000000000 +0200 +++ new/at-spi2-atk-2.26.0/droute/Makefile.am 2017-06-21 22:39:19.000000000 +0200 @@ -28,3 +28,5 @@ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(ATSPI_LIBS) + +EXTRA_DIST = meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/droute/meson.build new/at-spi2-atk-2.26.0/droute/meson.build --- old/at-spi2-atk-2.24.1/droute/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.26.0/droute/meson.build 2017-06-21 22:39:19.000000000 +0200 @@ -0,0 +1,18 @@ +droute_sources = [ + 'droute.c', + 'droute-variant.c', + 'droute-pairhash.c', +] + +libdroute = static_library('droute', droute_sources, + dependencies: [ glib_dep, libdbus_dep ], + include_directories: root_inc) + +libdroute_dep = declare_dependency(link_with: libdroute, + dependencies: [ glib_dep, libdbus_dep ], + include_directories: include_directories('.')) + +droute_test = executable('droute-test', 'droute-test.c', + dependencies: [ libdroute_dep, atspi_dep ], + include_directories: root_inc) +test('droute-test', droute_test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/meson.build new/at-spi2-atk-2.26.0/meson.build --- old/at-spi2-atk-2.24.1/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.26.0/meson.build 2017-09-11 21:56:20.000000000 +0200 @@ -0,0 +1,71 @@ +project('at-spi2-atk', 'c', + version: '2.26.0', + license: 'LGPLv2.1+', + default_options: [ + 'buildtype=debugoptimized', + 'warning_level=1', + 'c_std=c99', + ], + meson_version : '>= 0.40.1') + +atk_bridge_soversion = 0 +atk_bridge_libversion = '0.0.0' + +cc = meson.get_compiler('c') +host_system = host_machine.system() + +# XXX: for strcasecmp(); should use g_ascii_strcasecmp() +add_project_arguments([ '-D_DEFAULT_SOURCE', ], language: 'c') + +# XXX: Unused +at_spi_conf = configuration_data() +at_spi_conf.set('GETTEXT_PACKAGE', meson.project_name()) +configure_file(output: 'config.h', + configuration: at_spi_conf) + +root_inc = include_directories('.') + +# Dependencies +libdbus_req_version = '>= 1.5' +glib_req_version = '>= 2.32.0' +gobject_req_version = '>= 2.0.0' +gmodule_req_version = '>= 2.0.0' +atk_req_version = '>= 2.15.4' +atspi_req_version = '>= 2.17.90' +libxml_req_version = '>= 2.9.1' + +libdbus_dep = dependency('dbus-1', version: libdbus_req_version) +glib_dep = dependency('glib-2.0', version: glib_req_version) +gobject_dep = dependency('gobject-2.0', version: gobject_req_version) +gmodule_dep = dependency('gmodule-2.0', version: gmodule_req_version) +atk_dep = dependency('atk', version: atk_req_version) +atspi_dep = dependency('atspi-2', version: atspi_req_version) +libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) + +if get_option('disable_p2p') + p2p_cflags = [ '-DDISABLE_P2P' ] +else + p2p_cflags = [] +endif + +import('gnome') + +pkg_conf = configuration_data() +pkg_conf.set('prefix', get_option('prefix')) +pkg_conf.set('exec_prefix', get_option('prefix')) +pkg_conf.set('libdir', get_option('libdir')) +pkg_conf.set('includedir', get_option('includedir')) +pkg_conf.set('VERSION', meson.project_version()) + +configure_file(input: 'atk-bridge-2.0.pc.in', + output: 'atk-bridge-2.0.pc', + configuration: pkg_conf, + install: true, + install_dir: join_paths(get_option('libdir'), 'pkgconfig')) + +install_data('at-spi2-atk.desktop', + install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules')) + +subdir('droute') +subdir('atk-adaptor') +subdir('tests') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/meson_options.txt new/at-spi2-atk-2.26.0/meson_options.txt --- old/at-spi2-atk-2.24.1/meson_options.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.26.0/meson_options.txt 2017-06-21 22:39:19.000000000 +0200 @@ -0,0 +1,4 @@ +option('disable_p2p', + description: 'Disable peer-to-peer DBus connections', + type: 'boolean', + value: false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/tests/Makefile.am new/at-spi2-atk-2.26.0/tests/Makefile.am --- old/at-spi2-atk-2.24.1/tests/Makefile.am 2017-04-25 00:43:15.000000000 +0200 +++ new/at-spi2-atk-2.26.0/tests/Makefile.am 2017-06-21 22:39:19.000000000 +0200 @@ -84,3 +84,5 @@ libtestutils_la_SOURCES = atk_test_util.c \ atk_test_util.h + +EXTRA_DIST = meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.24.1/tests/meson.build new/at-spi2-atk-2.26.0/tests/meson.build --- old/at-spi2-atk-2.24.1/tests/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.26.0/tests/meson.build 2017-06-21 22:39:19.000000000 +0200 @@ -0,0 +1,77 @@ +subdir('dummyatk') + +xmlloader = static_library('xmlloader', [ 'atk-object-xml-loader.c' ], + dependencies: [ glib_dep, gobject_dep, libxml_dep, atk_dep, dummyatk_dep ], + include_directories: [ root_inc, include_directories('.') ]) +xmlloader_dep = declare_dependency(link_with: xmlloader) + +testutils = static_library('testutils', [ 'atk_test_util.c' ], + dependencies: [ glib_dep, atspi_dep ], + include_directories: [ root_inc, include_directories('.') ]) +testutils_dep = declare_dependency(link_with: testutils) + +# tests: +# - name +# - sources +# - dependencies +tests = [ + [ + 'atk-test', [ + 'atk_suite.c', + 'atk_test_accessible.c', + 'atk_test_action.c', + 'atk_test_component.c', + 'atk_test_collection.c', + 'atk_test_document.c', + 'atk_test_editable_text.c', + 'atk_test_hyperlink.c', + 'atk_test_hypertext.c', + 'atk_test_image.c', + 'atk_test_selection.c', + 'atk_test_state_set.c', + 'atk_test_table.c', + 'atk_test_table_cell.c', + 'atk_test_text.c', + 'atk_test_value.c', + ], + [ + glib_dep, + atspi_dep, + xmlloader_dep, + testutils_dep, + dummyatk_dep, + ] + ], + + [ + 'app-test', + [ + 'test-application.c', + ], + [ + glib_dep, + atk_dep, + xmlloader_dep, + testutils_dep, + dummyatk_dep, + libatk_bridge_dep, + ] + ], +] + +foreach t: tests + test_name = t[0] + test_sources = t[1] + test_deps = t[2] + + test_bin = executable(test_name, test_sources, + dependencies: test_deps, + include_directories: root_inc, + c_args: [ + '-DTESTS_BUILD_DIR="@0@"'.format(meson.current_build_dir()), + '-DTESTS_SRC_DIR="@0@"'.format(meson.current_source_dir()), + '-DTESTS_DATA_DIR="@0@"'.format(join_paths(meson.current_source_dir(), 'data')), + ]) + + test(test_name, test_bin) +endforeach