From e9abb380684885a6a04583307583f171a2dc9f09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 4 Nov 2012 23:44:46 +0200 Subject: [PATCH] up to 23.0.1271.60 nacl disabled, needs build fixing --- chromium-browser.spec | 40 ++++++++++++++++++++++++++++--------- chromium_useragent.patch.in | 23 +++++++++------------ nacl-build-irt.patch | 22 ++++++++++++-------- 3 files changed, 54 insertions(+), 31 deletions(-) diff --git a/chromium-browser.spec b/chromium-browser.spec index 6cd95ad..9b5edce 100644 --- a/chromium-browser.spec +++ b/chromium-browser.spec @@ -7,7 +7,8 @@ %bcond_without cups # with cups %bcond_without gconf # with GConf %bcond_without pulseaudio # with pulseaudio -%bcond_without nacl # build Native Client support +# disable nacl, see http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html +%bcond_with nacl # build Native Client support %bcond_without sandboxing # with sandboxing %bcond_with selinux # with SELinux (need policy first) %bcond_with shared_libs # with shared libs @@ -62,12 +63,13 @@ %define gyp_rev 1014 Summary: A WebKit powered web browser Name: chromium-browser -Version: 22.0.1229.94 -Release: 1 +Version: 23.0.1271.60 +Release: 0.1 License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking -Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz -# Source0-md5: cdcdd11480178f0f823e54bf490db408 +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 Source1: %{name}.default Source2: %{name}.sh Source3: %{name}.desktop @@ -90,6 +92,7 @@ Patch9: chromium-ppapi.patch Patch11: chromium-revert-jpeg-swizzle-r2.patch Patch15: nacl-build-irt.patch Patch16: nacl-linkingfix.patch +Patch17: system-icu.patch URL: http://www.chromium.org/Home %{?with_gconf:BuildRequires: GConf2-devel} BuildRequires: OpenGL-GLU-devel @@ -231,14 +234,35 @@ ln -s %{SOURCE7} src %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch15 -p1 cd src %patch9 -p0 %{!?with_libjpegturbo:%patch11 -p0} -%patch15 -p1 %patch16 -p1 +%patch17 -p0 cd .. cd src + +# Missing gyp files in tarball. +# https://code.google.com/p/chromium/issues/detail?id=144823 +if [ -e chrome/test/data/nacl/nacl_test_data.gyp ]; then + echo "tarball fixed, please remove workaround" + exit 1 +fi + +install -d chrome/test/data/nacl +cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF +{ + 'targets': [ + { + 'target_name': 'nacl_tests', + 'type': 'none', + }, + ], +} +EOF + sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0} libxml=0 %{!?with_system_zlib:zlib=0} %build @@ -420,11 +444,9 @@ fi %{_desktopdir}/*.desktop %{_iconsdir}/hicolor/*/apps/%{name}.png %dir %{_libdir}/%{name} -%{_libdir}/%{name}/chrome.pak +%{_libdir}/%{name}/chrome*.pak %{_libdir}/%{name}/content_resources.pak %{_libdir}/%{name}/resources.pak -%{_libdir}/%{name}/theme_resources_*.pak -%{_libdir}/%{name}/ui_resources_*.pak %dir %{_libdir}/%{name}/locales %{_libdir}/%{name}/locales/en-US.pak %dir %{_libdir}/%{name}/resources diff --git a/chromium_useragent.patch.in b/chromium_useragent.patch.in index 863a14a..fefbf62 100644 --- a/chromium_useragent.patch.in +++ b/chromium_useragent.patch.in @@ -1,26 +1,21 @@ ---- chromium-browser-16.0.912.21~r108057/src/webkit/glue/user_agent.cc~ 2011-11-05 15:01:12.000000000 +0100 -+++ chromium-browser-16.0.912.21~r108057/src/webkit/glue/user_agent.cc 2011-11-05 17:29:13.809556210 +0100 -@@ -127,6 +127,12 @@ - +--- chromium-browser-23.0.1271.60/src/webkit/user_agent/user_agent_util.cc~ 2012-10-30 21:01:17.000000000 +0200 ++++ chromium-browser-23.0.1271.60/src/webkit/user_agent/user_agent_util.cc 2012-11-04 17:00:57.206490293 +0200 +@@ -167,12 +167,20 @@ + // This is done to expose our product name in a manner that is maximally + // compatible with Safari, we hope!! std::string user_agent; - ++ + // We want to also add Chromium + std::string realproduct = product.c_str(); + size_t pos; + if ((pos = realproduct.find("/")) != std::string::npos) + realproduct.replace(0, pos, "Chromium"); + - // This is done to expose our product name in a manner that is maximally - // compatible with Safari, we hope!! - -@@ -134,11 +140,12 @@ base::StringAppendF( &user_agent, - "Mozilla/5.0 (%s%s) AppleWebKit/%d.%d" -- " (KHTML, like Gecko) %s Safari/%d.%d", -+ " (KHTML, like Gecko) @BUILD_DIST_NAME@/@BUILD_DIST_VERSION@ %s %s Safari/%d.%d", - kUserAgentPlatform, - webkit_glue::BuildOSCpuInfo().c_str(), +- "Mozilla/5.0 (%s) AppleWebKit/%d.%d (KHTML, like Gecko) %s Safari/%d.%d", ++ "Mozilla/5.0 (%s) AppleWebKit/%d.%d (KHTML, like Gecko) %s %s Safari/%d.%d", + os_info.c_str(), WEBKIT_VERSION_MAJOR, WEBKIT_VERSION_MINOR, + realproduct.c_str(), diff --git a/nacl-build-irt.patch b/nacl-build-irt.patch index 42c4a70..92d7622 100644 --- a/nacl-build-irt.patch +++ b/nacl-build-irt.patch @@ -1,11 +1,17 @@ ---- chromium-browser-20.0.1132.47/native_client/SConstruct~ 2012-06-28 16:03:20.000000000 +0300 -+++ chromium-browser-20.0.1132.47/native_client/SConstruct 2012-07-07 01:27:46.054400799 +0300 -@@ -3329,7 +3329,7 @@ +--- chromium-browser-23.0.1271.60/src/native_client/SConstruct~ 2012-10-30 21:04:38.000000000 +0200 ++++ chromium-browser-23.0.1271.60/src/native_client/SConstruct 2012-11-04 17:05:10.961306382 +0200 +@@ -2744,10 +2744,10 @@ #### ALPHABETICALLY SORTED #### - ], ppapi_scons_files['nonvariant_test_scons_files']) + ] --nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests + nonvariant_tests) -+#nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests + nonvariant_tests) +-nacl_env.Append(BUILD_SCONSCRIPTS=nonvariant_tests) +-nacl_env.AddChromeFilesFromGroup('nonvariant_test_scons_files') +-nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests) +-nacl_env.AddChromeFilesFromGroup('irt_variant_test_scons_files') ++#nacl_env.Append(BUILD_SCONSCRIPTS=nonvariant_tests) ++#nacl_env.AddChromeFilesFromGroup('nonvariant_test_scons_files') ++#nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests) ++#nacl_env.AddChromeFilesFromGroup('irt_variant_test_scons_files') - # ---------------------------------------------------------- - # Possibly install an sdk by downloading it + # Defines TESTS_TO_RUN_INBROWSER. + SConscript('tests/inbrowser_test_runner/selection.scons', -- 2.44.0