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

[Jan Steffens]

    Date: Monday, January 20, 2020 @ 11:12:43
  Author: heftig
Revision: 553209

archrelease: copy trunk to multilib-x86_64

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

----------+
 PKGBUILD |  103 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 55 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-20 11:11:07 UTC (rev 553208)
+++ PKGBUILD	2020-01-20 11:12:43 UTC (rev 553209)
@@ -1,48 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: jtts <jussaar at mbnet.fi>
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
-
-pkgname=lib32-libgusb
-pkgver=0.3.2
-pkgrel=2
-pkgdesc='GObject wrapper for libusb1'
-arch=(x86_64)
-url=https://github.com/hughsie/libgusb
-license=(LGPL2.1)
-depends=(
-  lib32-glib2
-  lib32-libusb
-  libgusb
-)
-makedepends=(
-  git
-  gobject-introspection
-  gtk-doc
-  meson
-  vala
-)
-source=(git+https://github.com/hughsie/libgusb#tag=bda40aca1f11f841524ad6ed16c352329b8a8d41)
-sha256sums=(SKIP)
-
-pkgver() {
-  cd libgusb
-
-  git describe --tags
-}
-
-build() {
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  arch-meson libgusb build \
-    --libdir='/usr/lib32'
-  ninja -C build
-}
-
-package() {
-  DESTDIR="${pkgdir}" ninja -C build install
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-libgusb/repos/multilib-x86_64/PKGBUILD (from rev 553208, lib32-libgusb/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-20 11:12:43 UTC (rev 553209)
@@ -0,0 +1,55 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: jtts <jussaar at mbnet.fi>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+
+pkgname=lib32-libgusb
+pkgver=0.3.2
+pkgrel=3
+pkgdesc='GObject wrapper for libusb1'
+url=https://github.com/hughsie/libgusb
+arch=(x86_64)
+license=(LGPL2.1)
+depends=(
+  lib32-glib2
+  lib32-libusb
+  libgusb
+)
+makedepends=(
+  git
+  gobject-introspection
+  gtk-doc
+  meson
+  vala
+)
+source=(git+https://github.com/hughsie/libgusb#tag=bda40aca1f11f841524ad6ed16c352329b8a8d41)
+sha256sums=(SKIP)
+
+prepare() {
+  cd libgusb
+
+  # https://github.com/hughsie/libgusb/issues/24
+  git cherry-pick -n 3813921b7248a5f8a340f3395ff0ddf304bcf64e
+}
+
+pkgver() {
+  cd libgusb
+
+  git describe --tags
+}
+
+build() {
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
+
+  arch-meson libgusb build \
+    --libdir='/usr/lib32'
+  ninja -C build
+}
+
+package() {
+  DESTDIR="${pkgdir}" ninja -C build install
+  rm -rf "${pkgdir}"/usr/{bin,include,share}
+}
+
+# vim: ts=2 sw=2 et: