[arch-commits] Commit in libxkbcommon/repos (4 files)

Jan Steffens heftig at nymeria.archlinux.org
Sun Feb 2 18:43:24 UTC 2014


    Date: Sunday, February 2, 2014 @ 19:43:24
  Author: heftig
Revision: 204980

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libxkbcommon/repos/extra-i686/PKGBUILD
    (from rev 204979, libxkbcommon/trunk/PKGBUILD)
  libxkbcommon/repos/extra-x86_64/PKGBUILD
    (from rev 204979, libxkbcommon/trunk/PKGBUILD)
Deleted:
  libxkbcommon/repos/extra-i686/PKGBUILD
  libxkbcommon/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   96 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   29 --------------
 extra-x86_64/PKGBUILD |   29 --------------
 3 files changed, 96 insertions(+), 58 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-02-02 18:41:57 UTC (rev 204979)
+++ extra-i686/PKGBUILD	2014-02-02 18:43:24 UTC (rev 204980)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: Mladen Pejakovic <pejakm at gmail.com>
-
-pkgname=libxkbcommon
-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 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=('935cf416354bf05210de2e389484f7e8')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: libxkbcommon/repos/extra-i686/PKGBUILD (from rev 204979, libxkbcommon/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-02-02 18:43:24 UTC (rev 204980)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Mladen Pejakovic <pejakm at gmail.com>
+
+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=(libxcb doxygen xorg-util-macros)
+source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
+md5sums=('bb782f1700e45b4f57c84ef513e3cf85')
+
+prepare() {
+  mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package_libxkbcommon() {
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+  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() {
+  pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
+  depends=(libxkbcommon libxcb)
+
+  mv x11/* "$pkgdir"
+
+  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE"
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-02-02 18:41:57 UTC (rev 204979)
+++ extra-x86_64/PKGBUILD	2014-02-02 18:43:24 UTC (rev 204980)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: Mladen Pejakovic <pejakm at gmail.com>
-
-pkgname=libxkbcommon
-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 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=('935cf416354bf05210de2e389484f7e8')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: libxkbcommon/repos/extra-x86_64/PKGBUILD (from rev 204979, libxkbcommon/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-02-02 18:43:24 UTC (rev 204980)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Mladen Pejakovic <pejakm at gmail.com>
+
+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=(libxcb doxygen xorg-util-macros)
+source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
+md5sums=('bb782f1700e45b4f57c84ef513e3cf85')
+
+prepare() {
+  mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package_libxkbcommon() {
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+  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() {
+  pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
+  depends=(libxkbcommon libxcb)
+
+  mv x11/* "$pkgdir"
+
+  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE"
+}




More information about the arch-commits mailing list