[packages/chromium-browser/DEVEL] use usb-ids from system usb.ids

glen glen at pld-linux.org
Sun Jan 13 20:45:55 CET 2013


commit 7d1152d49ce01304eff09a83cd4d9231fcd2cc6e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jan 13 21:45:29 2013 +0200

    use usb-ids from system usb.ids

 chromium-browser.spec | 3 ++-
 clean-source.sh       | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index fd5dde6..a6d053d 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -41,7 +41,6 @@
 # - use_system_hunspell
 # - use_system_stlport
 # - other defaults: src/build/common.gypi
-# - system usb-ids stuff
 
 # NOTES:
 # - mute BEEP mixer if you do not want to hear horrible system bell when
@@ -160,6 +159,7 @@ BuildRequires:	sqlite3-devel >= 3.6.1
 BuildRequires:	subversion
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
+BuildRequires:	usbutils
 BuildRequires:	util-linux
 %{?with_system_v8:BuildRequires:	v8-devel >= 3.7}
 BuildRequires:	which
@@ -372,6 +372,7 @@ test -e Makefile || \
 %endif
 	%{!?with_sse2:-Ddisable_sse2=1} \
 	%{?with_selinux:-Dselinux=1} \
+	-Dusb_ids_path=$(pkg-config --variable usbids usbutils) \
 	-Dlinux_link_libpci=1 \
 	%{!?with_tcmalloc:-Dlinux_use_tcmalloc=0} \
 	-Dlinux_use_gold_binary=0 \
diff --git a/clean-source.sh b/clean-source.sh
index b184e8f..afd02e9 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -483,7 +483,6 @@ clean_third_party() {
 		\! -path 'third_party/v8/*' \
 		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/widevine/*' \
-		\! -path 'third_party/usb_ids/*' \
 		-print -delete
 
 	rm -vf third_party/expat/files/lib/expat.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/7d1152d49ce01304eff09a83cd4d9231fcd2cc6e



More information about the pld-cvs-commit mailing list