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

[Jan Steffens]

    Date: Saturday, August 23, 2014 @ 11:55:08
  Author: heftig
Revision: 117795

archrelease: copy trunk to multilib-x86_64

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

----------+
 PKGBUILD |  100 ++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 60 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-23 09:55:03 UTC (rev 117794)
+++ PKGBUILD	2014-08-23 09:55:08 UTC (rev 117795)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor: Jan Alexander Steffens <jan.steffens at gmail.com>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: Mladen Pejakovic <pejakm at gmail.com>
-
-pkgname=lib32-libxkbcommon
-pkgver=0.4.2
-pkgrel=1
-pkgdesc='Keyboard handling library using XKB data'
-arch=('x86_64')
-url='http://xkbcommon.org/'
-license=('custom')
-depends=('lib32-glibc' "${pkgname#*-}")
-makedepends=('lib32-libxcb' 'xorg-util-macros')
-source=("http://xkbcommon.org/download/${pkgname#*-}-${pkgver}.tar.xz")
-sha256sums=('a0fc71b07eeddba4af62bd709e24cec219778bb6871384aa850b2f5798a48957')
-
-build() {
-  cd ${pkgname#*-}-${pkgver}
-
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  ./configure --prefix='/usr' --libdir='/usr/lib32' --disable-{docs,static,x11}
-  make
-}
-
-package() {
-  cd ${pkgname#*-}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/include
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s ${pkgname#*-} "${pkgdir}"/usr/share/licenses/${pkgname}
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-libxkbcommon/repos/multilib-x86_64/PKGBUILD (from rev 117794, lib32-libxkbcommon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-08-23 09:55:08 UTC (rev 117795)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# 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=0.4.3
+pkgrel=1
+pkgdesc='Keyboard handling library using XKB data (32-bit)'
+arch=('x86_64')
+url='http://xkbcommon.org/'
+license=('custom')
+depends=('lib32-glibc' "${pkgbase#*-}")
+makedepends=('lib32-libxcb' 'xorg-util-macros' 'gcc-multilib')
+source=("http://xkbcommon.org/download/${pkgbase#*-}-${pkgver}.tar.xz")
+sha256sums=('9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41')
+
+prepare() {
+  mkdir -p x11/usr/lib32/pkgconfig
+}
+
+build() {
+  cd ${pkgbase#*-}-${pkgver}
+
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  ./configure --prefix='/usr' --libdir='/usr/lib32' --disable-{docs,static}
+  make
+}
+
+package_lib32-libxkbcommon() {
+  cd ${pkgbase#*-}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/include
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s libxkbcommon "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon
+
+### Split libxkbcommon-x11
+
+  mv "$pkgdir"/usr/lib32/*x11* "$srcdir/x11/usr/lib32"
+  mv "$pkgdir"/usr/lib32/pkgconfig/*x11* "$srcdir/x11/usr/lib32/pkgconfig"
+}
+
+package_lib32-libxkbcommon-x11() {
+  pkgdesc="Keyboard handling library using XKB data for X11 XCB clients (32-bit)"
+  depends=(lib32-libxkbcommon lib32-libxcb libxkbcommon-x11)
+
+  mv x11/* "$pkgdir"
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s libxkbcommon-x11 "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon-x11
+}
+
+# vim: ts=2 sw=2 et: