I'm attaching a different way of fixing this issue.
I added the dependency because it was required for at-spi2-core to
build when I packaged 2.25.90 or .91 but the dependency was correctly
made optional again before 2.26.0 with this commit:
https://git.gnome.org/browse/at-spi2-core/commit/?id=aa3a11a1dece493
Thanks,
Jeremy Bicha
From 5ad4d7ed515f8bea31631ccca300a75dfcd793af Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Sat, 16 Sep 2017 11:22:30 -0400
Subject: [PATCH] Alternate fix for libxkbcommon linking issue
---
debian/control | 2 --
debian/patches/avoid_xkb_dep | 19 -------------------
debian/patches/series | 1 -
3 files changed, 22 deletions(-)
delete mode 100644 debian/patches/avoid_xkb_dep
diff --git a/debian/control b/debian/control
index 3ffada4..e6d6a03 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,6 @@ Build-Depends: debhelper (>= 9.20150628),
dh-autoreconf,
dbus, libdbus-1-dev,
libglib2.0-dev,
- libxkbcommon-x11-dev,
- libxkbcommon-dev,
libxtst-dev,
libgirepository1.0-dev,
intltool, gtk-doc-tools (>= 1.09),
diff --git a/debian/patches/avoid_xkb_dep b/debian/patches/avoid_xkb_dep
deleted file mode 100644
index e1cbb73..0000000
--- a/debian/patches/avoid_xkb_dep
+++ /dev/null
@@ -1,19 +0,0 @@
-reported on https://bugzilla.gnome.org/show_bug.cgi?id=787756
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,8 +109,8 @@ AS_IF([test "x$enable_x11" = xno], [
- # XKB (optional)
- PKG_CHECK_MODULES(XKB, [xkbcommon-x11], [
- AC_DEFINE(HAVE_XKB, 1, [Define to use XKB])
-- X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS"
-- X11_LIBS="$X11_LIBS $XKB_LIBS"
-+ #X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS"
-+ #X11_LIBS="$X11_LIBS $XKB_LIBS"
- ], [:])
- ])
-
diff --git a/debian/patches/series b/debian/patches/series
index 2b38357..54237f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
at-spi-by-default
-avoid_xkb_dep
--
2.14.1
