02/03: gnu: Add address@hidden

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 05c88516955814ac61dc7578017e1976c43a1cd3
Author: Jonathan Brielmaier <address@hidden>
Date:   Fri Jul 14 00:28:14 2017 +0200

    gnu: Add address@hidden
    
    * gnu/packages/libusb.scm (libusb-0.1): New variable.
    * gnu/packages/patches/libusb-0.1-disable-tests.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    
    Signed-off-by: Marius Bakke <address@hidden>
---
 gnu/local.mk                                        |  1 +
 gnu/packages/libusb.scm                             | 16 ++++++++++++++++
 gnu/packages/patches/libusb-0.1-disable-tests.patch | 15 +++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 3e085b1..ee93200 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -793,6 +793,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
   %D%/packages/patches/libtool-skip-tests2.patch               \
   %D%/packages/patches/libunwind-CVE-2015-3239.patch           \
+  %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
   %D%/packages/patches/libxcb-python-3.5-compat.patch          \
   %D%/packages/patches/libxml2-CVE-2016-4658.patch             \
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index ffbe5b1..ed97ed9 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Theodoros Foradis <address@hidden>
+;;; Copyright © 2017 Jonathan Brielmaier <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -95,6 +96,21 @@ devices on various operating systems.")
 version of libusb to run with newer libusb.")
     (license lgpl2.1+)))
 
+;; required by 0xffff, which compiles with libusb-compat, but executes only
+;; with libusb-0.1
+(define-public libusb-0.1
+  (package (inherit libusb)
+    (version "0.1.12")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://sourceforge/libusb/libusb-0.1 (LEGACY)/"
+                          version "/libusb-" version ".tar.gz"))
+      (sha256
+       (base32
+        "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"))
+      (patches (search-patches "libusb-0.1-disable-tests.patch"))))))
+
 (define-public libusb4java
   ;; There is no public release so we take the latest version from git.
   (let ((commit "396d642a57678a0d9663b062c980fe100cc0ea1e")
diff --git a/gnu/packages/patches/libusb-0.1-disable-tests.patch 
b/gnu/packages/patches/libusb-0.1-disable-tests.patch
new file mode 100644
index 0000000..37dd8bd
--- /dev/null
+++ b/gnu/packages/patches/libusb-0.1-disable-tests.patch
@@ -0,0 +1,15 @@
+Disable tests who fail because they have to run as root.
+
+--- libusb-0.1.12/tests/Makefile.in    2006-03-04 03:54:06.000000000 +0100
++++ libusb-0.1.12/tests/Makefile.in    2017-07-13 16:17:45.201728019 +0200
+@@ -255,8 +255,8 @@
+ hub_strings_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@
+ driver_name_SOURCES = driver_name.cpp
+ driver_name_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@
+-TESTS = testlibusb descriptor_test id_test find_hubs find_mice \
+-              get_resolution hub_strings $(OS_SPECIFIC)
++TESTS = testlibusb descriptor_test id_test find_hubs find_mice
++              #get_resolution hub_strings $(OS_SPECIFIC)
+ 
+ XFAIL_TESTS = get_resolution hub_strings $(OS_SPECIFIC_XFAIL)
+ all: all-am