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

Jan Steffens heftig at archlinux.org
Sun Oct 20 20:30:42 UTC 2019


    Date: Sunday, October 20, 2019 @ 20:30:42
  Author: heftig
Revision: 517985

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-libxkbcommon/repos/multilib-x86_64/PKGBUILD
    (from rev 517984, lib32-libxkbcommon/trunk/PKGBUILD)
Deleted:
  lib32-libxkbcommon/repos/multilib-x86_64/0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch
  lib32-libxkbcommon/repos/multilib-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch |   41 ---
 PKGBUILD                                                        |  131 ++++------
 2 files changed, 62 insertions(+), 110 deletions(-)

Deleted: 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch
===================================================================
--- 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch	2019-10-20 20:30:34 UTC (rev 517984)
+++ 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch	2019-10-20 20:30:42 UTC (rev 517985)
@@ -1,41 +0,0 @@
-From 1cd54b5e37730aee3e3c92262241fcdbab4407ac Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 20 Oct 2019 19:06:19 +0000
-Subject: [PATCH] context: Don't fail to create the context if HOME isn't
- available
-
-E.g. when Mutter has CAP_SYS_NICE and thus secure_getenv returns NULL.
-
-Fixes https://bugs.archlinux.org/task/64191
----
- src/context.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/context.c b/src/context.c
-index f43ee0a..6d86dd1 100644
---- a/src/context.c
-+++ b/src/context.c
-@@ -81,13 +81,13 @@ xkb_context_include_path_append_default(struct xkb_context *ctx)
-     int ret = 0;
- 
-     home = secure_getenv("HOME");
--    if (!home)
--        return ret;
--    err = asprintf(&user_path, "%s/.xkb", home);
--    if (err <= 0)
--        return ret;
--    ret |= xkb_context_include_path_append(ctx, user_path);
--    free(user_path);
-+    if (home != NULL) {
-+        err = asprintf(&user_path, "%s/.xkb", home);
-+        if (err <= 0)
-+            return ret;
-+        ret |= xkb_context_include_path_append(ctx, user_path);
-+        free(user_path);
-+    }
- 
-     root = secure_getenv("XKB_CONFIG_ROOT");
-     if (root != NULL)
--- 
-2.23.0
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-20 20:30:34 UTC (rev 517984)
+++ PKGBUILD	2019-10-20 20:30:42 UTC (rev 517985)
@@ -1,69 +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=0.9.0
-pkgrel=2
-url='https://xkbcommon.org/'
-arch=('x86_64')
-license=('custom')
-makedepends=('git' 'lib32-libxcb' 'lib32-wayland' 'meson' 'wayland-protocols'
-             'xorg-util-macros')
-checkdepends=('xorg-server-xvfb' 'libgl')
-source=("git+https://github.com/xkbcommon/libxkbcommon#tag=xkbcommon-${pkgver}"
-        0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch)
-sha256sums=('SKIP'
-            '62794414d698648eba9d05723f5c6a9b0bc8c3e1d611548932e3c5eb06e3c00e')
-
-prepare() {
-  mkdir -p build x11/usr/lib32/pkgconfig
-
-  cd libxkbcommon
-
-  # https://bugs.archlinux.org/task/64191
-  git apply -3 ../0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch
-}
-
-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'
-  ninja -C build
-}
-
-check() {
-  xvfb-run -a meson test -C build --print-errorlogs
-}
-
-package_lib32-libxkbcommon() {
-  pkgdesc='Keymap handling library for toolkits and window systems'
-  depends=('lib32-glibc' 'libxkbcommon')
-
-  DESTDIR="${pkgdir}" meson install -C build
-  rm -rf "${pkgdir}"/usr/include
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s libxkbcommon "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon
-
-  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'
-  depends=('lib32-libxcb' 'lib32-libxkbcommon' 'libxkbcommon-x11')
-
-  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 517984, lib32-libxkbcommon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-10-20 20:30:42 UTC (rev 517985)
@@ -0,0 +1,62 @@
+# 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=0.9.1
+pkgrel=1
+url='https://xkbcommon.org/'
+arch=('x86_64')
+license=('custom')
+makedepends=('git' 'lib32-libxcb' 'lib32-wayland' 'meson' 'wayland-protocols'
+             'xorg-util-macros')
+checkdepends=('xorg-server-xvfb' 'libgl')
+source=("git+https://github.com/xkbcommon/libxkbcommon#tag=xkbcommon-${pkgver}")
+sha256sums=('SKIP')
+
+prepare() {
+  mkdir -p build x11/usr/lib32/pkgconfig
+}
+
+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'
+  ninja -C build
+}
+
+check() {
+  xvfb-run -a meson test -C build --print-errorlogs
+}
+
+package_lib32-libxkbcommon() {
+  pkgdesc='Keymap handling library for toolkits and window systems'
+  depends=('lib32-glibc' 'libxkbcommon')
+
+  DESTDIR="${pkgdir}" meson install -C build
+  rm -rf "${pkgdir}"/usr/include
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s libxkbcommon "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon
+
+  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'
+  depends=('lib32-libxcb' 'lib32-libxkbcommon' 'libxkbcommon-x11')
+
+  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:



More information about the arch-commits mailing list