From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5YJ-0008O4-2L for guix-patches@gnu.org; Mon, 17 Jul 2017 08:55:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX5YF-0006ce-52 for guix-patches@gnu.org; Mon, 17 Jul 2017 08:55:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX5YE-0006cT-VS for guix-patches@gnu.org; Mon, 17 Jul 2017 08:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dX5YE-0003Km-ID for guix-patches@gnu.org; Mon, 17 Jul 2017 08:55:02 -0400 Subject: [bug#27685] [PATCH] gnu: Add libusb-0.1 Resent-Message-ID: From: Jonathan Brielmaier References: <1499987475-26967-1-git-send-email-jonathan.brielmaier@web.de> <878tjo6pvc.fsf@fastmail.com> <9df88aa3-525d-8ff1-d6a6-91aecc764630@web.de> Message-ID: <1d91a81b-fee7-5413-9145-3bc2fffbc4d0@web.de> Date: Mon, 17 Jul 2017 14:53:47 +0200 MIME-Version: 1.0 In-Reply-To: <9df88aa3-525d-8ff1-d6a6-91aecc764630@web.de> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wDCMeJS30Qdw553lam6lpHBnpr84msfCt" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke , 27685@debbugs.gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wDCMeJS30Qdw553lam6lpHBnpr84msfCt Content-Type: multipart/mixed; boundary="xNv2EAjc6pCxmP1mcIHa65iOTiwktCgsn"; protected-headers="v1" From: Jonathan Brielmaier To: Marius Bakke , 27685@debbugs.gnu.org Message-ID: <1d91a81b-fee7-5413-9145-3bc2fffbc4d0@web.de> Subject: Re: [bug#27685] [PATCH] gnu: Add libusb-0.1 References: <1499987475-26967-1-git-send-email-jonathan.brielmaier@web.de> <878tjo6pvc.fsf@fastmail.com> <9df88aa3-525d-8ff1-d6a6-91aecc764630@web.de> In-Reply-To: <9df88aa3-525d-8ff1-d6a6-91aecc764630@web.de> --xNv2EAjc6pCxmP1mcIHa65iOTiwktCgsn Content-Type: multipart/mixed; boundary="------------D644C260D2568369B27E9236" Content-Language: en-GB This is a multi-part message in MIME format. --------------D644C260D2568369B27E9236 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I attached the updated patch. On 07/16/2017 11:29 PM, Jonathan Brielmaier wrote: > Okay, I'll update the patch tomorrow. >=20 > 0xffff[1] (which I already packaged local) depends on libusb-0.1. > Although it compiles fine with libusb-compat, during executing it throw= s > an error[2]. >=20 > I hope this is a good reason :) >=20 > [1] https://github.com/pali/0xFFFF > [2] > https://github.com/pali/0xFFFF/blob/08485a0c094cf021e5abedd001741da9d0f= d1474/src/usb-device.c#L325 >=20 > Am 16.07.2017 um 23:20 schrieb Marius Bakke: >> Jonathan Brielmaier writes: >> >>> * gnu/packages/libusb.scm (libusb-0.1): New variable. >>> * gnu/packages/patches/libusb-0.1-disable-tests.patch: New file. >> >> Thanks! Remember to also add patches to 'gnu/local.mk'. >> >> The meat of this LGTM, but I do wonder why this is needed. Do you have= >> some other software depending on it? If so, which? >> >> I'm hesitant to add this old and unmaintained version without a good >> reason. >> >=20 --------------D644C260D2568369B27E9236 Content-Type: text/x-patch; name="0001-gnu-Add-libusb-0.1.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-libusb-0.1.patch" =46rom e2e37f46f9476c72bdcdec51b93f1c4782ec5c46 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 14 Jul 2017 00:28:14 +0200 Subject: [PATCH] gnu: Add libusb-0.1 * 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. --- gnu/local.mk | 1 + gnu/packages/libusb.scm | 14 ++++++++++++++ gnu/packages/patches/libusb-0.1-disable-tests.patch | 15 +++++++++++++++= 3 files changed, 30 insertions(+) create mode 100644 gnu/packages/patches/libusb-0.1-disable-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 199792b..d587b6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -787,6 +787,7 @@ dist_patch_DATA =3D \ %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..c6942d0 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 Theodoros Foradis +;;; Copyright =C2=A9 2017 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,19 @@ devices on various operating systems.") version of libusb to run with newer libusb.") (license lgpl2.1+))) =20 +(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 (LEGAC= Y)/" + 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/pa= ckages/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 =3D $(top_builddir)/libusbpp.la @OSLIBS@ + driver_name_SOURCES =3D driver_name.cpp + driver_name_LDADD =3D $(top_builddir)/libusbpp.la @OSLIBS@ +-TESTS =3D testlibusb descriptor_test id_test find_hubs find_mice \ +- get_resolution hub_strings $(OS_SPECIFIC) ++TESTS =3D testlibusb descriptor_test id_test find_hubs find_mice ++ #get_resolution hub_strings $(OS_SPECIFIC) +=20 + XFAIL_TESTS =3D get_resolution hub_strings $(OS_SPECIFIC_XFAIL) + all: all-am --=20 2.7.4 --------------D644C260D2568369B27E9236-- --xNv2EAjc6pCxmP1mcIHa65iOTiwktCgsn-- --wDCMeJS30Qdw553lam6lpHBnpr84msfCt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJZbLNmAAoJEOz8g5iLTkufKNgH/i0qU+9gC4vedx95BfyC6/rE jJtkWdV58aOPYD2iTKgKHBleDMhtFSgH0JuX6H50lCseRO0nPlpenYYoEB6N9pzm h7zT9MOEMjDzZQxfuqQTwoX5VQBpe/pGANf4/+fCn2YdagIZU8Aqcxd4BLNTs219 QDqHfm4GFX7I+GxV58YEwHhLPQng0KVUQjuk7zuy0MGo9k/Fi0Ay4EnZ9kk0pAGt 7mF6X7qmTDZA2MyielPZYgPQKLE1BK8OxwVrL7IPZcoAqDG+qNavrV0F5QKo2PI0 XsA8nhtwJgIwogAEdf7bhe6Skyf+9FyCSDg/DqihyIpFLC9rR/y8B0GN2dzG5xk= =dtmK -----END PGP SIGNATURE----- --wDCMeJS30Qdw553lam6lpHBnpr84msfCt--