| author | Michael Gilbert <mgilbert@debian.org> | |
| Wed, 22 May 2013 21:55:58 +0000 (17:55 -0400) | ||
| committer | Michael Gilbert <mgilbert@debian.org> | |
| Wed, 22 May 2013 21:55:58 +0000 (17:55 -0400) |
26 files changed:
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
+chromium-browser (27.0.1453.93-1) unstable; urgency=low
+
+ * New stable release:
+ - High CVE-2013-2837: Use-after-free in SVG. Credit to Sławomir Błażek.
+ - Medium CVE-2013-2838: Out-of-bounds read in v8. Credit to Christian
+ Holler.
+ - High CVE-2013-2839: Bad cast in clipboard handling. Credit to Jon of MWR
+ InfoSecurity.
+ - High CVE-2013-2840: Use-after-free in media loader. Credit to Nils of
+ MWR InfoSecurity.
+ - High CVE-2013-2841: Use-after-free in Pepper resource handling. Credit
+ to Chamal de Silva.
+ - High CVE-2013-2842: Use-after-free in widget handling. Credit to Cyril
+ Cattiaux.
+ - High CVE-2013-2843: Use-after-free in speech handling. Credit to Khalil
+ Zhani.
+ - High CVE-2013-2844: Use-after-free in style resolution. Credit to Sachin
+ Shinde (@cons0ul).
+ - High CVE-2013-2845: Memory safety issues in Web Audio. Credit to Atte
+ Kettunen of OUSPG.
+ - High CVE-2013-2846: Use-after-free in media loader. Credit to Chamal de
+ Silva.
+ - High CVE-2013-2847: Use-after-free race condition with workers. Credit
+ to Collin Payne.
+ - Medium CVE-2013-2848: Possible data extraction with XSS Auditor. Credit
+ to Egor Homakov.
+ - Low CVE-2013-2849: Possible XSS with drag+drop or copy+paste. Credit to
+ Mario Heiderich.
+
+ -- Michael Gilbert <mgilbert@debian.org> Wed, 22 May 2013 03:03:49 +0000
+
+chromium-browser (26.0.1410.43-1) unstable; urgency=medium
+
+ * New stable release:
+ - High CVE-2013-0916: Use-after-free in Web Audio. Credit to Atte Kettunen
+ of OUSPG.
+ - Low CVE-2013-0917: Out-of-bounds read in URL loader. Credit to Google
+ Chrome Security Team (Cris Neckar).
+ - Low CVE-2013-0918: Do not navigate dev tools upon drag and drop. Credit
+ to Vsevolod Vlasov of the Chromium development community.
+ - Medium CVE-2013-0919: Use-after-free with pop-up windows in extensions.
+ Credit to Google Chrome Security Team (Mustafa Emre Acer).
+ - Medium CVE-2013-0920: Use-after-free in extension bookmarks API. Credit
+ to Google Chrome Security Team (Mustafa Emre Acer).
+ - High CVE-2013-0921: Ensure isolated web sites run in their own processes.
+ - Low CVE-2013-0922: Avoid HTTP basic auth brute force attempts. Credit to
+ “t3553r”.
+ - Medium CVE-2013-0923: Memory safety issues in the USB Apps API. Credit to
+ Google Chrome Security Team (Mustafa Emre Acer).
+ - Low CVE-2013-0924: Check an extension’s permissions API usage again file
+ permissions. Credit to Benjamin Kalman of the Chromium development
+ community.
+ - Low CVE-2013-0925: Avoid leaking URLs to extensions without the tabs
+ permissions. Credit to Michael Vrable of Google.
+ - Medium CVE-2013-0926: Avoid pasting active tags in certain situations.
+ Credit to Subho Halder, Aditya Gupta, and Dev Kar of xys3c.
+ * Use embedded libvpx for vp9 support, which chromium now requires.
+ * Add libspeechd-dev build-dependency.
+ * Disable breakpad crash reporting.
+
+ -- Michael Gilbert <mgilbert@debian.org> Sat, 30 Mar 2013 14:44:33 +0000
+
+chromium-browser (25.0.1364.160-1) unstable; urgency=high
+
+ * New stable security release:
+ - High CVE-2013-0912: Type confusion in WebKit. Credit to Nils and Jon of
+ MWR Labs.
+
+ -- Michael Gilbert <mgilbert@debian.org> Fri, 08 Mar 2013 03:46:20 +0000
+
+chromium-browser (25.0.1364.152-1) unstable; urgency=high
+
+ * [8761d73] Remove armel and armhf. We cannot support them in wheezy
+ * New stable security release:
+ - High CVE-2013-0902: Use-after-free in frame loader. Credit to
+ Chamal de Silva.
+ - High CVE-2013-0903: Use-after-free in browser navigation
+ handling. Credit to "chromium.khalil".
+ - High CVE-2013-0904: Memory corruption in Web Audio.
+ Credit to Atte Kettunen of OUSPG.
+ - High CVE-2013-0905: Use-after-free with SVG animations.
+ Credit to Atte Kettunen of OUSPG.
+ - High CVE-2013-0906: Memory corruption in Indexed DB. Credit to Google
+ Chrome Security Team (Jüri Aedla).
+ - Medium CVE-2013-0907: Race condition in media thread handling. Credit
+ to Andrew Scherkus of the Chromium development community.
+ - Medium CVE-2013-0908: Incorrect handling of bindings for extension
+ processes.
+ - Low CVE-2013-0909: Referer leakage with XSS Auditor. Credit to Egor
+ Homakov.
+ - Medium CVE-2013-0910: Mediate renderer -> browser plug-in loads more
+ strictly. Credit to Google Chrome Security Team (Chris Evans).
+ - High CVE-2013-0911: Possible path traversal in database handling.
+ Credit to Google Chrome Security Team (Jüri Aedla).
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Tue, 05 Mar 2013 11:14:34 +0100
+
+chromium-browser (25.0.1364.97-1) unstable; urgency=low
+
+ * New stable release:
+ - High CVE-2013-0879: Memory corruption with web audio
+ node. Credit to Atte Kettunen of OUSPG.
+ - High CVE-2013-0880: Use-after-free in database handling.
+ Credit to Chamal de Silva.
+ - Medium CVE-2013-0881: Bad read in Matroska handling. Credit to
+ Atte Kettunen of OUSPG.
+ - High CVE-2013-0882: Bad memory access with excessive SVG
+ parameters. Credit to Renata Hodovan.
+ - Medium CVE-2013-0883: Bad read in Skia. Credit to Atte
+ Kettunen of OUSPG.
+ - Low CVE-2013-0884: Inappropriate load of NaCl. Credit to Google
+ Chrome Security Team (Chris Evans).
+ - Medium CVE-2013-0885: Too many API permissions granted to web store.
+ - Low CVE-2013-0887: Developer tools process has too many
+ permissions and places too much trust in the connected server.
+ - Medium CVE-2013-0888: Out-of-bounds read in Skia. Credit to Google
+ Chrome Security Team (Inferno).
+ - Low CVE-2013-0889: Tighten user gesture check for dangerous file
+ downloads.
+ - High CVE-2013-0890: Memory safety issues across the IPC
+ layer. Credit to Google Chrome Security Team (Chris Evans).
+ - High CVE-2013-0891: Integer overflow in blob handling. Credit to
+ Google Chrome Security Team (Jüri Aedla).
+ - Medium CVE-2013-0892: Lower severity issues across the IPC layer.
+ Credit to Google Chrome Security Team (Chris Evans).
+ - Medium CVE-2013-0893: Race condition in media handling. Credit to
+ Andrew Scherkus of the Chromium development community.
+ - High CVE-2013-0894: Buffer overflow in vorbis decoding. Credit to
+ Google Chrome Security Team (Inferno).
+ - High CVE-2013-0895: Incorrect path handling in file
+ copying. Credit to Google Chrome Security Team (Jüri Aedla).
+ - High CVE-2013-0896: Memory management issues in plug-in message
+ handling. Credit to Google Chrome Security Team (Cris Neckar).
+ - High CVE-2013-0898: Use-after-free in URL handling. Credit to
+ Alexander Potapenko of the Chromium development community.
+ - Low CVE-2013-0899: Integer overflow in Opus handling. Credit to
+ Google Chrome Security Team (Jüri Aedla).
+ - Medium CVE-2013-0900: Race condition in ICU. Credit to Google Chrome
+ Security Team (Inferno).
+ * [a5f15ae] Added libpci-dev to B-depends
+ * [ace2b7a] Refreshed patches
+ * [32c84fa] Install remoting_locales
+ * [f868804] Do not enable NEON on ARM, thanks Ubuntu.
+ * [d1a3e36] Ignore stamp files in missing checks
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Sat, 23 Feb 2013 11:45:07 +0100
+
+chromium-browser (24.0.1312.68-1) unstable; urgency=high
+
+ * New stable release:
+ - High CVE-2013-0839: Use-after-free in canvas font handling.
+ Credit to Atte Kettunen of OUSPG.
+ - Medium CVE-2013-0840: Missing URL validation when opening new
+ windows.
+ - High CVE-2013-0841: Unchecked array index in content blocking. Credit
+ to Google Chrome Security Team (Chris Evans).
+ - Medium CVE-2013-0842: Problems with NULL characters embedded in
+ paths. Credit to Google Chrome Security Team (Jüri Aedla).
+ - High CVE-2012-5145: Use-after-free in SVG layout. Credit to
+ Atte Kettunen of OUSPG.
+ - High CVE-2012-5146: Same origin policy bypass with malformed
+ URL. Credit to Erling A Ellingsen and Subodh Iyengar, both of Facebook.
+ - High CVE-2012-5147: Use-after-free in DOM handling. Credit to
+ José A. Vázquez.
+ - Medium CVE-2012-5148: Missing filename sanitization in hyphenation
+ support. Credit to Google Chrome Security Team (Justin Schuh).
+ - High CVE-2012-5149: Integer overflow in audio IPC handling. Credit to
+ Google Chrome Security Team (Chris Evans).
+ - High CVE-2012-5150: Use-after-free when seeking video. Credit to
+ Google Chrome Security Team (Inferno).
+ - High CVE-2012-5151: Integer overflow in PDF JavaScript. Credit to
+ Mateusz Jurczyk, with contribution from Gynvael Coldwind, both of Google
+ Security Team.
+ - Medium CVE-2012-5152: Out-of-bounds read when seeking video. Credit
+ to Google Chrome Security Team (Inferno).
+ - High CVE-2012-5153: Out-of-bounds stack access in v8. Credit to
+ Andreas Rossberg of the Chromium development community.
+ - High CVE-2013-0829: Corruption of database metadata leading to
+ incorrect file access. Credit to Google Chrome Security Team (Jüri Aedla).
+ - Low CVE-2013-0831: Possible path traversal from extension process.
+ Credit to Google Chrome Security Team (Tom Sepez).
+ - [160380] Medium CVE-2013-0832: Use-after-free with printing. Credit to Google
+ Chrome Security Team (Cris Neckar).
+ - Medium CVE-2013-0833: Out-of-bounds read with printing. Credit to
+ Google Chrome Security Team (Cris Neckar).
+ - Medium CVE-2013-0834: Out-of-bounds read with glyph handling. Credit
+ to Google Chrome Security Team (Cris Neckar).
+ - Low CVE-2013-0835: Browser crash with geolocation. Credit to Arthur
+ Gerkis.
+ - High CVE-2013-0836: Crash in v8 garbage collection. Credit to Google
+ Chrome Security Team (Cris Neckar).
+ - Medium CVE-2013-0837: Crash in extension tab handling. Credit to Tom
+ Nielsen.
+ - Low CVE-2013-0838: Tighten permissions on shared memory
+ segments. Credit to Google Chrome Security Team (Chris Palmer).
+ - High CVE-2012-5139: Use-after-free with visibility events.
+ Credit to Chamal de Silva.
+ - High CVE-2012-5140: Use-after-free in URL loader. Credit to
+ Chamal de Silva.
+ - Medium CVE-2012-5141: Limit Chromoting client plug-in instantiation.
+ Credit to Google Chrome Security Team (Jüri Aedla).
+ - Critical CVE-2012-5142: Crash in history navigation. Credit to Michal
+ Zalewski of Google Security Team.
+ - Medium CVE-2012-5143: Integer overflow in PPAPI image buffers. Credit
+ to Google Chrome Security Team (Cris Neckar).
+ - High CVE-2012-5144: Stack corruption in AAC decoding. Credit
+ to pawlkt.
+ - High CVE-2012-5138: Incorrect file path handling. Credit to Google
+ Chrome Security Team (Jüri Aedla).
+ - High CVE-2012-5137: Use-after-free in media source handling.
+ Credit to Pinkie Pie.
+ - High CVE-2012-5133: Use-after-free in SVG filters. Credit to
+ miaubiz.
+ - Medium CVE-2012-5130: Out-of-bounds read in Skia. Credit to
+ Atte Kettunen of OUSPG.
+ - Low CVE-2012-5132: Browser crash with chunked encoding. Credit to
+ Attila Szász.
+ - High CVE-2012-5134: Buffer underflow in libxml. Credit to Google
+ Chrome Security Team (Jüri Aedla).
+ - Medium CVE-2012-5135: Use-after-free with printing. Credit to Fermin
+ Serna of Google Security Team.
+ - Medium CVE-2012-5136: Bad cast in input element handling. Credit to
+ Google Chrome Security Team (Inferno).
+ - Medium CVE-2012-5127: Integer overflow leading to
+ out-of-bounds read in WebP handling. Credit to Phil Turnbull.
+ - [Linux 64-bit only] Medium CVE-2012-5120: Out-of-bounds array
+ access in v8. Credit to Atte Kettunen of OUSPG.
+ - High CVE-2012-5116: Use-after-free in SVG filter handling.
+ Credit to miaubiz.
+ - High CVE-2012-5121: Use-after-free in video layout. Credit to
+ Atte Kettunen of OUSPG.
+ - Low CVE-2012-5117: Inappropriate load of SVG subresource in img
+ context. Credit to Felix Gröbert of the Google Security Team.
+ - Medium CVE-2012-5119: Race condition in Pepper buffer handling.
+ Credit to Fermin Serna of the Google Security Team.
+ - Medium CVE-2012-5122: Bad cast in input handling. Credit to Google
+ Chrome Security Team (Inferno).
+ - Medium CVE-2012-5123: Out-of-bounds reads in Skia. Credit to
+ Google Chrome Security Team (Inferno).
+ - High CVE-2012-5124: Memory corruption in texture handling. Credit to
+ Al Patrick of the Chromium development community.
+ - Medium CVE-2012-5125: Use-after-free in extension tab handling.
+ Credit to Alexander Potapenko of the Chromium development community.
+ - Medium CVE-2012-5126: Use-after-free in plug-in placeholder handling.
+ Credit to Google Chrome Security Team (Inferno).
+ - High CVE-2012-5128: Bad write in v8. Credit to Google Chrome Security
+ Team (Cris Neckar).
+ * [574d76c] Override the lintian flag:
+ embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
+ * [3105012] Updated changelog
+ * [ac9c032] Use explicit library dependencies instead of dlopen
+ * [1ad217c] Fixed CHANNELS_URL
+ * [7c2d359] Drop SCM revision from the version
+ * [ca31c0c] Install all chromium libs
+ * [167aea7] Use internal copy of libpng. This is necessary because with
+ system libpng render process is consuming 100% CPU
+ (see http://code.google.com/p/chromium/issues/detail?id=174603)
+ * [8742d82] debian/patches/pulse_ftbfs.patch: Fix FTBFS
+ * [9e76ec7] Refreshed patches
+ * [1c6f4c3] Use Debian api key
+ * [cdf5c74] Refreshed patches
+ * [ad9480c] Remove useless embedded copy of documentation from source
+ containing non DFSG-compliant material:
+ - src/native_client/toolchain/linux_x86/info
+ - src/native_client/toolchain/linux_x86/man
+ - src/native_client/toolchain/linux_x86/share/info
+ - src/native_client/toolchain/linux_x86/x86_64-nacl/share/info
+ - src/native_client/toolchain/linux_x86_newlib/info
+ - src/native_client/toolchain/linux_x86_newlib/man
+ - src/native_client/toolchain/linux_x86_newlib/share/info
+ (Closes: #695703)
+ * [31ea388] Fixed Homepage field.
+ Thanks to Dmitry Shachnev (Closes: #686561)
+ * [d509e07] Override the lintian flag: embedded-library usr/lib/chromium/chromium: libpng
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Wed, 06 Feb 2013 15:34:17 +0100
+
+chromium-browser (22.0.1229.94~r161065-3) unstable; urgency=medium
+
+ * Use system vpx library again (resolves armel build failures).
+
+ -- Michael Gilbert <mgilbert@debian.org> Sun, 28 Oct 2012 00:55:58 -0400
+
+chromium-browser (22.0.1229.94~r161065-2) unstable; urgency=medium
+
+ * [574d76c] Override the lintian flag: embedded-library
+ usr/lib/chromium/libffmpegsumo.so: libavcodec
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Tue, 23 Oct 2012 17:51:56 +0200
+
+chromium-browser (22.0.1229.94~r161065-1) unstable; urgency=medium
+
+ * New stable release:
+ - High CVE-2012-2889: UXSS in frame handling. Credit to
+ Sergey Glazunov.
+ - High CVE-2012-2886: UXSS in v8 bindings. Credit to Sergey
+ Glazunov.
+ - High CVE-2012-2881: DOM tree corruption with plug-ins. Credit
+ to Chamal de Silva.
+ - High CVE-2012-2876: Buffer overflow in SSE2 optimizations.
+ Credit to Atte Kettunen of OUSPG.
+ - High CVE-2012-2883: Out-of-bounds write in Skia. Credit to
+ Atte Kettunen of OUSPG.
+ - High CVE-2012-2887: Use-after-free in onclick handling.
+ Credit to Atte Kettunen of OUSPG.
+ - High CVE-2012-2888: Use-after-free in SVG text references.
+ Credit to miaubiz.
+ - High CVE-2012-2894: Crash in graphics context handling.
+ Credit to Sławomir Błażek.
+ - Medium CVE-2012-2877: Browser crash with extensions and modal
+ dialogs. Credit to Nir Moshe.
+ - Low CVE-2012-2879: DOM topology corruption. Credit to pawlkt.
+ - Medium CVE-2012-2884: Out-of-bounds read in Skia. Credit to
+ Atte Kettunen of OUSPG.
+ - High CVE-2012-2874: Out-of-bounds write in Skia. Credit to Google
+ Chrome Security Team (Inferno).
+ - High CVE-2012-2878: Use-after-free in plug-in handling. Credit to
+ Fermin Serna of Google Security Team.
+ - Medium CVE-2012-2880: Race condition in plug-in paint buffer. Credit
+ to Google Chrome Security Team (Cris Neckar).
+ - High CVE-2012-2882: Wild pointer in OGG container handling. Credit to
+ Google Chrome Security Team (Inferno).
+ - Medium CVE-2012-2885: Possible double free on exit. Credit to the
+ Chromium development community.
+ - Low CVE-2012-2891: Address leak over IPC. Credit to Lei Zhang of the
+ Chromium development community.
+ - Low CVE-2012-2892: Pop-up block bypass. Credit to Google Chrome
+ Security Team (Cris Neckar).
+ - High CVE-2012-2893: Double free in XSL transforms. Credit to Google
+ Chrome Security Team (Cris Neckar).
+ - High CVE-2012-2900: Crash in Skia text rendering.
+ Credit to Atte Kettunen of OUSPG.
+ - Critical CVE-2012-5108: Race condition in audio device
+ handling. Credit to Atte Kettunen of OUSPG.
+ - Medium CVE-2012-5109: OOB read in ICU regex. Credit to Arthur
+ Gerkis.
+ - Medium CVE-2012-5110: Out-of-bounds read in compositor. Credit to
+ Google Chrome Security Team (Inferno).
+ - Low CVE-2012-5111: Plug-in crash monitoring was missing for Pepper
+ plug-ins. Credit to Google Chrome Security Team (Chris Evans).
+ - Critical CVE-2012-5112: SVG use-after-free and IPC arbitrary file write.
+ Credit to Pinkie Pie.
+ * [3de18b6] Use zlib internal copy. This is necessary due to the CRIME work
+ around. We can use the system zlib when chrome will remove
+ SPDY 2/3 support.
+ * [3b9811a] Updated patches
+ * [152902d] Install libvpx_obj_int_extract
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Mon, 01 Oct 2012 15:22:27 +0200
+
+chromium-browser (21.0.1180.89~r154005-1) unstable; urgency=high
+
+ * New stable security release:
+ - Medium CVE-2012-2865: Out-of-bounds read in line breaking. Credit to miaubiz.
+ - High CVE-2012-2866: Bad cast with run-ins. Credit to miaubiz.
+ - Low CVE-2012-2867: Browser crash with SPDY.
+ - Medium CVE-2012-2868: Race condition with workers and XHR.
+ Credit to miaubiz.
+ - High CVE-2012-2869: Avoid stale buffer in URL loading. Credit to
+ Fermin Serna of the Google Security Team.
+ - Low CVE-2012-2870: Lower severity memory management issues
+ in XPath. Credit to Nicolas Gregoire.
+ - High CVE-2012-2871: Bad cast in XSL transforms. Credit to
+ Nicolas Gregoire.
+ - Medium CVE-2012-2872: XSS in SSL interstitial. Credit to
+ Emmanuel Bronshtein.
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Fri, 31 Aug 2012 11:24:58 +0200
+
+chromium-browser (21.0.1180.75~r150248-1) unstable; urgency=medium
+
+ [ Shawn Landden ]
+ * [b7c6ba3] update changelog to record changes in last upload
+ * [3c6a149] master_prefs: don't go straight to internet, don't prompt to change default browser
+ * [e441276] initial_bookmarks.html: add Debian support page
+ * [2bb621a] compress source tarball as xz (Closes: #676774)
+
+ [ Giuseppe Iuculano ]
+ * New stable minor release fixing the following issues:
+ - REGRESSION: Rendering difference in Chrome 21 and 22 that affected on
+ Persian Wikipedia
+ - Some known crashes
+ - Audio objects are not "switched" immediately
+ - Print and Print Preview ignore paper size default in printer config
+ - Candidate windows is shown in wrong place in Retina display
+ - more of the choppy and distorted audio issues
+ - Japanese characters showing in Chinese font
+ - Sync invalidation notification broken after restart
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Fri, 10 Aug 2012 17:31:57 +0200
+
+chromium-browser (21.0.1180.57~r148591-1) unstable; urgency=medium
+
+ [ Giuseppe Iuculano ]
+ * [fd04758] Install demo extension
+ * New upstream stable release:
+ - Medium CVE-2012-2846: Cross-process interference in
+ renderers. Credit to Google Chrome Security Team (Julien Tinnes).
+ - Low CVE-2012-2847: Missing re-prompt to user upon excessive
+ downloads. Credit to Matt Austin of Aspect Security.
+ - Medium CVE-2012-2848: Overly broad file access granted after
+ drag+drop. Credit to Matt Austin of Aspect Security.
+ - Low CVE-2012-2849: Off-by-one read in GIF decoder. Credit to Atte
+ Kettunen of OUSPG.
+ - Medium CVE-2012-2853: webRequest can interfere with the Chrome Web
+ Store. Credit to Trev of Adblock.
+ - Low CVE-2012-2854: Leak of pointer values to WebUI renderers. Credit
+ to Nasko Oskov of the Chromium development community.
+ - High CVE-2012-2855: Use-after-free in PDF viewer. Credit to Mateusz
+ Jurczyk of Google Security Team, with contributions by Gynvael Coldwind of
+ Google Security Team.
+ - High CVE-2012-2857: Use-after-free in CSS DOM. Credit to
+ - Arthur Gerkis.
+ - High CVE-2012-2858: Buffer overflow in WebP decoder. Credit
+ to Jüri Aedla.
+ - Critical CVE-2012-2859: Crash in tab handling. Credit to
+ Jeff Roberts of Google Security Team.
+ - Medium CVE-2012-2860: Out-of-bounds access when clicking in date
+ picker. Credit to Chamal de Silva.
+ [ Shawn Landden ]
+ * [0d2e43a9] Switch to xz/lzma2 compression for debs. (from lzma)
+ * [e3e9a801] replace incorrect prefs.patch with patch from OpenSUSE
+ * [faed2b9e] /etc/chromium/master_preferences: don't bug user for
+ Google account.
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Tue, 07 Aug 2012 10:55:17 +0200
+
chromium-browser (20.0.1132.57~r145807-1) unstable; urgency=medium
[ Michael Gilbert ]
--- a/debian/chromium.install
+++ b/debian/chromium.install
debian/tmp/usr/lib/chromium/resources/extension/demo/library.js
debian/tmp/usr/lib/chromium/content_resources.pak
debian/tmp/usr/lib/chromium/locales/*
+debian/tmp/usr/lib/chromium/remoting_locales
#debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
#debian/tmp/usr/lib/chromium/libppGoogleNaClPluginChrome.so
-debian/tmp/usr/lib/chromium/libffmpegsumo.so
+debian/tmp/usr/lib/chromium/lib*
#debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
#debian/tmp/usr/lib/chromium/nacl_irt_*
debian/tmp/usr/lib/chromium/pseudo_locales/fake-bidi.pak
+debian/tmp/usr/lib/chromium/remoting_locales/en-US.pak
debian/chromium.desktop usr/share/applications
debian/chromium.xml usr/share/gnome-control-center/default-apps
debian/master_preferences etc/chromium
+debian/initial_bookmarks.html etc/chromium
debian/presubj usr/share/bug/chromium
chromium: embedded-library usr/lib/chromium/chromium: sqlite
+chromium: embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
+chromium: embedded-library usr/lib/chromium/libffmpegsumo.so: libavutil
chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_64.nexe
chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_32.nexe
+chromium: embedded-library usr/lib/chromium/chromium: libpng
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
Michael Gilbert <michael.s.gilbert@gmail.com>
Vcs-Git: git://git.debian.org/git/pkg-chromium/pkg-chromium.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-chromium/pkg-chromium.git
-Homepage: http://code.google.com/chromium/
+Homepage: http://www.chromium.org/Home
Build-Depends: cdbs,
debhelper (>= 7),
g++-4.6,
libcups2-dev (>= 1.5.0),
libgnome-keyring-dev,
libspeex-dev,
+ libspeechd-dev,
hardening-wrapper,
libxt-dev,
libxtst-dev,
libgles2-mesa-dev,
subversion,
libudev-dev,
- libssl-dev
+ libssl-dev,
+ libpci-dev
Standards-Version: 3.9.2
Package: chromium-browser
@@ -134,7 +136,7 @@ Description: page inspector for the chromium-browser - transitional dummy packag
This package contains 'inspector', transitional dummy package.
Package: chromium
-Architecture: i386 amd64 armel armhf
+Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends},
libnspr4 (>= 2:4.9-2~),
xdg-utils,
This package contains the Chromium browser.
Package: chromium-dbg
-Architecture: i386 amd64 armel armhf
+Architecture: i386 amd64
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, chromium (= ${binary:Version})
diff --git a/debian/initial_bookmarks.html b/debian/initial_bookmarks.html
--- /dev/null
@@ -0,0 +1,12 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+<DL><p>
+ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Bar</H3>
+ <DL><p>
+ <DT><A HREF="http://www.debian.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Debian.org</A>
+ <DT><A HREF="http://www.debian.org/News/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Latest News</A>
+ <DT><A HREF="http://www.debian.org/support" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Help</A>
+ </DL><p>
+</DL><p>
{
"distribution": {
+ "import_bookmarks": false,
+ "import_bookmarks_from_file": "/etc/chromium/initial_bookmarks.html",
"skip_first_run_ui": true,
"make_chrome_default": false,
"make_chrome_default_for_user": false,
"create_all_shortcuts": true,
- "show_welcome_page": true
+ "show_welcome_page": false
},
"browser": {
- "show_home_button": true
+ "show_home_button": true,
+ "check_default_browser" : false
},
"bookmark_bar": {
"show_on_all_tabs": true
},
- "first_run_tabs": [
- "http://www.debian.org"
- ],
"homepage": "http://www.debian.org"
}
+
diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
--- /dev/null
@@ -0,0 +1,71 @@
+Description: GYP assumes ARMv7 always wants NEON, even if compile flags disable.
+Origin: http://code.google.com/p/chromium/issues/detail?id=154107
+Author: Chad Miller <chad.miller@canonical.com>
+Bug-Chromium: 154107
+Bug-Ubuntu: 1084852
+
+Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+===================================================================
+--- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-03-16 09:38:40.000000000 +0100
++++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-03-30 17:42:05.571734731 +0100
+@@ -72,7 +72,7 @@
+ 'WEBRTC_LINUX',
+ ],
+ }],
+- ['target_arch=="arm" and armv7==1', {
++ ['target_arch=="arm" and armv7==1 and arm_neon==1', {
+ 'dependencies': [ 'isac_neon', ],
+ 'sources': [
+ 'lattice_armv7.S',
+Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
+===================================================================
+--- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-03-16 09:38:39.000000000 +0100
++++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-03-30 17:42:05.575734731 +0100
+@@ -18,6 +18,47 @@
+
+ #include "typedefs.h"
+
++#include <elf.h>
++#ifdef __arm__
++#include <fcntl.h>
++#include <unistd.h>
++#include <linux/auxvec.h>
++#include <asm/hwcap.h>
++#endif
++
++#ifdef __arm__
++uint64_t WebRtc_GetCPUFeaturesARM() {
++ static bool detected = false;
++ static uint64_t have_neon = 0;
++
++ int fd;
++ Elf32_auxv_t auxv;
++ unsigned int hwcaps;
++
++ if (!detected) {
++ int fd;
++ Elf32_auxv_t auxv;
++ unsigned int hwcaps;
++
++ fd = open("/proc/self/auxv", O_RDONLY);
++ if (fd >= 0) {
++ while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
++ if (auxv.a_type == AT_HWCAP) {
++ have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
++ break;
++ }
++ }
++ close (fd);
++ } else {
++ have_neon = 0;
++ }
++ detected = true;
++ }
++
++ return 0 | have_neon; // others here as we need them
++}
++#endif
++
+ // No CPU feature is available => straight C path.
+ int GetCPUInfoNoASM(CPUFeature feature) {
+ (void)feature;
-Index: sid/src/build/common.gypi
+Index: chromium/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2012-08-06 12:15:02.377549576 +0200
-+++ sid/src/build/common.gypi 2012-08-06 12:15:13.853549209 +0200
-@@ -732,7 +732,7 @@
+--- chromium.orig/src/build/common.gypi 2013-05-22 03:15:43.553475451 +0000
++++ chromium/src/build/common.gypi 2013-05-22 03:15:43.549475453 +0000
+@@ -919,7 +919,7 @@
'arm_fpu%': 'vfpv3',
# Set ARM float abi compilation flag.
- 'arm_float_abi%': 'softfp',
+ #'arm_float_abi%': 'softfp',
- # Enable new NPDevice API.
- 'enable_new_npdevice_api%': 0,
+ # Enable use of OpenMAX DL FFT routines.
+ 'use_openmax_dl_fft%': '<(use_openmax_dl_fft)',
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
-Index: sid/src/skia/skia.gyp
+Index: chromium/src/ui/base/resource/data_pack.cc
===================================================================
---- sid.orig/src/skia/skia.gyp 2012-08-06 10:27:59.000000000 +0200
-+++ sid/src/skia/skia.gyp 2012-08-06 12:19:18.277541378 +0200
-@@ -1210,9 +1210,11 @@
- [ 'target_arch == "arm" and armv7 != 1', {
- 'sources': [
- '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
-+ '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
- ],
- 'sources!': [
- '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
-+ '../third_party/skia/src/opts/opts_check_arm.cpp',
- ],
- }],
- ],
-Index: sid/src/ui/base/resource/data_pack.cc
-===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc 2012-08-06 10:29:02.000000000 +0200
-+++ sid/src/ui/base/resource/data_pack.cc 2012-08-06 12:19:18.277541378 +0200
-@@ -130,9 +130,11 @@
+--- chromium.orig/src/ui/base/resource/data_pack.cc 2013-05-22 03:15:53.209475098 +0000
++++ chromium/src/ui/base/resource/data_pack.cc 2013-05-22 03:15:53.185475099 +0000
+@@ -147,9 +147,11 @@
// 2) Verify the entries are within the appropriate bounds. There's an extra
// entry after the last item which gives us the length of the last item.
for (size_t i = 0; i < resource_count_ + 1; ++i) {
LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
<< "Was the file corrupted?";
UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
-Index: sid/src/v8/src/arm/macro-assembler-arm.cc
+Index: chromium/src/v8/src/arm/macro-assembler-arm.cc
===================================================================
---- sid.orig/src/v8/src/arm/macro-assembler-arm.cc 2012-08-06 10:30:43.000000000 +0200
-+++ sid/src/v8/src/arm/macro-assembler-arm.cc 2012-08-06 12:19:18.281541378 +0200
+--- chromium.orig/src/v8/src/arm/macro-assembler-arm.cc 2013-05-22 03:15:53.209475098 +0000
++++ chromium/src/v8/src/arm/macro-assembler-arm.cc 2013-05-22 03:15:53.205475100 +0000
@@ -61,9 +61,9 @@
// We do not support thumb inter-working with an arm architecture not supporting
// the blx instruction (below v5t). If you know what CPU you are compiling for
Do not use armv4 incopatible code
-Index: sid/src/third_party/skia/include/core/SkMath.h
+Index: chromium/src/build/common.gypi
===================================================================
---- sid.orig/src/third_party/skia/include/core/SkMath.h 2012-08-06 10:30:10.000000000 +0200
-+++ sid/src/third_party/skia/include/core/SkMath.h 2012-08-06 12:13:40.057552214 +0200
-@@ -156,7 +156,7 @@
- #if defined(__arm__) \
- && !defined(__thumb__) \
- && !defined(__ARM_ARCH_4T__) \
-- && !defined(__ARM_ARCH_5T__)
-+ && 0
- static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
- SkASSERT((int16_t)x == x);
- SkASSERT((int16_t)y == y);
-Index: sid/src/build/common.gypi
-===================================================================
---- sid.orig/src/build/common.gypi 2012-08-06 10:28:13.000000000 +0200
-+++ sid/src/build/common.gypi 2012-08-06 12:13:40.057552214 +0200
-@@ -2123,6 +2123,7 @@
+--- chromium.orig/src/build/common.gypi 2013-05-22 03:14:34.821477965 +0000
++++ chromium/src/build/common.gypi 2013-05-22 03:14:34.817477965 +0000
+@@ -2745,6 +2745,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
+ '-fno-tree-sink',
],
'conditions': [
- ['arm_thumb==1', {
-Index: sid/src/base/debug/debugger_posix.cc
-===================================================================
---- sid.orig/src/base/debug/debugger_posix.cc 2012-08-06 10:28:13.000000000 +0200
-+++ sid/src/base/debug/debugger_posix.cc 2012-08-06 12:13:40.057552214 +0200
-@@ -215,7 +215,7 @@
- } while (0)
- #else
- // ARM && !ANDROID
--#define DEBUG_BREAK() asm("bkpt 0")
-+#define DEBUG_BREAK() asm("nop")
- #endif
- #else
- #define DEBUG_BREAK() asm("int3")
-Index: sid/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
-===================================================================
---- sid.orig/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp 2012-08-06 10:30:09.000000000 +0200
-+++ sid/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp 2012-08-06 12:13:40.057552214 +0200
-@@ -675,8 +675,8 @@
- /* dst1_scale and dst2_scale*/
- "lsr r9, r5, #24 \n\t" /* src >> 24 */
- "lsr r10, r6, #24 \n\t" /* src >> 24 */
-- "smulbb r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */
-- "smulbb r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */
-+ "mul r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */
-+ "mul r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */
- "lsr r9, r9, #8 \n\t" /* r9 >> 8 */
- "lsr r10, r10, #8 \n\t" /* r10 >> 8 */
- "rsb r9, r9, #256 \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
-@@ -745,7 +745,7 @@
-
- "lsr r6, r5, #24 \n\t" /* src >> 24 */
- "and r8, r12, r5, lsr #8 \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
-- "smulbb r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */
-+ "mul r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */
- "and r9, r12, r5 \n\t" /* rb = r9 = r5 masked by r12 */
- "lsr r6, r6, #8 \n\t" /* r6 >> 8 */
- "mul r8, r8, %[alpha] \n\t" /* ag = r8 times scale */
+ ['arm_thumb==1 and android_webview_build==0', {
Author: Michael Gilbert <michael.s.gilbert@gmail.com>
Index: sid/src/printing/backend/cups_helper.h
===================================================================
---- sid.orig/src/printing/backend/cups_helper.h 2012-08-06 10:27:46.000000000 +0200
-+++ sid/src/printing/backend/cups_helper.h 2012-08-06 12:15:11.021549299 +0200
-@@ -7,6 +7,7 @@
- #pragma once
+--- sid.orig/src/printing/backend/cups_helper.h 2013-03-16 09:35:30.000000000 +0100
++++ sid/src/printing/backend/cups_helper.h 2013-03-30 17:41:53.611735017 +0100
+@@ -6,6 +6,7 @@
+ #define PRINTING_BACKEND_CUPS_HELPER_H_
#include <cups/cups.h>
+#include <cups/ppd.h>
- #include "printing/printing_export.h"
+ #include <string>
Index: sid/src/chrome/service/cloud_print/print_system_cups.cc
===================================================================
---- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2012-08-06 12:15:11.021549299 +0200
+--- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc 2013-03-16 09:37:20.000000000 +0100
++++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2013-03-30 17:41:53.615735017 +0100
@@ -5,6 +5,7 @@
#include "chrome/service/cloud_print/print_system.h"
Include system copy of expat.h
Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2012-08-06 10:33:28.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-03-16 09:38:14.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-03-30 17:34:46.651745229 +0100
@@ -32,9 +32,9 @@
#include "talk/xmllite/xmlnsstack.h"
struct XML_ParserStruct;
Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2012-08-06 10:33:25.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-03-16 09:38:11.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-03-30 17:34:46.655745229 +0100
@@ -31,9 +31,9 @@
#include "talk/base/common.h"
#include "talk/xmpp/constants.h"
namespace buzz {
Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2012-08-06 10:30:16.000000000 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-03-16 09:38:30.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-03-30 17:34:46.655745229 +0100
@@ -11,7 +11,7 @@
#include "SkString.h"
#include "SkStream.h"
#define CHAR_16_TO_9
Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2012-08-06 10:30:16.000000000 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-03-16 09:38:30.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-03-30 17:34:46.655745229 +0100
@@ -12,7 +12,7 @@
#include "SkString.h"
#include "SkStream.h"
{
Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2012-08-06 10:33:28.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-03-16 09:38:14.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-03-30 17:34:46.655745229 +0100
@@ -33,11 +33,7 @@
#include "talk/base/scoped_ptr.h"
#include "talk/xmllite/xmlparser.h"
description: ffmpeg compatibility on the arm arch
Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
===================================================================
---- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi 2012-08-06 10:29:43.000000000 +0200
-+++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2012-08-06 12:13:43.805552095 +0200
-@@ -168,21 +168,14 @@
- 'libavcodec/arm/dsputil_arm.S',
- 'libavcodec/arm/dsputil_armv6.S',
- 'libavcodec/arm/dsputil_init_arm.c',
-- 'libavcodec/arm/dsputil_init_armv5te.c',
- 'libavcodec/arm/dsputil_init_armv6.c',
-- 'libavcodec/arm/dsputil_init_vfp.c',
-- 'libavcodec/arm/dsputil_vfp.S',
- 'libavcodec/arm/fft_fixed_init_arm.c',
- 'libavcodec/arm/fft_init_arm.c',
- 'libavcodec/arm/fmtconvert_init_arm.c',
-- 'libavcodec/arm/fmtconvert_vfp.S',
- 'libavcodec/arm/h264pred_init_arm.c',
- 'libavcodec/arm/jrevdct_arm.S',
- 'libavcodec/arm/mpegvideo_arm.c',
-- 'libavcodec/arm/mpegvideo_armv5te.c',
-- 'libavcodec/arm/mpegvideo_armv5te_s.S',
- 'libavcodec/arm/simple_idct_arm.S',
-- 'libavcodec/arm/simple_idct_armv5te.S',
- 'libavcodec/arm/simple_idct_armv6.S',
- 'libavcodec/arm/vp8_armv6.S',
- 'libavcodec/arm/vp8dsp_armv6.S',
+--- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-03-16 09:38:07.000000000 +0100
++++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-03-30 17:40:15.887737358 +0100
+@@ -114,19 +114,16 @@
+ 'libavcodec/arm/h264dsp_init_arm.c',
+ 'libavcodec/arm/mpegaudiodsp_init_arm.c',
+ 'libavcodec/arm/mpegvideo_arm.c',
+- 'libavcodec/arm/mpegvideo_armv5te.c',
+ 'libavcodec/arm/sbrdsp_init_arm.c',
+ ],
+ 'asm_sources': [
+ 'libavcodec/arm/mpegaudiodsp_fixed_armv6.S',
+- 'libavcodec/arm/mpegvideo_armv5te_s.S',
+ ],
+ 'converter_outputs': [
+ '<(shared_generated_dir)/libavcodec/arm/aacpsdsp_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/h264dsp_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/mpegaudiodsp_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/mpegvideo_arm.c',
+- '<(shared_generated_dir)/libavcodec/arm/mpegvideo_armv5te.c',
+ '<(shared_generated_dir)/libavcodec/arm/sbrdsp_init_arm.c',
+ ],
+ }], # (target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromeOS") and (1)
+@@ -321,9 +318,7 @@
+ ['(target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)', {
+ 'c_sources': [
+ 'libavcodec/arm/dsputil_init_arm.c',
+- 'libavcodec/arm/dsputil_init_armv5te.c',
+ 'libavcodec/arm/dsputil_init_armv6.c',
+- 'libavcodec/arm/dsputil_init_vfp.c',
+ 'libavcodec/arm/fft_fixed_init_arm.c',
+ 'libavcodec/arm/fft_init_arm.c',
+ 'libavcodec/arm/fmtconvert_init_arm.c',
+@@ -333,26 +328,19 @@
+ 'libavcodec/arm/vp8dsp_init_armv6.c',
+ 'libavutil/arm/cpu.c',
+ 'libavutil/arm/float_dsp_init_arm.c',
+- 'libavutil/arm/float_dsp_init_vfp.c',
+ ],
+ 'asm_sources': [
+ 'libavcodec/arm/dsputil_arm.S',
+ 'libavcodec/arm/dsputil_armv6.S',
+- 'libavcodec/arm/dsputil_vfp.S',
+- 'libavcodec/arm/fmtconvert_vfp.S',
+ 'libavcodec/arm/jrevdct_arm.S',
+ 'libavcodec/arm/simple_idct_arm.S',
+- 'libavcodec/arm/simple_idct_armv5te.S',
+ 'libavcodec/arm/simple_idct_armv6.S',
+ 'libavcodec/arm/vp8_armv6.S',
+ 'libavcodec/arm/vp8dsp_armv6.S',
+- 'libavutil/arm/float_dsp_vfp.S',
+ ],
+ 'converter_outputs': [
+ '<(shared_generated_dir)/libavcodec/arm/dsputil_init_arm.c',
+- '<(shared_generated_dir)/libavcodec/arm/dsputil_init_armv5te.c',
+ '<(shared_generated_dir)/libavcodec/arm/dsputil_init_armv6.c',
+- '<(shared_generated_dir)/libavcodec/arm/dsputil_init_vfp.c',
+ '<(shared_generated_dir)/libavcodec/arm/fft_fixed_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/fft_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/fmtconvert_init_arm.c',
+@@ -362,7 +350,6 @@
+ '<(shared_generated_dir)/libavcodec/arm/vp8dsp_init_armv6.c',
+ '<(shared_generated_dir)/libavutil/arm/cpu.c',
+ '<(shared_generated_dir)/libavutil/arm/float_dsp_init_arm.c',
+- '<(shared_generated_dir)/libavutil/arm/float_dsp_init_vfp.c',
+ ],
+ }], # (target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)
+ ['(1) and (1) and (1)', {
Index: sid/src/chrome/app/resources/manpage.1.in
===================================================================
---- sid.orig/src/chrome/app/resources/manpage.1.in 2012-08-06 10:28:20.000000000 +0200
-+++ sid/src/chrome/app/resources/manpage.1.in 2012-08-06 12:15:05.973549461 +0200
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2013-03-16 09:36:16.000000000 +0100
++++ sid/src/chrome/app/resources/manpage.1.in 2013-03-30 17:41:44.635735232 +0100
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
===================================================================
---- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-08-06 10:28:37.000000000 +0200
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-08-06 12:15:50.369548039 +0200
-@@ -9,6 +9,7 @@
+--- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-03-16 09:36:26.000000000 +0100
++++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-03-30 17:41:58.651734896 +0100
+@@ -8,6 +8,7 @@
#include <stddef.h>
#include <string>
#include <vector>
#include "chrome/browser/search_engines/search_engine_type.h"
Index: sid/src/gpu/command_buffer/common/types.h
===================================================================
---- sid.orig/src/gpu/command_buffer/common/types.h 2012-08-06 10:27:47.000000000 +0200
-+++ sid/src/gpu/command_buffer/common/types.h 2012-08-06 12:15:50.369548039 +0200
+--- sid.orig/src/gpu/command_buffer/common/types.h 2013-03-16 09:35:31.000000000 +0100
++++ sid/src/gpu/command_buffer/common/types.h 2013-03-30 17:41:58.651734896 +0100
@@ -12,6 +12,7 @@
#endif
#include <cstddef>
typedef signed char int8;
Index: sid/src/ipc/ipc_channel.h
===================================================================
---- sid.orig/src/ipc/ipc_channel.h 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/ipc/ipc_channel.h 2012-08-06 12:15:50.369548039 +0200
+--- sid.orig/src/ipc/ipc_channel.h 2013-03-16 09:36:05.000000000 +0100
++++ sid/src/ipc/ipc_channel.h 2013-03-30 17:41:58.655734896 +0100
@@ -1,3 +1,4 @@
+#include <sys/types.h>
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// found in the LICENSE file.
Index: sid/src/third_party/ots/src/os2.cc
===================================================================
---- sid.orig/src/third_party/ots/src/os2.cc 2012-08-06 10:29:56.000000000 +0200
-+++ sid/src/third_party/ots/src/os2.cc 2012-08-06 12:15:50.369548039 +0200
+--- sid.orig/src/third_party/ots/src/os2.cc 2013-03-16 09:38:20.000000000 +0100
++++ sid/src/third_party/ots/src/os2.cc 2013-03-30 17:41:58.655734896 +0100
@@ -5,6 +5,7 @@
#include "os2.h"
// http://www.microsoft.com/opentype/otspec/os2.htm
Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2012-08-06 12:15:50.373548039 +0200
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-03-30 17:41:58.655734896 +0100
@@ -39,6 +39,7 @@
- #include <stddef.h> // for std::ptrdiff_t
+ #include <stddef.h> // for ptrdiff_t
#include <limits>
+#include <cstddef>
Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2012-08-06 12:15:50.373548039 +0200
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-03-30 17:41:58.655734896 +0100
@@ -63,6 +63,7 @@
#define HAVE_VDSO_SUPPORT 1
namespace base {
Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2012-08-06 12:15:50.373548039 +0200
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2013-03-30 17:41:58.655734896 +0100
@@ -33,6 +33,7 @@
#include "config.h"
#include "common.h"
#include <unistd.h> // for getpagesize
Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2012-08-06 12:15:50.373548039 +0200
-@@ -40,6 +40,7 @@
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-03-30 17:41:58.655734896 +0100
+@@ -39,6 +39,7 @@
#endif
#include <stddef.h> // for NULL
#include <map>
Index: sid/src/ui/gfx/codec/jpeg_codec.h
===================================================================
---- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/ui/gfx/codec/jpeg_codec.h 2012-08-06 12:15:50.373548039 +0200
-@@ -8,6 +8,7 @@
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2013-03-16 09:37:21.000000000 +0100
++++ sid/src/ui/gfx/codec/jpeg_codec.h 2013-03-30 17:41:58.655734896 +0100
+@@ -7,6 +7,7 @@
#include <stddef.h>
#include <vector>
description: use system glew library
Index: sid/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2012-08-06 12:13:54.125551763 +0200
-+++ sid/src/build/linux/system.gyp 2012-08-06 12:15:02.377549576 +0200
+--- sid.orig/src/build/linux/system.gyp 2012-11-13 10:38:43.396406253 +0100
++++ sid/src/build/linux/system.gyp 2012-11-13 10:38:47.172406163 +0100
@@ -497,6 +497,23 @@
},
},
'type': 'none',
Index: sid/src/chrome/chrome.gyp
===================================================================
---- sid.orig/src/chrome/chrome.gyp 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/chrome.gyp 2012-08-06 12:15:02.377549576 +0200
-@@ -247,6 +247,7 @@
+--- sid.orig/src/chrome/chrome.gyp 2012-11-08 08:57:58.000000000 +0100
++++ sid/src/chrome/chrome.gyp 2012-11-13 10:38:47.192406163 +0100
+@@ -250,6 +250,7 @@
'../base/base.gyp:base',
'../content/content.gyp:content_utility',
'../skia/skia.gyp:skia',
'utility/chrome_content_utility_client.cc',
Index: sid/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2012-08-06 12:13:40.057552214 +0200
-+++ sid/src/build/common.gypi 2012-08-06 12:15:02.377549576 +0200
-@@ -1409,6 +1409,7 @@
+--- sid.orig/src/build/common.gypi 2012-11-13 10:38:38.452406372 +0100
++++ sid/src/build/common.gypi 2012-11-13 10:38:47.196406163 +0100
+@@ -1567,6 +1567,7 @@
['enable_gpu==1', {
'defines': [
'ENABLE_GPU=1',
-Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
+Index: chromium/src/chrome/browser/ui/gtk/gtk_util.cc
===================================================================
---- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2012-08-06 10:28:32.000000000 +0200
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2012-08-06 12:19:22.081541256 +0200
-@@ -57,7 +57,7 @@
+--- chromium.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2013-05-22 03:15:59.425474873 +0000
++++ chromium/src/chrome/browser/ui/gtk/gtk_util.cc 2013-05-22 03:15:59.421474874 +0000
+@@ -54,7 +54,7 @@
#if defined(GOOGLE_CHROME_BUILD)
static const char* kIconName = "google-chrome";
#else
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 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/pr_time_unittest.cc 2012-08-06 12:12:18.157554839 +0200
+--- 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>
#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 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/time.cc 2012-08-06 12:12:18.157554839 +0200
-@@ -10,7 +10,7 @@
- #endif
+--- 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 2012-08-06 10:28:30.000000000 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2012-08-06 12:12:18.161554837 +0200
-@@ -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 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/base.gypi 2012-08-06 12:12:18.161554837 +0200
-@@ -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/crypto/nss_util.cc
+Index: chromium-browser/src/net/base/x509_certificate_nss.cc
===================================================================
---- sid.orig/src/crypto/nss_util.cc 2012-08-06 10:27:56.000000000 +0200
-+++ sid/src/crypto/nss_util.cc 2012-08-06 12:12:18.161554837 +0200
-@@ -9,7 +9,7 @@
- #include <plarena.h>
- #include <prerror.h>
- #include <prinit.h>
--#include <prtime.h>
-+#include <nspr/prtime.h>
- #include <pk11pub.h>
- #include <secmod.h>
-
-Index: sid/src/net/base/x509_certificate_nss.cc
-===================================================================
---- sid.orig/src/net/base/x509_certificate_nss.cc 2012-08-06 10:27:59.000000000 +0200
-+++ sid/src/net/base/x509_certificate_nss.cc 2012-08-06 12:12:18.161554837 +0200
+--- 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>
-
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
webkit needs to call nss to pull in nspr headers
-Index: sid/src/chrome/chrome_common.gypi
+Index: chromium/src/chrome/chrome_common.gypi
===================================================================
---- sid.orig/src/chrome/chrome_common.gypi 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/chrome_common.gypi 2012-08-06 12:12:25.157554613 +0200
-@@ -299,6 +299,11 @@
- '<(DEPTH)/third_party/wtl/include',
- ]
+--- chromium.orig/src/chrome/chrome_common.gypi 2013-05-22 03:08:57.793490276 +0000
++++ chromium/src/chrome/chrome_common.gypi 2013-05-22 03:08:57.793490276 +0000
+@@ -490,6 +490,11 @@
+ 'common/crash_keys.h',
+ ],
}],
+ ['OS=="linux"', {
+ 'include_dirs': [
Author: Raymond Wooninck (tittiatcoke)
Source: OpenSUSE (chromium-master-prefs-path.patch)
-Index: sid/src/chrome/browser/first_run/first_run_linux.cc
+Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
===================================================================
---- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2012-08-06 10:28:37.000000000 +0200
-+++ sid/src/chrome/browser/first_run/first_run_linux.cc 2012-08-06 12:13:35.981552344 +0200
-@@ -101,8 +101,7 @@
- FilePath MasterPrefsPath() {
+--- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-05-22 05:50:57.197135151 +0000
++++ chromium/src/chrome/browser/first_run/first_run_linux.cc 2013-05-22 05:51:58.833132898 +0000
+@@ -70,9 +70,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();
-+ master_prefs = FilePath("/etc/chromium");
+- return base::FilePath();
++ base::FilePath master_prefs = base::FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/debian/patches/pulse_ftbfs.patch b/debian/patches/pulse_ftbfs.patch
--- /dev/null
@@ -0,0 +1,13 @@
+Index: sid/src/media/audio/pulse/pulse_output.cc
+===================================================================
+--- sid.orig/src/media/audio/pulse/pulse_output.cc 2013-01-29 17:08:01.000000000 +0100
++++ sid/src/media/audio/pulse/pulse_output.cc 2013-02-06 13:38:14.129887904 +0100
+@@ -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/debian/patches/series b/debian/patches/series
--- a/debian/patches/series
+++ b/debian/patches/series
expat.patch
prefs.patch
armv4.patch
-ffmpeg_arm.patch
+#ffmpeg_arm.patch
system-speech.patch
-glew.patch
+#glew.patch
fix-manpage.patch
webkit-version.patch
#ffmpeg.patch
#system_v8.patch
#protobuf.patch
arm-no-float-abi.patch
-vpx.patch
gcc4.7.patch
arm.patch
icon.patch
+arm-neon.patch
Use system speex
-Index: sid/src/build/linux/system.gyp
+Index: chromium/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2012-08-06 10:28:12.000000000 +0200
-+++ sid/src/build/linux/system.gyp 2012-08-06 12:13:54.125551763 +0200
-@@ -384,6 +384,26 @@
+--- chromium.orig/src/build/linux/system.gyp 2013-05-22 03:14:40.493477755 +0000
++++ chromium/src/build/linux/system.gyp 2013-05-22 03:14:40.473477755 +0000
+@@ -619,6 +619,26 @@
],
},
{
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: sid/src/content/browser/speech/audio_encoder.cc
+Index: chromium/src/content/browser/speech/audio_encoder.cc
===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc 2012-08-06 10:27:52.000000000 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc 2012-08-06 12:13:54.125551763 +0200
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc 2013-05-22 03:14:40.493477755 +0000
++++ chromium/src/content/browser/speech/audio_encoder.cc 2013-05-22 03:15:28.897475986 +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>
- using std::string;
- using speech::AudioChunk;
-Index: sid/src/content/content_browser.gypi
+ namespace content {
+ namespace {
+Index: chromium/src/content/content_browser.gypi
===================================================================
---- sid.orig/src/content/content_browser.gypi 2012-08-06 10:27:54.000000000 +0200
-+++ sid/src/content/content_browser.gypi 2012-08-06 12:14:55.985549781 +0200
-@@ -13,7 +13,7 @@
- '../ppapi/ppapi_internal.gyp:ppapi_proxy',
- '../skia/skia.gyp:skia',
- '../third_party/flac/flac.gyp:libflac',
-- '../third_party/speex/speex.gyp:libspeex',
-+ '../build/linux/system.gyp:speex',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../third_party/zlib/zlib.gyp:zlib',
- '../ui/surface/surface.gyp:surface',
+--- chromium.orig/src/content/content_browser.gypi 2013-05-22 03:14:40.493477755 +0000
++++ chromium/src/content/content_browser.gypi 2013-05-22 03:14:40.493477755 +0000
+@@ -1172,7 +1172,7 @@
+ }, { # OS!="android"
+ 'dependencies': [
+ '../third_party/flac/flac.gyp:libflac',
+- '../third_party/speex/speex.gyp:libspeex',
++ '../build/linux/system.gyp:speex',
+ ],
+ }],
+ ['OS=="mac"', {
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
--- a/debian/patches/vpx.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sid/src/remoting/remoting.gyp
-===================================================================
---- sid.orig/src/remoting/remoting.gyp 2012-08-06 10:27:44.000000000 +0200
-+++ sid/src/remoting/remoting.gyp 2012-08-06 12:15:16.629549120 +0200
-@@ -1031,7 +1031,7 @@
- '../ui/ui.gyp:ui',
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
-- '../third_party/libvpx/libvpx.gyp:libvpx',
-+ '../third_party/libvpx/libvpx.gyp:libvpx_include',
- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
- '../third_party/zlib/zlib.gyp:zlib',
- '../media/media.gyp:yuv_convert',
-Index: sid/src/third_party/libvpx/libvpx.gyp
-===================================================================
---- sid.orig/src/third_party/libvpx/libvpx.gyp 2012-08-06 10:30:05.000000000 +0200
-+++ sid/src/third_party/libvpx/libvpx.gyp 2012-08-06 12:15:16.665549120 +0200
-@@ -281,11 +281,17 @@
- {
- 'target_name': 'libvpx_include',
- 'type': 'none',
-- 'direct_dependent_settings': {
-- 'include_dirs': [
-- 'source/libvpx',
-- ],
-- },
-+ 'conditions': [
-+ ['_toolset=="target"', {
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other vpx)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l vpx)',
-+ ],
-+ },
-+ }]]
- },
- {
- 'target_name': 'libvpx_lib',
description: debian-specific version parsing (for about dialog)
Index: sid/src/webkit/build/webkit_version.py
===================================================================
---- sid.orig/src/webkit/build/webkit_version.py 2012-08-06 10:27:46.000000000 +0200
-+++ sid/src/webkit/build/webkit_version.py 2012-08-06 12:15:08.557549378 +0200
+--- sid.orig/src/webkit/build/webkit_version.py 2013-03-16 09:35:29.000000000 +0100
++++ sid/src/webkit/build/webkit_version.py 2013-03-30 17:41:51.355735071 +0100
@@ -61,6 +61,15 @@
default_lastchange=None,
directory=os.path.join(webkit_dir, version_file_dir),
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
DEB_BUILDDIR := $(SRC_DIR)
#BUILD_ARGS := --keep-going
-WANT_LZMA_SRC ?= 0
+WANT_XZ_SRC ?= 1
WANT_XZ_DEBS ?= 1
WANT_DEBUG := 0
WANT_SYSTEM_LIBS ?= 1
# Disable SSE2
GYP_DEFINES = disable_sse2=1
+#Disable breakpad
+GYP_DEFINES += linux_breakpad=0
+
+#Debian Chromium Api Key
+GYP_DEFINES += google_api_key='AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k'
+GYP_DEFINES += google_default_client_id='811574891467.apps.googleusercontent.com'
+GYP_DEFINES += google_default_client_secret='kdloedMFGdGla2P1zacGjAQh'
+
+
# Enable all codecs for HTML5 in chromium, depending on which ffmpeg sumo lib
# is installed, the set of usable codecs (at runtime) will still vary
GYP_DEFINES += proprietary_codecs=1
#disable tcmalloc
GYP_DEFINES += linux_use_tcmalloc=0
+# Use explicit library dependencies instead of dlopen.
+# This makes breakages easier to detect by revdep-rebuild.
+GYP_DEFINES += linux_link_gsettings=1
+
+# Disable breakpad crash reporting
+GYP_DEFINES += linux_breakpad=0
+
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
GYP_DEFINES += no_strict_aliasing=1 gcc_version=44
endif
-ifeq (1,$(WANT_LZMA_SRC))
-TAR_EXT := lzma
-TAR_FLAGS := --lzma
+ifeq (1,$(WANT_XZ_SRC))
+TAR_EXT := xz
+TAR_FLAGS := --xz
DEB_TARBALL = $(wildcard *.tar.bz2 *.tar.$(TAR_EXT))
else
TAR_EXT := bz2
GYP_DEFINES += \
use_system_bzip2=1 \
use_system_libjpeg=1 \
- use_system_libpng=1 \
+ use_system_libpng=0 \
use_system_sqlite=$(USE_SYSTEM_SQLITE) \
use_system_libxml=1 \
use_system_libxslt=1 \
- use_system_zlib=1 \
+ use_system_zlib=0 \
use_system_libevent=1 \
use_system_icu=0 \
use_system_yasm=1 \
use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
- use_system_vpx=1 \
+ use_system_libvpx=0 \
use_system_xdg_utils=1 \
use_system_flac=1 \
use_system_libwebp=0 \
use_system_speex=1 \
+ linux_link_libspeechd=1 \
$(NULL)
endif
# Find missing
@find $(PKG_DIRS) -type f -print | grep -v /DEBIAN/ | grep -vE '(/usr/lib/debug|/test-results/|/locales/|/inspector/)' | \
grep $(LIB_DIR) | cut -d/ -f5- | sort > /tmp/pkg-$$$$.indebs ; \
- find debian/tmp/$(LIB_DIR) -type f -print | cut -d/ -f5- | grep -vE '(\.log$$|/locales/|/inspector/)' | sort > /tmp/pkg-$$$$.inhammer ; \
+ find debian/tmp/$(LIB_DIR) -type f -print | cut -d/ -f5- | grep -vE '(\.log$$|/locales/|/inspector/|\.stamp$$)' | sort > /tmp/pkg-$$$$.inhammer ; \
diff -u /tmp/pkg-$$$$.inhammer /tmp/pkg-$$$$.indebs ; \
if [ $$? -eq 0 ] ; then \
echo " => All fine" ; \
CHROMIUM_RLZ := http://src.chromium.org/svn/releases
DEPS_URL := http://src.chromium.org/svn/trunk/deps/third_party
GREEN_REV_URL := http://chromium-status.appspot.com/lkgr
-CHANNELS_URL := http://omahaproxy.appspot.com/
+CHANNELS_URL := http://omahaproxy.appspot.com/all
# See Staying Green More Of The Time at http://dev.chromium.org/developers/how-tos/get-the-code
USE_GREEN_REV ?= 0
tools/wine_valgrind \
v8/test/cctest \
webkit/data/layout_tests \
+ native_client/toolchain/linux_x86/info \
+ native_client/toolchain/linux_x86/man \
+ native_client/toolchain/linux_x86/share/info \
+ native_client/toolchain/linux_x86/x86_64-nacl/share/info \
+ native_client/toolchain/linux_x86_newlib/info \
+ native_client/toolchain/linux_x86_newlib/man \
+ native_client/toolchain/linux_x86_newlib/share/info \
$(NULL)
# There are directories we want to strip, but that are unnecessarily required by the build-system
endif
endif
# Remove binaries
- cd $(TMP_DDIR)/src && find . -type f \( -iname \*.exe -o -iname \*.dll -o -iname \*.pdb -o -name \*.o -o -name \*.a -o -name \*.dylib \) -exec rm -fv {} \; > REMOVED-bin_only.txt
+ cd $(TMP_DDIR)/src && find . -type f \( -iname \*.exe -o -iname \*.dll -o -iname \*.pdb -o -name \*.o -o -name \*.a -o -name \*.dylib -o -name \*.so -o -name \*.so.\* \) -ls -delete > REMOVED-bin_only.txt
+ wc -l $(TMP_DDIR)/src/REMOVED-*.txt
+
+ # Remove cache files and backups
+ cd $(TMP_DDIR)/src && find . -type f \( -iname \*.bak -o -iname \*.orig -o -iname \*.cache \) -ls -delete > REMOVED-ephemera.txt
wc -l $(TMP_DDIR)/src/REMOVED-*.txt
gos-pack: TMP_DIR = $(TMP_DDIR)
@@ -835,7 +863,7 @@ gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn log --xml --limit 1 | grep
gos-pack: VERSION = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')~svn$(REVISION)
else
gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn log --xml --limit 1 | grep '^ *revision=' | cut -d'"' -f2)
-gos-pack: VERSION = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')~r$(REVISION)
+gos-pack: VERSION = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')
endif
endif
gos-pack: