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

[Jan Steffens via arch-commits]

Date: Tuesday, November 24, 2020 @ 01:41:27
  Author: heftig
Revision: 401771

1.0.3-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-24 01:34:17 UTC (rev 401770)
+++ PKGBUILD2020-11-24 01:41:27 UTC (rev 401771)
@@ -4,7 +4,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
@@ -13,7 +13,7 @@
 makedepends=(xkeyboard-config libxml2 libxcb wayland wayland-protocols doxygen
  git meson)
 checkdepends=(xorg-server-xvfb libgl)
-_commit=13e6543ed427801bc48b8a51c9b54cd9ec90cafb  # tags/xkbcommon-1.0.2^0
+_commit=c60b77ea512bef92e481be38972b58dd71a34180  # tags/xkbcommon-1.0.3^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 sha256sums=('SKIP')
 

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

[Jan Steffens via arch-commits]

Date: Saturday, November 21, 2020 @ 19:00:17
  Author: heftig
Revision: 401606

1.0.2-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-21 17:12:38 UTC (rev 401605)
+++ PKGBUILD2020-11-21 19:00:17 UTC (rev 401606)
@@ -4,7 +4,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
@@ -13,7 +13,7 @@
 makedepends=(xkeyboard-config libxml2 libxcb wayland wayland-protocols doxygen
  git meson)
 checkdepends=(xorg-server-xvfb libgl)
-_commit=2c295b10aa87e9bd8c11954adcf7e92b031b92f9  # tags/xkbcommon-1.0.1^0
+_commit=13e6543ed427801bc48b8a51c9b54cd9ec90cafb  # tags/xkbcommon-1.0.2^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 sha256sums=('SKIP')
 

[arch-commits] Commit in libxkbcommon/trunk (PKGBUILD fix-test.diff)

[Jan Steffens via arch-commits]

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
===
--- PKGBUILD2020-09-12 02:39:45 UTC (rev 395812)
+++ PKGBUILD2020-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 == ''
- 
- 

[arch-commits] Commit in libxkbcommon/trunk (PKGBUILD fix-test.diff)

[Jan Steffens via arch-commits]

Date: Sunday, September 6, 2020 @ 21:31:46
  Author: heftig
Revision: 395530

1.0.0-1

Added:
  libxkbcommon/trunk/fix-test.diff
Modified:
  libxkbcommon/trunk/PKGBUILD

---+
 PKGBUILD  |   71 ++--
 fix-test.diff |   13 ++
 2 files changed, 52 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-06 18:01:06 UTC (rev 395529)
+++ PKGBUILD2020-09-06 21:31:46 UTC (rev 395530)
@@ -1,21 +1,23 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Contributor: Daniel Micay 
 # Contributor: Mladen Pejakovic 
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=0.10.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
 arch=(x86_64)
 license=(custom)
-depends=(xkeyboard-config glibc)
-makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
-checkdepends=(xorg-server-xvfb libgl)
-_commit=e3c3420a7146f4ea6225d6fb417baa05a79c8202  # tags/xkbcommon-0.10.0^0
-source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
-sha256sums=('SKIP')
+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
@@ -24,14 +26,12 @@
 
 prepare() {
   cd $pkgbase
-
-  printf '%s\n' >>doc/Doxyfile.in \
-HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
+  git apply -3 ../fix-test.diff
 }
 
 build() {
   arch-meson $pkgbase build
-  ninja -C build
+  meson compile -C build
 }
 
 check() {
@@ -38,39 +38,46 @@
   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
 
-### Split libxkbcommon-doc
+  _pick libxkbcommon-doc "$pkgdir"/usr/share/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"
+  _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"
-  depends=(libxkbcommon)
 
-  mv doc/* "$pkgdir"
-
-  install -d "$pkgdir/usr/share/licenses"
-  ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
+  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 libxcb)
+  depends=(libxkbcommon libxkbcommon.so libxcb)
+  provides=(libxkbcommon-x11.so)
 
-  mv x11/* "$pkgdir"
-
-  install -d "$pkgdir/usr/share/licenses"
-  ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
+  mv libxkbcommon-x11/* "$pkgdir"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
 }

Added: fix-test.diff
===
--- fix-test.diff   (rev 0)
+++ fix-test.diff   2020-09-06 21:31:46 UTC (rev 395530)
@@ -0,0 +1,13 @@
+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 == ''
+ 
+ 

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

[Jan Steffens via arch-commits]

Date: Sunday, January 19, 2020 @ 12:23:57
  Author: heftig
Revision: 373704

0.10.0-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-19 10:36:31 UTC (rev 373703)
+++ PKGBUILD2020-01-19 12:23:57 UTC (rev 373704)
@@ -4,7 +4,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=0.9.1
+pkgver=0.10.0
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
@@ -13,7 +13,7 @@
 depends=(xkeyboard-config glibc)
 makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
 checkdepends=(xorg-server-xvfb libgl)
-_commit=6d83838cc2e89a61d081e6f7f53aa9bccd0ddb34  # tags/xkbcommon-0.9.1^0
+_commit=e3c3420a7146f4ea6225d6fb417baa05a79c8202  # tags/xkbcommon-0.10.0^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 sha256sums=('SKIP')
 

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

[Jan Steffens via arch-commits]

Date: Sunday, October 20, 2019 @ 16:52:49
  Author: heftig
Revision: 365240

0.9.0-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-20 13:52:15 UTC (rev 365239)
+++ PKGBUILD2019-10-20 16:52:49 UTC (rev 365240)
@@ -4,7 +4,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=0.8.4
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
@@ -11,9 +11,9 @@
 arch=(x86_64)
 license=(custom)
 depends=(xkeyboard-config glibc)
+makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
 checkdepends=(xorg-server-xvfb libgl)
-makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
-_commit=d40b368b2f4c4cd130f63ac41e4a9d53b684c712  # tags/xkbcommon-0.8.4^0
+_commit=a88a0710f95c0422f52c54d9bad14b2cc45e3dd0  # tags/xkbcommon-0.9.0^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 md5sums=('SKIP')
 
@@ -35,7 +35,7 @@
 }
 
 check() {
-  xvfb-run -a meson test -C build
+  xvfb-run -a meson test -C build --print-errorlogs
 }
 
 package_libxkbcommon() {

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

[Jan Steffens via arch-commits]

Date: Saturday, February 23, 2019 @ 15:24:52
  Author: heftig
Revision: 346713

0.8.4-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-23 15:09:33 UTC (rev 346712)
+++ PKGBUILD2019-02-23 15:24:52 UTC (rev 346713)
@@ -4,7 +4,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=0.8.3
+pkgver=0.8.4
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
@@ -13,7 +13,7 @@
 depends=(xkeyboard-config glibc)
 checkdepends=(xorg-server-xvfb libgl)
 makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
-_commit=9f93ebcf2ba3684335db296a6e445c035bbeea9d  # tags/xkbcommon-0.8.3^0
+_commit=d40b368b2f4c4cd130f63ac41e4a9d53b684c712  # tags/xkbcommon-0.8.4^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 md5sums=('SKIP')
 

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

[Jan Steffens via arch-commits]

Date: Friday, February 8, 2019 @ 16:00:15
  Author: heftig
Revision: 345650

0.8.3-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-08 15:54:07 UTC (rev 345649)
+++ PKGBUILD2019-02-08 16:00:15 UTC (rev 345650)
@@ -4,7 +4,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=0.8.2
+pkgver=0.8.3
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 url="https://xkbcommon.org/;
@@ -13,7 +13,7 @@
 depends=(xkeyboard-config glibc)
 checkdepends=(xorg-server-xvfb libgl)
 makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
-_commit=f8134c8503c9868d65ee6e06b211ec2eaff3f60d  # tags/xkbcommon-0.8.2^0
+_commit=9f93ebcf2ba3684335db296a6e445c035bbeea9d  # tags/xkbcommon-0.8.3^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 md5sums=('SKIP')
 

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

[Jan Steffens via arch-commits]

Date: Saturday, December 16, 2017 @ 22:02:54
  Author: heftig
Revision: 312979

0.8.0-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |   40 
 1 file changed, 28 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-16 22:02:17 UTC (rev 312978)
+++ PKGBUILD2017-12-16 22:02:54 UTC (rev 312979)
@@ -4,8 +4,8 @@
 # Contributor: Mladen Pejakovic 
 
 pkgbase=libxkbcommon
-pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.7.2
+pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 arch=(x86_64)
@@ -14,7 +14,7 @@
 depends=(xkeyboard-config glibc)
 checkdepends=(xorg-server-xvfb libgl)
 makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
-_commit=ba9568bdb128f3c5f717b8503439ef6e50a66e97  # tags/xkbcommon-0.7.2^0
+_commit=b82e3b764e60df337ca695e8f8642e7bf42b0cca  # tags/xkbcommon-0.8.0^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 md5sums=('SKIP')
 
@@ -24,33 +24,48 @@
 }
 
 prepare() {
-  mkdir -p build x11/usr/{include/xkbcommon,lib/pkgconfig}
   cd $pkgbase
+  printf '%s\n' >>doc/Doxyfile.in \
+HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
 }
 
 build() {
-  cd build
-  meson --prefix=/usr --buildtype=release ../$pkgbase
-  ninja
+  arch-meson $pkgbase build
+  ninja -C build
 }
 
 check() {
   cd build
-  xvfb-run -a mesontest
+  xvfb-run -a meson test
 }
 
 package_libxkbcommon() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
-  install -Dm644 ../$pkgbase/LICENSE 
"$pkgdir/usr/share/licenses/libxkbcommon/LICENSE"
+  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)
@@ -57,5 +72,6 @@
 
   mv x11/* "$pkgdir"
 
-  install -Dm644 $pkgbase/LICENSE 
"$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE"
+  install -d "$pkgdir/usr/share/licenses"
+  ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname"
 }

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

[Jan Steffens]

Date: Friday, August 4, 2017 @ 19:07:21
  Author: heftig
Revision: 301648

0.7.2-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-04 19:03:18 UTC (rev 301647)
+++ PKGBUILD2017-08-04 19:07:21 UTC (rev 301648)
@@ -5,7 +5,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 arch=(i686 x86_64)
@@ -13,9 +13,8 @@
 license=(custom)
 depends=(xkeyboard-config glibc)
 checkdepends=(xorg-server-xvfb libgl)
-makedepends=(libxcb doxygen xorg-util-macros autoconf-archive git graphviz
- wayland wayland-protocols)
-_commit=877fe59ac362b4e9afb2979b6e0bc837950a1dad  # tags/xkbcommon-0.7.1^0
+makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson)
+_commit=ba9568bdb128f3c5f717b8503439ef6e50a66e97  # tags/xkbcommon-0.7.2^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 md5sums=('SKIP')
 
@@ -25,26 +24,25 @@
 }
 
 prepare() {
-  mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
+  mkdir -p build x11/usr/{include/xkbcommon,lib/pkgconfig}
   cd $pkgbase
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgbase
-  ./configure --prefix=/usr --disable-static
-  make
+  cd build
+  meson --prefix=/usr --buildtype=release ../$pkgbase
+  ninja
 }
 
 check() {
-  cd $pkgbase
-  xvfb-run -a make -k check
+  cd build
+  xvfb-run -a mesontest
 }
 
 package_libxkbcommon() {
-  cd $pkgbase
-  make DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/libxkbcommon/LICENSE"
+  cd build
+  DESTDIR="$pkgdir" ninja install
+  install -Dm644 ../$pkgbase/LICENSE 
"$pkgdir/usr/share/licenses/libxkbcommon/LICENSE"
 
 ### Split libxkbcommon-x11
 

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

[Jan Steffens]

Date: Wednesday, January 18, 2017 @ 22:52:20
  Author: heftig
Revision: 286958

0.7.1-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-18 22:43:58 UTC (rev 286957)
+++ PKGBUILD2017-01-18 22:52:20 UTC (rev 286958)
@@ -5,7 +5,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Keymap handling library for toolkits and window systems"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@
 checkdepends=(xorg-server-xvfb libgl)
 makedepends=(libxcb doxygen xorg-util-macros autoconf-archive git graphviz
  wayland wayland-protocols)
-_commit=d596f6e3ff2d1fde0491907fa9354e5cdf154ed1  # tags/xkbcommon-0.7.0^0
+_commit=877fe59ac362b4e9afb2979b6e0bc837950a1dad  # tags/xkbcommon-0.7.1^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit;)
 md5sums=('SKIP')
 

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

[Jan Steffens]

Date: Saturday, November 12, 2016 @ 18:30:06
  Author: heftig
Revision: 280610

0.7.0-1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |   29 +++--
 1 file changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-12 18:12:40 UTC (rev 280609)
+++ PKGBUILD2016-11-12 18:30:06 UTC (rev 280610)
@@ -5,35 +5,44 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.6.1
+pkgver=0.7.0
 pkgrel=1
-pkgdesc="Keyboard handling library using XKB data"
+pkgdesc="Keymap handling library for toolkits and window systems"
 arch=(i686 x86_64)
-url="http://xkbcommon.org/;
+url="https://xkbcommon.org/;
 license=(custom)
 depends=(xkeyboard-config glibc)
 checkdepends=(xorg-server-xvfb libgl)
-makedepends=(libxcb doxygen xorg-util-macros)
-source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-md5sums=('67a8f322b5fa32352272e811bb90dd73')
+makedepends=(libxcb doxygen xorg-util-macros autoconf-archive git graphviz
+ wayland wayland-protocols)
+_commit=d596f6e3ff2d1fde0491907fa9354e5cdf154ed1  # tags/xkbcommon-0.7.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() {
   mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
+  cd $pkgbase
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   ./configure --prefix=/usr --disable-static
   make
 }
 
 check() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   xvfb-run -a make -k check
 }
 
 package_libxkbcommon() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   make DESTDIR="$pkgdir" install
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/libxkbcommon/LICENSE"
 
@@ -50,5 +59,5 @@
 
   mv x11/* "$pkgdir"
 
-  install -Dm644 $pkgbase-$pkgver/LICENSE 
"$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE"
+  install -Dm644 $pkgbase/LICENSE 
"$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE"
 }

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

[Jan Steffens]

Date: Sunday, October 26, 2014 @ 01:56:42
  Author: heftig
Revision: 225341

0.5.0

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-25 23:47:05 UTC (rev 225340)
+++ PKGBUILD2014-10-25 23:56:42 UTC (rev 225341)
@@ -5,7 +5,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.4.3
+pkgver=0.5.0
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
@@ -12,9 +12,10 @@
 url=http://xkbcommon.org/;
 license=(custom)
 depends=(xkeyboard-config glibc)
+checkdepends=(xorg-server-xvfb libgl)
 makedepends=(libxcb doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-md5sums=('26c57ff21438ed45de2a4ca609177db9')
+md5sums=('2e1faeafcc609c30af3a561a91e84158')
 
 prepare() {
   mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
@@ -26,6 +27,11 @@
   make
 }
 
+check() {
+  cd $pkgbase-$pkgver
+  xvfb-run -a make -k check
+}
+
 package_libxkbcommon() {
   cd $pkgbase-$pkgver
   make DESTDIR=$pkgdir install

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

[Jan Steffens]

Date: Wednesday, August 20, 2014 @ 23:09:01
  Author: heftig
Revision: 220471

0.4.3

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-20 21:08:36 UTC (rev 220470)
+++ PKGBUILD2014-08-20 21:09:01 UTC (rev 220471)
@@ -5,7 +5,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 depends=(xkeyboard-config glibc)
 makedepends=(libxcb doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-md5sums=('4b717adce41c8305258e99a9b396330a')
+md5sums=('26c57ff21438ed45de2a4ca609177db9')
 
 prepare() {
   mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}

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

[Jan Steffens]

Date: Saturday, May 24, 2014 @ 01:56:31
  Author: heftig
Revision: 213499

0.4.2

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-23 23:54:54 UTC (rev 213498)
+++ PKGBUILD2014-05-23 23:56:31 UTC (rev 213499)
@@ -5,7 +5,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 depends=(xkeyboard-config glibc)
 makedepends=(libxcb doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-md5sums=('b70f4ed97b6c9432dc956e4177f3336a')
+md5sums=('4b717adce41c8305258e99a9b396330a')
 
 prepare() {
   mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}

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

[Jan Steffens]

Date: Friday, April 18, 2014 @ 13:44:31
  Author: heftig
Revision: 211256

0.4.1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-18 11:39:13 UTC (rev 211255)
+++ PKGBUILD2014-04-18 11:44:31 UTC (rev 211256)
@@ -5,7 +5,7 @@
 
 pkgbase=libxkbcommon
 pkgname=(libxkbcommon libxkbcommon-x11)
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 depends=(xkeyboard-config glibc)
 makedepends=(libxcb doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-md5sums=('bb782f1700e45b4f57c84ef513e3cf85')
+md5sums=('b70f4ed97b6c9432dc956e4177f3336a')
 
 prepare() {
   mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}

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

[Jan Steffens]

Date: Sunday, February 2, 2014 @ 19:21:56
  Author: heftig
Revision: 204973

0.4.0

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |   39 +--
 1 file changed, 29 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-02 16:54:39 UTC (rev 204972)
+++ PKGBUILD2014-02-02 18:21:56 UTC (rev 204973)
@@ -3,27 +3,46 @@
 # Contributor: Daniel Micay danielmi...@gmail.com
 # Contributor: Mladen Pejakovic pej...@gmail.com
 
-pkgname=libxkbcommon
-pkgver=0.3.2
+pkgbase=libxkbcommon
+pkgname=(libxkbcommon libxkbcommon-x11)
+pkgver=0.4.0
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
 url=http://xkbcommon.org/;
 license=(custom)
-depends=(xkeyboard-config glibc)
-makedepends=(doxygen xorg-util-macros)
+makedepends=(xkeyboard-config glibc libxcb doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-#source=($pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git)
-md5sums=('935cf416354bf05210de2e389484f7e8')
+md5sums=('bb782f1700e45b4f57c84ef513e3cf85')
 
+prepare() {
+  mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
+}
+
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
-package() {
-  cd $pkgname-$pkgver
+package_libxkbcommon() {
+  depends=(xkeyboard-config glibc)
+
+  cd $pkgbase-$pkgver
   make DESTDIR=$pkgdir install
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/libxkbcommon/LICENSE
+
+### Split libxkbcommon-x11
+
+  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-x11() {
+  depends=(libxkbcommon libxcb)
+
+  mv x11/* $pkgdir
+
+  install -Dm644 $pkgbase-$pkgver/COPYING 
$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE
+}

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

[Jan Steffens]

Date: Sunday, February 2, 2014 @ 19:38:07
  Author: heftig
Revision: 204977

add pkgdesc, simplify

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-02 18:37:50 UTC (rev 204976)
+++ PKGBUILD2014-02-02 18:38:07 UTC (rev 204977)
@@ -11,7 +11,8 @@
 arch=(i686 x86_64)
 url=http://xkbcommon.org/;
 license=(custom)
-makedepends=(xkeyboard-config glibc libxcb doxygen xorg-util-macros)
+depends=(xkeyboard-config glibc)
+makedepends=(libxcb doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
 md5sums=('bb782f1700e45b4f57c84ef513e3cf85')
 
@@ -26,8 +27,6 @@
 }
 
 package_libxkbcommon() {
-  depends=(xkeyboard-config glibc)
-
   cd $pkgbase-$pkgver
   make DESTDIR=$pkgdir install
   install -Dm644 COPYING $pkgdir/usr/share/licenses/libxkbcommon/LICENSE
@@ -40,6 +39,7 @@
 }
 
 package_libxkbcommon-x11() {
+  pkgdesc=Keyboard handling library using XKB data for X11 XCB clients
   depends=(libxkbcommon libxcb)
 
   mv x11/* $pkgdir

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

[Jan Steffens]

Date: Sunday, November 24, 2013 @ 19:54:27
  Author: heftig
Revision: 200282

0.3.2

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-24 17:51:20 UTC (rev 200281)
+++ PKGBUILD2013-11-24 18:54:27 UTC (rev 200282)
@@ -4,17 +4,17 @@
 # Contributor: Mladen Pejakovic pej...@gmail.com
 
 pkgname=libxkbcommon
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
 url=http://xkbcommon.org/;
 license=(custom)
-depends=(xkeyboard-config)
+depends=(xkeyboard-config glibc)
 makedepends=(doxygen xorg-util-macros)
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
 #source=($pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git)
-md5sums=('7287ea51df79c0f80e92b970a30b95e9')
+md5sums=('935cf416354bf05210de2e389484f7e8')
 
 build() {
   cd $pkgname-$pkgver

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

[Jan Steffens]

Date: Wednesday, June 12, 2013 @ 15:52:17
  Author: heftig
Revision: 188190

0.3.1

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-12 11:20:08 UTC (rev 188189)
+++ PKGBUILD2013-06-12 13:52:17 UTC (rev 188190)
@@ -4,7 +4,7 @@
 # Contributor: Mladen Pejakovic pej...@gmail.com
 
 pkgname=libxkbcommon
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
@@ -14,7 +14,8 @@
 makedepends=(doxygen xorg-util-macros)
 options=('!libtool')
 source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
-md5sums=('22a046100738f99b4cc0297aa210f4e4')
+#source=($pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git)
+md5sums=('7287ea51df79c0f80e92b970a30b95e9')
 
 build() {
   cd $pkgname-$pkgver

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

[Jan Steffens]

Date: Monday, April 1, 2013 @ 22:09:24
  Author: heftig
Revision: 181160

0.3.0

Modified:
  libxkbcommon/trunk/PKGBUILD

--+
 PKGBUILD |   23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-01 19:36:12 UTC (rev 181159)
+++ PKGBUILD2013-04-01 20:09:24 UTC (rev 181160)
@@ -1,28 +1,29 @@
 # $Id$
-# Maintainer: Daniel Micay danielmi...@gmail.com
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Daniel Micay danielmi...@gmail.com
 # Contributor: Mladen Pejakovic pej...@gmail.com
 
 pkgname=libxkbcommon
-pkgver=0.2.0
-pkgrel=3
+pkgver=0.3.0
+pkgrel=1
 pkgdesc=Keyboard handling library using XKB data
 arch=(i686 x86_64)
 url=http://xkbcommon.org/;
-license=('custom')
-depends=(glibc)
+license=(custom)
+depends=(xkeyboard-config)
 makedepends=(doxygen xorg-util-macros)
-source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2;)
-md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a')
 options=('!libtool')
+source=(http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz;)
+md5sums=('22a046100738f99b4cc0297aa210f4e4')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }