[packages/chromium-browser/DEVEL: 8/26] up to 24.0.1312.45
glen
glen at pld-linux.org
Wed Jan 2 21:01:55 CET 2013
commit 126ea630ec351ca9bd4282da75226438c388b0b4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Dec 21 20:47:09 2012 +0200
up to 24.0.1312.45
- added system minizip bcond
chromium-browser.spec | 18 +++---
gyp-system-minizip.patch | 96 -----------------------------
nacl-no-untar.patch | 157 ++++++++++-------------------------------------
pulse_fix-157876.patch | 14 +++++
system-icu.patch | 12 ----
system-jsoncpp.patch | 32 ++++------
system-speex.patch | 31 ----------
update-source.sh | 2 +-
8 files changed, 66 insertions(+), 296 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index a1ff2cc..b436bb2 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -17,6 +17,7 @@
%bcond_without system_jsoncpp # system jsoncpp
%bcond_without system_libusb # system libusb-1
%bcond_without system_libwebp # system libwebp
+%bcond_without system_minizip # system minizip
%bcond_without system_speex # system speex
%bcond_with system_sqlite # system sqlite
%bcond_without system_srtp # system srtp (can be used if using bundled libjingle)
@@ -65,12 +66,12 @@
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 23.0.1271.64
-Release: 2
+Version: 24.0.1312.45
+Release: 0.2
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: 6c467affd292ee9a9020ac91147969c8
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
+# Source0-md5: 2995d5aa3f1ecb470e60e0984229fcce
Source1: %{name}.default
Source2: %{name}.sh
Source3: %{name}.desktop
@@ -80,7 +81,6 @@ Source7: clean-source.sh
Source8: get-source.sh
#Patch0: system-libs.patch
Patch1: plugin-searchdirs.patch
-Patch2: gyp-system-minizip.patch
Patch3: disable_dlog_and_dcheck_in_release_builds.patch
Patch4: path-libpdf.patch
Patch5: options-support.patch
@@ -93,11 +93,10 @@ Patch9: chromium-ppapi.patch
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
Patch19: system-jsoncpp.patch
-Patch20: system-speex.patch
Patch21: system-srtp.patch
+Patch22: pulse_fix-157876.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
BuildRequires: OpenGL-GLU-devel
@@ -237,7 +236,6 @@ ln -s %{SOURCE7} src
#%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -248,12 +246,11 @@ cd src
%patch9 -p0
%{!?with_libjpegturbo:%patch11 -p0}
%patch16 -p1
-%patch17 -p0
%patch19 -p1
%patch21 -p1
+%patch22 -p1
cd ..
%patch18 -p1
-%patch20 -p1
cd src
@@ -350,6 +347,7 @@ test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
%{gyp_with system_flac} \
%{gyp_with system_libusb} \
%{gyp_with system_libwebp} \
+ %{gyp_with system_minizip} \
%{gyp_with system_speex} \
%{gyp_with system_sqlite} \
%{gyp_with system_v8} \
diff --git a/gyp-system-minizip.patch b/gyp-system-minizip.patch
deleted file mode 100644
index d7429f8..0000000
--- a/gyp-system-minizip.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- chromium-browser-16.0.912.21~r108057/src/third_party/zlib/zlib.gyp~ 2011-11-05 15:05:40.000000000 +0100
-+++ chromium-browser-16.0.912.21~r108057/src/third_party/zlib/zlib.gyp 2011-11-05 17:31:17.605374715 +0100
-@@ -88,12 +88,6 @@
- 'USE_SYSTEM_ZLIB',
- ],
- 'sources': [
-- 'contrib/minizip/ioapi.c',
-- 'contrib/minizip/ioapi.h',
-- 'contrib/minizip/unzip.c',
-- 'contrib/minizip/unzip.h',
-- 'contrib/minizip/zip.c',
-- 'contrib/minizip/zip.h',
- ],
- 'conditions': [
- ['OS=="android"', {
-@@ -102,7 +96,7 @@
- ],
- 'link_settings': {
- 'libraries': [
-- '-lz',
-+ '-lminizip',
- ],
- },
- },
---- chromium-browser-17.0.963.26/src/chrome/common/zip.cc~ 2012-01-04 04:02:54.000000000 +0200
-+++ chromium-browser-17.0.963.26/src/chrome/common/zip.cc 2012-01-05 22:51:39.376075829 +0200
-@@ -12,8 +12,8 @@
- #include "chrome/common/zip_internal.h"
- #include "chrome/common/zip_reader.h"
- #include "net/base/file_stream.h"
--#include "third_party/zlib/contrib/minizip/unzip.h"
--#include "third_party/zlib/contrib/minizip/zip.h"
-+#include <minizip/unzip.h>
-+#include <minizip/zip.h>
-
- namespace {
-
---- chromium-browser-17.0.963.26/src/chrome/common/zip_internal.h~ 2012-01-04 04:02:54.000000000 +0200
-+++ chromium-browser-17.0.963.26/src/chrome/common/zip_internal.h 2012-01-06 01:00:57.206864774 +0200
-@@ -8,8 +8,8 @@
-
- #include <string>
-
--#include "third_party/zlib/contrib/minizip/unzip.h"
--#include "third_party/zlib/contrib/minizip/zip.h"
-+#include <minizip/unzip.h>
-+#include <minizip/zip.h>
-
- // Utility functions and constants used internally for the zip file
- // library in the directory. Don't use them outside of the library.
---- chromium-browser-17.0.963.26/src/chrome/common/zip_internal.cc~ 2012-01-04 04:02:54.000000000 +0200
-+++ chromium-browser-17.0.963.26/src/chrome/common/zip_internal.cc 2012-01-06 01:08:20.967378679 +0200
-@@ -5,8 +5,8 @@
- #include "chrome/common/zip.h"
-
- #include "base/utf_string_conversions.h"
--#include "third_party/zlib/contrib/minizip/unzip.h"
--#include "third_party/zlib/contrib/minizip/zip.h"
-+#include <minizip/unzip.h>
-+#include <minizip/zip.h>
- #if defined(OS_WIN)
- #include "third_party/zlib/contrib/minizip/iowin32.h"
- #endif
---- chromium-browser-17.0.963.26/src/chrome/common/zip_reader.h~ 2012-01-04 04:02:54.000000000 +0200
-+++ chromium-browser-17.0.963.26/src/chrome/common/zip_reader.h 2012-01-06 01:12:08.277856237 +0200
-@@ -12,7 +12,7 @@
- #include "base/file_path.h"
- #include "base/memory/scoped_ptr.h"
- #include "base/time.h"
--#include "third_party/zlib/contrib/minizip/unzip.h"
-+#include <minizip/unzip.h>
-
- namespace zip {
-
---- chromium-browser-17.0.963.26/src/chrome/common/zip_reader.cc~ 2012-01-04 04:02:54.000000000 +0200
-+++ chromium-browser-17.0.963.26/src/chrome/common/zip_reader.cc 2012-01-06 01:12:40.065988131 +0200
-@@ -10,7 +10,7 @@
- #include "base/utf_string_conversions.h"
- #include "chrome/common/zip_internal.h"
- #include "net/base/file_stream.h"
--#include "third_party/zlib/contrib/minizip/unzip.h"
-+#include <minizip/unzip.h>
- #if defined(OS_WIN)
- #include "third_party/zlib/contrib/minizip/iowin32.h"
- #endif
---- chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc~ 2012-02-12 16:37:27.000000000 +0100
-+++ chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc 2012-02-12 16:53:51.341474034 +0100
-@@ -10,7 +10,7 @@
- #if defined(OS_WIN)
- #include "third_party/zlib/contrib/minizip/iowin32.h"
- #elif defined(OS_POSIX)
--#include "third_party/zlib/contrib/minizip/ioapi.h"
-+#include <minizip/ioapi.h>
- #endif
-
- namespace {
diff --git a/nacl-no-untar.patch b/nacl-no-untar.patch
index 078a1db..a3105a1 100644
--- a/nacl-no-untar.patch
+++ b/nacl-no-untar.patch
@@ -1,117 +1,6 @@
---- 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 @@
+--- chromium-browser-24.0.1312.14/./src/native_client/build/untrusted.gypi~ 2012-11-14 04:37:51.000000000 +0200
++++ chromium-browser-24.0.1312.14/./src/native_client/build/untrusted.gypi 2012-11-16 22:01:20.476042441 +0200
+@@ -162,7 +162,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -120,7 +9,7 @@
'>@(extra_args)',
'--arch', 'x86-64',
'--build', 'newlib_nexe',
-@@ -213,7 +213,7 @@
+@@ -203,7 +203,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -129,7 +18,7 @@
'>@(extra_args)',
'--arch', 'x86-64',
'--build', 'newlib_nlib',
-@@ -253,7 +253,7 @@
+@@ -244,7 +244,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -138,7 +27,7 @@
'>@(extra_args)',
'--arch', 'x86-32',
'--build', 'newlib_nexe',
-@@ -293,7 +293,7 @@
+@@ -285,7 +285,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -147,7 +36,7 @@
'>@(extra_args)',
'--arch', 'x86-32',
'--build', 'newlib_nlib',
-@@ -339,7 +339,7 @@
+@@ -331,7 +331,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -156,7 +45,7 @@
'>@(extra_args)',
'--arch', 'arm',
'--build', 'newlib_nexe',
-@@ -379,7 +379,7 @@
+@@ -371,7 +371,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -165,7 +54,7 @@
'>@(extra_args)',
'--arch', 'arm',
'--build', 'newlib_nlib',
-@@ -425,7 +425,7 @@
+@@ -418,7 +418,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -174,7 +63,7 @@
'>@(extra_args)',
'--arch', 'x86-64',
'--build', 'glibc_nexe',
-@@ -465,7 +465,7 @@
+@@ -459,7 +459,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -183,7 +72,7 @@
'>@(extra_args)',
'--arch', 'x86-32',
'--build', 'glibc_nexe',
-@@ -505,7 +505,7 @@
+@@ -500,7 +500,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -192,7 +81,7 @@
'>@(extra_args)',
'--arch', 'x86-64',
'--build', 'glibc_nlib',
-@@ -545,7 +545,7 @@
+@@ -541,7 +541,7 @@
'action': [
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
@@ -201,7 +90,7 @@
'>@(extra_args)',
'--arch', 'x86-32',
'--build', 'glibc_nlib',
-@@ -586,7 +586,7 @@
+@@ -583,7 +583,7 @@
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
'>@(extra_args)',
@@ -210,7 +99,7 @@
'--arch', 'x86-64',
'--build', 'glibc_nso',
'--root', '<(DEPTH)',
-@@ -626,7 +626,7 @@
+@@ -624,7 +624,7 @@
'>(python_exe)',
'<(DEPTH)/native_client/build/build_nexe.py',
'>@(extra_args)',
@@ -219,3 +108,21 @@
'--arch', 'x86-32',
'--build', 'glibc_nso',
'--root', '<(DEPTH)',
+@@ -702,7 +702,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', 'pnacl',
+ '--build', 'newlib_pexe',
+@@ -743,7 +743,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', 'pnacl',
+ '--build', 'newlib_plib',
diff --git a/pulse_fix-157876.patch b/pulse_fix-157876.patch
new file mode 100644
index 0000000..4749d41
--- /dev/null
+++ b/pulse_fix-157876.patch
@@ -0,0 +1,14 @@
+retrievad from google cache of
+http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch
+
+--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700
++++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700
+@@ -86,7 +86,7 @@
+
+ // All channel maps have the same size array of channel positions.
+ for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
+- int channel_position = kChannelOrderings[channel_layout][channel];
++ int channel_position = ChannelOrder(channel_layout, static_cast<Channels>(channel));
+ if (channel_position > -1) {
+ channel_map.map[channel_position] = ChromiumToPAChannelPosition(
+ static_cast<Channels>(channel));
diff --git a/system-icu.patch b/system-icu.patch
deleted file mode 100644
index 4f2c6d0..0000000
--- a/system-icu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- printing/backend/print_backend.cc.orig 2012-09-27 09:40:47.000000000 +0200
-+++ printing/backend/print_backend.cc 2012-09-27 09:41:26.000000000 +0200
-@@ -6,8 +6,8 @@
-
- #include <algorithm>
-
--#include "third_party/icu/public/common/unicode/uchar.h"
- #include "ui/base/text/text_elider.h"
-+#include "unicode/uchar.h"
-
- namespace {
-
diff --git a/system-jsoncpp.patch b/system-jsoncpp.patch
index 7478bc5..9f03818 100644
--- a/system-jsoncpp.patch
+++ b/system-jsoncpp.patch
@@ -65,27 +65,17 @@ diff -up chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h
namespace pp {
class URLUtil_Dev;
-diff -up chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp.system-jsoncpp chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp
---- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400
-+++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp 2012-07-07 21:09:15.092006176 -0400
-@@ -65,7 +65,7 @@
- '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
- '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
- '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
-- '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp',
-+ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
- '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
- '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
- '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
-@@ -106,7 +106,7 @@
- '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
- '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
- '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
-- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-+ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
- ],
- 'conditions': [
- ['OS=="mac"', {
+--- chromium-browser-24.0.1312.14/ppapi/native_client/src/trusted/plugin/plugin.gyp~ 2012-11-14 04:35:12.000000000 +0200
++++ chromium-browser-24.0.1312.14/ppapi/native_client/src/trusted/plugin/plugin.gyp 2012-11-16 00:01:34.889848810 +0200
+@@ -76,7 +76,7 @@
+ '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
+ '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
+ '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
++ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
+ ],
+ 'conditions': [
+ ['OS=="mac"', {
diff -up chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp
--- chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp 2012-07-07 21:09:54.042990761 -0400
+++ chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp 2012-07-07 21:10:37.294008997 -0400
diff --git a/system-speex.patch b/system-speex.patch
deleted file mode 100644
index 71f63b9..0000000
--- a/system-speex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-even third_party/speex/speex.h is wrapper to system speex, here are some
-includes included directly from third party dir...
-
---- chromium-browser-23.0.1271.64/src/remoting/codec/audio_decoder_speex.cc~ 2012-10-31 19:01:20.000000000 +0000
-+++ chromium-browser-23.0.1271.64/src/remoting/codec/audio_decoder_speex.cc 2012-11-12 23:04:42.083266707 +0000
-@@ -11,9 +11,9 @@
- #include "base/logging.h"
- #include "base/stl_util.h"
- #include "remoting/proto/audio.pb.h"
--#include "third_party/speex/speex.h"
--#include "third_party/speex/include/speex/speex_callbacks.h"
--#include "third_party/speex/include/speex/speex_stereo.h"
-+#include <speex/speex.h>
-+#include <speex/speex_callbacks.h>
-+#include <speex/speex_stereo.h>
-
- namespace remoting {
-
---- chromium-browser-23.0.1271.64/src/remoting/codec/audio_encoder_speex.cc~ 2012-10-31 19:01:20.000000000 +0000
-+++ chromium-browser-23.0.1271.64/src/remoting/codec/audio_encoder_speex.cc 2012-11-12 23:06:33.544849553 +0000
-@@ -11,8 +11,8 @@
- #include "base/logging.h"
- #include "base/stl_util.h"
- #include "remoting/proto/audio.pb.h"
--#include "third_party/speex/speex.h"
--#include "third_party/speex/include/speex/speex_stereo.h"
-+#include <speex/speex.h>
-+#include <speex/speex_stereo.h>
-
- namespace {
- // A quality of 8 in wide band mode corresponds to 27,800 bits per second.
diff --git a/update-source.sh b/update-source.sh
index 824b498..7241594 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -149,7 +149,7 @@ fi
dist=$(rpm -E %{pld_release})
arch=$(rpm -E %{_host_cpu})
-outdir=$(readlink -f $dir)/build-$dist-$arch
+outdir=$(readlink -f $dir)/BUILD-$dist-$arch
logfile=$outdir/$pkg.log
rpmdir=$outdir/RPMS
rpmdest=~/public_html/chromium-browser/$dist/$arch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/c5b396f3e17f0197cddc207f9444418b631a6fb1
More information about the pld-cvs-commit
mailing list