[arch-commits] Commit in lib32-libxkbcommon/repos/multilib-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Saturday, May 21, 2022 @ 22:30:03
  Author: heftig
Revision: 1209900

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-libxkbcommon/repos/multilib-x86_64/PKGBUILD
    (from rev 1209899, lib32-libxkbcommon/trunk/PKGBUILD)
Deleted:
  lib32-libxkbcommon/repos/multilib-x86_64/PKGBUILD

----------+
 PKGBUILD |  204 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 109 insertions(+), 95 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-21 22:29:45 UTC (rev 1209899)
+++ PKGBUILD	2022-05-21 22:30:03 UTC (rev 1209900)
@@ -1,95 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Jan Alexander Steffens <jan.steffens at gmail.com>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: Mladen Pejakovic <pejakm at gmail.com>
-
-pkgbase=lib32-libxkbcommon
-pkgname=(
-  lib32-libxkbcommon
-  lib32-libxkbcommon-x11
-)
-pkgver=1.4.0
-pkgrel=1
-pkgdesc='Keymap handling library for toolkits and window systems (32-bit)'
-url=https://xkbcommon.org/
-arch=(x86_64)
-license=(custom)
-makedepends=(
-  git
-  lib32-libxcb
-  lib32-libxml2
-  lib32-wayland
-  meson
-  wayland-protocols
-  xorg-util-macros
-)
-checkdepends=(
-  xorg-server-xvfb
-  libgl
-)
-_tag=6e8f0d331715a3672f5c663b704b9ea5caabe113
-source=(git+https://github.com/xkbcommon/libxkbcommon#tag=${_tag})
-sha256sums=('SKIP')
-
-pkgver() {
-  cd libxkbcommon
-
-  git describe --tags | sed 's/^xkbcommon-//'
-}
-
-build() {
-  export CC='gcc -m32'
-  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
-
-  arch-meson libxkbcommon build \
-    --libdir=/usr/lib32 \
-    -D enable-docs=false \
-    -D enable-tools=false
-  meson compile -C build
-}
-
-check() {
-  xvfb-run -s '-nolisten local' meson test -C build --print-errorlogs
-}
-
-package_lib32-libxkbcommon() {
-  depends=(
-    lib32-libxml2
-    libxkbcommon
-  )
-  provides=(
-    libxkbcommon.so
-    libxkbregistry.so
-  )
-
-  meson install -C build --destdir "${pkgdir}"
-  rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s libxkbcommon "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon
-
-  mkdir -p x11/usr/lib32/pkgconfig
-  mv "${pkgdir}"/usr/lib32/*x11* x11/usr/lib32
-  mv "${pkgdir}"/usr/lib32/pkgconfig/*x11* x11/usr/lib32/pkgconfig
-}
-
-package_lib32-libxkbcommon-x11() {
-  pkgdesc='Keyboard handling library using XKB data for X11 XCB clients (32-bit)'
-  depends=(
-    lib32-libxkbcommon
-    libxkbcommon.so
-    lib32-libxcb
-    libxkbcommon-x11
-  )
-  provides=(
-    libxkbcommon-x11.so
-  )
-
-  mv x11/* "${pkgdir}"/
-  find "${pkgdir}" -type d -exec chmod 755 {} +
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s libxkbcommon-x11 "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon-x11
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-libxkbcommon/repos/multilib-x86_64/PKGBUILD (from rev 1209899, lib32-libxkbcommon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-21 22:30:03 UTC (rev 1209900)
@@ -0,0 +1,109 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Jan Alexander Steffens <jan.steffens at gmail.com>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Mladen Pejakovic <pejakm at gmail.com>
+
+pkgbase=lib32-libxkbcommon
+pkgname=(
+  lib32-libxkbcommon
+  lib32-libxkbcommon-x11
+)
+pkgver=1.4.1
+pkgrel=1
+pkgdesc='Keymap handling library for toolkits and window systems (32-bit)'
+url='https://xkbcommon.org/'
+arch=(x86_64)
+license=(custom)
+makedepends=(
+  git
+  lib32-libxcb
+  lib32-libxml2
+  lib32-wayland
+  meson
+  wayland-protocols
+  xkeyboard-config
+  xorgproto
+)
+checkdepends=(
+  libgl
+  xorg-server-xvfb
+)
+options=(
+  debug
+)
+_commit=57af9cb71f19f37394399b549f7cb7b0d9fe3988  # tags/xkbcommon-1.4.1^0
+source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd libxkbcommon
+  git describe --tags | sed 's/^xkbcommon-//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd libxkbcommon
+}
+
+build() {
+  export CC='gcc -m32'
+  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
+
+  arch-meson libxkbcommon build \
+    --libdir=/usr/lib32 \
+    -D enable-docs=false \
+    -D enable-tools=false
+  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_lib32-libxkbcommon() {
+  depends=(
+    lib32-libxml2
+    xkeyboard-config
+    libxkbcommon
+  )
+  provides=(
+    libxkbcommon.so
+    libxkbregistry.so
+  )
+
+  meson install -C build --destdir "$pkgdir"
+  rm -r "$pkgdir/usr/include"
+
+  _pick x11 "$pkgdir"/usr/lib32/*x11*
+  _pick x11 "$pkgdir"/usr/lib32/pkgconfig/*x11*
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libxkbcommon/LICENSE
+}
+
+package_lib32-libxkbcommon-x11() {
+  pkgdesc='Keyboard handling library using XKB data for X11 XCB clients (32-bit)'
+  depends=(
+    lib32-libxcb
+    lib32-libxkbcommon
+    libxkbcommon.so
+    libxkbcommon-x11
+  )
+  provides=(
+    libxkbcommon-x11.so
+  )
+
+  mv x11/* "$pkgdir"/
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libxkbcommon/LICENSE
+}
+
+# vim:set sw=2 sts=-1 et: