guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: libusb-for-axoloti: Adjust patch.


From: Ricardo Wurmus
Subject: 01/01: gnu: libusb-for-axoloti: Adjust patch.
Date: Wed, 23 May 2018 09:24:09 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit 6623bd826be7ccf39aeb4157c2863db06cc3f18a
Author: Ricardo Wurmus <address@hidden>
Date:   Wed May 23 15:23:01 2018 +0200

    gnu: libusb-for-axoloti: Adjust patch.
    
    * gnu/packages/patches/libusb-for-axoloti.patch: Adjust patch for use with
    current version of libusb.
---
 gnu/packages/patches/libusb-for-axoloti.patch | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/patches/libusb-for-axoloti.patch 
b/gnu/packages/patches/libusb-for-axoloti.patch
index 76a45e8..fb94c48 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
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]