commit 9cce36cb20b34b39ab4ce73e6210416d78dbe7cd
Author: Elan Ruusamäe <[email protected]>
Date: Thu Nov 14 22:12:17 2013 +0200
fix build with system jinja
chromium-browser.spec | 4 +++-
system-jinja.patch | 13 +++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 61f3745..4c59167 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -105,6 +105,7 @@ Patch26: master-prefs-path.patch
Patch28: system-mesa.patch
Patch29: system-icu.patch
Patch30: system-ply.patch
+Patch31: system-jinja.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -166,7 +167,7 @@ BuildRequires: pkgconfig
%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
BuildRequires: python
#BuildRequires: python-gyp >= 1-%{gyp_rev}
-BuildRequires: python-jinja2
+BuildRequires: python-jinja2 >= 2.7
BuildRequires: python-modules
BuildRequires: python-ply >= 3.4
%{?with_system_re2:BuildRequires: re2-devel >= 20130115-2}
@@ -300,6 +301,7 @@ ln -s %{SOURCE7} .
%patch26 -p2
%patch29 -p0
%patch30 -p1
+%patch31 -p0
sh -x clean-source.sh \
%{!?with_nacl:nacl=0} \
diff --git a/system-jinja.patch b/system-jinja.patch
new file mode 100644
index 0000000..b099cf3
--- /dev/null
+++ b/system-jinja.patch
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/core/core.gypi.orig 2013-09-27
18:25:24.634284363 +0000
++++ third_party/WebKit/Source/core/core.gypi 2013-09-27 18:25:48.614432099
+0000
+@@ -3863,10 +3863,6 @@
+ 'tests/TreeTestHelpers.h',
+ ],
+ 'scripts_for_in_files': [
+- # jinja2/__init__.py contains version string, so sufficient as
+- # dependency for whole jinja2 package
+- '<(DEPTH)/third_party/jinja2/__init__.py',
+- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ 'scripts/in_file.py',
+ 'scripts/in_generator.py',
+ 'scripts/license.py',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/719e6b64d8466b4731cda074d265a27ad7ec1012
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
