summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-05-23 15:23:01 +0200
committerRicardo Wurmus <rekado@elephly.net>2018-05-23 15:23:01 +0200
commit6623bd826be7ccf39aeb4157c2863db06cc3f18a (patch)
tree6a73f627a64cf98769e85fb45b02bc3d8825be98 /gnu
parent8efe2a22eaaf00d667c54968c025a3477cb3c3f7 (diff)
downloadguix-6623bd826be7ccf39aeb4157c2863db06cc3f18a.tar.gz
gnu: libusb-for-axoloti: Adjust patch.
* gnu/packages/patches/libusb-for-axoloti.patch: Adjust patch for use with
current version of libusb.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/patches/libusb-for-axoloti.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/patches/libusb-for-axoloti.patch b/gnu/packages/patches/libusb-for-axoloti.patch
index 76a45e801d..fb94c489b0 100644
--- a/gnu/packages/patches/libusb-for-axoloti.patch
+++ b/gnu/packages/patches/libusb-for-axoloti.patch
@@ -1,8 +1,8 @@
-diff -rpu4 libusb-1.0.22.orig/libusb/descriptor.c libusb-1.0.22/libusb/descriptor.c
---- libusb-1.0.22.orig/libusb/descriptor.c	2018-03-17 08:23:37.000000000 +0100
-+++ libusb-1.0.22/libusb/descriptor.c	2018-03-29 10:36:09.968429473 +0200
-@@ -1173,9 +1173,9 @@ int API_EXPORTED libusb_get_string_descr
- 	if (tbuf[1] != LIBUSB_DT_STRING)
+diff --git a/libusb/descriptor.c b/libusb/descriptor.c
+index 74d6de5..0b0e314 100644
+--- a/libusb/descriptor.c
++++ b/libusb/descriptor.c
+@@ -1174,7 +1174,7 @@ int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev_ha
  		return LIBUSB_ERROR_IO;
  
  	if (tbuf[0] > r)
@@ -11,4 +11,6 @@ diff -rpu4 libusb-1.0.22.orig/libusb/descriptor.c libusb-1.0.22/libusb/descripto
  
  	di = 0;
  	for (si = 2; si < tbuf[0]; si += 2) {
- 		if (di >= (length - 1))
+-- 
+2.17.0
+