commit 63c64837d29536c417d9e9af85878eaf8596d821
Author: Elan Ruusamäe <[email protected]>
Date: Thu Nov 14 20:32:14 2013 +0200
up to 31.0.1650.48, disabled system webp
chromium-browser.spec | 14 +++++++-------
system-ply.patch | 22 +++++++++++-----------
2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index e42e2fe..61f3745 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -20,7 +20,7 @@
%bcond_without system_libexif # system libexif
%bcond_without system_libmtp # system libmtp
%bcond_with system_libusb # system libusb-1, disabled:
http://crbug.com/266149
-%bcond_without system_libwebp # system libwebp
+%bcond_with system_libwebp # system libwebp, disabled:
http://crbug.com/288019
%bcond_without system_libxnvctrl # system libxnvctrl
%bcond_with system_mesa # system Mesa
%bcond_without system_minizip # system minizip
@@ -59,9 +59,9 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define branch 30.0.1599
-%define basever 66
-%define patchver 114
+%define branch 31.0.1650
+%define basever 48
+#define patchver 114
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
@@ -70,10 +70,10 @@ Version: %{branch}.%{patchver}
%else
Version: %{branch}.%{basever}
%endif
-Release: 3
+Release: 0.2
License: BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
Group: X11/Applications/Networking
-Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.gz
# Source0-md5: 065e908d4b4a7ca44026a8234b336cf1
%if "%{?patchver}" != ""
Patch0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
@@ -299,7 +299,7 @@ ln -s %{SOURCE7} .
%patch24 -p2
%patch26 -p2
%patch29 -p0
-%patch30 -p0
+%patch30 -p1
sh -x clean-source.sh \
%{!?with_nacl:nacl=0} \
diff --git a/system-ply.patch b/system-ply.patch
index 2ab2c8a..787bee8 100644
--- a/system-ply.patch
+++ b/system-ply.patch
@@ -1,11 +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',
+---
chromium-browser-31.0.1650.48/third_party/WebKit/Source/bindings/derived_sources.gyp~
2013-11-08 08:50:07.000000000 +0200
++++
chromium-browser-31.0.1650.48/third_party/WebKit/Source/bindings/derived_sources.gyp
2013-11-13 19:07:02.379771691 +0200
+@@ -44,8 +44,6 @@
+ ],
+ 'compiler_module_files': [
+ 'scripts/idl_compiler.py',
+- '<(DEPTH)/third_party/ply/lex.py',
+- '<(DEPTH)/third_party/ply/yacc.py',
+ # jinja2/__init__.py contains version string, so sufficient for
package
+ '<(DEPTH)/third_party/jinja2/__init__.py',
+ '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
================================================================
---- 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
