Accepting request 640110 from GNOME:Factory

Resub, spellfix (forwarded request 640094 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/640110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/at-spi2-core?expand=0&rev=81

at-spi2-core-2.28.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87
-size 186676

at-spi2-core-2.30.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b
+size 188016

at-spi2-core-bus-launch-use__linux__.patch

@@ -0,0 +1,41 @@
+From 2e449f62a9f6a8a3f47e0819b1a0af24d1caee27 Mon Sep 17 00:00:00 2001
+From: David Herrmann <dh.herrmann@gmail.com>
+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 <unistd.h>
+ #include <string.h>
+ #include <signal.h>
+-#ifdef __linux
++#ifdef __linux__
+ #include <sys/prctl.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -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
+

at-spi2-core-generate-pc.patch

@@ -0,0 +1,77 @@
+From 8a2107d67cf7a574f14836252d1952a5adea889f Mon Sep 17 00:00:00 2001
+From: Soapux <nulldomain@gmail.com>
+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
+

at-spi2-core.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Oct  4 10:50:55 UTC 2018 - bjorn.lie@gmail.com
+
+- Add at-spi2-core-bus-launch-use__linux__.patch: bus-launch:
+  use __linux__ over __linux.
+- Add at-spi2-core-generate-pc.patch: meson: Generate a pkg-config
+  file.
+- Disable gtk-doc BuildRequires and pass enable_docs=false to
+  meson. Temp workaround for buildfail when building docs with
+  meson 0.48.
+
+-------------------------------------------------------------------
+Fri Sep  7 20:28:29 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 2.30.0:
+  + No changes, stable bump only.
+
+-------------------------------------------------------------------
+Tue Jun 19 23:07:04 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 2.29.1:
+  + Add dbus-broker support to bus launcher.
+  + Add ScrollTo and ScrollToPoint component interfaces.
+  + Do not use deprecated GSettings API.
+  + Fix various compiler warnings and documentation annotations.
+
 -------------------------------------------------------------------
 Tue Mar 13 08:00:03 UTC 2018 - dimstar@opensuse.org
 

at-spi2-core.spec

@@ -12,20 +12,26 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           at-spi2-core
-Version:        2.28.0
+Version:        2.30.0
 Release:        0
 Summary:        Assistive Technology Service Provider Interface - D-Bus based implementation
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-URL:            http://www.gnome.org/
+URL:            https://www.gnome.org/
-Source0:        http://download.gnome.org/sources/at-spi2-core/2.28/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/at-spi2-core/2.30/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-BuildRequires:  gtk-doc
+# 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:  meson
 BuildRequires:  pkgconfig
@@ -87,7 +93,7 @@ to develop applications that require these.
 %build
 %meson \
 	--libexecdir="%{_libexecdir}/at-spi2" \
-	-D enable_docs=true \
+	-D enable_docs=false \
 	-D enable-introspection=yes \
 	-D enable-x11=yes \
 	%{nil}
@@ -123,9 +129,9 @@ 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
-%dir %{_datadir}/gtk-doc/html
+#%%dir %%{_datadir}/gtk-doc/html
-%doc %{_datadir}/gtk-doc/html/libatspi/
+#%%doc %%{_datadir}/gtk-doc/html/libatspi/
 
 %files lang -f at-spi2-core.lang