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

[Jan Steffens]

    Date: Wednesday, September 5, 2018 @ 19:15:43
  Author: heftig
Revision: 333531

2.30.0-2

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-05 18:38:49 UTC (rev 333530)
+++ PKGBUILD	2018-09-05 19:15:43 UTC (rev 333531)
@@ -3,16 +3,19 @@
 
 pkgname=at-spi2-core
 pkgver=2.30.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="https://gitlab.gnome.org/GNOME/at-spi2-core"
 arch=(x86_64)
 license=(GPL2)
 depends=(dbus glib2 libxtst)
-makedepends=(intltool gobject-introspection git gtk-doc meson)
+makedepends=(intltool gobject-introspection git gtk-doc meson dbus-broker)
+optdepends=('dbus-broker: Alternative bus implementation')
 _commit=2f3b23bb626e91aa321f06374ff66a709c323430  # tags/AT_SPI2_CORE_2_30_0^0
-source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit"
+        fallback.diff)
+sha256sums=('SKIP'
+            'e2254af6fe94a42402544dc9fd0f322318d2809be01ef1e9e944388f2aa3cad7')
 
 pkgver() {
   cd $pkgname
@@ -21,11 +24,13 @@
 
 prepare() {
   cd $pkgname
+
+  # Try to unbreak fallback
+  patch -Np1 -i ../fallback.diff
 }
 
 build() {
   arch-meson $pkgname build \
-    -D dbus_broker=/usr/bin/dbus-broker-launch \
     -D default_bus=dbus-broker \
     -D enable_docs=true
   ninja -C build
@@ -33,6 +38,7 @@
 
 check() {
   # memory test fails without desktop
+  # broker fails to launch without journald
   dbus-run-session meson test -C build || :
 }
 

Added: fallback.diff
===================================================================
--- fallback.diff	                        (rev 0)
+++ fallback.diff	2018-09-05 19:15:43 UTC (rev 333531)
@@ -0,0 +1,27 @@
+ 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,