From 49078585cc97bfa00ddb20d135eb90ae160ef8474c749fed5ff4c715227a4b71 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Apr 2019 13:35:58 +0000 Subject: [PATCH] Accepting request 695599 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/695599 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=186 --- at-spi2-core-2.30.1.tar.xz | 3 - at-spi2-core-2.32.1.tar.xz | 3 + at-spi2-core-bus-launch-use__linux__.patch | 41 ------------ at-spi2-core-generate-pc.patch | 77 ---------------------- at-spi2-core.changes | 54 +++++++++++++++ at-spi2-core.spec | 22 ++----- 6 files changed, 64 insertions(+), 136 deletions(-) delete mode 100644 at-spi2-core-2.30.1.tar.xz create mode 100644 at-spi2-core-2.32.1.tar.xz delete mode 100644 at-spi2-core-bus-launch-use__linux__.patch delete mode 100644 at-spi2-core-generate-pc.patch diff --git a/at-spi2-core-2.30.1.tar.xz b/at-spi2-core-2.30.1.tar.xz deleted file mode 100644 index 717f8ca..0000000 --- a/at-spi2-core-2.30.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:856f1f8f1bf0482a1bc275b18b9f28815d346bc4175004d37e175a1a0e50ca48 -size 188056 diff --git a/at-spi2-core-2.32.1.tar.xz b/at-spi2-core-2.32.1.tar.xz new file mode 100644 index 0000000..dac8bdc --- /dev/null +++ b/at-spi2-core-2.32.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53 +size 188952 diff --git a/at-spi2-core-bus-launch-use__linux__.patch b/at-spi2-core-bus-launch-use__linux__.patch deleted file mode 100644 index ad5d82f..0000000 --- a/at-spi2-core-bus-launch-use__linux__.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2e449f62a9f6a8a3f47e0819b1a0af24d1caee27 Mon Sep 17 00:00:00 2001 -From: David Herrmann -Date: Fri, 10 Aug 2018 16:15:35 +0200 -Subject: [PATCH] bus-launch: use __linux__ over __linux - -The canonical way to check for linux support is '__linux__', not -'__linux'. Particularly, on ppc64le '__linux' is not defined and the -build will fail. - -For reference, see: - - https://sourceforge.net/p/predef/wiki/OperatingSystems/ ---- - bus/at-spi-bus-launcher.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c -index 5d58dff..7572cb6 100644 ---- a/bus/at-spi-bus-launcher.c -+++ b/bus/at-spi-bus-launcher.c -@@ -25,7 +25,7 @@ - #include - #include - #include --#ifdef __linux -+#ifdef __linux__ - #include - #include - #include -@@ -278,7 +278,7 @@ setup_bus_child_daemon (gpointer data) - close (app->pipefd[1]); - - /* On Linux, tell the bus process to exit if this process goes away */ --#ifdef __linux -+#ifdef __linux__ - prctl (PR_SET_PDEATHSIG, 15); - #endif - } --- -2.18.0 - diff --git a/at-spi2-core-generate-pc.patch b/at-spi2-core-generate-pc.patch deleted file mode 100644 index 5a2973b..0000000 --- a/at-spi2-core-generate-pc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8a2107d67cf7a574f14836252d1952a5adea889f Mon Sep 17 00:00:00 2001 -From: Soapux -Date: Thu, 6 Sep 2018 11:56:49 -0500 -Subject: [PATCH] meson: Generate a pkg-config file - -Use Meson's pkgconfig module to generate the pkg-config file -for us instead of using a template. ---- - atspi-2.pc.in | 11 ----------- - atspi/meson.build | 10 ++++++++++ - meson.build | 14 -------------- - 3 files changed, 10 insertions(+), 25 deletions(-) - delete mode 100644 atspi-2.pc.in - -diff --git a/atspi-2.pc.in b/atspi-2.pc.in -deleted file mode 100644 -index 71d028a..0000000 ---- a/atspi-2.pc.in -+++ /dev/null -@@ -1,11 +0,0 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -- --Name: atspi --Description: Accessibility Technology software library --Requires: dbus-1 glib-2.0 --Version: @VERSION@ --Libs: -L${libdir} -latspi --Cflags: -I${includedir}/at-spi-2.0 -diff --git a/atspi/meson.build b/atspi/meson.build -index 1f8d021..b7a9357 100644 ---- a/atspi/meson.build -+++ b/atspi/meson.build -@@ -113,3 +113,13 @@ if have_gir - ) - endif - -+pkgconfig = import('pkgconfig') -+pkgconfig.generate( -+ name: 'atspi', -+ description: 'Accessibility Technology software library', -+ version: meson.project_version(), -+ libraries: atspi, -+ requires: 'dbus-1 glib-2.0', -+ subdirs: 'at-spi-2.0', -+ filebase: 'atspi-2', -+) -diff --git a/meson.build b/meson.build -index 2b6ef8a..8ef8ae3 100644 ---- a/meson.build -+++ b/meson.build -@@ -109,20 +109,6 @@ xgettext = find_program('xgettext', required : false) - - configure_file(output: 'config.h', configuration: at_spi_conf) - --# Compat variables for pkgconfig --pkgconf = configuration_data() --pkgconf.set('prefix', get_option('prefix')) --pkgconf.set('exec_prefix', get_option('prefix')) --pkgconf.set('libdir', atspi_libdir) --pkgconf.set('includedir', atspi_includedir) --pkgconf.set('VERSION', meson.project_version()) -- --configure_file(input: 'atspi-2.pc.in', -- output: 'atspi-2.pc', -- configuration: pkgconf, -- install: true, -- install_dir: join_paths(get_option('libdir'), 'pkgconfig')) -- - gnome = import('gnome') - - subdir('dbind') --- -2.18.0 - diff --git a/at-spi2-core.changes b/at-spi2-core.changes index 4ebc84f..d581fc0 100644 --- a/at-spi2-core.changes +++ b/at-spi2-core.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Wed Apr 10 08:33:28 UTC 2019 - Bjørn Lie + +- Update to version 2.32.1: + + Fix meson build for meson 0.50.0 and newer. +- Drop at-spi2-core-meson-build-fix.patch: Fixed upstream. + +------------------------------------------------------------------- +Tue Mar 12 17:00:11 UTC 2019 - mgorse@suse.com + +- Add at-spi2-core-meson-build-fix.patch: fix build for meson + 0.50.0 (glgo#GNOME/at-spi2-core!9). + +------------------------------------------------------------------- +Tue Mar 12 06:42:24 UTC 2019 - Bjørn Lie + +- Update to version 2.32.0: + + Stable release version bump. + +------------------------------------------------------------------- +Tue Mar 5 02:31:03 UTC 2019 - Bjørn Lie + +- Update to version 2.31.92: + + Fix atspi_table_cell_get_(row_column)_headers. + + Update documentation to indicate that extents are only + meaningful when an object has both STATE_VISIBLE and + STATE_SHOWING. + + Use a consistent style for the meson options. + + Fix a compiler warning on BSD. + + Add ScrollSubstringTo and ScrollSubstringToPoint text + interfaces. +- Enable gtk-docs BuildRequires and update options passed to meson. +- Drop unneeded and unused intltool BuildRequires. + +------------------------------------------------------------------- +Tue Mar 5 02:31:02 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 2.31.2: + + Add ScrollSubstringTo and ScrollSubstringToPoint text + interfaces. + +------------------------------------------------------------------- +Tue Mar 5 02:31:01 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 2.31.1: + + Bus launcher: fix an issue where the error wasn't cleared on + failure. + + Add support for locking/unlocking modifiers. + + Update error log text for consistency. + + Documentation clean-ups. +- Drop upstream fixed patches: + + at-spi2-core-bus-launch-use__linux__.patch. + + at-spi2-core-generate-pc.patch. + ------------------------------------------------------------------- Mon Mar 4 21:44:27 UTC 2019 - mgorse@suse.com diff --git a/at-spi2-core.spec b/at-spi2-core.spec index 6fa5c57..bfb2be8 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -17,22 +17,16 @@ Name: at-spi2-core -Version: 2.30.1 +Version: 2.32.1 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://www.gnome.org/ -Source0: https://download.gnome.org/sources/at-spi2-core/2.30/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/at-spi2-core/2.32/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-UPSTREAM-FIX at-spi2-core-bus-launch-use__linux__.patch -- bus-launch: use __linux__ over __linux -Patch0: at-spi2-core-bus-launch-use__linux__.patch -# PATCH-UPSTREAM-FIX at-spi2-core-generate-pc.patch -- meson: Generate a pkg-config file -Patch1: at-spi2-core-generate-pc.patch -###FIXME### Disabled due to build error with meson 048 and newer -#BuildRequires: gtk-doc -BuildRequires: intltool +BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-1) >= 1.0 @@ -93,9 +87,9 @@ to develop applications that require these. %build %meson \ --libexecdir="%{_libexecdir}/at-spi2" \ - -D enable_docs=false \ - -D enable-introspection=yes \ - -D enable-x11=yes \ + -Ddocs=true \ + -Dintrospection=yes \ + -Dx11=yes \ %{nil} %meson_build @@ -129,9 +123,7 @@ to develop applications that require these. %{_libdir}/libatspi.so %{_libdir}/pkgconfig/atspi-2.pc %{_datadir}/gir-1.0/*.gir -#%%dir %%{_datadir}/gtk-doc -#%%dir %%{_datadir}/gtk-doc/html -#%%doc %%{_datadir}/gtk-doc/html/libatspi/ +%doc %{_datadir}/gtk-doc/html/libatspi/ %files lang -f at-spi2-core.lang