Commit 83a553a00966326bca29bcd3e06996a54fc1fc41

Jan Alexander Steffens (heftig) 2018-07-17T17:21:02

meson: Fix xkbcommon-x11.pc Requires versioning Old meson expects an array with one dependency per element. Providing a string containing multiple deps results in only the first dep getting its whitespace properly applied. As a result, the output was: Requires.private: xcb >= 1.10 xcb-xkb>=1.10 And downstream projects failed to find a package named 'xcb-xkb>=1.10'. Specifying an array of versioned deps results in correct output: Requires.private: xcb >= 1.10, xcb-xkb >= 1.10 Fixes #64. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/meson.build b/meson.build
index 3935182..360958b 100644
--- a/meson.build
+++ b/meson.build
@@ -258,8 +258,8 @@ You can disable X11 support with -Denable-x11=false.''')
         libraries: libxkbcommon_x11,
         version: meson.project_version(),
         description: 'XKB API common to servers and clients - X11 support',
-        requires: 'xkbcommon',
-        requires_private: 'xcb>=1.10 xcb-xkb>=1.10',
+        requires: ['xkbcommon'],
+        requires_private: ['xcb>=1.10', 'xcb-xkb>=1.10'],
     )
 endif