commit 9516ca978d43a322445dcd286276ce9c10b3cb7f
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Sun Nov 11 21:11:24 2012 +0200
up to 23.0.1271.64; nacl builds now
chromium-browser.spec | 27 +++---
nacl-no-untar.patch | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 233 insertions(+), 15 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 54f743e..f271a10 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -62,13 +62,12 @@
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 23.0.1271.60
-Release: 0.1
+Version: 23.0.1271.64
+Release: 1
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
-Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
-# Source0-md5: d7d10e30992db870820f7baa5e2f8e29
-#Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz
+Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz
+# Source0-md5: 6c467affd292ee9a9020ac91147969c8
Source1: %{name}.default
Source2: %{name}.sh
Source3: %{name}.desktop
@@ -76,7 +75,7 @@ Source5: find-lang.sh
Source6: update-source.sh
Source7: clean-source.sh
Source8: get-source.sh
-Patch0: system-libs.patch
+#Patch0: system-libs.patch
Patch1: plugin-searchdirs.patch
Patch2: gyp-system-minizip.patch
Patch3: disable_dlog_and_dcheck_in_release_builds.patch
@@ -92,6 +91,7 @@ Patch11: chromium-revert-jpeg-swizzle-r2.patch
Patch15: nacl-build-irt.patch
Patch16: nacl-linkingfix.patch
Patch17: system-icu.patch
+Patch18: nacl-no-untar.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
BuildRequires: OpenGL-GLU-devel
@@ -102,7 +102,7 @@ BuildRequires: bzip2-devel
%{?with_nacl:BuildRequires: crossnacl-binutils >= 2.20.1}
%{?with_nacl:BuildRequires: crossnacl-gcc >= 4.4.3}
%{?with_nacl:BuildRequires: crossnacl-gcc-c++ >= 4.4.3}
-%{?with_nacl:BuildRequires: crossnacl-newlib >= 1.18.0}
+%{?with_nacl:BuildRequires: crossnacl-newlib >= 1.20.0-3}
%{?with_cups:BuildRequires: cups-devel}
BuildRequires: dbus-glib-devel
BuildRequires: expat-devel
@@ -225,7 +225,7 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
%{__sed} -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE5} > find-lang.sh
ln -s %{SOURCE7} src
-%patch0 -p1
+#%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -240,6 +240,7 @@ cd src
%patch16 -p1
%patch17 -p0
cd ..
+%patch18 -p1
cd src
@@ -294,12 +295,6 @@ for i in $(find %{_prefix}/x86_64-nacl/include -type f |
grep -v "c++"); do
ln -s $i ${i#%{_prefix}/x86_64-nacl/include/}
done
cd ../../../../../..
-
-: Preparing NaCl newlib toolchain
-install -d sdk
-cp -a native_client/toolchain/linux_x86_newlib sdk/nacl-sdk
-install -d native_client/toolchain/.tars
-tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk
%endif
test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp
\
@@ -323,9 +318,11 @@ test -e Makefile || %{__python} build/gyp_chromium
--format=make build/all.gyp \
-Dffmpeg_branding=Chrome \
-Dproprietary_codecs=1 \
%if %{with nacl}
- %{?_:# Disable glibc Native Client toolchain, we don't need it (gentoo
bug #417019).} \
-Ddisable_glibc=1 \
-Dnaclsdk_mode=custom:/usr/x86_64-nacl \
+ -Ddisable_glibc_untar=1 \
+ -Ddisable_newlib_untar=1 \
+ -Ddisable_pnacl_untar=1 \
%else
-Ddisable_nacl=1 \
%endif
diff --git a/nacl-no-untar.patch b/nacl-no-untar.patch
new file mode 100644
index 0000000..078a1db
--- /dev/null
+++ b/nacl-no-untar.patch
@@ -0,0 +1,221 @@
+--- chromium-browser-23.0.1271.64/src/native_client/tools.gyp~ 2012-11-11
16:04:58.000000000 +0200
++++ chromium-browser-23.0.1271.64/src/native_client/tools.gyp 2012-11-11
16:06:02.252718808 +0200
+@@ -35,7 +35,7 @@
+ 'disable_pnacl%': 0,
+ },
+ 'conditions': [
+- ['disable_newlib==0', {
++ ['disable_newlib==0 and disable_newlib_untar==0', {
+ 'actions': [
+ {
+ 'action_name': 'Untar newlib',
+@@ -58,7 +58,7 @@
+ },
+ ]
+ }],
+- ['disable_glibc==0', {
++ ['disable_glibc==0 and disable_glibc_untar==0', {
+ 'actions': [
+ {
+ 'action_name': 'Untar glibc',
+@@ -81,7 +81,7 @@
+ },
+ ]
+ }],
+- ['disable_pnacl==0', {
++ ['disable_pnacl==0 and disable_pnacl_untar==0', {
+ 'actions': [
+ {
+ 'action_name': 'Untar pnacl',
+--- chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi~
2012-11-11 16:04:58.000000000 +0200
++++ chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi
2012-11-11 16:19:15.369299822 +0200
+@@ -168,7 +168,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_newlib64)',
+ '>(source_list_newlib64)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+ ],
+ 'outputs': ['>(out_newlib64)'],
+ 'action': [
+@@ -209,7 +208,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_newlib64)',
+ '>(source_list_newlib64)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+ ],
+ 'outputs': ['>(out_newlib64)'],
+ 'action': [
+@@ -250,7 +248,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_newlib32)',
+ '>(source_list_newlib32)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+ ],
+ 'outputs': ['>(out_newlib32)'],
+ 'action': [
+@@ -291,7 +288,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_newlib32)',
+ '>(source_list_newlib32)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+ ],
+ 'outputs': ['>(out_newlib32)'],
+ 'action': [
+@@ -424,7 +420,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc64)',
+ '>(source_list_glibc64)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
+ ],
+ 'outputs': ['>(out_glibc64)'],
+ 'action': [
+@@ -465,7 +460,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc32)',
+ '>(source_list_glibc32)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
+ ],
+ 'outputs': ['>(out_glibc32)'],
+ 'action': [
+@@ -506,7 +500,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc64)',
+ '>(source_list_glibc64)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
+ ],
+ 'outputs': ['>(out_glibc64)'],
+ 'action': [
+@@ -547,7 +540,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc32)',
+ '>(source_list_glibc32)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
+ ],
+ 'outputs': ['>(out_glibc32)'],
+ 'action': [
+@@ -588,7 +580,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc64)',
+ '>(source_list_glibc64)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+ ],
+ 'outputs': ['>(out_glibc64)'],
+ 'action': [
+@@ -629,7 +620,6 @@
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc32)',
+ '>(source_list_glibc32)',
+-
'<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+ ],
+ 'outputs': ['>(out_glibc32)'],
+ 'action': [
+--- chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi~
2012-11-11 16:54:53.000000000 +0000
++++ chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi
2012-11-11 17:00:51.043248254 +0000
+@@ -173,7 +173,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-64',
+ '--build', 'newlib_nexe',
+@@ -213,7 +213,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-64',
+ '--build', 'newlib_nlib',
+@@ -253,7 +253,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-32',
+ '--build', 'newlib_nexe',
+@@ -293,7 +293,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-32',
+ '--build', 'newlib_nlib',
+@@ -339,7 +339,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'arm',
+ '--build', 'newlib_nexe',
+@@ -379,7 +379,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'arm',
+ '--build', 'newlib_nlib',
+@@ -425,7 +425,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-64',
+ '--build', 'glibc_nexe',
+@@ -465,7 +465,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-32',
+ '--build', 'glibc_nexe',
+@@ -505,7 +505,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-64',
+ '--build', 'glibc_nlib',
+@@ -545,7 +545,7 @@
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '>@(extra_args)',
+ '--arch', 'x86-32',
+ '--build', 'glibc_nlib',
+@@ -586,7 +586,7 @@
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+ '>@(extra_args)',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '--arch', 'x86-64',
+ '--build', 'glibc_nso',
+ '--root', '<(DEPTH)',
+@@ -626,7 +626,7 @@
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+ '>@(extra_args)',
+- '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
++ '-t', '<(DEPTH)/native_client/toolchain/',
+ '--arch', 'x86-32',
+ '--build', 'glibc_nso',
+ '--root', '<(DEPTH)',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/9516ca978d43a322445dcd286276ce9c10b3cb7f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
