Date: Monday, August 6, 2018 @ 00:19:52 Author: heftig Revision: 330635
0.8.2-1 Modified: libxkbcommon/trunk/PKGBUILD Deleted: libxkbcommon/trunk/0001-meson-Fix-xkbcommon-x11.pc-Requires.patch ------------------------------------------------+ 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch | 78 ----------------------- PKGBUILD | 18 +---- 2 files changed, 6 insertions(+), 90 deletions(-) Deleted: 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch =================================================================== --- 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch 2018-08-06 00:11:12 UTC (rev 330634) +++ 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch 2018-08-06 00:19:52 UTC (rev 330635) @@ -1,78 +0,0 @@ -From bfd80332b5f4804244f14d475bc0182bd0553a64 Mon Sep 17 00:00:00 2001 -Message-Id: <bfd80332b5f4804244f14d475bc0182bd0553a64.1531783043.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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) <[email protected]> ---- - 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-08-06 00:11:12 UTC (rev 330634) +++ PKGBUILD 2018-08-06 00:19:52 UTC (rev 330635) @@ -5,8 +5,8 @@ pkgbase=libxkbcommon pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11) -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.2 +pkgrel=1 pkgdesc="Keymap handling library for toolkits and window systems" url="https://xkbcommon.org/"; arch=(x86_64) @@ -14,11 +14,9 @@ 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"; - 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch) -md5sums=('SKIP' - '9ff496a1d19a644e736da32d39946a19') +_commit=f8134c8503c9868d65ee6e06b211ec2eaff3f60d # tags/xkbcommon-0.8.2^0 +source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit";) +md5sums=('SKIP') pkgver() { cd $pkgbase @@ -28,9 +26,6 @@ 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 } @@ -41,8 +36,7 @@ } check() { - cd build - xvfb-run -a meson test + xvfb-run -a meson test -C build } package_libxkbcommon() {
