[packages/chromium-browser/DEVEL: 3/3] up to 26.0.1410.12
glen
glen at pld-linux.org
Tue Feb 26 20:47:37 CET 2013
commit f2f193c6115815ddbc2ce7679ee973605c29e463
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Feb 26 21:16:05 2013 +0200
up to 26.0.1410.12
builds with:
--without system_ffmpeg --without system_libvpx
chromium-browser.spec | 35 ++++++-----------------------------
clean-source.sh | 24 +++++++++++++++++-------
gnome3-volume-control.patch | 24 ++++++++++++------------
master-prefs-path.patch | 14 ++++++--------
no-pnacl.patch | 31 -------------------------------
system-libpng.patch | 11 -----------
system-opus.patch | 26 --------------------------
7 files changed, 41 insertions(+), 124 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 341a9d0..f4ce02c 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -28,6 +28,7 @@
%bcond_with system_sqlite # system sqlite
%bcond_without system_libsrtp # system srtp (can be used if using bundled libjingle)
%bcond_with system_v8 # system v8
+# system vpx broken currently due unreleased VP9 codec: https://code.google.com/p/chromium/issues/detail?id=174287
%bcond_without system_libvpx # system libvpx
%bcond_without system_yasm # system yasm
%bcond_without system_zlib # system zlib
@@ -56,8 +57,8 @@
# http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
# http://carme.pld-linux.org/~glen/chromium-browser/th/i686/chromium-nightly.conf
-%define branch 25.0.1364
-%define basever 97
+%define branch 26.0.1410
+%define basever 12
#define patchver 70
%define gyp_rev 1014
Summary: A WebKit powered web browser
@@ -70,7 +71,7 @@ Version: %{branch}.%{basever}
Release: 1
License: BSD, 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/dev/%{name}-%{branch}.%{basever}.tar.gz
# Source0-md5: d005fc9e50c28a2e3c71eee7310417f4
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
@@ -97,13 +98,10 @@ Patch10: system-libxnvctrl.patch
# libjpeg-turbo >= 1.1.90 supports that feature
Patch11: chromium-revert-jpeg-swizzle-r2.patch
Patch12: system-ffmpeg.patch
-Patch13: system-libpng.patch
-Patch14: system-opus.patch
Patch15: nacl-build-irt.patch
Patch16: nacl-linkingfix.patch
Patch18: nacl-no-untar.patch
Patch19: system-jsoncpp.patch
-Patch23: no-pnacl.patch
Patch24: nacl-verbose.patch
Patch25: gnome3-volume-control.patch
Patch26: master-prefs-path.patch
@@ -276,44 +274,23 @@ cd src
#%patch2 -p1
%{!?with_libjpegturbo:%patch11 -p0}
%patch12 -p1
-%patch13 -p0
-%patch14 -p2
%patch16 -p1
%patch19 -p1
-%patch25 -p1
%patch27 -p1
cd ..
+%patch25 -p1
%patch18 -p1
-%patch23 -p1
%patch24 -p1
%patch26 -p1
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_nacl:nacl=0} \
%{!?with_system_protobuf:protobuf=0} \
%{!?with_system_v8:v8=0} \
%{!?with_system_zlib:zlib=0} \
+ %{!?with_system_libvpx:libvpx=0} \
%{!?with_system_libxnvctrl:libXNVCtrl=0} \
%{nil}
diff --git a/clean-source.sh b/clean-source.sh
index c75b0bd..4846080 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -79,6 +79,7 @@ remove_nonessential_dirs() {
chrome/installer/mac/third_party/xz/config/mac \
chrome/installer/tools \
chrome/third_party/jstemplate/tutorial_examples \
+ third_party/jstemplate/tutorial_examples \
chrome/third_party/mock4js/examples \
chrome/third_party/wtl/ \
chrome/tools/build/chromeos \
@@ -425,22 +426,27 @@ remove_nonessential_dirs() {
v8/tools \
webkit/tools \
) '!' -type d '(' \
- '!' -name '*.gyp*' \
'!' -name '*.grd' \
+ '!' -name '*.gyp*' \
'!' -path 'base/mac/bundle_locations.h' \
'!' -path 'base/mac/crash_logging.h' \
'!' -path 'base/win/windows_version.h' \
'!' -path 'build/android/cpufeatures.gypi' \
'!' -path 'chrome/browser/chromeos/contacts/contact.proto' \
+ '!' -path 'chrome/browser/chromeos/extensions/file_browser_handler_api.h' \
+ '!' -path 'chrome/browser/chromeos/extensions/networking_private_api.h' \
'!' -path 'chrome/browser/chromeos/settings/cros_settings.h' \
'!' -path 'chrome/browser/chromeos/settings/cros_settings_names.h' \
'!' -path 'chrome/browser/chromeos/settings/cros_settings_provider.h' \
+ '!' -path 'chrome/browser/chromeos/settings/device_settings_service.h' \
'!' -path 'chrome/tools/build/generate_policy_source.py' \
'!' -path 'chrome/tools/build/linux/sed.sh' \
'!' -path 'chrome/tools/build/make_version_cc.py' \
'!' -path 'chrome/tools/build/repack_locales.py' \
'!' -path 'chrome/tools/build/version.py' \
'!' -path 'chromeos/chromeos_export.h' \
+ '!' -path 'chromeos/dbus/dbus_client_implementation_type.h' \
+ '!' -path 'chromeos/dbus/session_manager_client.h' \
'!' -path 'chromeos/network/onc/onc_constants.h' \
'!' -path 'content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h' \
'!' -path 'content/common/mac/attributed_string_coder.h' \
@@ -471,7 +477,7 @@ remove_nonessential_dirs() {
almost_strip_dirs() {
local dir
for dir in \
- breakpad \
+ breakpad_ \
build/ios \
courgette \
third_party/cros_dbus_cplusplus \
@@ -492,10 +498,11 @@ almost_strip_dirs() {
'!' -path 'tools/json_comment_eater.py' \
'!' -path 'tools/json_schema_compiler/*' \
'!' -path 'tools/json_to_struct/*' \
+ '!' -path 'tools/licenses.py' \
'!' -path 'tools/protoc_wrapper/*' \
+ '!' -path 'tools/usb_ids/*' \
'!' -path 'tools/uuidgen.py' \
'!' -path 'tools/zip2msi.py' \
- '!' -path 'tools/usb_ids/*' \
-print -delete
}
@@ -506,25 +513,27 @@ clean_third_party() {
local dir
for dir in \
third_party/ashmem \
- third_party/npapi/npspy \
- third_party/re2/benchlog \
third_party/eyesfree \
third_party/guava \
+ third_party/iaccessible2 \
third_party/icon_family \
third_party/isimpledom \
third_party/jsoncpp \
third_party/jsr-305 \
third_party/libexif \
third_party/mach_override \
+ third_party/npapi/npspy \
+ third_party/re2/benchlog \
third_party/snappy \
- third_party/iaccessible2 \
- third_party/sudden_motion_sensor \
third_party/sqlite/*.patch \
third_party/sqlite/src/*.patch \
+ third_party/sudden_motion_sensor \
; do
rm -vfr "$dir"
done
+return
+
find third_party -type f \! -iname '*.gyp*' \
\! -path 'third_party/WebKit/*' \
\! -path 'third_party/adobe/flash/*' \
@@ -537,6 +546,7 @@ clean_third_party() {
\! -path 'third_party/hunspell/*' \
\! -path 'third_party/hyphen/*' \
\! -path 'third_party/iccjpeg/*' \
+ \! -path 'third_party/jstemplate/* '\
\! -path 'third_party/khronos/*' \
\! -path 'third_party/leveldatabase/*' \
\! -path 'third_party/libXNVCtrl/*' \
diff --git a/gnome3-volume-control.patch b/gnome3-volume-control.patch
index 6001885..e71c1a5 100644
--- a/gnome3-volume-control.patch
+++ b/gnome3-volume-control.patch
@@ -1,12 +1,12 @@
-diff -up chromium-14.0.835.186/media/audio/linux/audio_manager_linux.cc.gnome3 chromium-14.0.835.186/media/audio/linux/audio_manager_linux.cc
---- chromium-14.0.835.186/media/audio/linux/audio_manager_linux.cc.gnome3 2011-09-20 04:26:05.000000000 -0400
-+++ chromium-14.0.835.186/media/audio/linux/audio_manager_linux.cc 2011-09-27 10:06:22.987780465 -0400
-@@ -191,7 +191,7 @@ void AudioManagerLinux::ShowAudioInputSe
- base::nix::DesktopEnvironment desktop = base::nix::GetDesktopEnvironment(
- env.get());
- std::string command((desktop == base::nix::DESKTOP_ENVIRONMENT_GNOME) ?
-- "gnome-volume-control" : "kmix");
-+ "gnome-control-center sound" : "kmix");
- base::LaunchProcess(CommandLine(FilePath(command)), base::LaunchOptions(),
- NULL);
- }
+--- chromium-browser-26.0.1410.12/src/media/audio/linux/audio_manager_linux.cc~ 2013-02-21 12:02:26.000000000 +0200
++++ chromium-browser-26.0.1410.12/src/media/audio/linux/audio_manager_linux.cc 2013-02-25 15:16:54.634665398 +0200
+@@ -92,7 +92,8 @@
+ CommandLine command_line(CommandLine::NO_PROGRAM);
+ switch (base::nix::GetDesktopEnvironment(env.get())) {
+ case base::nix::DESKTOP_ENVIRONMENT_GNOME:
+- command_line.SetProgram(base::FilePath("gnome-volume-control"));
++ command_line.SetProgram(base::FilePath("gnome-control-center"));
++ command_line.AppendArg("sound");
+ break;
+ case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE4:
diff --git a/master-prefs-path.patch b/master-prefs-path.patch
index 298613f..b037842 100644
--- a/master-prefs-path.patch
+++ b/master-prefs-path.patch
@@ -1,13 +1,11 @@
-Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
-===================================================================
---- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc
-+++ chromium/src/chrome/browser/first_run/first_run_linux.cc
-@@ -100,8 +100,7 @@ void AutoImport(
- FilePath MasterPrefsPath() {
+--- chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_linux.cc~ 2013-02-21 12:11:48.000000000 +0200
++++ chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_linux.cc 2013-02-25 16:00:59.000031225 +0200
+@@ -71,8 +71,7 @@
+ base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
- FilePath master_prefs;
+ base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
-- return FilePath();
+- return base::FilePath();
+ master_prefs = FilePath("/etc/chromium-browser");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/no-pnacl.patch b/no-pnacl.patch
deleted file mode 100644
index cf9fb78..0000000
--- a/no-pnacl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp~ 2012-12-19 10:03:43.000000000 +0200
-+++ chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp 2013-01-01 22:26:15.004609235 +0200
-@@ -94,7 +94,7 @@
- 'nlib_target': 'libnacl.a',
- 'build_glibc': 0,
- 'build_newlib': 1,
-- 'build_pnacl_newlib': 1,
-+ 'build_pnacl_newlib%': 0,
- },
- 'sources': [
- '<@(sources_for_nacl_extensions)',
---- a/src/native_client/build/untrusted.gypi (revision 10450)
-+++ b/src/native_client/build/untrusted.gypi (working copy)
-@@ -771,7 +771,7 @@
- ],
- },
- 'target_conditions': [
-- ['nexe_target!="" and build_pnacl_newlib!=0', {
-+ ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
- 'variables': {
- 'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
- 'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
-@@ -889,7 +889,7 @@
- }],
- ],
- }],
-- ['nlib_target!="" and build_pnacl_newlib!=0', {
-+ ['nlib_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
- 'variables': {
- 'tool_name': 'pnacl_newlib',
- 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
diff --git a/system-libpng.patch b/system-libpng.patch
deleted file mode 100644
index e972cde..0000000
--- a/system-libpng.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/shim_headers.gypi.orig 2012-12-20 02:51:12.000000000 +0100
-+++ build/shim_headers.gypi 2012-12-20 02:51:40.000000000 +0100
-@@ -10,7 +10,7 @@
-
- {
- 'variables': {
-- 'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
-+ 'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
- },
- 'direct_dependent_settings': {
- 'include_dirs+': [
diff --git a/system-opus.patch b/system-opus.patch
deleted file mode 100644
index 07b294d..0000000
--- a/system-opus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc~ 2012-12-20 10:01:10.000000000 +0200
-+++ chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc 2013-01-06 13:47:49.557009450 +0200
-@@ -15,8 +15,7 @@
- #include "media/base/decoder_buffer.h"
- #include "media/base/demuxer.h"
- #include "media/base/pipeline.h"
--#include "third_party/opus/src/include/opus.h"
--#include "third_party/opus/src/include/opus_multistream.h"
-+#include "third_party/opus/opus.h"
-
- namespace media {
-
---- chromium-browser-25.0.1364.5/src/third_party/opus/opus.h 2013-01-06 14:34:57.267997054 +0200
-+++ chromium-browser-25.0.1364.5/src/third_party/opus/opus.h 2013-01-06 17:26:46.252153771 +0200
-@@ -7,6 +7,11 @@
-
-+#if !defined(THIRD_PARTY_OPUS_OPUS_H_)
-+#define THIRD_PARTY_OPUS_OPUS_H_
- #if defined(USE_SYSTEM_OPUS)
- #include <opus/opus.h>
-+#include <opus/opus_multistream.h>
- #else
- #include "third_party/opus/src/include/opus.h"
-+#include "third_party/opus/src/include/opus_multistream.h"
-+#endif
- #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/f2f193c6115815ddbc2ce7679ee973605c29e463
More information about the pld-cvs-commit
mailing list