[jhbuild] Revert "3.20: move libusb1 from sysdeps to core-deps"
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Revert "3.20: move libusb1 from sysdeps to core-deps"
- Date: Thu, 26 Nov 2015 19:34:50 +0000 (UTC)
commit f6b020d420d5b7cfd59262ec6ac56da245473609
Author: Frédéric Péters <fpeters 0d be>
Date: Tue Nov 24 18:33:26 2015 +0100
Revert "3.20: move libusb1 from sysdeps to core-deps"
This reverts commit 9379a8d0a26212b8e3068fcc3df53dc9bcf337a9 as libgusb
requires libusb-1.0 1.0.19, released over a year ago.
modulesets/gnome-suites-core-deps-3.20.modules | 5 -----
modulesets/gnome-sysdeps-3.20.modules | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 52c87bb..1bf9581 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -1325,11 +1325,6 @@
<!-- OS Core Services dependencies -->
- <autotools id="libusb1">
- <pkg-config>libusb-1.0.pc</pkg-config>
- <branch repo="github.com" checkoutdir="libusb" module="libusb/libusb.git" revision="v1.0.19"
version="1.0.19" />
- </autotools>
-
<autotools id="libgusb">
<branch repo="github.com" checkoutdir="libgusb" module="hughsie/libgusb.git"/>
<dependencies>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index f9109f0..83a3cc9 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -698,6 +698,11 @@
</systemdependencies>
</systemmodule>
+ <systemmodule id="libusb1">
+ <pkg-config>libusb-1.0.pc</pkg-config>
+ <branch repo="system" version="1.0.19"/>
+ </systemmodule>
+
<systemmodule id="libuuid">
<pkg-config>uuid.pc</pkg-config>
<branch repo="system"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]