[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/13.0.782.215_r97094-1-6-g99bbcd1
Giuseppe Iuculano
iuculano at debian.org
Sat Aug 27 11:39:50 UTC 2011
The following commit has been merged in the experimental branch:
commit e5747b0986676a3a2ef2db9b0914d75c6a129f49
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Thu Aug 25 14:36:25 2011 +0200
Refreshed patches
diff --git a/debian/changelog b/debian/changelog
index f222f18..83ec687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ chromium-browser (14.0.835.109~r97804-1) UNRELEASED; urgency=low
* New beta release
* Fix gbp.conf for experimental branch
+ * Refreshed patches
- -- Giuseppe Iuculano <iuculano at debian.org> Wed, 24 Aug 2011 19:21:48 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org> Thu, 25 Aug 2011 14:36:05 +0200
chromium-browser (13.0.782.215~r97094-2) UNRELEASED; urgency=low
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 68951c9..4633bf6 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -12,7 +12,7 @@ Do not use armv4 incopatible code
SkASSERT((int16_t)y == y);
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
-@@ -1284,6 +1284,7 @@
+@@ -1426,6 +1426,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
@@ -22,15 +22,15 @@ Do not use armv4 incopatible code
['arm_thumb == 1', {
--- a/src/base/debug/debugger_posix.cc
+++ b/src/base/debug/debugger_posix.cc
-@@ -168,7 +168,7 @@ bool BeingDebugged() {
- // http://code.google.com/p/nativeclient/issues/detail?id=645
- #define DEBUG_BREAK() abort()
- #elif defined(ARCH_CPU_ARM_FAMILY)
+@@ -187,7 +187,7 @@ bool BeingDebugged() {
+ } while (0)
+ #else
+ // ARM && !ANDROID
-#define DEBUG_BREAK() asm("bkpt 0")
+#define DEBUG_BREAK() asm("nop")
+ #endif
#else
#define DEBUG_BREAK() asm("int3")
- #endif
--- a/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
+++ b/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
@@ -685,8 +685,8 @@ static void S32A_Blend_BlitRow32_arm(SkP
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index 4f72eb5..d29f9a6 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -1,7 +1,7 @@
Description: Fix build failure due to cups 1.5 header changes
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
---- chromium-browser-13.0.782.107~r94237.orig/src/printing/backend/cups_helper.h
-+++ chromium-browser-13.0.782.107~r94237/src/printing/backend/cups_helper.h
+--- a/src/printing/backend/cups_helper.h
++++ b/src/printing/backend/cups_helper.h
@@ -7,6 +7,7 @@
#pragma once
@@ -10,8 +10,8 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
class GURL;
---- chromium-browser-13.0.782.107~r94237.orig/src/chrome/service/cloud_print/print_system_cups.cc
-+++ chromium-browser-13.0.782.107~r94237/src/chrome/service/cloud_print/print_system_cups.cc
+--- a/src/chrome/service/cloud_print/print_system_cups.cc
++++ b/src/chrome/service/cloud_print/print_system_cups.cc
@@ -5,6 +5,7 @@
#include "chrome/service/cloud_print/print_system.h"
@@ -20,9 +20,9 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
#include <dlfcn.h>
#include <errno.h>
#include <pthread.h>
---- chromium-browser-13.0.782.107~r94237.orig/src/chrome/browser/ui/webui/print_preview_handler.cc
-+++ chromium-browser-13.0.782.107~r94237/src/chrome/browser/ui/webui/print_preview_handler.cc
-@@ -37,6 +37,7 @@
+--- a/src/chrome/browser/ui/webui/print_preview_handler.cc
++++ b/src/chrome/browser/ui/webui/print_preview_handler.cc
+@@ -46,6 +46,7 @@
#if defined(USE_CUPS)
#include <cups/cups.h>
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 375dd02..4bbcd2b 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -10,55 +10,13 @@ Include system copy of expat.h
#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
// The base class that contains common functionality between
---- a/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc
-+++ b/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc
-@@ -31,9 +31,9 @@
- #include "talk/xmllite/xmlelement.h"
- #include "talk/xmllite/xmlbuilder.h"
- #ifdef EXPAT_RELATIVE_PATH
--#include "lib/expat.h"
-+#include <expat.h>
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif // EXPAT_RELATIVE_PATH
-
- namespace buzz {
---- a/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
-+++ b/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
-@@ -34,9 +34,9 @@
- #include "talk/xmllite/xmlparser.h"
-
- #ifdef EXPAT_RELATIVE_PATH
--#include "lib/expat.h"
-+#include <expat.h>
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif // EXPAT_RELATIVE_PATH
-
- namespace buzz {
---- a/src/third_party/libjingle/source/talk/xmllite/xmlparser.cc
-+++ b/src/third_party/libjingle/source/talk/xmllite/xmlparser.cc
-@@ -36,9 +36,9 @@
- #include "talk/xmllite/xmlconstants.h"
- #include "talk/xmllite/xmlnsstack.h"
- #ifdef EXPAT_RELATIVE_PATH
--#include "lib/expat.h"
-+#include <expat.h>
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif // EXPAT_RELATIVE_PATH
-
- namespace buzz {
--- a/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
+++ b/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
@@ -32,9 +32,9 @@
#include "talk/xmllite/xmlnsstack.h"
#ifdef EXPAT_RELATIVE_PATH
--#include "lib/expat.h"
+-#include "expat.h"
+#include <expat.h>
#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
@@ -68,11 +26,11 @@ Include system copy of expat.h
struct XML_ParserStruct;
--- a/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
+++ b/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
-@@ -30,9 +30,9 @@
- #include "talk/xmpp/xmppstanzaparser.h"
+@@ -31,9 +31,9 @@
+ #include "talk/base/common.h"
#include "talk/xmpp/constants.h"
#ifdef EXPAT_RELATIVE_PATH
--#include "lib/expat.h"
+-#include "expat.h"
+#include <expat.h>
#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
diff --git a/debian/patches/ffmpeg_arm.patch b/debian/patches/ffmpeg_arm.patch
index 633e120..3c03dc2 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -1,6 +1,6 @@
--- a/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
+++ b/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
-@@ -35,10 +35,10 @@
+@@ -34,10 +34,10 @@
#define HAVE_ALTIVEC 0
#define HAVE_AMD3DNOW 0
#define HAVE_AMD3DNOWEXT 0
@@ -12,19 +12,23 @@
+#define HAVE_ARMV6 0
+#define HAVE_ARMV6T2 0
+#define HAVE_ARMVFP 0
+ #define HAVE_AVX 0
#define HAVE_IWMMXT 0
#define HAVE_MMI 0
- #define HAVE_MMX 0
--- a/src/third_party/ffmpeg/ffmpeg.gyp
+++ b/src/third_party/ffmpeg/ffmpeg.gyp
-@@ -275,10 +275,7 @@
- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.S',
- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_armv6.S',
- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.c',
-- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv5te.c',
- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.c',
-- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.c',
-- 'patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S',
- 'patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.c',
- 'patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S',
- 'patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S',
+@@ -395,14 +395,10 @@
+ 'patched-ffmpeg/libavcodec/arm/dsputil_arm.S',
+ 'patched-ffmpeg/libavcodec/arm/dsputil_armv6.S',
+ 'patched-ffmpeg/libavcodec/arm/dsputil_init_arm.c',
+- 'patched-ffmpeg/libavcodec/arm/dsputil_init_armv5te.c',
+ 'patched-ffmpeg/libavcodec/arm/dsputil_init_armv6.c',
+- 'patched-ffmpeg/libavcodec/arm/dsputil_init_vfp.c',
+- 'patched-ffmpeg/libavcodec/arm/dsputil_vfp.S',
+ 'patched-ffmpeg/libavcodec/arm/fft_fixed_init_arm.c', # jun 11
+ 'patched-ffmpeg/libavcodec/arm/fft_init_arm.c',
+ 'patched-ffmpeg/libavcodec/arm/fmtconvert_init_arm.c', # jun 11
+- 'patched-ffmpeg/libavcodec/arm/fmtconvert_vfp.S', # jun 11
+ # BUG(ihf): Seems like a bug in ffmpeg that we need
+ # h264pred_init_arm.c to enable vp8.
+ 'patched-ffmpeg/libavcodec/arm/h264pred_init_arm.c',
diff --git a/debian/patches/glew.patch b/debian/patches/glew.patch
index 301578e..05608f6 100644
--- a/debian/patches/glew.patch
+++ b/debian/patches/glew.patch
@@ -1,7 +1,7 @@
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -399,6 +399,23 @@
- ],
+@@ -432,6 +432,23 @@
+ },
},
{
+ 'target_name': 'glew',
@@ -21,22 +21,22 @@
+ }]]
+ },
+ {
+ # TODO(satorux): Remove this once dbus-glib clients are gone.
'target_name': 'dbus-glib',
'type': 'settings',
- 'direct_dependent_settings': {
--- a/src/chrome/chrome.gyp
+++ b/src/chrome/chrome.gyp
-@@ -482,6 +482,7 @@
- 'dependencies': [
+@@ -499,6 +499,7 @@
'../base/base.gyp:base',
+ '../content/content.gyp:content_utility',
'../skia/skia.gyp:skia',
+ '../build/linux/system.gyp:glew',
],
'sources': [
- 'utility/utility_main.cc',
+ 'utility/chrome_content_utility_client.cc',
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
-@@ -720,6 +720,7 @@
+@@ -810,6 +810,7 @@
['enable_gpu==1', {
'defines': [
'ENABLE_GPU=1',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index fa4e9aa..6401192 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -34,12 +34,12 @@ Include system copy of prtime.h
#include "chrome/browser/autocomplete/autocomplete.h"
--- a/src/chrome/common/metrics_helpers.cc
+++ b/src/chrome/common/metrics_helpers.cc
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,7 @@
+ #include "base/perftimer.h"
#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 "base/time.h"
+ #include "base/utf_string_conversions.h"
#include "chrome/common/logging_chrome.h"
- #include "googleurl/src/gurl.h"
- #include "libxml/xmlwriter.h"
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 0218d26..ea8a0b1 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,7 +1,7 @@
Tell Chromium to look in /etc/chromium for the master_preferences file
--- a/src/chrome/common/chrome_paths.cc
+++ b/src/chrome/common/chrome_paths.cc
-@@ -279,7 +279,7 @@ bool PathProvider(int key, FilePath* res
+@@ -325,7 +325,7 @@ bool PathProvider(int key, FilePath* res
#if defined(GOOGLE_CHROME_BUILD)
cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
#else
@@ -12,7 +12,7 @@ Tell Chromium to look in /etc/chromium for the master_preferences file
return false;
--- a/src/chrome/browser/first_run/first_run.cc
+++ b/src/chrome/browser/first_run/first_run.cc
-@@ -101,9 +101,7 @@ bool FirstRun::ProcessMasterPreferences(
+@@ -102,9 +102,7 @@ bool FirstRun::ProcessMasterPreferences(
// The standard location of the master prefs is next to the chrome binary.
FilePath master_prefs;
diff --git a/debian/patches/series b/debian/patches/series
index f682890..ab4755b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,7 @@ glew.patch
fix-manpage.patch
webkit-version.patch
#ffmpeg.patch
-gcc46.patch
+#gcc46.patch
#vpx.patch
#protobuf.patch
#javascript-i18n.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 954129b..cde4fe1 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,7 +1,7 @@
Use system speex
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -340,6 +340,26 @@
+@@ -323,6 +323,26 @@
}]]
},
{
@@ -25,13 +25,13 @@ Use system speex
+ }]]
+ },
+ {
- 'target_name': 'gnome-keyring',
+ 'target_name': 'gnome_keyring',
'type': 'settings',
'conditions': [
--- a/src/content/browser/speech/audio_encoder.cc
+++ b/src/content/browser/speech/audio_encoder.cc
@@ -10,7 +10,7 @@
- #include "base/stl_util-inl.h"
+ #include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "third_party/flac/flac.h"
-#include "third_party/speex/speex.h"
@@ -49,4 +49,4 @@ Use system speex
+ '../build/linux/system.gyp:speex',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/zlib/zlib.gyp:zlib',
- '../ui/ui.gyp:ui_base',
+ '../ui/ui.gyp:ui',
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index ad926bc..74d3928 100644
--- a/debian/patches/webkit-version.patch
+++ b/debian/patches/webkit-version.patch
@@ -1,6 +1,6 @@
--- a/src/webkit/build/webkit_version.py
+++ b/src/webkit/build/webkit_version.py
-@@ -51,6 +51,15 @@ def GetWebKitRevision(webkit_dir, versio
+@@ -60,6 +60,15 @@ def GetWebKitRevision(webkit_dir, versio
default_lastchange=None,
directory=os.path.join(webkit_dir, version_file_dir))
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list