From a9be2c98d81a8be926603c03880cb019bce77820 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 8 Dec 2019 19:57:10 -0600
Subject: [PATCH] libgusb: update to 0.3.1

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 srcpkgs/libgusb/patches/add-gir.patch       | 50 ---------------------
 srcpkgs/libgusb/patches/fix-cross-gir.patch | 13 ------
 srcpkgs/libgusb/template                    |  6 +--
 3 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 srcpkgs/libgusb/patches/add-gir.patch
 delete mode 100644 srcpkgs/libgusb/patches/fix-cross-gir.patch

diff --git a/srcpkgs/libgusb/patches/add-gir.patch b/srcpkgs/libgusb/patches/add-gir.patch
deleted file mode 100644
index 6ff2a5068ce..00000000000
--- a/srcpkgs/libgusb/patches/add-gir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Source: maxice8
-Upstream: no but feel free to get it upstream where it should be
-Reason: Conditionalize gobject intropection allowing cross compilation
-
-Note that this isn't in upstreamable condition (missing checks for vapi depending on gir for example)
-and considering it is gnome-tech it is very unlikely that it will ever get merged
---- gusb/meson.build
-+++ gusb/meson.build
-@@ -67,10 +67,17 @@ gusb = shared_library(
-   install : true
- )
- 
-+deps = [ 'gio-2.0', 'libusb-1.0' ]
-+
-+with_gir = get_option('gir')
-+if with_gir
-+  deps += [ 'gobject-2.0' ]
-+endif
-+
- pkgg = import('pkgconfig')
- pkgg.generate(
-   libraries : gusb,
--  requires : [ 'gio-2.0', 'gobject-2.0', 'libusb-1.0' ],
-+  requires : deps,
-   subdirs : 'gusb-1',
-   version : meson.project_version(),
-   name : 'gusb',
-@@ -78,6 +85,7 @@ pkgg.generate(
-   description : 'GUsb is a GLib binding for libusb1',
- )
- 
-+if with_gir
- libgusb_girtarget = gnome.generate_gir(gusb,
-   sources : [
-     gusb_version_h,
-@@ -119,6 +127,7 @@ libgusb_girtarget = gnome.generate_gir(gusb,
- )
- libgusb_gir = libgusb_girtarget[0]
- libgusb_typelib = libgusb_girtarget[1]
-+endif
- 
- if get_option('vapi')
- gnome.generate_vapi('gusb',
---- meson_options.txt
-+++ meson_options.txt
-@@ -2,3 +2,4 @@ option('tests', type : 'boolean', value : true, description : 'Build self tests'
- option('vapi', type : 'boolean', value : true, description : 'Build VAPI')
- option('usb_ids', type : 'string', value : '/usr/share/hwdata/usb.ids', description : 'Path to usb.ids file')
- option('docs', type : 'boolean', value : true, description : 'Generate documentation')
-+option('gir', type : 'boolean', value : true, description : 'Generate gobject introspection data')
diff --git a/srcpkgs/libgusb/patches/fix-cross-gir.patch b/srcpkgs/libgusb/patches/fix-cross-gir.patch
deleted file mode 100644
index 41405efdbf2..00000000000
--- a/srcpkgs/libgusb/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gusb/meson.build b/gusb/meson.build
-index 5276259..b6a04d5 100644
---- gusb/meson.build
-+++ gusb/meson.build
-@@ -113,6 +113,7 @@ libgusb_girtarget = gnome.generate_gir(gusb,
-   export_packages : 'gusb',
-   extra_args : [
-     '--c-include=gusb.h',
-+	'-DGUSB_COMPILATION',
-     ],
-   link_with : gusb,
-   dependencies : [
-
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 44970c06c2f..b8f469ebb8f 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.0
-revision=5
+version=0.3.1
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dgir=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
-checksum=d8e7950f99b6ae4c3e9b8c65f3692b9635289e6cff8de40c4af41b2e9b348edc
+checksum=4b677a372e97748970b1bb3dac076da2d051e4376c5960e77b7159701c851fed
 
 build_options="gir vala"
 build_options_default="gir vala"