packages: chromium-browser/chromium-browser.spec, chromium-browser/chromium...
atler
atler at pld-linux.org
Fri Jan 7 21:30:21 CET 2011
Author: atler Date: Fri Jan 7 20:30:21 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 10.0.632.0, r70714
- update libvpx BR
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.90 -> 1.91) , chromium-system-vpx.patch (1.1 -> 1.2) , plugin-searchdirs.patch (1.4 -> 1.5) , system-libs.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.90 packages/chromium-browser/chromium-browser.spec:1.91
--- packages/chromium-browser/chromium-browser.spec:1.90 Tue Dec 14 22:09:07 2010
+++ packages/chromium-browser/chromium-browser.spec Fri Jan 7 21:30:16 2011
@@ -22,18 +22,18 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define svndate 20101214
-%define svnver 69095
+%define svndate 20110107
+%define svnver 70714
%define rel 1
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 10.0.611.0
+Version: 10.0.632.0
Release: %{svnver}.%{rel}
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5: d91fca61b2c2300643e773bd31d813cb
+# Source0-md5: 03ca2a884fb63066ee77172c9ed07a26
Source2: %{name}.sh
Source3: %{name}.desktop
Source4: find-lang.sh
@@ -66,7 +66,7 @@
BuildRequires: libpng-devel
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libstdc++-devel
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel >= 0.9.5-2
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lzma
@@ -316,6 +316,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.91 2011/01/07 20:30:16 atler
+- up to 10.0.632.0, r70714
+- update libvpx BR
+
Revision 1.90 2010/12/14 21:09:07 glen
- up to 10.0.611.0, r69095
================================================================
Index: packages/chromium-browser/chromium-system-vpx.patch
diff -u packages/chromium-browser/chromium-system-vpx.patch:1.1 packages/chromium-browser/chromium-system-vpx.patch:1.2
--- packages/chromium-browser/chromium-system-vpx.patch:1.1 Thu Dec 2 09:09:44 2010
+++ packages/chromium-browser/chromium-system-vpx.patch Fri Jan 7 21:30:16 2011
@@ -4,9 +4,9 @@
extern "C" {
#define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vp8cx.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
+#include "vpx/vpx_codec.h"
+#include "vpx/vpx_encoder.h"
+#include "vpx/vp8cx.h"
@@ -19,9 +19,9 @@
extern "C" {
#define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
--#include "third_party/libvpx/include/vpx/vp8dx.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
+#include "vpx/vpx_codec.h"
+#include "vpx/vpx_decoder.h"
+#include "vpx/vp8dx.h"
@@ -62,3 +62,13 @@
# Add pkg-config result to include path when use_system_ffmpeg!=0
['use_system_ffmpeg!=0', {
'cflags': [
+--- remoting/remoting.gyp~ 2010-12-24 04:01:42.000000000 +0100
++++ remoting/remoting.gyp 2011-01-07 19:29:09.730911879 +0100
+@@ -114,7 +114,6 @@
+ '../gfx/gfx.gyp:gfx',
+ '../media/media.gyp:media',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+- '../third_party/libvpx/libvpx.gyp:libvpx_include',
+ '../third_party/zlib/zlib.gyp:zlib',
+ 'chromoting_jingle_glue',
+ 'proto/chromotocol.gyp:chromotocol_proto_lib',
================================================================
Index: packages/chromium-browser/plugin-searchdirs.patch
diff -u packages/chromium-browser/plugin-searchdirs.patch:1.4 packages/chromium-browser/plugin-searchdirs.patch:1.5
--- packages/chromium-browser/plugin-searchdirs.patch:1.4 Mon Aug 30 15:15:30 2010
+++ packages/chromium-browser/plugin-searchdirs.patch Fri Jan 7 21:30:16 2011
@@ -1,15 +1,15 @@
---- chromium-browser-7.0.509.0~svn20100830r57827/src/webkit/glue/plugins/plugin_list_posix.cc~ 2010-08-30 13:11:06.000000000 +0300
-+++ chromium-browser-7.0.509.0~svn20100830r57827/src/webkit/glue/plugins/plugin_list_posix.cc 2010-08-30 14:34:22.711621299 +0300
-@@ -90,6 +86,8 @@
- if (home)
- plugin_dirs->push_back(FilePath(home).Append(".mozilla/plugins"));
+--- chromium-browser-10.0.632.0~svn20110107r70714/src/webkit/plugins/npapi/plugin_list_posix.cc~ 2010-12-22 04:02:37.000000000 +0100
++++ chromium-browser-10.0.632.0~svn20110107r70714/src/webkit/plugins/npapi/plugin_list_posix.cc 2011-01-07 17:41:38.193692743 +0100
+@@ -146,6 +146,8 @@
+ if (!home.empty())
+ plugin_dirs->push_back(home.Append(".mozilla/plugins"));
+ // in PLD Linux we want to search only Chrome specific dirs.
+#if 0
// 3) NS_SYSTEM_PLUGINS_DIR:
// This varies across different browsers and versions, so check 'em all.
plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
-@@ -161,6 +161,7 @@
+@@ -161,6 +163,7 @@
plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
#endif // defined(ARCH_CPU_64_BITS)
================================================================
Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.7 packages/chromium-browser/system-libs.patch:1.8
--- packages/chromium-browser/system-libs.patch:1.7 Thu Jul 22 16:15:29 2010
+++ packages/chromium-browser/system-libs.patch Fri Jan 7 21:30:16 2011
@@ -33,8 +33,8 @@
#if defined(OS_WIN)
#include "third_party/zlib/contrib/minizip/iowin32.h"
#endif
---- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_posix.cc~ 2010-01-07 23:19:11.000000000 +0200
-+++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_posix.cc 2010-02-02 09:16:08.740140511 +0200
+--- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc~ 2010-01-07 23:19:11.000000000 +0200
++++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc 2010-02-02 09:16:08.740140511 +0200
@@ -13,7 +13,7 @@
// These headers must be included in this order to make the declaration gods
@@ -42,7 +42,7 @@
-#include "base/third_party/nspr/prcpucfg_linux.h"
+#include <nspr/prcpucfg.h>
- namespace {
+ namespace webkit {
--- chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~ 2010-07-21 05:01:25.000000000 +0300
+++ chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc 2010-07-22 13:58:51.340525649 +0300
@@ -55,3 +55,14 @@
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
+--- chromium-browser-10.0.632.0~svn20110107r70714/src/chrome/common/metrics_helpers.cc~ 2010-12-14 04:02:04.000000000 +0100
++++ chromium-browser-10.0.632.0~svn20110107r70714/src/chrome/common/metrics_helpers.cc 2011-01-07 18:42:11.020015382 +0100
+@@ -19,7 +19,7 @@
+ #include "base/string_number_conversions.h"
+ #include "base/sys_info.h"
+ #include "base/utf_string_conversions.h"
+-#include "base/third_party/nspr/prtime.h"
++#include <nspr/prtime.h>
+ #include "chrome/common/logging_chrome.h"
+ #include "googleurl/src/gurl.h"
+ #include "libxml/xmlwriter.h"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.90&r2=1.91&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-system-vpx.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/plugin-searchdirs.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list