[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/25.0.1364.152-1-4-ga2d8d34
Michael Gilbert
mgilbert at debian.org
Tue Apr 2 01:12:58 UTC 2013
The following commit has been merged in the master branch:
commit 9974d73b49507ed2af563b29f9068ebe3bc73416
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Apr 1 21:12:02 2013 -0400
refresh patches
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
index 6daf741..d636a4d 100644
--- a/debian/patches/arm-no-float-abi.patch
+++ b/debian/patches/arm-no-float-abi.patch
@@ -1,8 +1,8 @@
-Index: sid/src/build/common.gypi
+Index: chromium-browser/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2013-02-22 13:16:14.915093970 +0100
-+++ sid/src/build/common.gypi 2013-02-22 13:16:37.555093429 +0100
-@@ -868,7 +868,7 @@
+--- chromium-browser.orig/src/build/common.gypi 2013-03-30 15:06:48.084381472 +0000
++++ chromium-browser/src/build/common.gypi 2013-03-30 15:06:48.080381472 +0000
+@@ -911,7 +911,7 @@
'arm_fpu%': 'vfpv3',
# Set ARM float abi compilation flag.
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 6f53bf7..969472d 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,9 +1,9 @@
Do not use armv4 incopatible code
-Index: sid/src/build/common.gypi
+Index: chromium-browser/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2013-02-22 11:22:56.000000000 +0100
-+++ sid/src/build/common.gypi 2013-02-22 13:16:14.915093970 +0100
-@@ -2558,6 +2558,7 @@
+--- chromium-browser.orig/src/build/common.gypi 2013-03-30 15:01:40.836384122 +0000
++++ chromium-browser/src/build/common.gypi 2013-03-30 15:01:40.828384122 +0000
+@@ -2662,6 +2662,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
@@ -11,10 +11,10 @@ Index: sid/src/build/common.gypi
],
'conditions': [
['arm_thumb==1', {
-Index: sid/src/base/debug/debugger_posix.cc
+Index: chromium-browser/src/base/debug/debugger_posix.cc
===================================================================
---- sid.orig/src/base/debug/debugger_posix.cc 2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/debug/debugger_posix.cc 2013-02-22 13:16:14.919093970 +0100
+--- chromium-browser.orig/src/base/debug/debugger_posix.cc 2013-03-30 15:01:40.836384122 +0000
++++ chromium-browser/src/base/debug/debugger_posix.cc 2013-03-30 15:01:40.832384122 +0000
@@ -230,7 +230,7 @@
} while (0)
#else
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index eabd123..4e83014 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,8 +1,8 @@
Include system copy of prtime.h
-Index: sid/src/base/pr_time_unittest.cc
+Index: chromium-browser/src/base/pr_time_unittest.cc
===================================================================
---- sid.orig/src/base/pr_time_unittest.cc 2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/pr_time_unittest.cc 2013-02-22 13:12:18.243099632 +0100
+--- chromium-browser.orig/src/base/pr_time_unittest.cc 2013-03-30 14:55:16.652387438 +0000
++++ chromium-browser/src/base/pr_time_unittest.cc 2013-03-30 14:55:16.640387437 +0000
@@ -5,7 +5,7 @@
#include <time.h>
@@ -12,54 +12,54 @@ Index: sid/src/base/pr_time_unittest.cc
#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-Index: sid/src/base/time.cc
+Index: chromium-browser/src/base/time.cc
===================================================================
---- sid.orig/src/base/time.cc 2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/time.cc 2013-02-22 13:12:18.243099632 +0100
+--- chromium-browser.orig/src/base/time.cc 2013-03-30 14:55:16.652387438 +0000
++++ chromium-browser/src/base/time.cc 2013-03-30 14:55:44.116387204 +0000
@@ -12,7 +12,7 @@
#include <limits>
- #include "base/sys_string_conversions.h"
+ #include "base/strings/sys_string_conversions.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/logging.h"
-Index: sid/src/chrome/browser/metrics/metrics_log.cc
+Index: chromium-browser/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2013-02-22 11:23:17.000000000 +0100
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-02-22 13:12:18.247099632 +0100
-@@ -16,7 +16,7 @@
- #include "base/string_number_conversions.h"
+--- chromium-browser.orig/src/chrome/browser/metrics/metrics_log.cc 2013-03-30 14:55:16.652387438 +0000
++++ chromium-browser/src/chrome/browser/metrics/metrics_log.cc 2013-03-30 14:55:16.644387438 +0000
+@@ -19,7 +19,7 @@
#include "base/string_util.h"
+ #include "base/strings/string_number_conversions.h"
#include "base/sys_info.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time.h"
#include "base/tracked_objects.h"
#include "base/utf_string_conversions.h"
-Index: sid/src/base/base.gypi
+Index: chromium-browser/src/base/base.gypi
===================================================================
---- sid.orig/src/base/base.gypi 2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/base.gypi 2013-02-22 13:12:18.247099632 +0100
-@@ -17,7 +17,6 @@
- 'third_party/dmg_fp/dtoa_wrapper.cc',
- 'third_party/icu/icu_utf.cc',
- 'third_party/icu/icu_utf.h',
+--- chromium-browser.orig/src/base/base.gypi 2013-03-30 14:55:16.652387438 +0000
++++ chromium-browser/src/base/base.gypi 2013-03-30 14:56:24.860387023 +0000
+@@ -25,7 +25,6 @@
+ 'third_party/nspr/prcpucfg_openbsd.h',
+ 'third_party/nspr/prcpucfg_solaris.h',
+ 'third_party/nspr/prcpucfg_win.h',
- 'third_party/nspr/prtime.cc',
'third_party/nspr/prtime.h',
- 'third_party/nspr/prcpucfg_linux.h',
+ 'third_party/nspr/prtypes.h',
'third_party/xdg_mime/xdgmime.h',
-Index: sid/src/net/base/x509_certificate_nss.cc
+Index: chromium-browser/src/net/base/x509_certificate_nss.cc
===================================================================
---- sid.orig/src/net/base/x509_certificate_nss.cc 2013-02-22 11:22:32.000000000 +0100
-+++ sid/src/net/base/x509_certificate_nss.cc 2013-02-22 13:12:18.247099632 +0100
+--- chromium-browser.orig/src/net/base/x509_certificate_nss.cc 2013-03-30 14:55:16.652387438 +0000
++++ chromium-browser/src/net/base/x509_certificate_nss.cc 2013-03-30 14:56:54.568387012 +0000
@@ -9,7 +9,7 @@
#include <keyhi.h>
#include <nss.h>
#include <pk11pub.h>
-#include <prtime.h>
+#include <nspr/prtime.h>
+ #include <seccomon.h>
#include <secder.h>
#include <sechash.h>
-
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index dd2061b..205d94a 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,9 +1,9 @@
webkit needs to call nss to pull in nspr headers
-Index: sid/src/chrome/chrome_common.gypi
+Index: chromium-browser/src/chrome/chrome_common.gypi
===================================================================
---- sid.orig/src/chrome/chrome_common.gypi 2013-02-22 11:24:08.000000000 +0100
-+++ sid/src/chrome/chrome_common.gypi 2013-02-22 13:16:07.307094153 +0100
-@@ -400,6 +400,11 @@
+--- chromium-browser.orig/src/chrome/chrome_common.gypi 2013-03-30 14:57:14.356386421 +0000
++++ chromium-browser/src/chrome/chrome_common.gypi 2013-03-30 14:57:14.348386420 +0000
+@@ -438,6 +438,11 @@
'<(DEPTH)/third_party/wtl/include',
]
}],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 33d5f0a..6497733 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,15 +1,15 @@
Author: Raymond Wooninck (tittiatcoke)
Source: OpenSUSE (chromium-master-prefs-path.patch)
-Index: sid/src/chrome/browser/first_run/first_run_linux.cc
+Index: chromium-browser/src/chrome/browser/first_run/first_run_linux.cc
===================================================================
---- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-02-22 11:23:22.000000000 +0100
-+++ sid/src/chrome/browser/first_run/first_run_linux.cc 2013-02-22 13:16:12.515094029 +0100
-@@ -101,8 +101,7 @@
- FilePath MasterPrefsPath() {
+--- chromium-browser.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-03-30 14:57:40.680386194 +0000
++++ chromium-browser/src/chrome/browser/first_run/first_run_linux.cc 2013-03-30 15:00:41.448384646 +0000
+@@ -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");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/debian/patches/series b/debian/patches/series
index 9b2b2f4..cc24fc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@ nss.patch
expat.patch
prefs.patch
armv4.patch
-ffmpeg_arm.patch
+#ffmpeg_arm.patch
system-speech.patch
#glew.patch
fix-manpage.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 727a922..a969339 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
Use system speex
-Index: sid/src/build/linux/system.gyp
+Index: chromium-browser/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2013-02-22 11:22:56.000000000 +0100
-+++ sid/src/build/linux/system.gyp 2013-02-22 13:16:27.135093679 +0100
-@@ -492,6 +492,26 @@
+--- chromium-browser.orig/src/build/linux/system.gyp 2013-03-30 15:03:35.028383135 +0000
++++ chromium-browser/src/build/linux/system.gyp 2013-03-30 15:03:35.024383136 +0000
+@@ -619,6 +619,26 @@
],
},
{
@@ -30,24 +30,24 @@ Index: sid/src/build/linux/system.gyp
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: sid/src/content/browser/speech/audio_encoder.cc
+Index: chromium-browser/src/content/browser/speech/audio_encoder.cc
===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc 2013-02-22 11:22:20.000000000 +0100
-+++ sid/src/content/browser/speech/audio_encoder.cc 2013-02-22 13:16:27.139093679 +0100
+--- chromium-browser.orig/src/content/browser/speech/audio_encoder.cc 2013-03-30 15:03:35.028383135 +0000
++++ chromium-browser/src/content/browser/speech/audio_encoder.cc 2013-03-30 15:06:23.812381682 +0000
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
- #include "third_party/flac/flac.h"
--#include "third_party/speex/speex.h"
+ #include "third_party/flac/include/FLAC/stream_encoder.h"
+-#include "third_party/speex/include/speex/speex.h"
+#include <speex/speex.h>
namespace content {
namespace {
-Index: sid/src/content/content_browser.gypi
+Index: chromium-browser/src/content/content_browser.gypi
===================================================================
---- sid.orig/src/content/content_browser.gypi 2013-02-22 11:22:27.000000000 +0100
-+++ sid/src/content/content_browser.gypi 2013-02-22 13:16:27.139093679 +0100
-@@ -1064,7 +1064,7 @@
+--- chromium-browser.orig/src/content/content_browser.gypi 2013-03-30 15:03:35.028383135 +0000
++++ chromium-browser/src/content/content_browser.gypi 2013-03-30 15:03:35.028383135 +0000
+@@ -1097,7 +1097,7 @@
}, { # OS!="android"
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
deleted file mode 100644
index e152e67..0000000
--- a/debian/patches/vpx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: sid/src/third_party/libvpx/libvpx.gyp
-===================================================================
---- sid.orig/src/third_party/libvpx/libvpx.gyp 2012-11-08 08:58:51.000000000 +0100
-+++ sid/src/third_party/libvpx/libvpx.gyp 2012-11-13 10:39:00.600405842 +0100
-@@ -3,6 +3,11 @@
- # found in the LICENSE file.
- {
- 'variables': {
-+ 'use_system_vpx%': 0,
-+ },
-+ 'conditions': [
-+ ['use_system_vpx==0',{
-+ 'variables':{
- 'conditions': [
- ['os_posix==1', {
- 'asm_obj_extension': 'o',
-@@ -506,6 +511,31 @@
- ]
- },
- ],
-+ },{ # use_system_vpx==1
-+ 'targets': [
-+ {
-+ 'target_name':'libvpx',
-+ 'type':'none',
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@(pkg-config --cflags vpx)',
-+ ],
-+ 'defines': [
-+ 'USE_SYSTEM_VPX',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other vpx)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l vpx)',
-+ ],
-+ },
-+ },
-+ ],
-+ }],
-+ ],
- }
-
- # Local Variables:
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list