[arch-commits] Commit in libxkbcommon/trunk (PKGBUILD fix-test.diff)
Jan Steffens
heftig at archlinux.org
Sat Sep 12 06:53:14 UTC 2020
Date: Saturday, September 12, 2020 @ 06:53:13
Author: heftig
Revision: 395813
1.0.1-1
Modified:
libxkbcommon/trunk/PKGBUILD
Deleted:
libxkbcommon/trunk/fix-test.diff
---------------+
PKGBUILD | 15 ++++++---------
fix-test.diff | 13 -------------
2 files changed, 6 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-12 02:39:45 UTC (rev 395812)
+++ PKGBUILD 2020-09-12 06:53:13 UTC (rev 395813)
@@ -4,7 +4,7 @@
pkgbase=libxkbcommon
pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=1.0.0
+pkgver=1.0.1
pkgrel=1
pkgdesc="Keymap handling library for toolkits and window systems"
url="https://xkbcommon.org/"
@@ -12,12 +12,10 @@
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')
+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
@@ -26,7 +24,6 @@
prepare() {
cd $pkgbase
- git apply -3 ../fix-test.diff
}
build() {
@@ -35,7 +32,7 @@
}
check() {
- xvfb-run -a meson test -C build --print-errorlogs
+ xvfb-run -s '-nolisten local' meson test -C build --print-errorlogs
}
_pick() {
Deleted: fix-test.diff
===================================================================
--- fix-test.diff 2020-09-12 02:39:45 UTC (rev 395812)
+++ fix-test.diff 2020-09-12 06:53:13 UTC (rev 395813)
@@ -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 == ''
-
-
More information about the arch-commits
mailing list