[arch-commits] Commit in libxkbcommon/trunk (2 files)

[Jan Steffens]

    Date: Monday, July 16, 2018 @ 23:21:12
  Author: heftig
Revision: 328849

0.8.0-2

Added:
  libxkbcommon/trunk/0001-meson-Fix-xkbcommon-x11.pc-Requires.patch
Modified:
  libxkbcommon/trunk/PKGBUILD

------------------------------------------------+
 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch |   78 +++++++++++++++++++++++
 PKGBUILD                                       |   16 +++-
 2 files changed, 89 insertions(+), 5 deletions(-)

Added: 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch
===================================================================
--- 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch	                        (rev 0)
+++ 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch	2018-07-16 23:21:12 UTC (rev 328849)
@@ -0,0 +1,78 @@
+From bfd80332b5f4804244f14d475bc0182bd0553a64 Mon Sep 17 00:00:00 2001
+Message-Id: <bfd80332b5f4804244f14d475bc0182bd0553a64.1531783043.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 17 Jul 2018 01:15:30 +0200
+Subject: [PATCH] meson: Fix xkbcommon-x11.pc Requires
+
+The meson-generated pkgconfig file was missing Requires and
+Requires.private.
+
+Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+---
+ meson.build | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 7ee4f78..1243eae 100644
+--- a/meson.build
++++ b/meson.build
+@@ -216,48 +216,52 @@ if get_option('enable-x11')
+ You can disable X11 support with -Denable-x11=false.''')
+     endif
+ 
++    libxkbcommon_x11_deps = [
++        xcb_dep,
++        xcb_xkb_dep,
++    ]
++
+     libxkbcommon_x11_internal = static_library(
+         'xkbcommon-x11-internal',
+         'src/x11/keymap.c',
+         'src/x11/state.c',
+         'src/x11/util.c',
+         'src/x11/x11-priv.h',
+         'src/context.h',
+         'src/context-priv.c',
+         'src/keymap.h',
+         'src/keymap-priv.c',
+         'src/atom.h',
+         'src/atom.c',
+         include_directories: include_directories('src'),
+         link_with: libxkbcommon,
+-        dependencies: [
+-            xcb_dep,
+-            xcb_xkb_dep,
+-        ],
++        dependencies: libxkbcommon_x11_deps,
+     )
+     libxkbcommon_x11_link_args = []
+     if have_version_script
+         libxkbcommon_x11_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbcommon-x11.map')
+     endif
+     libxkbcommon_x11 = library(
+         'xkbcommon-x11',
+         'xkbcommon/xkbcommon-x11.h',
+         link_whole: libxkbcommon_x11_internal,
+         link_args: libxkbcommon_x11_link_args,
+         link_depends: 'xkbcommon-x11.map',
+         version: '0.0.0',
+         install: true,
+     )
+     install_headers(
+         'xkbcommon/xkbcommon-x11.h',
+         subdir: 'xkbcommon',
+     )
+     pkgconfig.generate(
+         name: 'xkbcommon-x11',
+         filebase: 'xkbcommon-x11',
+         libraries: libxkbcommon_x11,
+         version: meson.project_version(),
+         description: 'XKB API common to servers and clients - X11 support',
++        requires: libxkbcommon,
++        requires_private: libxkbcommon_x11_deps,
+     )
+ endif
+ 
+-- 
+2.18.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-16 22:43:25 UTC (rev 328848)
+++ PKGBUILD	2018-07-16 23:21:12 UTC (rev 328849)
@@ -6,17 +6,19 @@
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Keymap handling library for toolkits and window systems"
+url="https://xkbcommon.org/"
 arch=(x86_64)
-url="https://xkbcommon.org/"
 license=(custom)
 depends=(xkeyboard-config glibc)
 checkdepends=(xorg-server-xvfb libgl)
 makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
 _commit=b82e3b764e60df337ca695e8f8642e7bf42b0cca  # tags/xkbcommon-0.8.0^0
-source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit")
-md5sums=('SKIP')
+source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit"
+        0001-meson-Fix-xkbcommon-x11.pc-Requires.patch)
+md5sums=('SKIP'
+         '9ff496a1d19a644e736da32d39946a19')
 
 pkgver() {
   cd $pkgbase
@@ -25,6 +27,10 @@
 
 prepare() {
   cd $pkgbase
+
+  # https://bugs.archlinux.org/task/58973
+  patch -Np1 -i ../0001-meson-Fix-xkbcommon-x11.pc-Requires.patch
+
   printf '%s\n' >>doc/Doxyfile.in \
     HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
 }
@@ -40,7 +46,7 @@
 }
 
 package_libxkbcommon() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
 
 ### Split libxkbcommon-doc