[arch-commits] Commit in at-spi2-core/trunk (PKGBUILD fallback.diff)

[Jan Steffens]

    Date: Wednesday, March 13, 2019 @ 20:55:05
  Author: heftig
Revision: 347862

2.32.0-1

Modified:
  at-spi2-core/trunk/PKGBUILD
Deleted:
  at-spi2-core/trunk/fallback.diff

---------------+
 PKGBUILD      |   15 +++++----------
 fallback.diff |   27 ---------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-13 20:43:22 UTC (rev 347861)
+++ PKGBUILD	2019-03-13 20:55:05 UTC (rev 347862)
@@ -2,7 +2,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.30.1
+pkgver=2.32.0
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="https://gitlab.gnome.org/GNOME/at-spi2-core"
@@ -11,11 +11,9 @@
 depends=(dbus glib2 libxtst)
 makedepends=(intltool gobject-introspection git gtk-doc meson dbus-broker)
 optdepends=('dbus-broker: Alternative bus implementation')
-_commit=92a98cc17f6aa624ca501def329af4efd8196050  # tags/AT_SPI2_CORE_2_30_1^0
-source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit"
-        fallback.diff)
-sha256sums=('SKIP'
-            'e2254af6fe94a42402544dc9fd0f322318d2809be01ef1e9e944388f2aa3cad7')
+_commit=cd55a73884a1371718f45dd22340b5d4ddf41dbb  # tags/AT_SPI2_CORE_2_32_0^0
+source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -24,15 +22,12 @@
 
 prepare() {
   cd $pkgname
-
-  # Try to unbreak fallback
-  patch -Np1 -i ../fallback.diff
 }
 
 build() {
   arch-meson $pkgname build \
     -D default_bus=dbus-broker \
-    -D enable_docs=true
+    -D docs=true
   ninja -C build
 }
 

Deleted: fallback.diff
===================================================================
--- fallback.diff	2019-03-13 20:43:22 UTC (rev 347861)
+++ fallback.diff	2019-03-13 20:55:05 UTC (rev 347862)
@@ -1,27 +0,0 @@
- bus/at-spi-bus-launcher.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git c/bus/at-spi-bus-launcher.c i/bus/at-spi-bus-launcher.c
-index 5d58dff..994a767 100644
---- c/bus/at-spi-bus-launcher.c
-+++ i/bus/at-spi-bus-launcher.c
-@@ -293,7 +293,9 @@ ensure_a11y_bus_daemon (A11yBusLauncher *app, char *config_path)
- 
-   if (pipe (app->pipefd) < 0)
-     g_error ("Failed to create pipe: %s", strerror (errno));
--  
-+
-+  g_clear_pointer (&app->a11y_launch_error_message, g_free);
-+
-   if (!g_spawn_async (NULL,
-                       argv,
-                       NULL,
-@@ -389,6 +391,8 @@ ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path)
-   if (listen (app->listenfd, 1024) < 0)
-     g_error ("Failed to listen on socket: %s", strerror(errno));
- 
-+  g_clear_pointer (&app->a11y_launch_error_message, g_free);
-+
-   if (!g_spawn_async (NULL,
-                       argv,
-                       NULL,