Date: Saturday, September 12, 2020 @ 06:53:25
Author: heftig
Revision: 395814
archrelease: copy trunk to extra-x86_64
Added:
libxkbcommon/repos/extra-x86_64/PKGBUILD
(from rev 395813, libxkbcommon/trunk/PKGBUILD)
Deleted:
libxkbcommon/repos/extra-x86_64/PKGBUILD
libxkbcommon/repos/extra-x86_64/fix-test.diff
---------------+
PKGBUILD | 163 +++++++++++++++++++++++++++-----------------------------
fix-test.diff | 13 ----
2 files changed, 80 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-12 06:53:13 UTC (rev 395813)
+++ PKGBUILD 2020-09-12 06:53:25 UTC (rev 395814)
@@ -1,83 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Daniel Micay <danielmi...@gmail.com>
-# Contributor: Mladen Pejakovic <pej...@gmail.com>
-
-pkgbase=libxkbcommon
-pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Keymap handling library for toolkits and window systems"
-url="https://xkbcommon.org/";
-arch=(x86_64)
-license=(custom)
-makedepends=(xkeyboard-config libxml2 libxcb wayland wayland-protocols doxygen
- git meson)
-checkdepends=(xorg-server-xvfb libgl python-pytest)
-_commit=12f99d0dfe012c07d82d70296bbcac8a0a8ac0a9 # tags/xkbcommon-1.0.0^0
-source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit";
- fix-test.diff)
-sha256sums=('SKIP'
- 'e965cf7516d3158f3de1016e955f804a14b3e514df66520d7919e5289eefde69')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/^xkbcommon-//;s/-/+/g'
-}
-
-prepare() {
- cd $pkgbase
- git apply -3 ../fix-test.diff
-}
-
-build() {
- arch-meson $pkgbase build
- meson compile -C build
-}
-
-check() {
- xvfb-run -a meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_libxkbcommon() {
- depends=(xkeyboard-config libxml2)
- optdepends=('libxkbcommon-x11: xkbcli interactive-x11'
- 'wayland: xkbcli interactive-wayland')
- provides=(libxkbcommon.so libxkbregistry.so)
-
- DESTDIR="$pkgdir" meson install -C build
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
-
- _pick libxkbcommon-doc "$pkgdir"/usr/share/doc
-
- _pick libxkbcommon-x11 "$pkgdir"/usr/lib/*x11*
- _pick libxkbcommon-x11 "$pkgdir"/usr/lib/pkgconfig/*x11*
- _pick libxkbcommon-x11 "$pkgdir"/usr/lib/xkbcommon/*x11*
- _pick libxkbcommon-x11 "$pkgdir"/usr/include/xkbcommon/*x11*
- _pick libxkbcommon-x11 "$pkgdir"/usr/share/man/man1/*x11*
-}
-
-package_libxkbcommon-doc() {
- pkgdesc="API documentation for libxkbcommon"
-
- mv libxkbcommon-doc/* "$pkgdir"
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
-}
-
-package_libxkbcommon-x11() {
- pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
- depends=(libxkbcommon libxkbcommon.so libxcb)
- provides=(libxkbcommon-x11.so)
-
- mv libxkbcommon-x11/* "$pkgdir"
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
-}
Copied: libxkbcommon/repos/extra-x86_64/PKGBUILD (from rev 395813,
libxkbcommon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-09-12 06:53:25 UTC (rev 395814)
@@ -0,0 +1,80 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Daniel Micay <danielmi...@gmail.com>
+# Contributor: Mladen Pejakovic <pej...@gmail.com>
+
+pkgbase=libxkbcommon
+pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="Keymap handling library for toolkits and window systems"
+url="https://xkbcommon.org/";
+arch=(x86_64)
+license=(custom)
+makedepends=(xkeyboard-config libxml2 libxcb wayland wayland-protocols doxygen
+ git meson)
+checkdepends=(xorg-server-xvfb libgl)
+_commit=2c295b10aa87e9bd8c11954adcf7e92b031b92f9 # tags/xkbcommon-1.0.1^0
+source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit";)
+sha256sums=('SKIP')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/^xkbcommon-//;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgbase
+}
+
+build() {
+ arch-meson $pkgbase build
+ meson compile -C build
+}
+
+check() {
+ xvfb-run -s '-nolisten local' meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_libxkbcommon() {
+ depends=(xkeyboard-config libxml2)
+ optdepends=('libxkbcommon-x11: xkbcli interactive-x11'
+ 'wayland: xkbcli interactive-wayland')
+ provides=(libxkbcommon.so libxkbregistry.so)
+
+ DESTDIR="$pkgdir" meson install -C build
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
+
+ _pick libxkbcommon-doc "$pkgdir"/usr/share/doc
+
+ _pick libxkbcommon-x11 "$pkgdir"/usr/lib/*x11*
+ _pick libxkbcommon-x11 "$pkgdir"/usr/lib/pkgconfig/*x11*
+ _pick libxkbcommon-x11 "$pkgdir"/usr/lib/xkbcommon/*x11*
+ _pick libxkbcommon-x11 "$pkgdir"/usr/include/xkbcommon/*x11*
+ _pick libxkbcommon-x11 "$pkgdir"/usr/share/man/man1/*x11*
+}
+
+package_libxkbcommon-doc() {
+ pkgdesc="API documentation for libxkbcommon"
+
+ mv libxkbcommon-doc/* "$pkgdir"
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
+}
+
+package_libxkbcommon-x11() {
+ pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
+ depends=(libxkbcommon libxkbcommon.so libxcb)
+ provides=(libxkbcommon-x11.so)
+
+ mv libxkbcommon-x11/* "$pkgdir"
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
+}
Deleted: fix-test.diff
===================================================================
--- fix-test.diff 2020-09-12 06:53:13 UTC (rev 395813)
+++ fix-test.diff 2020-09-12 06:53:25 UTC (rev 395814)
@@ -1,13 +0,0 @@
-diff --git i/test/tool-option-parsing.py w/test/tool-option-parsing.py
-index de638d1..367e799 100755
---- i/test/tool-option-parsing.py
-+++ w/test/tool-option-parsing.py
-@@ -170,7 +170,7 @@ def test_invalid_option(tool):
- # xkbcli --version
- def test_xkbcli_version(xkbcli):
- stdout, stderr = xkbcli.run_command_success(['--version'])
-- assert stdout.startswith('0')
-+ assert stdout.startswith('1')
- assert stderr == ''
-
-
