Date: Monday, July 16, 2018 @ 23:21:57
Author: heftig
Revision: 328850
archrelease: copy trunk to extra-x86_64
Added:
libxkbcommon/repos/extra-x86_64/0001-meson-Fix-xkbcommon-x11.pc-Requires.patch
(from rev 328849,
libxkbcommon/trunk/0001-meson-Fix-xkbcommon-x11.pc-Requires.patch)
libxkbcommon/repos/extra-x86_64/PKGBUILD
(from rev 328849, libxkbcommon/trunk/PKGBUILD)
Deleted:
libxkbcommon/repos/extra-x86_64/PKGBUILD
------------------------------------------------+
0001-meson-Fix-xkbcommon-x11.pc-Requires.patch | 78 +++++++++++
PKGBUILD | 160 +++++++++++------------
2 files changed, 161 insertions(+), 77 deletions(-)
Copied:
libxkbcommon/repos/extra-x86_64/0001-meson-Fix-xkbcommon-x11.pc-Requires.patch
(from rev 328849,
libxkbcommon/trunk/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:57 UTC
(rev 328850)
@@ -0,0 +1,78 @@
+From bfd80332b5f4804244f14d475bc0182bd0553a64 Mon Sep 17 00:00:00 2001
+Message-Id:
<bfd80332b5f4804244f14d475bc0182bd0553a64.1531783043.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@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.steff...@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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-16 23:21:12 UTC (rev 328849)
+++ PKGBUILD 2018-07-16 23:21:57 UTC (rev 328850)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Daniel Micay <danielmi...@gmail.com>
-# Contributor: Mladen Pejakovic <pej...@gmail.com>
-
-pkgbase=libxkbcommon
-pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="Keymap handling library for toolkits and window systems"
-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')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/^xkbcommon-//;s/-/+/g'
-}
-
-prepare() {
- cd $pkgbase
- printf '%s\n' >>doc/Doxyfile.in \
- HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
-}
-
-build() {
- arch-meson $pkgbase build
- ninja -C build
-}
-
-check() {
- cd build
- xvfb-run -a meson test
-}
-
-package_libxkbcommon() {
- DESTDIR="$pkgdir" ninja -C build install
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
-
-### Split libxkbcommon-doc
-
- mkdir -p "$srcdir"/doc/usr/share
- mv "$pkgdir"/usr/share/doc "$srcdir/doc/usr/share"
-
-### Split libxkbcommon-x11
-
- mkdir -p "$srcdir"/x11/usr/{include/xkbcommon,lib/pkgconfig}
- mv "$pkgdir"/usr/lib/*x11* "$srcdir/x11/usr/lib"
- mv "$pkgdir"/usr/lib/pkgconfig/*x11* "$srcdir/x11/usr/lib/pkgconfig"
- mv "$pkgdir"/usr/include/xkbcommon/*x11* "$srcdir/x11/usr/include/xkbcommon"
-}
-
-package_libxkbcommon-doc() {
- pkgdesc="API documentation for libxkbcommon"
- depends=(libxkbcommon)
-
- mv doc/* "$pkgdir"
-
- install -d "$pkgdir/usr/share/licenses"
- ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-package_libxkbcommon-x11() {
- pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
- depends=(libxkbcommon libxcb)
-
- mv x11/* "$pkgdir"
-
- install -d "$pkgdir/usr/share/licenses"
- ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
-}
Copied: libxkbcommon/repos/extra-x86_64/PKGBUILD (from rev 328849,
libxkbcommon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-16 23:21:57 UTC (rev 328850)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Daniel Micay <danielmi...@gmail.com>
+# Contributor: Mladen Pejakovic <pej...@gmail.com>
+
+pkgbase=libxkbcommon
+pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
+pkgver=0.8.0
+pkgrel=2
+pkgdesc="Keymap handling library for toolkits and window systems"
+url="https://xkbcommon.org/";
+arch=(x86_64)
+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";
+ 0001-meson-Fix-xkbcommon-x11.pc-Requires.patch)
+md5sums=('SKIP'
+ '9ff496a1d19a644e736da32d39946a19')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/^xkbcommon-//;s/-/+/g'
+}
+
+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
+}
+
+build() {
+ arch-meson $pkgbase build
+ ninja -C build
+}
+
+check() {
+ cd build
+ xvfb-run -a meson test
+}
+
+package_libxkbcommon() {
+ DESTDIR="$pkgdir" meson install -C build
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
+
+### Split libxkbcommon-doc
+
+ mkdir -p "$srcdir"/doc/usr/share
+ mv "$pkgdir"/usr/share/doc "$srcdir/doc/usr/share"
+
+### Split libxkbcommon-x11
+
+ mkdir -p "$srcdir"/x11/usr/{include/xkbcommon,lib/pkgconfig}
+ mv "$pkgdir"/usr/lib/*x11* "$srcdir/x11/usr/lib"
+ mv "$pkgdir"/usr/lib/pkgconfig/*x11* "$srcdir/x11/usr/lib/pkgconfig"
+ mv "$pkgdir"/usr/include/xkbcommon/*x11* "$srcdir/x11/usr/include/xkbcommon"
+}
+
+package_libxkbcommon-doc() {
+ pkgdesc="API documentation for libxkbcommon"
+ depends=(libxkbcommon)
+
+ mv doc/* "$pkgdir"
+
+ install -d "$pkgdir/usr/share/licenses"
+ ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_libxkbcommon-x11() {
+ pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
+ depends=(libxkbcommon libxcb)
+
+ mv x11/* "$pkgdir"
+
+ install -d "$pkgdir/usr/share/licenses"
+ ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
+}
