[packages/chromium-browser] use system python-ply
glen
glen at pld-linux.org
Sat Oct 5 20:15:28 CEST 2013
commit e0a7fe40ee39eb09e89702600ebd5ecb11e86c4b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Oct 5 21:15:00 2013 +0300
use system python-ply
chromium-browser.spec | 5 +++--
clean-source.sh | 1 -
system-ply.patch | 11 +++++++++++
3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index e01978d..320b37a 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -49,7 +49,6 @@
# - use_system_ssl (use_openssl: http://crbug.com/62803)
# - use_system_stlport (android specific)
# - vpx: invert (remove) media_use_libvpx when libvpx with vp9 support is released
-# - system ply (3.4)
# NOTES:
# - mute BEEP mixer if you do not want to hear horrible system bell when
@@ -105,6 +104,7 @@ Patch25: gnome3-volume-control.patch
Patch26: master-prefs-path.patch
Patch28: system-mesa.patch
Patch29: system-icu.patch
+Patch30: system-ply.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -168,7 +168,7 @@ BuildRequires: python
#BuildRequires: python-gyp >= 1-%{gyp_rev}
BuildRequires: python-jinja2
BuildRequires: python-modules
-BuildRequires: python-ply
+BuildRequires: python-ply >= 3.4
%{?with_system_re2:BuildRequires: re2-devel >= 20130115-2}
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.453
@@ -299,6 +299,7 @@ ln -s %{SOURCE7} .
%patch24 -p2
%patch26 -p2
%patch29 -p0
+%patch30 -p0
sh -x clean-source.sh \
%{!?with_nacl:nacl=0} \
diff --git a/clean-source.sh b/clean-source.sh
index 39e36ee..b813fd7 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -591,7 +591,6 @@ clean_third_party() {
\! -path 'third_party/mt19937ar/*' \
\! -path 'third_party/npapi/*' \
\! -path 'third_party/ots/*' \
- \! -path 'third_party/ply/*' \
\! -path 'third_party/protobuf/*' \
\! -path 'third_party/qcms/*' \
\! -path 'third_party/re2/*' \
diff --git a/system-ply.patch b/system-ply.patch
new file mode 100644
index 0000000..2ab2c8a
--- /dev/null
+++ b/system-ply.patch
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/bindings/derived_sources.gyp.orig 2013-07-30 22:29:53.610647573 +0000
++++ third_party/WebKit/Source/bindings/derived_sources.gyp 2013-07-30 22:30:05.150721649 +0000
+@@ -262,8 +262,6 @@
+ 'msvs_external_rule': 1,
+ 'inputs': [
+ 'scripts/idl_compiler.py',
+- '<(DEPTH)/third_party/ply/lex.py',
+- '<(DEPTH)/third_party/ply/yacc.py',
+ '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+ '<(DEPTH)/tools/idl_parser/idl_node.py',
+ '<(DEPTH)/tools/idl_parser/idl_parser.py',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/e0a7fe40ee39eb09e89702600ebd5ecb11e86c4b
More information about the pld-cvs-commit
mailing list