diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-07-21 06:47:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-07-21 06:47:11 +0000 |
| commit | ff0e2e453cdd14cd4a972ba44360c7a15efb75d8 (patch) | |
| tree | 3594e5d580e4870119065f5b714ed64c2852765b /dev-libs | |
| parent | Add a patch to fix bug 426410 . (diff) | |
| download | gentoo-2-ff0e2e453cdd14cd4a972ba44360c7a15efb75d8.tar.gz gentoo-2-ff0e2e453cdd14cd4a972ba44360c7a15efb75d8.tar.bz2 gentoo-2-ff0e2e453cdd14cd4a972ba44360c7a15efb75d8.zip | |
Only apply -libusbx.patch for dev-libs/libusbx < 1.0.13 because upstream has different solution in git.
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libusb-compat/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch | 4 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog index 38617ed10209..3938265ebf73 100644 --- a/dev-libs/libusb-compat/ChangeLog +++ b/dev-libs/libusb-compat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libusb-compat # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.18 2012/07/01 18:08:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.19 2012/07/21 06:47:11 ssuominen Exp $ + + 21 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> + libusb-compat-0.1.4.ebuild, files/libusb-0.1-libusbx.patch: + Only apply -libusbx.patch for dev-libs/libusbx < 1.0.13 because upstream has + different solution in git. 01 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-compat-0.1.4.ebuild: diff --git a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch index 5ee7b79af62f..9a4eb46c323b 100644 --- a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch +++ b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch @@ -1,6 +1,6 @@ -http://libusb.org/ticket/138 -http://sourceforge.net/apps/trac/libusbx/ticket/31 http://bugs.gentoo.org/423135 +http://sourceforge.net/apps/trac/libusbx/ticket/31 +http://libusbx.git.sourceforge.net/git/gitweb.cgi?p=libusbx/libusbx;a=commit;h=7ec94a45ed8155e7a1d4d5d75575099b09c78834 --- libusb/core.c +++ libusb/core.c diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild index 2ae8b7f88711..651f1b4aa479 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.10 2012/07/01 18:08:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.11 2012/07/21 06:47:11 ssuominen Exp $ EAPI=4 inherit eutils @@ -24,7 +24,7 @@ DOCS="AUTHORS ChangeLog NEWS README" src_prepare() { epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch - has_version dev-libs/libusbx && \ + has_version '<dev-libs/libusbx-1.0.13' && \ epatch "${FILESDIR}"/${PN/-compat}-0.1-libusbx.patch } |