* [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
@ 2017-04-20 7:43 Mark H Weaver
2017-04-20 8:34 ` Mark H Weaver
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Mark H Weaver @ 2017-04-20 7:43 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1.1: Type: text/plain, Size: 1042 bytes --]
Hello Guix,
Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
additional fixes cherry-picked from upstream ESR 52.1. It seems to work
well on my system, except that my GNOME 3 session has locked up a couple
of times while testing it[*]. I'm not yet sure whether the problem is
caused by IceCat or something else. I'd appreciate it if other people
could try it out.
[*] The mouse cursor still moves, and I can switch to text VTs, but
otherwise the GUI is unresponsive. Killing icecat is not sufficient
to unfreeze the graphical session, but I'm able to restart the X
server without rebooting.
Note that upstream has apparently removed support for Gstreamer, so our
IceCat package now links directly to ffmpeg, as Mathieu OTHACEHE
suggested a few months ago. It would be nice to find a way to make this
more modular.
I've also attached a patch to add autoconf-2.13 (from 1999!), since it
appears to be a build requirement of IceCat 52.x. I haven't tested it
for anything except building IceCat.
Mark
[-- Attachment #1.2: [PATCH 1/2] gnu: Add autoconf@2.13 --]
[-- Type: text/x-patch, Size: 2518 bytes --]
From 743060c66e9a74e196121d882048599f5eb5a953 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Apr 2017 00:42:15 -0400
Subject: [PATCH 1/2] gnu: Add autoconf@2.13.
* gnu/packages/autotools.scm (autoconf-2.13): New variable.
---
gnu/packages/autotools.scm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index e8b087000..4dbe7b2a2 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017 ng0 <ng0@libertad.pw>
;;;
@@ -92,6 +92,35 @@ know anything about Autoconf or M4.")
(base32
"0j3jdjpf5ly39dlp0bg70h72nzqr059k0x8iqxvaxf106chpgn9j"))))))
+(define-public autoconf-2.13
+ ;; GNU IceCat 52.x requires autoconf-2.13 to build!
+ (package (inherit autoconf)
+ (version "2.13")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/autoconf/autoconf-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"))))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ ;; The 'configure' script in autoconf-2.13 can't cope with "SHELL=" and
+ ;; "CONFIG_SHELL=" arguments, so we set them as environment variables
+ ;; and pass a simplified set of arguments.
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key build inputs outputs #:allow-other-keys)
+ (let ((bash (which "bash"))
+ (out (assoc-ref outputs "out")))
+ (setenv "CONFIG_SHELL" bash)
+ (setenv "SHELL" bash)
+ (zero? (system* bash "./configure"
+ (string-append "--prefix=" out)
+ (string-append "--build=" build)))))))))))
+
(define* (autoconf-wrapper #:optional (autoconf autoconf))
"Return an wrapper around AUTOCONF that generates `configure' scripts that
--
2.12.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: [PATCH 2/2] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 --]
[-- Type: text/x-patch, Size: 103616 bytes --]
From 87f481b3376f7bbbf2b62307317e6386ac10ebfa Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Apr 2017 00:41:32 -0400
Subject: [PATCH 2/2] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from
ESR 52.1.
* gnu/packages/gnuzilla.scm (icecat): Update to 52.0.2-gnu1.
[source]: Remove all patches except "icecat-avoid-bundled-libraries.patch".
Add selected fixes from the upstream mozilla-esr52 repository, up to 52.1.
Remove "dom/devicestorage" in the snippet.
[inputs]: Remove gstreamer and gst-plugins-base. Add gtk+ version 3,
libnotify and ffmpeg. Move yasm to native-inputs.
[native-inputs]: Add autoconf-2.13 and yasm.
[arguments]: In configure-flags, remove the following switches which are no
longer accepted: --enable-{pango,svg,canvas,mathml,gstreamer=1.0 and
--disable-gnomevfs. Pass --enable-default-toolkit=cairo-gtk3 to use Gtk+3.
Remove the 'remove-h264parse-from-blacklist' phase. Adapt the
'arrange-to-link-libxul-with-libraries-it-might-dlopen' phase as needed.
In the 'configure' phase, set the AUTOCONF environment variable.
(mozilla-patch): Update the URL pattern to fetch from the mozilla-esr52
repository.
* gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Adapt to mozilla-esr52.
* gnu/packages/patches/icecat-binutils.patch: Remove file.
* gnu/packages/patches/icecat-bug-1299500-pt10.patch: New file.
* gnu/local.mk (dist_patch_DATA): Remove "icecat-binutils.patch".
Add "icecat-bug-1299500-pt10.patch".
---
gnu/local.mk | 2 +-
gnu/packages/gnuzilla.scm | 269 ++--
.../patches/icecat-avoid-bundled-libraries.patch | 37 +-
gnu/packages/patches/icecat-binutils.patch | 40 -
gnu/packages/patches/icecat-bug-1299500-pt10.patch | 1639 ++++++++++++++++++++
5 files changed, 1824 insertions(+), 163 deletions(-)
delete mode 100644 gnu/packages/patches/icecat-binutils.patch
create mode 100644 gnu/packages/patches/icecat-bug-1299500-pt10.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d0c6b30e1..be5f504fc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -663,7 +663,7 @@ dist_patch_DATA = \
%D%/packages/patches/hypre-doc-tables.patch \
%D%/packages/patches/hypre-ldflags.patch \
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
- %D%/packages/patches/icecat-binutils.patch \
+ %D%/packages/patches/icecat-bug-1299500-pt10.patch \
%D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 87695329c..aa90490b7 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -31,10 +31,10 @@
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages databases)
#:use-module (gnu packages glib)
- #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages libcanberra)
@@ -301,10 +301,10 @@ standards.")
(license license:mpl2.0)))
(define (mozilla-patch file-name changeset hash)
- "Return an origin for CHANGESET from the mozilla-esr45 repository."
+ "Return an origin for CHANGESET from the mozilla-esr52 repository."
(origin
(method url-fetch)
- (uri (string-append "https://hg.mozilla.org/releases/mozilla-esr45/raw-rev/"
+ (uri (string-append "https://hg.mozilla.org/releases/mozilla-esr52/raw-rev/"
changeset))
(sha256 (base32 hash))
(file-name file-name)))
@@ -312,7 +312,7 @@ standards.")
(define-public icecat
(package
(name "icecat")
- (version "45.7.0-gnu1")
+ (version "52.0.2-gnu1")
(source
(origin
(method url-fetch)
@@ -321,77 +321,165 @@ standards.")
"/" name "-" version ".tar.bz2"))
(sha256
(base32
- "1mn73liylqzxk441f28wk326yglqs8zcwqs4zz51s8i2id2jsnv3"))
+ "0asaba04y6rwc7nx898p89jdxkbnsb3dxjvpdi8xb1rbgyms80c9"))
(patches
(list
(search-patch "icecat-avoid-bundled-libraries.patch")
- (search-patch "icecat-binutils.patch")
- (mozilla-patch "icecat-CVE-2017-5398-pt01.patch" "1a39a54b5fea" "0k3sbf2w2yng2rpv6wl9zrm5cbsgq3pslr19xwrk8sk753as79fp")
- (mozilla-patch "icecat-CVE-2017-5402.patch" "9828c3bb7b73" "0zgks0v9sqhwwkmry4daswvjwk6aqln6abx0iac1vwqqpg6swff6")
- (mozilla-patch "icecat-CVE-2017-5398-pt02.patch" "fa3268a1147e" "1jyd1hvp42pz5l15agmb1jhw74b38x8xnj9ih5v4pskv41bgmyg5")
- (mozilla-patch "icecat-CVE-2017-5400.patch" "347c10e4d6d1" "1w6yrm97l477q4ripbj0nimc87p4jscabvihpncxqbq9xzc4km7p")
- (mozilla-patch "icecat-CVE-2017-5410.patch" "fe4a2cda54ad" "0spcs93hpz13d8670jgvww80f0ynrbhwbh62fkv27lpr6wmqwqh1")
- (mozilla-patch "icecat-CVE-2017-5401.patch" "c38f8546be5f" "1sa22w9kzgynsn4c6zh4d66byskk5kffzbvlzrhyzvqjddypf9p8")
- (mozilla-patch "icecat-CVE-2017-5398-pt03.patch" "41c80ecafa99" "0r33arr5wcgl00zgncasiyl65bmm6jy45clxnbb75nzjmsd1zx1s")
- (mozilla-patch "icecat-CVE-2017-5405.patch" "381552c888b4" "1sjhh390cx1jqx74lxk6qd8f8ccppqgagqfhc9pnbm2m67hxvkj9")
- (mozilla-patch "icecat-CVE-2017-5407.patch" "4ba337cdb998" "0vyknizid2z9nvl31m08c7fknizhv8dh8m54apm39k8lx77vf70p")
- (mozilla-patch "icecat-CVE-2017-5398-pt04.patch" "886650fac531" "18fsr5dmav96ja0dah7mj34n8mjpckp0bbc32zjyaj5qx0m4h5cw")
- (mozilla-patch "icecat-CVE-2017-5409.patch" "0a22becb23cd" "19fshrq4qkj5s0mjrads6by84gy7rsq3k57gha6sw6rvx8chjaz6")
- (mozilla-patch "icecat-CVE-2017-5398-pt05.patch" "a0ead6ef09eb" "1hpsq81hhhq2a2dcq2dfndiwx93vvp5rfq0cgv6kwk2bsrq77wqq")
- (mozilla-patch "icecat-CVE-2017-5398-pt06.patch" "d3fede027d06" "1aw02p367cm0ayijdiiawlb7qhab6jwqwkakj317yd1cjnmkalwr")
- (mozilla-patch "icecat-CVE-2017-5398-pt07.patch" "ffca0f060bb4" "0qwisfp7idjj5nc1vp1afrf5lj66l2gp7rllkjmrqpz6cyfc708v")
- (mozilla-patch "icecat-CVE-2017-5398-pt08.patch" "4aa65b44dcb9" "07j6dz2b7hp1bkfvkxwgpn2wc3hqrgjgwpaz96fcpz8yadg2fssw")
- (mozilla-patch "icecat-bug-1318914.patch" "30e2382d800f" "0w8zky5i7zc5q943x37rdvi4wbcing0q7w9fcgvnnh5li2sbrsy8")
- (mozilla-patch "icecat-CVE-2017-5408.patch" "403d2300adc2" "06r4j48rc1fd9gvmvqy68mlqah5xfxpkvwmxk0gnqc364kpq9slk")
- (mozilla-patch "icecat-CVE-2017-5398-pt09.patch" "546ab5e99568" "05rdb9bm3n4lj0zq5a95xnwsb0vzirb9mbc2wf9xbi4xlamsgvvw")
- (mozilla-patch "icecat-bug-1311380.patch" "ef6eeb7f8846" "1w19is5blbrwf3wlmy6wzgabih8sxp2kmkffqcj2g4jypfwyqn73")
- (mozilla-patch "icecat-CVE-2017-5398-pt10.patch" "eec69810d80e" "1r20abhw7b38igsrdpkhcfwx9i9gmcxikv4y3sjr4wkbp684f7av")
- (mozilla-patch "icecat-CVE-2017-5398-pt11.patch" "fec35ce6e68b" "1imdfrs8dxz44rhsmvydh29w5j64cij6g5ggrmhvz3386xvlil2v")
- (mozilla-patch "icecat-CVE-2017-5398-pt12.patch" "725e2a217722" "06gfhi2ich279rjnxi15fb4igimsxnv5w6bx4g91js8wbvp2r3v0")
- (mozilla-patch "icecat-CVE-2017-5398-pt13.patch" "d905a2e3a4d9" "1ibxi2s0czj47b739zmmjzbln8lpn27hdg4b17w58vhbhzkq31cx")
- (mozilla-patch "icecat-CVE-2017-5398-pt14.patch" "0032560ae945" "0md3p5cix6nzbj5m199awc9gk52pygy5s9lx3a38vh3xvd92lsbj")
- (mozilla-patch "icecat-CVE-2017-5398-pt15.patch" "91dda1e79ad8" "0b5h8fhagczfqkdgby982w6qgkw9y11zxxpdbn89rwmjpyp9nghx")
- (mozilla-patch "icecat-CVE-2017-5404.patch" "556dd9e4a9e3" "0mbdx4xn1xs67n47ys9m42lc5ny96rz21ala848yajpdlxsz680g")
- (mozilla-patch "icecat-bug-1341137-pt1.patch" "e86e0423dad1" "0dk1v7lcs61nx76qxcibha3ygqri15ldcvwwsrsayff9fq6k0v4y")
- (mozilla-patch "icecat-bug-1341137-pt2.patch" "9aebee8b8cb9" "0m7p5iprhhwdv89aqqg7fla5szw6v7x2sll4ns0zg60pk4vm6izq")
- (mozilla-patch "icecat-bug-1341137-pt3.patch" "69f3d44bdb48" "1ad7rw6nmg3c49ylqxlqqkb6cm2f0ygfzrigs6b60a2zkjqhbl0h")
- (mozilla-patch "icecat-bug-1341137-pt4.patch" "22546e2cee64" "0gbwxa3p7qkq53hwnvxcqhx8h34qmnjdxy0h3ajik4mw76vrna9s")
- (mozilla-patch "icecat-bug-1341137-pt5.patch" "e5083d8a855a" "1247vbpqzf007nigbxxqd6nwgr1dxd4p8cd0dr45afqh19vhlapj")
- (mozilla-patch "icecat-bug-1339122.patch" "b0d156c7445e" "026jp5bb565yvhkmmicgygcn1lmak85p0466yl1vnjlx1rc8n724")
- (mozilla-patch "icecat-bug-1319087.patch" "9cd44507fd65" "0mcfvby53r2150libazgrgaqrdyvl0g6cr1f01dsya3cgmc9mkcn")
- (mozilla-patch "icecat-bug-1342661.patch" "d449995ef7d9" "1kz8k2jxvhqpjgrsj7r0kqq79036lrkfnx5pvdnsl59np9128j81") ; CVE-2017-5443
- (mozilla-patch "icecat-bug-1343261.patch" "9b5374019b58" "0v5w50r5ys4jjy1lpks280cq8paw7wdy9mrk7szzq7nlcxz90is7") ; CVE-2017-5429 (pt1)
- (mozilla-patch "icecat-bug-1343552-pt1.patch" "08bc7a3330e4" "1hsvffscqc4zflni866ilylgi3a13wz0n882z85xplbhwhc9lcfj") ; CVE-2017-5447 (pt1)
- (mozilla-patch "icecat-bug-1343552-pt2.patch" "8c61ebe37f1b" "1fjsr6bzfyd1zqzz2pglwh2ckys95h21wy3j4rlwkz66057z53qq") ; CVE-2017-5447 (pt2)
- (mozilla-patch "icecat-bug-1340718.patch" "bfa75fc20c2b" "08gksd06lwbb5ykdrk9gh2cb9bximwxhbxl3rprz64jj2bnmd3dq")
- (mozilla-patch "icecat-bug-1345461.patch" "bcd5e51251dd" "1ms2ad8j04lz761cvdwi9rj5qv3qbjmg0zwyp3fykcf01a323ygd") ; CVE-2017-5436
- (mozilla-patch "icecat-bug-1343505.patch" "290f10412f92" "1dsj22fkz60zfa6isnxj54clg32dwzapwh5f1vz6jsin9r67ik2p") ; CVE-2017-5446
- (mozilla-patch "icecat-bug-1346648.patch" "9369ede30cc1" "1wrdn2aixbzifz7wyqnfi65gaiva8i746pi53z6w62lmn1hwd3ji") ; CVE-2017-5448
- (mozilla-patch "icecat-bug-1347979.patch" "4ae2261bfab0" "1yi3jicwjy7w8f0sv5di4rx05bfpkhcwj3r6dhl5315yz4ifqy30") ; CVE-2017-5442
- (mozilla-patch "icecat-bug-1343795.patch" "dcf468969700" "0syfq35s2r86ajmnqsxlfanvxd9ax57qkfmxpkvmk447s3mxsk08") ; CVE-2017-5441
- (mozilla-patch "icecat-bug-1347168.patch" "5a6390274b64" "1lg5px4sncalh82y61ni9rlg50d83jmmrrvn0944x4zfrzlfaz8x") ; CVE-2017-5433
- (mozilla-patch "icecat-bug-1341096.patch" "64158495e5ae" "1lyh8m159hhzrxj5hr0yib2sb8rkd20qxpykrf398v18s3yc08cx") ; CVE-2017-5429 (pt2)
- (mozilla-patch "icecat-bug-1346654.patch" "f359ec604627" "0j6rzbnzlz8x9sj2r79d1zr4p89c5zq7y49xa4kn6am5ay3ws0ri") ; CVE-2017-5432
- (mozilla-patch "icecat-bug-1344461.patch" "6f14d2ef7981" "0n24hqvjj7vxqdvxhk38swnmvcv7h7vvn5invbidhv22m0qqzs2c") ; CVE-2017-5444
- (mozilla-patch "icecat-bug-1292534.patch" "c709d4b36145" "18cdck3fr4a1ygszb6qk07g6fi3kv6i697pjfcipvqrk358qb0hq") ; CVE-2017-5469
- (mozilla-patch "icecat-bug-1336830.patch" "18e355831dd5" "042487xhq9zkky3pxiqy1rpy69z0j20w0jnl7kwg2j1bzfbnniip") ; CVE-2017-5439
- (mozilla-patch "icecat-bug-1336832.patch" "ebeb0b45a84b" "17ch2aqsrnkiwbnkf6x7a1cpi8jgfjhwr6wp0bsa89s8v1dax6w4") ; CVE-2017-5440
- (mozilla-patch "icecat-bug-1349946.patch" "ccbecbe17a45" "19vwmhvqarpzai8mcq6i7szkrp1h9m8v5lyimkmmdlmagrivjw7f") ; CVE-2017-5434
- (mozilla-patch "icecat-bug-1350683.patch" "00ed655efad1" "0nfk9345lshim8xl29qka5man73jgxcppv3pzfrgjhk97z7h6ifq") ; CVE-2017-5435
- (mozilla-patch "icecat-bug-1342823.patch" "609145968cfe" "1y5kw8khzxnx5cbrv4zmdd1nzha85r3cmxn3inami9fx8vikxjq8") ; CVE-2017-5429 (pt3)
- (mozilla-patch "icecat-bug-1336828.patch" "982cfe33c513" "0amj3qx5399mrdcqakvfn5pabp562i1s87a8zd65jyqs4mwgcjap") ; CVE-2017-5438
- (mozilla-patch "icecat-bug-1348894.patch" "eed8086d0af7" "18p567nhj7nvh740fhh3l0mqx0b7370b45005j43ll08rf2nhygl") ; CVE-2017-5429 (pt4)
- (mozilla-patch "icecat-bug-1344467.patch" "38664f88d8f5" "0zdkmiqjr6h1bfs4qw74p5bnw74kcx9fxr4mcnshpavv2gvc6dn4") ; CVE-2017-5445
- (mozilla-patch "icecat-bug-1350844.patch" "c071fab59d05" "16hf5c4appca8vwxl5yvl5ig5bw8cb8hl8apvknsn5rdsjwjlrpr") ; CVE-2017-5429 (pt5)
- (mozilla-patch "icecat-bug-1352926.patch" "8fade3eebca2" "165v18545g4br1j6nbbhq2h9098iqvqpbd54zmgwwk9c973qhp3c") ; CVE-2017-5429 (pt6)
- (mozilla-patch "icecat-bug-1343642.patch" "6172686bf59c" "0iwihvx11am28cbmgg68llf3mr4ghrclimr51vms1nq9ji767wdb") ; CVE-2017-5460
- (mozilla-patch "icecat-bug-1349340.patch" "260b50fb6d39" "0lq08bkj1ihhwmf0yhxcnvngzym222q3n66ql9fbda4n7prlfhzl") ; CVE-2017-5429 (pt7)
- (mozilla-patch "icecat-bug-1353088.patch" "44a90ca714b9" "1rb27bnrm9a5nnwrsxx7z36yhhz8x6lv0df98jv1128zvd373blp") ; CVE-2017-5429 (pt8)
- (mozilla-patch "icecat-bug-1347617.patch" "e40b00161221" "0nm6jqbkb6rdahzd39gnhmy1gwawa5jbd7i80c7g1igj3x8ab50y") ; CVE-2017-5465
- (mozilla-patch "icecat-bug-1278157.patch" "a7803c36d797" "10l8jbqlmfkvi4jj0vhkl0a9vdsh3niy5rjr26br3633nyyr4747")
- (mozilla-patch "icecat-bug-1348941.patch" "4fe9b979b84d" "069rzn60vn90gcck2wakr6m83q0cy32x5r54ccia9nc26a01p6p5") ; CVE-2017-5429 (pt9)
- (mozilla-patch "icecat-bug-1347075.patch" "a017569d3535" "1j7q02q2ybpfx9cr6dn9x27jva1d6dzs4pdxx2a1xmk5va03lrmq") ; CVE-2017-5464
- (mozilla-patch "icecat-bug-1333858.patch" "413dc18f25c8" "0g1q1y22m5gds8p07nq5c8f84jc152x4sac40b17gawj1005n5v9"))) ; CVE-2017-5459
+ ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1344380 ;; NSS fix CVE-2017-5461 (CRITICAL)
+ ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1345089 ;; NSS fix CVE-2017-5462 (MODERATE)
+ ;;
+ ;; CVE-2017-5430: Memory safety bugs fixed in Firefox 53 and Firefox ESR 52.1 (CRITICAL)
+ ;; bugs 1349621,1337418 not found in ESR52!
+ ;;
+ (mozilla-patch "icecat-CVE-2017-5443.patch" "6daaaff9f1f6" "0jvb6y5fiwr13fyx58k49n81kv6h03vcch502g57y6nsx2wsqng6")
+ (mozilla-patch "icecat-bug-1319087.patch" "82297fcc6f19" "02qcbg2r2smswgnwj7fs5bcrr3rlqbpsh2nmcbsjyblp5fk1ag36")
+ (mozilla-patch "icecat-CVE-2017-5429-pt01.patch" "dd526ebe7e58" "1rj0pz6iql59zrynz48njcfg8i0v55bjdndplss9wl37lfydl7ca")
+ (mozilla-patch "icecat-CVE-2017-5447-pt1.patch" "3bc981f85a17" "0am9k3mii2r05lp6xpizxp356mb8xrbqs9kmx0wx5wyy08wjzmks")
+ (mozilla-patch "icecat-CVE-2017-5447-pt2.patch" "4f752b0e5920" "183s5dwzd57b299grvyvn139fsp9am0smd3yb4shw8g0iwzz61nf")
+ (mozilla-patch "icecat-CVE-2017-5449.patch" "1714eda3de9b" "0ncngdpzvffvpw4c1mi0dda5l02lwyil4rnq3i6salnwlrq9x32z")
+ (mozilla-patch "icecat-CVE-2017-5455.patch" "b10922304d81" "0rglbavb8rx7hl53ksgypazz27263b1yn97gznpdsq89zhirfw3m")
+ (mozilla-patch "icecat-CVE-2017-5446.patch" "d98de46f8f27" "040agykr4w4wsbi0xm3rrrjxk48iwz8l1hn11vfv45nzsx2f1hzq")
+ ;; The next patch is for the bundled graphite2.
+ ;; XXX TODO Make sure our system graphite2 has these fixes!
+ (mozilla-patch "icecat-CVE-2017-5436.patch" "e6132f638311" "07w9pijx42psgmkj2i6i87lf30gl0yyb5caz6wz7fm8phi8wwy9p")
+ (mozilla-patch "icecat-bug-1342395.patch" "0e0e8abe2153" "1xlnq2fd50kf0rz9dibz5vlaa9zj2pifjvky2fdykcan62xz75hy")
+ (mozilla-patch "icecat-bug-1342841.patch" "623afac083f8" "1pv86j0dxdmi7g3rx4zqplz4gxq5lfyzpdssq83naypcxic6zafb")
+ (mozilla-patch "icecat-bug-1344644.patch" "cac0735c228f" "0695f0hvxnzgcirgxx3axn5nhkywqxjcvnrlhg7jwfann4mnbsfn")
+ (mozilla-patch "icecat-bug-1322660.patch" "9d6d60e64255" "0ds74ilhyc9qkkjgkm0xk7ay3926971rzwfh2avhhkfargn7idib")
+ (mozilla-patch "icecat-bug-1343330.patch" "6f23bd449bc7" "1igz6yhx803hygf7cii8bchx7bfw1niq8s0nc5l9i5rb8ml2b7f0")
+ (mozilla-patch "icecat-bug-1346961.patch" "3a2dc54cf986" "0dfp3s7d43zx3svajbkhvi73b71hhr7vrc9yz0iz37pykg40c4hn")
+ (mozilla-patch "icecat-bug-1318070.patch" "a68d6d9b87d0" "1yqgkgv7i0xy5dm0pgg1cbav4qglsdk8brzcjcpfz65bmn1pqrhh")
+ (mozilla-patch "icecat-CVE-2017-5448.patch" "6684a3c7f834" "0agyynvcjk28d7l2l4cqz67ddg9xw7ymiirb0npabd1si9zj27xb")
+ (mozilla-patch "icecat-bug-1336345.patch" "590416f46ec8" "1q2svqjd735rickr9i3kdkd0la6ikdphhmzr19h1r84nrl6a87ia")
+ (mozilla-patch "icecat-bug-1336356.patch" "00ba83ac39be" "1h6qsfv4r9mlc2ihjm9kmzi76aijdnnyx1g2r30ia87xha106pnk")
+ (mozilla-patch "icecat-bug-1342363.patch" "10285b4a6b71" "0l2ww19y6qbarcp9brjgbpf4vi3k38r6ak8is5736vqz0c17dim0")
+ (mozilla-patch "icecat-bug-1343787.patch" "28287b7f0938" "1w85s9rqh0dyfx6qn5plypbypz9casig03b6yiy9bpiq7ckrxz56")
+ (mozilla-patch "icecat-bug-1292803.patch" "adbf7b59a405" "1l1p0b5rc05czk6kr3k3k99m1fkwphj2jrd092gdbib8q4m4cvzv")
+ (mozilla-patch "icecat-bug-1313869.patch" "eba25396310b" "1ws0dr0kwclzbc2m0sihd3aqvbbg57ycia0fg6y294k6qipcxv38")
+ (mozilla-patch "icecat-bug-1141756-pt1.patch" "f7c262517722" "0r1zzbxf47q5w8vcy402yin105ngam3csb2q7h7n8axm97307ykp")
+ (mozilla-patch "icecat-bug-1141756-pt2.patch" "420396d5e26d" "0yv1pmpydzkirfwrxrgbw98dm4a9a4s0izha0wabrp4lb3655jv5")
+ (mozilla-patch "icecat-bug-1343210.patch" "ed9521749d6f" "1j2zzi00qyqjgh15ingvl6f88zlk4imp31m5jmf7w5f9jqi5ly3k")
+ (mozilla-patch "icecat-bug-1342442.patch" "775b6f85ef81" "00h9dgds7jv9n4cznj5qhh8liaf1b3wvnlqc2z7a3kj07ijllwzb")
+ (mozilla-patch "icecat-bug-1344527.patch" "d4612b14c907" "1n3a0mp351a7xgvshm6688gh89hg0xci3y621zs2pyqsfm114366")
+ (mozilla-patch "icecat-CVE-2017-5442.patch" "5f1aa2336998" "1y2marhrglc66vchd6z0jdmhg0pmkxp1cwim63bp9l6pj7lxyjma")
+ (mozilla-patch "icecat-CVE-2017-5430-pt01.patch" "512604631b23" "171nzxr4av4818d0fyg9hcsdxkai61sghl45xnsr2al34l28wsw3")
+ (mozilla-patch "icecat-CVE-2017-5430-pt02.patch" "16772200ad6f" "087j16rcbs5kgvpa096kd6jarwwwfrhwph54wzjn671wr1vnsvvd")
+ (mozilla-patch "icecat-CVE-2017-5441.patch" "c744e9d57250" "0m70157lczf17hxb2pabsl3grhcjqallbdfpsd58q8q6fk99k6x3")
+ (mozilla-patch "icecat-CVE-2017-5433.patch" "b4fc7a4cb5e0" "12q6mr5prpgqg5xnrww09qjm3jx2amb8zig62cd46ba8n9z2j9ab")
+ (mozilla-patch "icecat-CVE-2017-5429-pt02.patch" "21eac0b4fd2f" "1a6v0hwcc26gnlxygplc11dfzc8bykhh44j4gsz88kl5c5jqhlk9")
+ (mozilla-patch "icecat-CVE-2017-5432.patch" "62df7046e959" "1qvxbpkf87g4vnl8hxqvwb1ydrpkqq3rbkivr8q4029rvgalf4rf")
+ (mozilla-patch "icecat-bug-1350599.patch" "f6a978b2fcec" "0rkbbmw52mxgrmn1xny4jkn3slwb5jsqs4yr07ffhz7r801jy9iz")
+ (mozilla-patch "icecat-bug-1332839.patch" "2ad0f87f5dba" "04458jidri521hgf3r63pl736zz4gmgv6b8spa32anfb7gryj8fy")
+ (mozilla-patch "icecat-bug-1337548.patch" "29a1ad09a6ec" "0pld81bpc34w6g2ara54sx30msas55kwzr537pvxxc002lpvzs57")
+ (mozilla-patch "icecat-CVE-2017-5430-pt03.patch" "5dec7534760f" "1xh0y7srl7nznb6szpfiykd6r1ibyxrdvasc36w0chqjdmq7xr32")
+ (mozilla-patch "icecat-bug-1343851.patch" "e104d53316d7" "1yhv3qvzzi3kr881ji1dnm8ydnr3snh2vzl3c4vdzmvrjx8q5rcb")
+ (mozilla-patch "icecat-bug-1345222.patch" "864644fadcb0" "0qpplxyfn87bigzdkwlrhj9isd5gfafhjgqfckb239a09wwrblf3")
+ (mozilla-patch "icecat-bug-1348584.patch" "7cee9ad555af" "0856bpa3n71a3y5m4gilcdb9ghb60p545xkv9zbr245r20mj32ds")
+ (mozilla-patch "icecat-bug-1346720.patch" "6a597a9cd494" "091a5sanw3w3gl0jcmf8d60m59vwbh5v36vnar20m0hl7xrv4v7p")
+ (mozilla-patch "icecat-CVE-2017-5430-pt04.patch" "09693629803f" "18fhmsghq0232mhh8j10cy0a4979nmkbh43jlcyrg3l63l7795k4")
+ (mozilla-patch "icecat-CVE-2017-5430-pt05.patch" "2b8268ea97a9" "0l0f54krxdmqbgldikwjncxvn6irihcljldd3z039himrvplisjg")
+ (mozilla-patch "icecat-bug-1347700-pt1.patch" "ee706896916c" "0m85x80y98c154hyis08kcy81kbw3v34na1v862vxzs939d3mc0n")
+ (mozilla-patch "icecat-bug-1347700-pt2.patch" "08ecc2d92f81" "1s6411ccifw9l22hhmf32nhm8r5hbclnhy7jm2n228sqfr4h971g")
+ (mozilla-patch "icecat-bug-1337682.patch" "15af6a323161" "1nxbwd0574gscnkxfyhzv3yqvxiccb2d0rmba9vi6i62646l2pd5")
+ (mozilla-patch "icecat-CVE-2017-5451.patch" "d91260f0069a" "15w4rzz51hps2fr8djf5z1rzdwxshclk936mxv5anx1skkwms0y8")
+ (mozilla-patch "icecat-CVE-2017-5444.patch" "7740cf7e121b" "1706mx4zmnib336p2wmfp9ncyl66lk2da82f28xvcw262mg1c8lw")
+ (mozilla-patch "icecat-bug-1347164-pt1.patch" "b35a6d6dcdca" "077r0pns58fw3xd3qnbhib4q21vvw0aynpa8iyn1pycg8mppmd0f")
+ (mozilla-patch "icecat-bug-1347164-pt2.patch" "a42fc05969b9" "1ijq8ccsk5k56h77sv5kqv48w7csj3vbakzq98awgbvypzfdyhss")
+ (mozilla-patch "icecat-bug-1347164-pt3.patch" "f78ac1ac0a37" "0kj6jq482cqwyngy1kmb69zpq35xah8h33kml8i4l7andiyaq3zm")
+ (mozilla-patch "icecat-bug-1347164-pt4.patch" "795a3d48a775" "18lw99hmrr93k95hk6v6bx5rcf22aa902x2yf5p6wxdqg56nc0zp")
+ (mozilla-patch "icecat-bug-1338699.patch" "94ce63191069" "0rdivablincah3gbgl4wzjmqlraazivmr8bhqxdpy8dk0a6fvv4s")
+ (mozilla-patch "icecat-bug-1342301.patch" "e640e758a7cd" "17f36vvf82n6shlaip7ji8qsy9861f9a5r79h000p3wb3bb7lbfs")
+ (mozilla-patch "icecat-bug-1342170.patch" "df7ed78b7c0a" "1kq256i66hcm2k9d37i5ws354ksv3bbglmscdjv2v5f7wg3y967v")
+ (mozilla-patch "icecat-bug-1342634.patch" "d72e56823bbb" "0c186d77lyyg0hjxw15d44rybw6yr5aw8g9m3311xfdn5wiygijb")
+ (mozilla-patch "icecat-bug-1348796-pt1.patch" "cef01720769e" "0h57372lxanjs5zw9b3vwr2x36yz9gj73swyg50aqp13j4rcbpmy")
+ (mozilla-patch "icecat-bug-1348796-pt2.patch" "7d3584b75f20" "1a4hvpsvn39832g54hsxhqs24cq8v4nd69jqskkgc1ybs09ncmr3")
+ (mozilla-patch "icecat-bug-1192800.patch" "e56b0938ea0f" "1hlbxhjzj65s6p2v6f66zdfb3gw5yx77msgq5idsv9jip2w88mpq")
+ (mozilla-patch "icecat-bug-1309438.patch" "1f30d97563c8" "0rvq729fg9j959ha9qvw5wv7r6vw70qvpy7ynifgqhgrpa749n70")
+ (mozilla-patch "icecat-bug-1315332.patch" "66495c8d9459" "0vzlx8i0cidpymm6ar07h3yk63fxf64f0b2vb0pihd72h0jzd5s9")
+ (mozilla-patch "icecat-bug-1346439.patch" "a9fcc2dc324a" "13991jijwa84yczkmc212s23w269r8b1a4yiygqgwaily29l1dc5")
+ (mozilla-patch "icecat-CVE-2017-5469.patch" "3dcc5f5c2df4" "0b36m6rgxc05h39l6wkzi6dlmq9brcigk7xjrifs4786f0z564hz")
+ (mozilla-patch "icecat-CVE-2017-5430-pt06.patch" "ac0ca89b5a6b" "1646y9y2wmq8pxb081x3076dq9ana7hh5fxwbsnn17v5wqhi8gfb")
+ (mozilla-patch "icecat-CVE-2017-5467.patch" "6ed26e6c1a09" "0r1n1dwb4l8xwlns0aifyka6mldb6cy2crhh2qkap64cpj3bzl9s")
+ (mozilla-patch "icecat-CVE-2017-5439.patch" "2fde528ca7b6" "0iv0sjhnh7br0z3pcpk346wbj162ynacfk3p9309hg6kr1cd92fp")
+ (mozilla-patch "icecat-CVE-2017-5440.patch" "d88bd03d1234" "1pls63djh4w5023ag3fwjk79cpx816ilgajl5l1qlqyacl8c0v4p")
+ (mozilla-patch "icecat-bug-1349987.patch" "3282e8f6a121" "1dyc84h7v0l9gndmbiwfqk33f703zr3fv96mwbn58msdf20ma9l2")
+ (mozilla-patch "icecat-CVE-2017-5434.patch" "ee0a7b55e470" "01vs4p56p0ii0fvmg0kn7gaz6gwf2kwmv6v4pa6v68hwxx1phaag")
+ (mozilla-patch "icecat-CVE-2017-5430-pt07.patch" "a4e1e04c88ee" "0q07qwzxf2iisrhknjbn1zksv2rr6qzzh6w8ibzlj1sqbdg3h852")
+ (mozilla-patch "icecat-bug-1335043.patch" "a49419f75b9c" "0pkh5yimnj3p1sd2g9vndgcn11zdx6yhpa88s8vk7fqbs8gf1fz3")
+ (mozilla-patch "icecat-bug-1299500-pt01.patch" "5fdd36b4400a" "1gdrsbf03wf9v90f1bd2sp9ac38a9lzpzfrv8l8f7gvy70acjxmb")
+ (mozilla-patch "icecat-bug-1299500-pt02.patch" "34776df5ce44" "15mlf59ii0rk97j8mlf3wz1q0w28ma5mll47dvci6cv3dziai9f1")
+ (mozilla-patch "icecat-bug-1299500-pt03.patch" "26189af0f504" "1wh1s2xd1w03zi5jdaagk6j5i8v9xsm9360xmv446wdraygkqbci")
+ (mozilla-patch "icecat-bug-1299500-pt04.patch" "798a8fe17e7b" "0vlalanffq3paa7zab003v1d377x5pvcsy8nc8fr5pdlvi622jll")
+ (mozilla-patch "icecat-bug-1299500-pt05.patch" "daf2e4f2bd5c" "1rxbjbyr1a6dxjb0qj6900g3kqjphir40pis4qcfl8q811y18jwk")
+ (mozilla-patch "icecat-bug-1299500-pt06.patch" "1187091c3134" "0r8zz4zbglxg6sl0ybz9lyq1c5w2nqp0xcn2d3rz9bvyj8byqc7m")
+ (mozilla-patch "icecat-bug-1299500-pt07.patch" "a908f2c2fe30" "1fvwy3fxfrdi9y8hmf4f9aa72i0g6s55s8cp0w22gllsl1f6gvyf")
+ (mozilla-patch "icecat-bug-1299500-pt08.patch" "e95a26cf7a42" "0pd0kcn7dqd1gy1si85as5zzc96v7vq0v8n3g3gjzms5rdnk085l")
+ (mozilla-patch "icecat-bug-1299500-pt09.patch" "d63f3b14e571" "0cqd7dal6prsrj7bn2d699idbq4fzjry9vqlbmm9dkyn5683sdy1")
+ (search-patch "icecat-bug-1299500-pt10.patch") ; Adapted for GNU IceCat, based on:
+ ;"08f2bc167ae8" "07d1i23ffvi74a5558bb0645vbrap6qlrpcwfyb7dm3llbfnfycy")
+ (mozilla-patch "icecat-bug-1299500-pt11.patch" "263f27805689" "0nczkvyvlpdjif3xfvj7g2mfz6j06w99x2sblqfmqq6mwrlavpq0")
+ (mozilla-patch "icecat-CVE-2017-5456.patch" "538e0b382cc2" "0wq2ywn4a7i4ypcx03hl23a4xx3lavz7y505m9kw43fx15r4070r")
+ (mozilla-patch "icecat-bug-1280079.patch" "6fbcb6a4b91e" "0qcwz9js1bwlnwyv3vhkm0hvahd043lm2bijqsmm0jy20dbslga4")
+ (mozilla-patch "icecat-CVE-2017-5435.patch" "a362e1205ba4" "127i4ybfb4dk5axp4dxcl7ag7zyx7b517myvs6q4yd8981d1jjd3")
+ (mozilla-patch "icecat-bug-1341960.patch" "b24ce30e8cfa" "0a521wn8hbaliawmxs21b8wc1gkha8iih62j4zyrfg5rm7ff6p6s")
+ (mozilla-patch "icecat-CVE-2017-5454.patch" "ac40d4a4e414" "0dnzz95vpq32bsh6hajk4hrcrxwd4w6m7kayl2iziryny86jgak2")
+ (mozilla-patch "icecat-CVE-2017-5429-pt03.patch" "e469af8e9ccc" "0yn8zqakr9yw0jvysxyc8if09kqf4fr5rq4p9qdkb1p81p4dpmp5")
+ (mozilla-patch "icecat-bug-1351094.patch" "4c1383e76adc" "0wdldx88qabyhrwnnii44pggmfgqylzxy6ckwzgq86r2yipi4rsq")
+ (mozilla-patch "icecat-bug-1336527.patch" "b9f53baeabb3" "0y1l641ffbr4i85p0wc1ir6bcsy6h94bchbfc7ppxfijva4fjgvd")
+ (mozilla-patch "icecat-bug-1345716.patch" "2569af645a98" "1d6lx85ij90j6q6ixwp0h3w7y424yvkz0njsi0my727akbli5rsn")
+ (mozilla-patch "icecat-bug-1208957.patch" "2b68880d8f6b" "1pl0vkv7clyjchi9kg4995z82sr8xv7cbz1kvsg1v66md6pmp4s4")
+ (mozilla-patch "icecat-bug-1208957.patch" "bc646835442b" "0f29r5yvlb5w84nvvn6j9r9dq5314jgygjmsna3grzigpkb88gyj")
+ (mozilla-patch "icecat-bug-1347944.patch" "47cb652ddc25" "0n7871958zwndwz53xvzwjv41v5ar1vxaam8kzr5dkbqmprddimx")
+ (mozilla-patch "icecat-bug-1347632.patch" "7d8f7a52a108" "0gkbkzkz989j7pk3ia1rfvyjg3si8hnnadwkb2rw13qjxdzhx2zn")
+ (mozilla-patch "icecat-CVE-2017-5438.patch" "154c93b9435b" "00f8lr5s8h68392bb45zi0xfgqrgfkdxbzwdypp10d89784fvjvd")
+ (mozilla-patch "icecat-bug-1347486.patch" "15dbaf157058" "1mwgfnx1zsvhp0pgmc8577yw6lnf7g3ikdfj0r21fgffrn76bp69")
+ (mozilla-patch "icecat-bug-1218437.patch" "e13692bfd5f5" "10jrbs26m8l1vchw6svssrb5h8p82acrcmkx92ybvv4qbaq2bcl0")
+ (mozilla-patch "icecat-bug-1345853.patch" "5fa27dc4c4a3" "1sqqa4hir2bsnnwnlr34has62kpncmw6l9mylwprd09fxmzzgrd7")
+ (mozilla-patch "icecat-CVE-2017-5429-pt04.patch" "00c051cd38c7" "1d4aa4nqyjc01mg3jvdjjp7z05c2qhdjj85dhdrd9c18gfiyv4fi")
+ (mozilla-patch "icecat-bug-1349921.patch" "c6897adc4037" "0acvcdy8awdmpz84243jzf82agrm73wqa198fjbns1p1v3s425z2")
+ (mozilla-patch "icecat-bug-1338623.patch" "edcafd42dd52" "1xqgjy7a62jsyz1b5mibrcnd7zpb4gdaas0a6z5dwfvz52j4xa16")
+ (mozilla-patch "icecat-bug-1294799.patch" "0617b074ec3d" "19h7dj44shvdzzj87svpv5q97cikxyxhiwfzf9rnqj1b7fw0xrdh")
+ (mozilla-patch "icecat-bug-1345049.patch" "88466b911357" "16pgd13mw9a0snyhq6vxmjc7kr9mikvhazkgbc6vpykwi0i0z85b")
+ (mozilla-patch "icecat-bug-1339999.patch" "b7cb8f8b0877" "0zv1kxcva699ahb9s36l4d9mlrkm0b7hmh6g1422j6iijn136vxb")
+ (mozilla-patch "icecat-bug-1350868.patch" "ddd6c44790c0" "182ii4wsz2vdd1q4dszd5hka8i2n0ghmqk7l39bd02d3zfibhhvc")
+ (mozilla-patch "icecat-bug-1342360.patch" "416681a239ef" "0ngs8xgmdhz9ag4dlrqhr0vmanqxr9q2vf16jpm3cimyc06zjxz4")
+ (mozilla-patch "icecat-CVE-2017-5429-pt05.patch" "a76e626ae6db" "0zn2j8fmhp7502kx1jhrvh85vsys5x6x6gw3v4gl0h8px354v6yw")
+ (mozilla-patch "icecat-CVE-2017-5429-pt06.patch" "0ce4196ab86e" "0isczy8261qz2zsdxax4j51gypz0gi39q7nfwxg88sl81kc5vym8")
+ (mozilla-patch "icecat-CVE-2017-5429-pt07.patch" "39da731d80ed" "0vswnv1hqa7r8iz6y5ja7i6w3cyq5xrcd66c1q29ac6n4gn7x338")
+ (mozilla-patch "icecat-CVE-2017-5430-pt08.patch" "1b148cf9c545" "0ilrib0c2c7mfycpz2hq3vrfdf6sf8lcdbfjk6r4xyxv54vh3lwk")
+ (mozilla-patch "icecat-bug-1325841.patch" "74e9f13c554f" "0glzcgjsy71y78zaccn33w8djs96i6dd3gafyzkihnkpfddd5cij")
+ (mozilla-patch "icecat-CVE-2017-5445.patch" "d7d87adfe186" "02p705si2j69ya8n5a916x58nycs07ja0sfpxrwl16f4n2plc91h")
+ (mozilla-patch "icecat-bug-1346424.patch" "5ede402f494f" "0kbx8yn8ppv7099ic6nhw32f7h42pnwk6dpvb179ilw90ah902q7")
+ (mozilla-patch "icecat-CVE-2017-5430-pt09.patch" "da44c5cfab2e" "16i4dz5sfkhh3a0khrcf8zn5w20rkf4aqwygjj3cp4qhdh7wnr75")
+ (mozilla-patch "icecat-CVE-2017-5430-pt10.patch" "0f966927bd55" "07pkhc6l6ylwrzgfm7i1galrvjawqqrhvhk6jcw4b30sfhi0bxq1")
+ (mozilla-patch "icecat-CVE-2017-5429-pt08.patch" "f0f591f82cc0" "18p091503vpfpp4l3d7hkqj78zavv6qj1lynhlfx67zdp3xqcf8r")
+ (mozilla-patch "icecat-CVE-2017-5464.patch" "1852dc0beba4" "1zdnkrsqjfv1q2jhj4829ypiwyg78n4jv54yn3b74vwcf5zvzx8m")
+ (mozilla-patch "icecat-bug-1083140.patch" "6913f0537208" "0vaf61ryp0bzkz6l1w73alhglibbgm0jcgccxvvm43ni67pcxqbq")
+ ;; TODO: Consider updating bundled tzdata, or unbundling it. The patch below uses GIT binary patches.
+ ;;(mozilla-patch "icecat-bug-1343493.patch" "35496444b380" "1wa79az7121xw078cgpczxavrqy0fsp4ib2nb69giha6acxcaqas")
+ (mozilla-patch "icecat-CVE-2017-5430-pt11.patch" "64495dfa29db" "0m7vklnwnaf7sw97m87bm4lb9pjmlh1vvrbaf1931db8nhd6m737")
+ (mozilla-patch "icecat-bug-1350783.patch" "26cd34db3c14" "15vq3lrilg3n9j80cdjmk7xib2iq5gcx9ypq8xs7f5ya9ibasqlx")
+ (mozilla-patch "icecat-CVE-2017-5429-pt09.patch" "6cd77a0d7ac0" "0kxlbl5m3gffxqrv7ky3swsbyg1ykj0wjhlfl9amsb4g8gra3zkj")
+ (mozilla-patch "icecat-CVE-2017-5460-pt1.patch" "a803be74843c" "1ywwakzjkfr714i9pfn152n86c6rp427chzdys8phdkcvp5d5p45")
+ (mozilla-patch "icecat-CVE-2017-5460-pt2.patch" "73762c1392ae" "18jy9ccqvn6l6hznvq5xsqm1pc7i81svc2grgv21wfwg9sd6zwwh")
+ (mozilla-patch "icecat-bug-1337392-pt1.patch" "4ab6d5c43036" "07pygzngssra9wnmqqrs24d6gc5kfh20fkzvpcasxh4f2hi21z9b")
+ (mozilla-patch "icecat-bug-1337392-pt2.patch" "13f2d85da9a7" "1iwfz7dp5i93bhjspy4kyz0vqrl8x8ndg5kxdyzwb1b339xim9qy")
+ (mozilla-patch "icecat-CVE-2017-5429-pt10.patch" "7a30cddfcd54" "1773pijh6gi086l930cn1a0k7kvy7f3cnirfblw98sq7h9qfyy33")
+ (mozilla-patch "icecat-bug-1345873-pt1.patch" "75cea353ad78" "14cig2y7d3p033hx3096gxzlqwgddq8d0ig0g3l8p1b0xwvvyryl")
+ (mozilla-patch "icecat-bug-1345873-pt2.patch" "b08ef5a82f89" "0afz01jv850x09df85d7ycqkcdlafi4w2xi5k155lk2b92w8lhpj")
+ (mozilla-patch "icecat-bug-1340163.patch" "f3f2a995a239" "1ydsj4ja475jscalkw6ggdxgbsp5l2mam5109k0y7c98abzqraxk")
+ (mozilla-patch "icecat-bug-1348174-pt1.patch" "330904d6f0dc" "19wnp4d8481w86xkk78n7c7wrr99rq6cq3v09hd8am4n0mzwzaja")
+ (mozilla-patch "icecat-bug-1348174-pt2.patch" "c61b99483c4b" "0mjsahi8ly24415ri2sylas6g0kb8wawi095idqiq019c3r7q9cq")
+ (mozilla-patch "icecat-bug-1348601.patch" "1848bd238064" "1f5kadhn6w1rs26sdrcc3mq0zzlmmsm6ymqhshkzn57nrj6akm7b")
+ (mozilla-patch "icecat-bug-1345991.patch" "2008a4b89d9a" "07fkg9r2rxbk362ckv2h8inhd2dadvzigshm6zsjfjs2fyzp95hp")
+ (mozilla-patch "icecat-bug-1344498-pt1.patch" "9acd0103d67f" "1f0j667g05h9ydmc924cs8mzif1n7s56wixsgnyqc3s231dswhml")
+ (mozilla-patch "icecat-bug-1344498-pt2.patch" "49aadb25b1ec" "0s618m802b1x5pyqh5mj1azaxch7ggxq9503b7mwhg90vz8qw7ki")
+ (mozilla-patch "icecat-bug-1344205.patch" "34b453085dc0" "02h1bh24f9i5sm3my07m2q58cpzqfhagwwv11l9fidxcm9dmzmrd")
+ (mozilla-patch "icecat-bug-1349862.patch" "864ff0c36b6b" "1i3wmigv982x9hzkfg25jhyvkynmar69x6cj6r4g9zkk5f5ypdh5")
+ (mozilla-patch "icecat-CVE-2017-5459.patch" "5ec6fbedb420" "07flhha4rkjbry5590yr5by36ypb1k33qm3rzkbmw0vk5gyak8dp")
+ (mozilla-patch "icecat-CVE-2017-5465.patch" "2b95de78a92c" "0vvq1fz84yyw7za929x6ki25paivlwd4ng1ddkcb2bw6da6yp12k")
+ (mozilla-patch "icecat-CVE-2017-5466.patch" "a5ec5e70abf1" "1jjviyk6db8iccd7997mwmgs188fsyrzivap3ffjf8m6j4mf9cra")
+ (mozilla-patch "icecat-bug-1347646.patch" "1b50711a46ce" "1i3505zzgf0mvg2405y2gzq36xc8ic2ga8w6d3n9kqryxj0mc7bh")))
(modules '((guix build utils)))
(snippet
'(begin
@@ -423,6 +511,7 @@ standards.")
;;
;; TODO: Use system graphite2.
;;
+ "dom/devicestorage" ; Removed in ESR 52.1, awkward to patch out
"modules/freetype2"
"modules/zlib"
"modules/libbz2"
@@ -449,9 +538,8 @@ standards.")
("dbus-glib" ,dbus-glib)
("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
- ("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base)
- ("gtk+" ,gtk+-2)
+ ("gtk+" ,gtk+)
+ ("gtk+-2" ,gtk+-2)
("pango" ,pango)
("freetype" ,freetype)
("hunspell" ,hunspell)
@@ -460,11 +548,13 @@ standards.")
("libjpeg-turbo" ,libjpeg-turbo)
("libxft" ,libxft)
("libevent" ,libevent-2.0)
+ ("libnotify" ,libnotify)
("libxinerama" ,libxinerama)
("libxscrnsaver" ,libxscrnsaver)
("libxcomposite" ,libxcomposite)
("libxt" ,libxt)
("libffi" ,libffi)
+ ("ffmpeg" ,ffmpeg)
("libvpx" ,libvpx)
("icu4c" ,icu4c)
("pixman" ,pixman)
@@ -476,14 +566,15 @@ standards.")
("sqlite" ,sqlite)
("startup-notification" ,startup-notification)
("unzip" ,unzip)
- ("yasm" ,yasm)
("zip" ,zip)
("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)
("python" ,python-2) ; Python 3 not supported
("python2-pysqlite" ,python2-pysqlite)
+ ("yasm" ,yasm)
("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf-2.13)
("which" ,which)))
(arguments
`(#:tests? #f ; no check target
@@ -495,17 +586,11 @@ standards.")
;; practice somehow. See <http://hydra.gnu.org/build/378133>.
#:validate-runpath? #f
- #:configure-flags '("--enable-default-toolkit=cairo-gtk2"
- "--enable-pango"
+ #:configure-flags '("--enable-default-toolkit=cairo-gtk3"
"--enable-gio"
- "--enable-svg"
- "--enable-canvas"
- "--enable-mathml"
"--enable-startup-notification"
"--enable-pulseaudio"
- "--enable-gstreamer=1.0"
- "--disable-gnomevfs"
"--disable-gconf"
"--disable-gnomeui"
@@ -563,16 +648,6 @@ standards.")
#t))
#t)))
(add-after
- 'unpack 'remove-h264parse-from-blacklist
- (lambda _
- ;; Remove h264parse from gstreamer format helper blacklist. It
- ;; was put there to work around a bug in a pre-1.0 version of
- ;; gstreamer. See:
- ;; https://www.mozilla.org/en-US/security/advisories/mfsa2015-47/
- (substitute* "dom/media/gstreamer/GStreamerFormatHelper.cpp"
- (("^ \"h264parse\",\n") ""))
- #t))
- (add-after
'unpack 'use-skia-by-default
(lambda _
;; Use the bundled Skia library by default, since IceCat appears
@@ -595,10 +670,11 @@ standards.")
;; calls to dlopen or PR_LoadLibrary, but that didn't seem to
;; work. More investigation is needed.
(substitute* "toolkit/library/moz.build"
- (("^# This needs to be last")
- "OS_LIBS += [
+ (("^# This library needs to be last" all)
+ (string-append "OS_LIBS += [
'GL', 'gnome-2', 'canberra', 'Xss', 'cups', 'gssapi_krb5',
- 'gstreamer-1.0', 'gstapp-1.0', 'gstvideo-1.0' ]\n\n"))
+ 'avcodec', 'avutil', 'pulse', 'notify' ]\n\n"
+ all)))
#t))
(replace
'configure
@@ -615,6 +691,7 @@ standards.")
,@configure-flags)))
(setenv "SHELL" bash)
(setenv "CONFIG_SHELL" bash)
+ (setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13
(mkdir "../build")
(chdir "../build")
(format #t "build directory: ~s~%" (getcwd))
diff --git a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch
index 267f7b8aa..114631517 100644
--- a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch
+++ b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch
@@ -1,8 +1,8 @@
Fixes needed when avoiding bundled libraries.
---- icecat-45.3.0/xpcom/build/moz.build.orig
-+++ icecat-45.3.0/xpcom/build/moz.build
-@@ -92,10 +92,5 @@
+--- icecat-52.0.2/xpcom/build/moz.build.orig
++++ icecat-52.0.2/xpcom/build/moz.build
+@@ -93,10 +93,5 @@
'/docshell/base',
]
@@ -13,38 +13,23 @@ Fixes needed when avoiding bundled libraries.
-
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
CXXFLAGS += CONFIG['TK_CFLAGS']
---- icecat-45.3.0/storage/moz.build.orig
-+++ icecat-45.3.0/storage/moz.build
-@@ -108,7 +108,6 @@
- DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
+--- icecat-52.0.2/storage/moz.build.orig
++++ icecat-52.0.2/storage/moz.build
+@@ -114,7 +114,6 @@
+ DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True
LOCAL_INCLUDES += [
- '/db/sqlite3/src',
'/dom/base',
]
---- icecat-45.3.0/dom/indexedDB/moz.build.orig
-+++ icecat-45.3.0/dom/indexedDB/moz.build
-@@ -96,7 +96,6 @@
- SOURCES['Key.cpp'].flags += ['-Wno-error=type-limits']
+--- icecat-52.0.2/dom/indexedDB/moz.build.orig
++++ icecat-52.0.2/dom/indexedDB/moz.build
+@@ -101,7 +101,6 @@
+ CXXFLAGS += ['-Wno-error=shadow']
LOCAL_INCLUDES += [
- '/db/sqlite3/src',
'/dom/base',
'/dom/storage',
'/dom/workers',
---- icecat-45.3.0/modules/libmar/tests/Makefile.in.orig
-+++ icecat-45.3.0/modules/libmar/tests/Makefile.in
-@@ -10,12 +10,5 @@
- ifndef MOZ_PROFILE_GENERATE
- libs::
- $(INSTALL) ../tool/signmar$(BIN_SUFFIX) $(TESTROOT)/unit
-- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX) $(TESTROOT)/unit
--ifndef MOZ_FOLD_LIBS
-- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX) $(TESTROOT)/unit
-- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(TESTROOT)/unit
-- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(TESTROOT)/unit
-- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) $(TESTROOT)/unit
--endif
- endif
- endif # Not Android
diff --git a/gnu/packages/patches/icecat-binutils.patch b/gnu/packages/patches/icecat-binutils.patch
deleted file mode 100644
index 53a3ed9bb..000000000
--- a/gnu/packages/patches/icecat-binutils.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-# HG changeset patch
-# User J. Brown <jb999@gmx.de>
-# Date 1476951900 14400
-# Node ID cca249d09ef600650e6127c18be438a37e9d4587
-# Parent d8bbf1a3957fd25ff24bfee51331c150b154cc39
-Bug 1242901 - Fix linking libxul.so with binutils/GNU ld >= 2.26. r=glandium
-
-The build fails with:
-
- /usr/bin/ld: ../../xpcom/components/nsComponentManager.o: relocation R_386_GOTOFF against protected data `start_kPStaticModules_NSModule' can not be used when making a shared object
- /usr/bin/ld: final link failed: Bad value
- collect2: error: ld returned 1 exit status
-
-This is a patch from 2016/04/27 16:36:50 ryoon found on
-http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/firefox45/patches/#dirlist.
-
-diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
---- a/xpcom/components/Module.h
-+++ b/xpcom/components/Module.h
-@@ -133,17 +133,17 @@ struct Module
- #if defined(MOZILLA_INTERNAL_API)
- # define NSMODULE_NAME(_name) _name##_NSModule
- # if defined(_MSC_VER)
- # pragma section(".kPStaticModules$M", read)
- # pragma comment(linker, "/merge:.kPStaticModules=.rdata")
- # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport)
- # elif defined(__GNUC__)
- # if defined(__ELF__)
--# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected")))
-+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default")))
- # elif defined(__MACH__)
- # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default")))
- # elif defined (_WIN32)
- # define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), dllexport))
- # endif
- # endif
- # if !defined(NSMODULE_SECTION)
- # error Do not know how to define sections.
-
diff --git a/gnu/packages/patches/icecat-bug-1299500-pt10.patch b/gnu/packages/patches/icecat-bug-1299500-pt10.patch
new file mode 100644
index 000000000..406738b8a
--- /dev/null
+++ b/gnu/packages/patches/icecat-bug-1299500-pt10.patch
@@ -0,0 +1,1639 @@
+Based on the following HG changeset, but adapted to GNU IceCat and
+also assumes that the dom/devicestorage subtree is deleted by our
+snippet. Note that the other parts of this patchset are downloaded
+directly from the upstream mozilla-esr52 mercurial repository.
+
+# HG changeset patch
+# User Andrea Marchesini <amarchesini@mozilla.com>
+# Date 1489000545 -3600
+# Node ID 08f2bc167ae82a6f86e427283d8b972ba794b846
+# Parent d63f3b14e5718b62c0adad2eab81b785250f3d4a
+Bug 1299500 - Get rid of DeviceStorage API - part 10 - DeviceStorage, r=ehsan, r=billm, a=jcristau
+
+diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
+--- a/dom/bindings/Bindings.conf
++++ b/dom/bindings/Bindings.conf
+@@ -228,21 +228,16 @@ DOMInterfaces = {
+ 'DeviceAcceleration': {
+ 'headerFile': 'mozilla/dom/DeviceMotionEvent.h',
+ },
+
+ 'DeviceRotationRate': {
+ 'headerFile': 'mozilla/dom/DeviceMotionEvent.h',
+ },
+
+-'DeviceStorage': {
+- 'nativeType': 'nsDOMDeviceStorage',
+- 'headerFile': 'DeviceStorage.h',
+-},
+-
+ 'Document': {
+ 'nativeType': 'nsIDocument',
+ 'binaryNames': {
+ 'documentURI': 'documentURIFromJS',
+ 'URL': 'documentURIFromJS'
+ }
+ },
+
+diff --git a/dom/filesystem/DeviceStorageFileSystem.cpp b/dom/filesystem/DeviceStorageFileSystem.cpp
+--- a/dom/filesystem/DeviceStorageFileSystem.cpp
++++ b/dom/filesystem/DeviceStorageFileSystem.cpp
+@@ -1,26 +1,24 @@
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+ /* vim: set ts=8 sts=2 et sw=2 tw=80: */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #include "mozilla/dom/DeviceStorageFileSystem.h"
+
+-#include "DeviceStorage.h"
+ #include "mozilla/Preferences.h"
+ #include "mozilla/dom/Directory.h"
+ #include "mozilla/dom/File.h"
+ #include "mozilla/dom/FileSystemUtils.h"
+ #include "mozilla/ipc/BackgroundParent.h"
+ #include "mozilla/Unused.h"
+ #include "nsCOMPtr.h"
+ #include "nsDebug.h"
+-#include "nsDeviceStorage.h"
+ #include "nsIFile.h"
+ #include "nsPIDOMWindow.h"
+ #include "nsGlobalWindow.h"
+
+ using namespace mozilla::ipc;
+
+ namespace mozilla {
+ namespace dom {
+@@ -37,44 +35,16 @@ DeviceStorageFileSystem::DeviceStorageFi
+ if (mozilla::Preferences::GetBool("device.storage.prompt.testing", false)) {
+ mPermissionCheckType = ePermissionCheckNotRequired;
+ } else {
+ mPermissionCheckType = ePermissionCheckRequired;
+ }
+ } else {
+ AssertIsOnBackgroundThread();
+ }
+-
+- // Get the permission name required to access the file system.
+- DebugOnly<nsresult> rv =
+- DeviceStorageTypeChecker::GetPermissionForType(mStorageType, mPermission);
+- NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "GetPermissionForType failed");
+-
+- // Get the local path of the file system root.
+- nsCOMPtr<nsIFile> rootFile;
+- DeviceStorageFile::GetRootDirectoryForType(aStorageType,
+- aStorageName,
+- getter_AddRefs(rootFile));
+-
+- Unused <<
+- NS_WARN_IF(!rootFile ||
+- NS_FAILED(rootFile->GetPath(mLocalOrDeviceStorageRootPath)));
+-
+- if (!XRE_IsParentProcess()) {
+- return;
+- }
+-
+- // DeviceStorageTypeChecker is a singleton object and must be initialized on
+- // the main thread. We initialize it here so that we can use it on the worker
+- // thread.
+- if (NS_IsMainThread()) {
+- DebugOnly<DeviceStorageTypeChecker*> typeChecker =
+- DeviceStorageTypeChecker::CreateOrGet();
+- MOZ_ASSERT(typeChecker);
+- }
+ }
+
+ DeviceStorageFileSystem::~DeviceStorageFileSystem()
+ {
+ AssertIsOnOwningThread();
+ }
+
+ already_AddRefed<FileSystemBase>
+diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
+--- a/dom/ipc/ContentChild.cpp
++++ b/dom/ipc/ContentChild.cpp
+@@ -168,44 +168,41 @@
+ #include "mozilla/X11Util.h"
+ #endif
+
+ #ifdef ACCESSIBILITY
+ #include "nsAccessibilityService.h"
+ #endif
+
+ #include "mozilla/dom/File.h"
+-#include "mozilla/dom/devicestorage/DeviceStorageRequestChild.h"
+ #include "mozilla/dom/PPresentationChild.h"
+ #include "mozilla/dom/PresentationIPCService.h"
+ #include "mozilla/ipc/InputStreamUtils.h"
+
+ #ifdef MOZ_WEBSPEECH
+ #include "mozilla/dom/PSpeechSynthesisChild.h"
+ #endif
+
+ #include "ProcessUtils.h"
+ #include "URIUtils.h"
+ #include "nsContentUtils.h"
+ #include "nsIPrincipal.h"
+-#include "nsDeviceStorage.h"
+ #include "DomainPolicy.h"
+ #include "mozilla/dom/ipc/StructuredCloneData.h"
+ #include "mozilla/dom/time/DateCacheCleaner.h"
+ #include "mozilla/net/NeckoMessageUtils.h"
+ #include "mozilla/widget/PuppetBidiKeyboard.h"
+ #include "mozilla/RemoteSpellCheckEngineChild.h"
+ #include "GMPServiceChild.h"
+ #include "gfxPlatform.h"
+ #include "nscore.h" // for NS_FREE_PERMANENT_DATA
+ #include "VRManagerChild.h"
+
+ using namespace mozilla;
+ using namespace mozilla::docshell;
+-using namespace mozilla::dom::devicestorage;
+ using namespace mozilla::dom::ipc;
+ using namespace mozilla::dom::workers;
+ using namespace mozilla::media;
+ using namespace mozilla::embedding;
+ using namespace mozilla::gmp;
+ using namespace mozilla::hal_sandbox;
+ using namespace mozilla::ipc;
+ using namespace mozilla::layers;
+@@ -1806,29 +1803,16 @@ ContentChild::GetCPOWManager()
+ }
+
+ bool
+ ContentChild::RecvPTestShellConstructor(PTestShellChild* actor)
+ {
+ return true;
+ }
+
+-PDeviceStorageRequestChild*
+-ContentChild::AllocPDeviceStorageRequestChild(const DeviceStorageParams& aParams)
+-{
+- return new DeviceStorageRequestChild();
+-}
+-
+-bool
+-ContentChild::DeallocPDeviceStorageRequestChild(PDeviceStorageRequestChild* aDeviceStorage)
+-{
+- delete aDeviceStorage;
+- return true;
+-}
+-
+ PNeckoChild*
+ ContentChild::AllocPNeckoChild()
+ {
+ return new NeckoChild();
+ }
+
+ bool
+ ContentChild::DeallocPNeckoChild(PNeckoChild* necko)
+@@ -2531,38 +2515,16 @@ ContentChild::RecvVolumes(nsTArray<Volum
+ if (vs) {
+ vs->RecvVolumesFromParent(aVolumes);
+ }
+ #endif
+ return true;
+ }
+
+ bool
+-ContentChild::RecvFilePathUpdate(const nsString& aStorageType,
+- const nsString& aStorageName,
+- const nsString& aPath,
+- const nsCString& aReason)
+-{
+- if (nsDOMDeviceStorage::InstanceCount() == 0) {
+- // No device storage instances in this process. Don't try and
+- // and create a DeviceStorageFile since it will fail.
+-
+- return true;
+- }
+-
+- RefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aStorageType, aStorageName, aPath);
+-
+- nsString reason;
+- CopyASCIItoUTF16(aReason, reason);
+- nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+- obs->NotifyObservers(dsf, "file-watcher-update", reason.get());
+- return true;
+-}
+-
+-bool
+ ContentChild::RecvFileSystemUpdate(const nsString& aFsName,
+ const nsString& aVolumeName,
+ const int32_t& aState,
+ const int32_t& aMountGeneration,
+ const bool& aIsMediaPresent,
+ const bool& aIsSharing,
+ const bool& aIsFormatting,
+ const bool& aIsFake,
+diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
+--- a/dom/ipc/ContentChild.h
++++ b/dom/ipc/ContentChild.h
+@@ -193,22 +193,16 @@ public:
+ const IPCTabContext& aContext,
+ const uint32_t& aChromeFlags,
+ const ContentParentId& aCpID,
+ const bool& aIsForApp,
+ const bool& aIsForBrowser) override;
+
+ virtual bool DeallocPBrowserChild(PBrowserChild*) override;
+
+- virtual PDeviceStorageRequestChild*
+- AllocPDeviceStorageRequestChild(const DeviceStorageParams&) override;
+-
+- virtual bool
+- DeallocPDeviceStorageRequestChild(PDeviceStorageRequestChild*) override;
+-
+ virtual PBlobChild*
+ AllocPBlobChild(const BlobConstructorParams& aParams) override;
+
+ virtual bool DeallocPBlobChild(PBlobChild* aActor) override;
+
+ virtual PCrashReporterChild*
+ AllocPCrashReporterChild(const mozilla::dom::NativeThreadId& id,
+ const uint32_t& processType) override;
+@@ -436,21 +430,16 @@ public:
+
+ virtual bool
+ RecvInitBlobURLs(nsTArray<BlobURLRegistrationData>&& aRegistations) override;
+
+ virtual bool RecvLastPrivateDocShellDestroyed() override;
+
+ virtual bool RecvVolumes(InfallibleTArray<VolumeInfo>&& aVolumes) override;
+
+- virtual bool RecvFilePathUpdate(const nsString& aStorageType,
+- const nsString& aStorageName,
+- const nsString& aPath,
+- const nsCString& aReason) override;
+-
+ virtual bool RecvFileSystemUpdate(const nsString& aFsName,
+ const nsString& aVolumeName,
+ const int32_t& aState,
+ const int32_t& aMountGeneration,
+ const bool& aIsMediaPresent,
+ const bool& aIsSharing,
+ const bool& aIsFormatting,
+ const bool& aIsFake,
+diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
+--- a/dom/ipc/ContentParent.cpp
++++ b/dom/ipc/ContentParent.cpp
+@@ -23,17 +23,16 @@
+
+ #include "chrome/common/process_watcher.h"
+
+ #include "mozilla/a11y/PDocAccessible.h"
+ #include "AppProcessChecker.h"
+ #include "AudioChannelService.h"
+ #include "BlobParent.h"
+ #include "CrashReporterParent.h"
+-#include "DeviceStorageStatics.h"
+ #include "GMPServiceParent.h"
+ #include "HandlerServiceParent.h"
+ #include "IHistory.h"
+ #include "imgIContainer.h"
+ #include "mozIApplication.h"
+ #if defined(XP_WIN) && defined(ACCESSIBILITY)
+ #include "mozilla/a11y/AccessibleWrap.h"
+ #endif
+@@ -50,17 +49,16 @@
+ #include "mozilla/dom/GetFilesHelper.h"
+ #include "mozilla/dom/GeolocationBinding.h"
+ #include "mozilla/dom/Notification.h"
+ #include "mozilla/dom/PContentBridgeParent.h"
+ #include "mozilla/dom/PContentPermissionRequestParent.h"
+ #include "mozilla/dom/PCycleCollectWithLogsParent.h"
+ #include "mozilla/dom/PMemoryReportRequestParent.h"
+ #include "mozilla/dom/ServiceWorkerRegistrar.h"
+-#include "mozilla/dom/devicestorage/DeviceStorageRequestParent.h"
+ #include "mozilla/dom/power/PowerManagerService.h"
+ #include "mozilla/dom/Permissions.h"
+ #include "mozilla/dom/PresentationParent.h"
+ #include "mozilla/dom/PPresentationParent.h"
+ #include "mozilla/dom/PushNotifier.h"
+ #include "mozilla/dom/FlyWebPublishedServerIPC.h"
+ #include "mozilla/dom/quota/QuotaManagerService.h"
+ #include "mozilla/dom/time/DateCacheCleaner.h"
+@@ -272,17 +270,16 @@ using base::ChildPrivileges;
+ using base::KillProcess;
+ #ifdef MOZ_ENABLE_PROFILER_SPS
+ using mozilla::ProfileGatherer;
+ #endif
+
+ #ifdef MOZ_CRASHREPORTER
+ using namespace CrashReporter;
+ #endif
+-using namespace mozilla::dom::devicestorage;
+ using namespace mozilla::dom::power;
+ using namespace mozilla::media;
+ using namespace mozilla::embedding;
+ using namespace mozilla::gfx;
+ using namespace mozilla::gmp;
+ using namespace mozilla::hal;
+ using namespace mozilla::ipc;
+ using namespace mozilla::layers;
+@@ -2775,22 +2772,16 @@ ContentParent::Observe(nsISupports* aSub
+ Unused << SendCycleCollect();
+ }
+ else if (!strcmp(aTopic, "child-mmu-request")){
+ Unused << SendMinimizeMemoryUsage();
+ }
+ else if (!strcmp(aTopic, "last-pb-context-exited")) {
+ Unused << SendLastPrivateDocShellDestroyed();
+ }
+- else if (!strcmp(aTopic, "file-watcher-update")) {
+- nsCString creason;
+- CopyUTF16toUTF8(aData, creason);
+- DeviceStorageFile* file = static_cast<DeviceStorageFile*>(aSubject);
+- Unused << SendFilePathUpdate(file->mStorageType, file->mStorageName, file->mPath, creason);
+- }
+ #ifdef MOZ_WIDGET_GONK
+ else if(!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
+ nsCOMPtr<nsIVolume> vol = do_QueryInterface(aSubject);
+ if (!vol) {
+ return NS_ERROR_NOT_AVAILABLE;
+ }
+
+ nsString volName;
+@@ -3021,35 +3012,16 @@ ContentParent::AllocPBrowserParent(const
+ }
+
+ bool
+ ContentParent::DeallocPBrowserParent(PBrowserParent* frame)
+ {
+ return nsIContentParent::DeallocPBrowserParent(frame);
+ }
+
+-PDeviceStorageRequestParent*
+-ContentParent::AllocPDeviceStorageRequestParent(const DeviceStorageParams& aParams)
+-{
+- RefPtr<DeviceStorageRequestParent> result = new DeviceStorageRequestParent(aParams);
+- if (!result->EnsureRequiredPermissions(this)) {
+- return nullptr;
+- }
+- result->Dispatch();
+- return result.forget().take();
+-}
+-
+-bool
+-ContentParent::DeallocPDeviceStorageRequestParent(PDeviceStorageRequestParent* doomed)
+-{
+- DeviceStorageRequestParent *parent = static_cast<DeviceStorageRequestParent*>(doomed);
+- NS_RELEASE(parent);
+- return true;
+-}
+-
+ PBlobParent*
+ ContentParent::AllocPBlobParent(const BlobConstructorParams& aParams)
+ {
+ return nsIContentParent::AllocPBlobParent(aParams);
+ }
+
+ bool
+ ContentParent::DeallocPBlobParent(PBlobParent* aActor)
+@@ -3871,35 +3843,16 @@ ContentParent::RecvAsyncMessage(const ns
+ InfallibleTArray<CpowEntry>&& aCpows,
+ const IPC::Principal& aPrincipal,
+ const ClonedMessageData& aData)
+ {
+ return nsIContentParent::RecvAsyncMessage(aMsg, Move(aCpows), aPrincipal,
+ aData);
+ }
+
+-bool
+-ContentParent::RecvFilePathUpdateNotify(const nsString& aType,
+- const nsString& aStorageName,
+- const nsString& aFilePath,
+- const nsCString& aReason)
+-{
+- RefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aType,
+- aStorageName,
+- aFilePath);
+-
+- nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+- if (!obs) {
+- return false;
+- }
+- obs->NotifyObservers(dsf, "file-watcher-update",
+- NS_ConvertASCIItoUTF16(aReason).get());
+- return true;
+-}
+-
+ static int32_t
+ AddGeolocationListener(nsIDOMGeoPositionCallback* watcher,
+ nsIDOMGeoPositionErrorCallback* errorCallBack,
+ bool highAccuracy)
+ {
+ nsCOMPtr<nsIDOMGeoGeolocation> geo = do_GetService("@mozilla.org/geolocation;1");
+ if (!geo) {
+ return -1;
+@@ -4943,35 +4896,16 @@ ContentParent::RecvBeginDriverCrashGuard
+ bool
+ ContentParent::RecvEndDriverCrashGuard(const uint32_t& aGuardType)
+ {
+ mDriverCrashGuard = nullptr;
+ return true;
+ }
+
+ bool
+-ContentParent::RecvGetDeviceStorageLocation(const nsString& aType,
+- nsString* aPath)
+-{
+-#ifdef MOZ_WIDGET_ANDROID
+- mozilla::AndroidBridge::GetExternalPublicDirectory(aType, *aPath);
+- return true;
+-#else
+- return false;
+-#endif
+-}
+-
+-bool
+-ContentParent::RecvGetDeviceStorageLocations(DeviceStorageLocationInfo* info)
+-{
+- DeviceStorageStatics::GetDeviceStorageLocationsForIPC(info);
+- return true;
+-}
+-
+-bool
+ ContentParent::RecvGetAndroidSystemInfo(AndroidSystemInfo* aInfo)
+ {
+ #ifdef MOZ_WIDGET_ANDROID
+ nsSystemInfo::GetAndroidSystemInfo(aInfo);
+ return true;
+ #else
+ MOZ_CRASH("wrong platform!");
+ return false;
+diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
+--- a/dom/ipc/ContentParent.h
++++ b/dom/ipc/ContentParent.h
+@@ -726,22 +726,16 @@ private:
+ const IPCTabContext& aContext,
+ const uint32_t& aChromeFlags,
+ const ContentParentId& aCpId,
+ const bool& aIsForApp,
+ const bool& aIsForBrowser) override;
+
+ virtual bool DeallocPBrowserParent(PBrowserParent* frame) override;
+
+- virtual PDeviceStorageRequestParent*
+- AllocPDeviceStorageRequestParent(const DeviceStorageParams&) override;
+-
+- virtual bool
+- DeallocPDeviceStorageRequestParent(PDeviceStorageRequestParent*) override;
+-
+ virtual PBlobParent*
+ AllocPBlobParent(const BlobConstructorParams& aParams) override;
+
+ virtual bool DeallocPBlobParent(PBlobParent* aActor) override;
+
+ virtual bool
+ RecvPBlobConstructor(PBlobParent* aActor,
+ const BlobConstructorParams& params) override;
+@@ -927,21 +921,16 @@ private:
+ const IPC::Principal& aPrincipal,
+ nsTArray<StructuredCloneData>* aRetvals) override;
+
+ virtual bool RecvAsyncMessage(const nsString& aMsg,
+ InfallibleTArray<CpowEntry>&& aCpows,
+ const IPC::Principal& aPrincipal,
+ const ClonedMessageData& aData) override;
+
+- virtual bool RecvFilePathUpdateNotify(const nsString& aType,
+- const nsString& aStorageName,
+- const nsString& aFilePath,
+- const nsCString& aReason) override;
+-
+ virtual bool RecvAddGeolocationListener(const IPC::Principal& aPrincipal,
+ const bool& aHighAccuracy) override;
+ virtual bool RecvRemoveGeolocationListener() override;
+
+ virtual bool RecvSetGeolocationHigherAccuracy(const bool& aEnable) override;
+
+ virtual bool RecvConsoleMessage(const nsString& aMessage) override;
+
+@@ -1047,21 +1036,16 @@ private:
+ const uint32_t& aDropEffect) override;
+
+ virtual bool RecvProfile(const nsCString& aProfile) override;
+
+ virtual bool RecvGetGraphicsDeviceInitData(ContentDeviceData* aOut) override;
+
+ void StartProfiler(nsIProfilerStartParams* aParams);
+
+- virtual bool RecvGetDeviceStorageLocation(const nsString& aType,
+- nsString* aPath) override;
+-
+- virtual bool RecvGetDeviceStorageLocations(DeviceStorageLocationInfo* info) override;
+-
+ virtual bool RecvGetAndroidSystemInfo(AndroidSystemInfo* aInfo) override;
+
+ virtual bool RecvNotifyBenchmarkResult(const nsString& aCodecName,
+ const uint32_t& aDecodeFPS) override;
+
+ virtual bool RecvNotifyPushObservers(const nsCString& aScope,
+ const IPC::Principal& aPrincipal,
+ const nsString& aMessageId) override;
+diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
+--- a/dom/ipc/PContent.ipdl
++++ b/dom/ipc/PContent.ipdl
+@@ -10,17 +10,16 @@ include protocol PBrowser;
+ include protocol PCompositorBridge;
+ include protocol PContentBridge;
+ include protocol PContentPermissionRequest;
+ include protocol PCycleCollectWithLogs;
+ include protocol PCrashReporter;
+ include protocol PPSMContentDownloader;
+ include protocol PExternalHelperApp;
+ include protocol PHandlerService;
+-include protocol PDeviceStorageRequest;
+ include protocol PFileDescriptorSet;
+ include protocol PHal;
+ include protocol PHeapSnapshotTempFileHelper;
+ include protocol PProcessHangMonitor;
+ include protocol PImageBridge;
+ include protocol PMedia;
+ include protocol PMemoryReportRequest;
+ include protocol PNecko;
+@@ -111,130 +110,16 @@ struct FontListEntry {
+ nsCString filepath;
+ uint16_t weight;
+ int16_t stretch;
+ uint8_t italic;
+ uint8_t index;
+ bool isHidden;
+ };
+
+-struct DeviceStorageFreeSpaceParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageUsedSpaceParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageAvailableParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageStatusParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageFormatParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageMountParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageUnmountParams
+-{
+- nsString type;
+- nsString storageName;
+-};
+-
+-struct DeviceStorageAddParams
+-{
+- nsString type;
+- nsString storageName;
+- nsString relpath;
+- PBlob blob;
+-};
+-
+-struct DeviceStorageAppendParams
+-{
+- nsString type;
+- nsString storageName;
+- nsString relpath;
+- PBlob blob;
+-};
+-
+-struct DeviceStorageCreateFdParams
+-{
+- nsString type;
+- nsString storageName;
+- nsString relpath;
+-};
+-
+-struct DeviceStorageGetParams
+-{
+- nsString type;
+- nsString storageName;
+- nsString rootDir;
+- nsString relpath;
+-};
+-
+-struct DeviceStorageDeleteParams
+-{
+- nsString type;
+- nsString storageName;
+- nsString relpath;
+-};
+-
+-struct DeviceStorageEnumerationParams
+-{
+- nsString type;
+- nsString storageName;
+- nsString rootdir;
+- uint64_t since;
+-};
+-
+-union DeviceStorageParams
+-{
+- DeviceStorageAddParams;
+- DeviceStorageAppendParams;
+- DeviceStorageCreateFdParams;
+- DeviceStorageGetParams;
+- DeviceStorageDeleteParams;
+- DeviceStorageEnumerationParams;
+- DeviceStorageFreeSpaceParams;
+- DeviceStorageUsedSpaceParams;
+- DeviceStorageAvailableParams;
+- DeviceStorageStatusParams;
+- DeviceStorageFormatParams;
+- DeviceStorageMountParams;
+- DeviceStorageUnmountParams;
+-};
+-
+-struct DeviceStorageLocationInfo {
+- nsString music;
+- nsString pictures;
+- nsString videos;
+- nsString sdcard;
+- nsString apps;
+- nsString crashes;
+-};
+-
+ union PrefValue {
+ nsCString;
+ int32_t;
+ bool;
+ };
+
+ union MaybePrefValue {
+ PrefValue;
+@@ -355,17 +240,16 @@ nested(upto inside_cpow) sync protocol P
+ parent opens PGMPService;
+ child opens PBackground;
+
+ manages PBlob;
+ manages PBrowser;
+ manages PContentPermissionRequest;
+ manages PCrashReporter;
+ manages PCycleCollectWithLogs;
+- manages PDeviceStorageRequest;
+ manages PPSMContentDownloader;
+ manages PExternalHelperApp;
+ manages PFileDescriptorSet;
+ manages PHal;
+ manages PHandlerService;
+ manages PHeapSnapshotTempFileHelper;
+ manages PMedia;
+ manages PMemoryReportRequest;
+@@ -538,19 +422,16 @@ child:
+ /**
+ * Send BlobURLRegistrationData to child process.
+ */
+ async InitBlobURLs(BlobURLRegistrationData[] registrations);
+
+ // Notify child that last-pb-context-exited notification was observed
+ async LastPrivateDocShellDestroyed();
+
+- async FilePathUpdate(nsString storageType, nsString storageName, nsString filepath,
+- nsCString reasons);
+-
+ // Note: Any changes to this structure should also be changed in
+ // VolumeInfo above.
+ async FileSystemUpdate(nsString fsName, nsString mountPoint, int32_t fsState,
+ int32_t mountGeneration, bool isMediaPresent,
+ bool isSharing, bool isFormatting, bool isFake,
+ bool isUnmounting, bool isRemovable, bool isHotSwappable);
+
+ // Notify volume is removed.
+@@ -738,17 +619,16 @@ parent:
+ * process. |newPluginEpoch| is the current epoch in the chrome process. If
+ * |pluginEpoch == newPluginEpoch|, then |plugins| will be left empty.
+ */
+ sync FindPlugins(uint32_t pluginEpoch) returns (nsresult aResult, PluginTag[] plugins, uint32_t newPluginEpoch);
+
+ async PJavaScript();
+
+ async PRemoteSpellcheckEngine();
+- async PDeviceStorageRequest(DeviceStorageParams params);
+
+ sync PCrashReporter(NativeThreadId tid, uint32_t processType);
+
+ /**
+ * Is this token compatible with the provided version?
+ *
+ * |version| The offered version to test
+ * Returns |True| if the offered version is compatible
+@@ -921,21 +801,16 @@ parent:
+ async FirstIdle();
+
+ async AudioChannelServiceStatus(bool aActiveTelephonyChannel,
+ bool aContentOrNormalChannel,
+ bool aAnyActiveChannel);
+
+ async AudioChannelChangeDefVolChannel(int32_t aChannel, bool aHidden);
+
+- async FilePathUpdateNotify(nsString aType,
+- nsString aStorageName,
+- nsString aFilepath,
+- nsCString aReason);
+-
+ // called by the child (test code only) to propagate volume changes to the parent
+ async CreateFakeVolume(nsString fsName, nsString mountPoint);
+ async SetFakeVolumeState(nsString fsName, int32_t fsState);
+ async RemoveFakeVolume(nsString fsName);
+
+ sync KeywordToURI(nsCString keyword)
+ returns (nsString providerName, OptionalInputStreamParams postData, OptionalURIParams uri);
+
+@@ -1108,22 +983,16 @@ parent:
+ float aFullZoom)
+ returns (nsresult rv,
+ bool windowOpened,
+ FrameScriptInfo[] frameScripts,
+ nsCString urlToLoad,
+ TextureFactoryIdentifier textureFactoryIdentifier,
+ uint64_t layersId);
+
+- sync GetDeviceStorageLocation(nsString type)
+- returns (nsString path);
+-
+- sync GetDeviceStorageLocations()
+- returns (DeviceStorageLocationInfo info);
+-
+ sync GetAndroidSystemInfo()
+ returns (AndroidSystemInfo info);
+
+ /**
+ * Tells the parent to ungrab the pointer on the default display.
+ *
+ * This is for GTK platforms where we have to ensure the pointer ungrab happens in the
+ * chrome process as that's the process that receives the pointer event.
+diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
+--- a/dom/ipc/moz.build
++++ b/dom/ipc/moz.build
+@@ -120,17 +120,16 @@ if CONFIG['MOZ_CONTENT_SANDBOX'] and CON
+ 'mozsandbox',
+ ]
+
+ LOCAL_INCLUDES += [
+ '/caps',
+ '/chrome',
+ '/docshell/base',
+ '/dom/base',
+- '/dom/devicestorage',
+ '/dom/events',
+ '/dom/filesystem',
+ '/dom/geolocation',
+ '/dom/media/webspeech/synth/ipc',
+ '/dom/security',
+ '/dom/storage',
+ '/dom/workers',
+ '/embedding/components/printingui/ipc',
+diff --git a/dom/moz.build b/dom/moz.build
+--- a/dom/moz.build
++++ b/dom/moz.build
+@@ -42,17 +42,16 @@ DIRS += [
+ 'base',
+ 'archivereader',
+ 'bindings',
+ 'battery',
+ 'browser-element',
+ 'cache',
+ 'canvas',
+ 'crypto',
+- 'devicestorage',
+ 'encoding',
+ 'events',
+ 'fetch',
+ 'filehandle',
+ 'filesystem',
+ 'flyweb',
+ 'gamepad',
+ 'geolocation',
+diff --git a/dom/webidl/DeviceStorage.webidl b/dom/webidl/DeviceStorage.webidl
+deleted file mode 100644
+--- a/dom/webidl/DeviceStorage.webidl
++++ /dev/null
+@@ -1,95 +0,0 @@
+-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+-/* This Source Code Form is subject to the terms of the Mozilla Public
+- * License, v. 2.0. If a copy of the MPL was not distributed with this
+- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+-
+-dictionary DeviceStorageEnumerationParameters {
+- Date since;
+-};
+-
+-[Pref="device.storage.enabled"]
+-interface DeviceStorage : EventTarget {
+- attribute EventHandler onchange;
+-
+- [Throws]
+- DOMRequest? add(Blob? aBlob);
+- [Throws]
+- DOMRequest? addNamed(Blob? aBlob, DOMString aName);
+-
+- /**
+- * Append data to a given file.
+- * If the file doesn't exist, a "NotFoundError" event will be dispatched.
+- * In the same time, it is a request.onerror case.
+- * If the file exists, it will be opened with the following permission:
+- * "PR_WRONLY|PR_CREATE_FILE|PR_APPEND".
+- * The function will return null when blob file is null and other unexpected situations.
+- * @parameter aBlob: A Blob object representing the data to append
+- * @parameter aName: A string representing the full name (path + file name) of the file
+- * to append data to.
+- */
+- [Throws]
+- DOMRequest? appendNamed(Blob? aBlob, DOMString aName);
+-
+- [Throws]
+- DOMRequest get(DOMString aName);
+- [Throws]
+- DOMRequest getEditable(DOMString aName);
+- [Throws]
+- DOMRequest delete(DOMString aName);
+-
+- [Throws]
+- DOMCursor enumerate(optional DeviceStorageEnumerationParameters options);
+- [Throws]
+- DOMCursor enumerate(DOMString path,
+- optional DeviceStorageEnumerationParameters options);
+- [Throws]
+- DOMCursor enumerateEditable(optional DeviceStorageEnumerationParameters options);
+- [Throws]
+- DOMCursor enumerateEditable(DOMString path,
+- optional DeviceStorageEnumerationParameters options);
+-
+- [Throws]
+- DOMRequest freeSpace();
+- [Throws]
+- DOMRequest usedSpace();
+- [Throws]
+- DOMRequest available();
+- [Throws]
+- DOMRequest storageStatus();
+- [Throws]
+- DOMRequest format();
+- [Throws]
+- DOMRequest mount();
+- [Throws]
+- DOMRequest unmount();
+-
+- // Note that the storageName is just a name (like sdcard), and doesn't
+- // include any path information.
+- readonly attribute DOMString storageName;
+-
+- // Indicates if the storage area denoted by storageName is capable of
+- // being mounted and unmounted.
+- readonly attribute boolean canBeMounted;
+-
+- // Indicates if the storage area denoted by storageName is capable of
+- // being shared and unshared.
+- readonly attribute boolean canBeShared;
+-
+- // Indicates if the storage area denoted by storageName is capable of
+- // being formatted.
+- readonly attribute boolean canBeFormatted;
+-
+- // Determines if this storage area is the one which will be used by default
+- // for storing new files.
+- readonly attribute boolean default;
+-
+- // Indicates if the storage area denoted by storageName is removable
+- readonly attribute boolean isRemovable;
+-
+- // True if the storage area is close to being full
+- readonly attribute boolean lowDiskSpace;
+-
+- [NewObject]
+- // XXXbz what type does this really return?
+- Promise<any> getRoot();
+-};
+diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
+--- a/dom/webidl/moz.build
++++ b/dom/webidl/moz.build
+@@ -104,17 +104,16 @@ WEBIDL_FILES = [
+ 'DataTransfer.webidl',
+ 'DataTransferItem.webidl',
+ 'DataTransferItemList.webidl',
+ 'DecoderDoctorNotification.webidl',
+ 'DedicatedWorkerGlobalScope.webidl',
+ 'DelayNode.webidl',
+ 'DesktopNotification.webidl',
+ 'DeviceMotionEvent.webidl',
+- 'DeviceStorage.webidl',
+ 'Directory.webidl',
+ 'Document.webidl',
+ 'DocumentFragment.webidl',
+ 'DocumentTimeline.webidl',
+ 'DocumentType.webidl',
+ 'DOMCursor.webidl',
+ 'DOMError.webidl',
+ 'DOMException.webidl',
+diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
+--- a/layout/build/nsLayoutStatics.cpp
++++ b/layout/build/nsLayoutStatics.cpp
+@@ -122,17 +122,16 @@ using namespace mozilla::system;
+ #include "mozilla/dom/CustomElementRegistry.h"
+ #include "mozilla/dom/time/DateCacheCleaner.h"
+ #include "mozilla/EventDispatcher.h"
+ #include "mozilla/IMEStateManager.h"
+ #include "mozilla/dom/HTMLVideoElement.h"
+ #include "TouchManager.h"
+ #include "MediaDecoder.h"
+ #include "MediaPrefs.h"
+-#include "mozilla/dom/devicestorage/DeviceStorageStatics.h"
+ #include "mozilla/ServoBindings.h"
+ #include "mozilla/StaticPresData.h"
+ #include "mozilla/dom/WebIDLGlobalNameHash.h"
+
+ using namespace mozilla;
+ using namespace mozilla::net;
+ using namespace mozilla::dom;
+ using namespace mozilla::dom::ipc;
+@@ -303,18 +302,16 @@ nsLayoutStatics::Initialize()
+ nsStyleContext::Initialize();
+ mozilla::LayerAnimationInfo::Initialize();
+ #endif
+
+ MediaDecoder::InitStatics();
+
+ PromiseDebugging::Init();
+
+- mozilla::dom::devicestorage::DeviceStorageStatics::Initialize();
+-
+ mozilla::dom::WebCryptoThreadPool::Initialize();
+
+ // NB: We initialize servo in nsAppRunner.cpp, because we need to do it after
+ // creating the hidden DOM window to support some current stylo hacks. We
+ // should move initialization back here once those go away.
+
+ #ifndef MOZ_WIDGET_ANDROID
+ // On Android, we instantiate it when constructing AndroidBridge.
+diff --git a/mobile/android/components/ContentPermissionPrompt.js b/mobile/android/components/ContentPermissionPrompt.js
+--- a/mobile/android/components/ContentPermissionPrompt.js
++++ b/mobile/android/components/ContentPermissionPrompt.js
+@@ -8,20 +8,16 @@ const Cu = Components.utils;
+ const Cc = Components.classes;
+
+ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+ Cu.import("resource://gre/modules/Services.jsm");
+
+ const kEntities = {
+ "contacts": "contacts",
+ "desktop-notification": "desktopNotification2",
+- "device-storage:music": "deviceStorageMusic",
+- "device-storage:pictures": "deviceStoragePictures",
+- "device-storage:sdcard": "deviceStorageSdcard",
+- "device-storage:videos": "deviceStorageVideos",
+ "geolocation": "geolocation",
+ "flyweb-publish-server": "flyWebPublishServer",
+ };
+
+ // For these types, prompt for permission if action is unknown.
+ const PROMPT_FOR_UNKNOWN = [
+ "desktop-notification",
+ "geolocation",
+diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
++++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+@@ -2198,54 +2198,16 @@ public class GeckoAppShell
+ return null;
+ }
+
+ @WrapForJNI
+ private static String connectionGetMimeType(URLConnection connection) {
+ return connection.getContentType();
+ }
+
+- /**
+- * Retrieve the absolute path of an external storage directory.
+- *
+- * @param type The type of directory to return
+- * @return Absolute path of the specified directory or null on failure
+- */
+- @WrapForJNI(calledFrom = "gecko")
+- private static String getExternalPublicDirectory(final String type) {
+- final String state = Environment.getExternalStorageState();
+- if (!Environment.MEDIA_MOUNTED.equals(state) &&
+- !Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+- // External storage is not available.
+- return null;
+- }
+-
+- if ("sdcard".equals(type)) {
+- // SD card has a separate path.
+- return Environment.getExternalStorageDirectory().getAbsolutePath();
+- }
+-
+- final String systemType;
+- if ("downloads".equals(type)) {
+- systemType = Environment.DIRECTORY_DOWNLOADS;
+- } else if ("pictures".equals(type)) {
+- systemType = Environment.DIRECTORY_PICTURES;
+- } else if ("videos".equals(type)) {
+- systemType = Environment.DIRECTORY_MOVIES;
+- } else if ("music".equals(type)) {
+- systemType = Environment.DIRECTORY_MUSIC;
+- } else if ("apps".equals(type)) {
+- File appInternalStorageDirectory = getApplicationContext().getFilesDir();
+- return new File(appInternalStorageDirectory, "mozilla").getAbsolutePath();
+- } else {
+- return null;
+- }
+- return Environment.getExternalStoragePublicDirectory(systemType).getAbsolutePath();
+- }
+-
+ @WrapForJNI(calledFrom = "gecko")
+ private static int getMaxTouchPoints() {
+ PackageManager pm = getApplicationContext().getPackageManager();
+ if (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND)) {
+ // at least, 5+ fingers.
+ return 5;
+ } else if (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT)) {
+ // at least, 2+ fingers.
+diff --git a/netwerk/test/mochitests/signed_web_packaged_app.sjs b/netwerk/test/mochitests/signed_web_packaged_app.sjs
+--- a/netwerk/test/mochitests/signed_web_packaged_app.sjs
++++ b/netwerk/test/mochitests/signed_web_packaged_app.sjs
+@@ -35,19 +35,16 @@ Content-Type: application/x-web-app-mani
+ "src": "scripts/library.js",
+ "integrity": "TN2ByXZiaBiBCvS4MeZ02UyNi44vED+KjdjLInUl4o8="
+ }
+ ],
+ "moz-permissions": [
+ {
+ "systemXHR": {
+ "description": "Needed to download stuff"
+- },
+- "devicestorage:pictures": {
+- "description": "Need to load pictures"
+ }
+ }
+ ],
+ "package-identifier": "09bc9714-7ab6-4320-9d20-fde4c237522c",
+ "description": "A great app!"
+ }\r
+ --NKWXJUAFXB\r
+ Content-Location: page2.html\r
+diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+--- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
++++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+@@ -268,53 +268,16 @@ this.DownloadIntegration = {
+ // Add the view used for detecting changes to downloads to be persisted.
+ // We must do this after the list of persistent downloads has been loaded,
+ // even if the load operation failed. We wait for a complete initialization
+ // so other callers cannot modify the list without being detected. The
+ // DownloadAutoSaveView is kept alive by the underlying DownloadList.
+ yield new DownloadAutoSaveView(list, this._store).initialize();
+ }),
+
+-#ifdef MOZ_WIDGET_GONK
+- /**
+- * Finds the default download directory which can be either in the
+- * internal storage or on the sdcard.
+- *
+- * @return {Promise}
+- * @resolves The downloads directory string path.
+- */
+- _getDefaultDownloadDirectory: Task.async(function* () {
+- let directoryPath;
+- let win = Services.wm.getMostRecentWindow("navigator:browser");
+- let storages = win.navigator.getDeviceStorages("sdcard");
+- let preferredStorageName;
+- // Use the first one or the default storage.
+- storages.forEach((aStorage) => {
+- if (aStorage.default || !preferredStorageName) {
+- preferredStorageName = aStorage.storageName;
+- }
+- });
+-
+- // Now get the path for this storage area.
+- if (preferredStorageName) {
+- let volume = volumeService.getVolumeByName(preferredStorageName);
+- if (volume && volume.state === Ci.nsIVolume.STATE_MOUNTED){
+- directoryPath = OS.Path.join(volume.mountPoint, "downloads");
+- yield OS.File.makeDir(directoryPath, { ignoreExisting: true });
+- }
+- }
+- if (directoryPath) {
+- return directoryPath;
+- } else {
+- throw new Components.Exception("No suitable storage for downloads.",
+- Cr.NS_ERROR_FILE_UNRECOGNIZED_PATH);
+- }
+- }),
+-#endif
+-
+ /**
+ * Determines if a Download object from the list of persistent downloads
+ * should be saved into a file, so that it can be restored across sessions.
+ *
+ * This function allows filtering out downloads that the host application is
+ * not interested in persisting across sessions, for example downloads that
+ * finished successfully.
+ *
+@@ -377,18 +340,16 @@ this.DownloadIntegration = {
+ #ifdef MOZ_WIDGET_ANDROID
+ // Android doesn't have a $HOME directory, and by default we only have
+ // write access to /data/data/org.mozilla.{$APP} and /sdcard
+ directoryPath = gEnvironment.get("DOWNLOADS_DIRECTORY");
+ if (!directoryPath) {
+ throw new Components.Exception("DOWNLOADS_DIRECTORY is not set.",
+ Cr.NS_ERROR_FILE_UNRECOGNIZED_PATH);
+ }
+-#elifdef MOZ_WIDGET_GONK
+- directoryPath = this._getDefaultDownloadDirectory();
+ #else
+ // For Linux, use XDG download dir, with a fallback to Home/Downloads
+ // if the XDG user dirs are disabled.
+ try {
+ directoryPath = this._getDirectory("DfltDwnld");
+ } catch(e) {
+ directoryPath = yield this._createDownloadsDirectory("Home");
+ }
+@@ -405,19 +366,16 @@ this.DownloadIntegration = {
+ /**
+ * Returns the user downloads directory asynchronously.
+ *
+ * @return {Promise}
+ * @resolves The downloads directory string path.
+ */
+ getPreferredDownloadsDirectory: Task.async(function* () {
+ let directoryPath = null;
+-#ifdef MOZ_WIDGET_GONK
+- directoryPath = this._getDefaultDownloadDirectory();
+-#else
+ let prefValue = 1;
+
+ try {
+ prefValue = Services.prefs.getIntPref("browser.download.folderList");
+ } catch(e) {}
+
+ switch(prefValue) {
+ case 0: // Desktop
+@@ -435,17 +393,16 @@ this.DownloadIntegration = {
+ } catch(ex) {
+ // Either the preference isn't set or the directory cannot be created.
+ directoryPath = yield this.getSystemDownloadsDirectory();
+ }
+ break;
+ default:
+ directoryPath = yield this.getSystemDownloadsDirectory();
+ }
+-#endif
+ return directoryPath;
+ }),
+
+ /**
+ * Returns the temporary downloads directory asynchronously.
+ *
+ * @return {Promise}
+ * @resolves The downloads directory string path.
+diff --git a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp b/toolkit/components/jsdownloads/src/DownloadPlatform.cpp
+--- a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp
++++ b/toolkit/components/jsdownloads/src/DownloadPlatform.cpp
+@@ -185,28 +185,16 @@ nsresult DownloadPlatform::DownloadDone(
+ if (sourceCFURL) {
+ ::CFRelease(sourceCFURL);
+ }
+ if (referrerCFURL) {
+ ::CFRelease(referrerCFURL);
+ }
+ }
+ #endif
+- if (mozilla::Preferences::GetBool("device.storage.enabled", true)) {
+- // Tell DeviceStorage that a new file may have been added.
+- nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+- nsCOMPtr<nsISupportsString> pathString
+- = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID);
+- if (obs && pathString) {
+- if (NS_SUCCEEDED(pathString->SetData(path))) {
+- (void)obs->NotifyObservers(pathString, "download-watcher-notify",
+- u"modified");
+- }
+- }
+- }
+ }
+
+ #endif
+
+ return NS_OK;
+ }
+
+ nsresult DownloadPlatform::MapUrlToZone(const nsAString& aURL,
+diff --git a/toolkit/components/jsdownloads/test/unit/common_test_Download.js b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
+--- a/toolkit/components/jsdownloads/test/unit/common_test_Download.js
++++ b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
+@@ -2315,103 +2315,16 @@ add_task(function* test_toSerializable_s
+ let download2 = yield Downloads.createDownload(reserialized);
+
+ do_check_eq(download1.startTime.constructor.name, "Date");
+ do_check_eq(download2.startTime.constructor.name, "Date");
+ do_check_eq(download1.startTime.toJSON(), download2.startTime.toJSON());
+ });
+
+ /**
+- * This test will call the platform specific operations within
+- * DownloadPlatform::DownloadDone. While there is no test to verify the
+- * specific behaviours, this at least ensures that there is no error or crash.
+- */
+-add_task(function* test_platform_integration()
+-{
+- let downloadFiles = [];
+- let oldDeviceStorageEnabled = false;
+- try {
+- oldDeviceStorageEnabled = Services.prefs.getBoolPref("device.storage.enabled");
+- } catch (e) {
+- // This happens if the pref doesn't exist.
+- }
+- let downloadWatcherNotified = false;
+- let observer = {
+- observe: function(subject, topic, data) {
+- do_check_eq(topic, "download-watcher-notify");
+- do_check_eq(data, "modified");
+- downloadWatcherNotified = true;
+- }
+- }
+- Services.obs.addObserver(observer, "download-watcher-notify", false);
+- Services.prefs.setBoolPref("device.storage.enabled", true);
+- let downloadDoneCalled = false;
+- let monitorFn = base => ({
+- __proto__: base,
+- downloadDone() {
+- return super.downloadDone(...arguments).then(() => {
+- downloadDoneCalled = true;
+- });
+- },
+- });
+- Integration.downloads.register(monitorFn);
+- DownloadIntegration.allowDirectories = true;
+- function cleanup() {
+- for (let file of downloadFiles) {
+- file.remove(true);
+- }
+- Services.obs.removeObserver(observer, "download-watcher-notify");
+- Services.prefs.setBoolPref("device.storage.enabled", oldDeviceStorageEnabled);
+- Integration.downloads.unregister(monitorFn);
+- DownloadIntegration.allowDirectories = false;
+- }
+-
+- for (let isPrivate of [false, true]) {
+- downloadDoneCalled = false;
+-
+- // Some platform specific operations only operate on files outside the
+- // temporary directory or in the Downloads directory (such as setting
+- // the Windows searchable attribute, and the Mac Downloads icon bouncing),
+- // so use the system Downloads directory for the target file.
+- let targetFilePath = yield DownloadIntegration.getSystemDownloadsDirectory();
+- targetFilePath = OS.Path.join(targetFilePath,
+- "test" + (Math.floor(Math.random() * 1000000)));
+- let targetFile = new FileUtils.File(targetFilePath);
+- downloadFiles.push(targetFile);
+-
+- let download;
+- if (gUseLegacySaver) {
+- download = yield promiseStartLegacyDownload(httpUrl("source.txt"),
+- { isPrivate, targetFile });
+- }
+- else {
+- download = yield Downloads.createDownload({
+- source: { url: httpUrl("source.txt"), isPrivate },
+- target: targetFile,
+- });
+- download.start().catch(() => {});
+- }
+-
+- // Wait for the whenSucceeded promise to be resolved first.
+- // downloadDone should be called before the whenSucceeded promise is resolved.
+- yield download.whenSucceeded().then(function () {
+- do_check_true(downloadDoneCalled);
+- do_check_true(downloadWatcherNotified);
+- });
+-
+- // Then, wait for the promise returned by "start" to be resolved.
+- yield promiseDownloadStopped(download);
+-
+- yield promiseVerifyTarget(download.target, TEST_DATA_SHORT);
+- }
+-
+- cleanup();
+-});
+-
+-/**
+ * Checks that downloads are added to browsing history when they start.
+ */
+ add_task(function* test_history()
+ {
+ mustInterruptResponses();
+
+ // We will wait for the visit to be notified during the download.
+ yield PlacesTestUtils.clearHistory();
+diff --git a/toolkit/content/devicestorage.properties b/toolkit/content/devicestorage.properties
+deleted file mode 100644
+--- a/toolkit/content/devicestorage.properties
++++ /dev/null
+@@ -1,4 +0,0 @@
+-# Extensions we recognize for DeviceStorage storage areas
+-pictures=*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp;
+-music=*.mp3; *.oga; *.ogg; *.m4a; *.m4b; *.m4p; *.m4r; *.3gp; *.3gpp; *.mp4; *.m3u; *.pls; *.opus; *.amr; *.wav; *.lcka; *.mka; *.flac;
+-videos=*.mp4; *.mpeg; *.mpg; *.ogv; *.ogx; *.webm; *.3gp; *.3gpp; *.3g2; *.ogg; *.m4v; *.ts; *.m2ts; *.avi; *.divx; *.mkv;
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -40,17 +40,16 @@ toolkit.jar:
+ content/global/browser-content.js
+ * content/global/buildconfig.html
+ content/global/contentAreaUtils.js
+ #ifndef MOZ_ICECATMOBILE
+ content/global/customizeToolbar.css
+ content/global/customizeToolbar.js
+ content/global/customizeToolbar.xul
+ #endif
+- content/global/devicestorage.properties
+ #ifndef MOZ_ICECATMOBILE
+ content/global/editMenuOverlay.js
+ * content/global/editMenuOverlay.xul
+ content/global/finddialog.js
+ * content/global/finddialog.xul
+ content/global/findUtils.js
+ #endif
+ content/global/filepicker.properties
+@@ -113,9 +112,9 @@ toolkit.jar:
+ content/global/bindings/videocontrols.css (widgets/videocontrols.css)
+ * content/global/bindings/wizard.xml (widgets/wizard.xml)
+ #ifdef XP_MACOSX
+ content/global/macWindowMenu.js
+ #endif
+ content/global/svg/svgBindings.xml (/layout/svg/resources/content/svgBindings.xml)
+ content/global/gmp-sources/eme-adobe.json (gmp-sources/eme-adobe.json)
+ content/global/gmp-sources/openh264.json (gmp-sources/openh264.json)
+- content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
+\ No newline at end of file
++ content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
+diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
+--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
++++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
+@@ -101,20 +101,16 @@
+
+ #ifdef MOZ_WIDGET_ANDROID
+ #include "IceCatMobileJNIWrappers.h"
+ #endif
+
+ #include "mozilla/Preferences.h"
+ #include "mozilla/ipc/URIUtils.h"
+
+-#ifdef MOZ_WIDGET_GONK
+-#include "nsDeviceStorage.h"
+-#endif
+-
+ using namespace mozilla;
+ using namespace mozilla::ipc;
+
+ // Download Folder location constants
+ #define NS_PREF_DOWNLOAD_DIR "browser.download.dir"
+ #define NS_PREF_DOWNLOAD_FOLDERLIST "browser.download.folderList"
+ enum {
+ NS_FOLDER_VALUE_DESKTOP = 0
+@@ -321,65 +317,16 @@ static nsresult GetDownloadDirectory(nsI
+ }
+
+ if (!dir) {
+ // If not, we default to the OS X default download location.
+ nsresult rv = NS_GetSpecialDirectory(NS_OSX_DEFAULT_DOWNLOAD_DIR,
+ getter_AddRefs(dir));
+ NS_ENSURE_SUCCESS(rv, rv);
+ }
+-#elif defined(MOZ_WIDGET_GONK)
+- // On Gonk, store the files on the sdcard in the downloads directory.
+- // We need to check with the volume manager which storage point is
+- // available.
+-
+- // Pick the default storage in case multiple (internal and external) ones
+- // are available.
+- nsString storageName;
+- nsDOMDeviceStorage::GetDefaultStorageName(NS_LITERAL_STRING("sdcard"),
+- storageName);
+-
+- RefPtr<DeviceStorageFile> dsf(
+- new DeviceStorageFile(NS_LITERAL_STRING("sdcard"),
+- storageName,
+- NS_LITERAL_STRING("downloads")));
+- NS_ENSURE_TRUE(dsf->mFile, NS_ERROR_FILE_ACCESS_DENIED);
+-
+- // If we're not checking for availability we're done.
+- if (aSkipChecks) {
+- dsf->mFile.forget(_directory);
+- return NS_OK;
+- }
+-
+- // Check device storage status before continuing.
+- nsString storageStatus;
+- dsf->GetStatus(storageStatus);
+-
+- // If we get an "unavailable" status, it means the sd card is not present.
+- // We'll also catch internal errors by looking for an empty string and assume
+- // the SD card isn't present when this occurs.
+- if (storageStatus.EqualsLiteral("unavailable") ||
+- storageStatus.IsEmpty()) {
+- return NS_ERROR_FILE_NOT_FOUND;
+- }
+-
+- // If we get a status other than 'available' here it means the card is busy
+- // because it's mounted via USB or it is being formatted.
+- if (!storageStatus.EqualsLiteral("available")) {
+- return NS_ERROR_FILE_ACCESS_DENIED;
+- }
+-
+- bool alreadyThere;
+- nsresult rv = dsf->mFile->Exists(&alreadyThere);
+- NS_ENSURE_SUCCESS(rv, rv);
+- if (!alreadyThere) {
+- rv = dsf->mFile->Create(nsIFile::DIRECTORY_TYPE, 0770);
+- NS_ENSURE_SUCCESS(rv, rv);
+- }
+- dir = dsf->mFile;
+ #elif defined(ANDROID)
+ // We ask Java for the temporary download directory. The directory will be
+ // different depending on whether we have the permission to write to the
+ // public download directory or not.
+ // In the case where we do not have the permission we will start the
+ // download to the app cache directory and later move it to the final
+ // destination after prompting for the permission.
+ jni::String::LocalRef downloadDir;
+diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
+--- a/widget/android/AndroidBridge.cpp
++++ b/widget/android/AndroidBridge.cpp
+@@ -1119,42 +1119,8 @@ nsresult AndroidBridge::InputStreamRead(
+
+ if (read <= 0) {
+ *aRead = 0;
+ return NS_OK;
+ }
+ *aRead = read;
+ return NS_OK;
+ }
+-
+-nsresult AndroidBridge::GetExternalPublicDirectory(const nsAString& aType, nsAString& aPath) {
+- if (XRE_IsContentProcess()) {
+- nsString key(aType);
+- nsAutoString path;
+- if (AndroidBridge::sStoragePaths.Get(key, &path)) {
+- aPath = path;
+- return NS_OK;
+- }
+-
+- // Lazily get the value from the parent.
+- dom::ContentChild* child = dom::ContentChild::GetSingleton();
+- if (child) {
+- nsAutoString type(aType);
+- child->SendGetDeviceStorageLocation(type, &path);
+- if (!path.IsEmpty()) {
+- AndroidBridge::sStoragePaths.Put(key, path);
+- aPath = path;
+- return NS_OK;
+- }
+- }
+-
+- ALOG_BRIDGE("AndroidBridge::GetExternalPublicDirectory no cache for %s",
+- NS_ConvertUTF16toUTF8(aType).get());
+- return NS_ERROR_NOT_AVAILABLE;
+- }
+-
+- auto path = GeckoAppShell::GetExternalPublicDirectory(aType);
+- if (!path) {
+- return NS_ERROR_NOT_AVAILABLE;
+- }
+- aPath = path->ToString();
+- return NS_OK;
+-}
+diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
+--- a/widget/android/AndroidBridge.h
++++ b/widget/android/AndroidBridge.h
+@@ -197,18 +197,16 @@ public:
+ static jmethodID GetStaticMethodID(JNIEnv* env, jclass jClass, const char* methodName, const char* methodType);
+
+ static jni::Object::LocalRef ChannelCreate(jni::Object::Param);
+
+ static void InputStreamClose(jni::Object::Param obj);
+ static uint32_t InputStreamAvailable(jni::Object::Param obj);
+ static nsresult InputStreamRead(jni::Object::Param obj, char *aBuf, uint32_t aCount, uint32_t *aRead);
+
+- static nsresult GetExternalPublicDirectory(const nsAString& aType, nsAString& aPath);
+-
+ protected:
+ static nsDataHashtable<nsStringHashKey, nsString> sStoragePaths;
+
+ static AndroidBridge* sBridge;
+
+ AndroidBridge();
+ ~AndroidBridge();
+
+diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
+--- a/widget/android/GeneratedJNIWrappers.cpp
++++ b/widget/android/GeneratedJNIWrappers.cpp
+@@ -274,24 +274,16 @@ auto GeckoAppShell::GetExceptionStackTra
+ constexpr char GeckoAppShell::GetExtensionFromMimeType_t::name[];
+ constexpr char GeckoAppShell::GetExtensionFromMimeType_t::signature[];
+
+ auto GeckoAppShell::GetExtensionFromMimeType(mozilla::jni::String::Param a0) -> mozilla::jni::String::LocalRef
+ {
+ return mozilla::jni::Method<GetExtensionFromMimeType_t>::Call(GeckoAppShell::Context(), nullptr, a0);
+ }
+
+-constexpr char GeckoAppShell::GetExternalPublicDirectory_t::name[];
+-constexpr char GeckoAppShell::GetExternalPublicDirectory_t::signature[];
+-
+-auto GeckoAppShell::GetExternalPublicDirectory(mozilla::jni::String::Param a0) -> mozilla::jni::String::LocalRef
+-{
+- return mozilla::jni::Method<GetExternalPublicDirectory_t>::Call(GeckoAppShell::Context(), nullptr, a0);
+-}
+-
+ constexpr char GeckoAppShell::GetHWDecoderCapability_t::name[];
+ constexpr char GeckoAppShell::GetHWDecoderCapability_t::signature[];
+
+ auto GeckoAppShell::GetHWDecoderCapability() -> bool
+ {
+ return mozilla::jni::Method<GetHWDecoderCapability_t>::Call(GeckoAppShell::Context(), nullptr);
+ }
+
+diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h
+--- a/widget/android/GeneratedJNIWrappers.h
++++ b/widget/android/GeneratedJNIWrappers.h
+@@ -724,36 +724,16 @@ public:
+ static const mozilla::jni::CallingThread callingThread =
+ mozilla::jni::CallingThread::GECKO;
+ static const mozilla::jni::DispatchTarget dispatchTarget =
+ mozilla::jni::DispatchTarget::CURRENT;
+ };
+
+ static auto GetExtensionFromMimeType(mozilla::jni::String::Param) -> mozilla::jni::String::LocalRef;
+
+- struct GetExternalPublicDirectory_t {
+- typedef GeckoAppShell Owner;
+- typedef mozilla::jni::String::LocalRef ReturnType;
+- typedef mozilla::jni::String::Param SetterType;
+- typedef mozilla::jni::Args<
+- mozilla::jni::String::Param> Args;
+- static constexpr char name[] = "getExternalPublicDirectory";
+- static constexpr char signature[] =
+- "(Ljava/lang/String;)Ljava/lang/String;";
+- static const bool isStatic = true;
+- static const mozilla::jni::ExceptionMode exceptionMode =
+- mozilla::jni::ExceptionMode::ABORT;
+- static const mozilla::jni::CallingThread callingThread =
+- mozilla::jni::CallingThread::GECKO;
+- static const mozilla::jni::DispatchTarget dispatchTarget =
+- mozilla::jni::DispatchTarget::CURRENT;
+- };
+-
+- static auto GetExternalPublicDirectory(mozilla::jni::String::Param) -> mozilla::jni::String::LocalRef;
+-
+ struct GetHWDecoderCapability_t {
+ typedef GeckoAppShell Owner;
+ typedef bool ReturnType;
+ typedef bool SetterType;
+ typedef mozilla::jni::Args<> Args;
+ static constexpr char name[] = "getHWDecoderCapability";
+ static constexpr char signature[] =
+ "()Z";
+diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
+--- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
++++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
+@@ -155,17 +155,16 @@
+ #include "mozilla/dom/CSSValueBinding.h"
+ #include "mozilla/dom/CSSValueListBinding.h"
+ #include "mozilla/dom/CustomEventBinding.h"
+ #ifdef MOZ_WEBRTC
+ #include "mozilla/dom/DataChannelBinding.h"
+ #endif
+ #include "mozilla/dom/DataContainerEventBinding.h"
+ #include "mozilla/dom/DataTransferBinding.h"
+-#include "mozilla/dom/DeviceStorageBinding.h"
+ #include "mozilla/dom/DOMCursorBinding.h"
+ #include "mozilla/dom/DOMExceptionBinding.h"
+ #include "mozilla/dom/DOMParserBinding.h"
+ #include "mozilla/dom/DOMRequestBinding.h"
+ #include "mozilla/dom/DocumentBinding.h"
+ #include "mozilla/dom/DocumentFragmentBinding.h"
+ #include "mozilla/dom/DocumentTypeBinding.h"
+ #include "mozilla/dom/DocumentBinding.h"
+
--
2.12.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 7:43 [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 Mark H Weaver
@ 2017-04-20 8:34 ` Mark H Weaver
2017-04-20 13:17 ` Clément Lassieur
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Mark H Weaver @ 2017-04-20 8:34 UTC (permalink / raw)
To: guix-devel
Mark H Weaver <mhw@netris.org> writes:
> Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
> additional fixes cherry-picked from upstream ESR 52.1. It seems to work
> well on my system, except that my GNOME 3 session has locked up a couple
> of times while testing it[*]. I'm not yet sure whether the problem is
> caused by IceCat or something else. I'd appreciate it if other people
> could try it out.
>
> [*] The mouse cursor still moves, and I can switch to text VTs, but
> otherwise the GUI is unresponsive. Killing icecat is not sufficient
> to unfreeze the graphical session, but I'm able to restart the X
> server without rebooting.
Actually, it turns out that I can consistently recover from these
freezes by kill -9 <gnome-shell-pid> from a text console. gnome-session
restarts gnome-shell automatically, and IceCat is still functional.
Mark
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 7:43 [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 Mark H Weaver
2017-04-20 8:34 ` Mark H Weaver
@ 2017-04-20 13:17 ` Clément Lassieur
2017-04-20 15:12 ` Maxim Cournoyer
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Clément Lassieur @ 2017-04-20 13:17 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
Hi Mark,
Thanks for this patch, it works well :)
I still can't watch videos from http://onlinemoviescinema.com, but I
guess it's an upstream issue (or DRM issue?). I can watch them with
Firefox/ffmpeg.
I didn't experience your unresponsive GUI issue (using ratpoison).
Clément
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 7:43 [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 Mark H Weaver
2017-04-20 8:34 ` Mark H Weaver
2017-04-20 13:17 ` Clément Lassieur
@ 2017-04-20 15:12 ` Maxim Cournoyer
2017-04-20 19:44 ` ng0
2017-04-20 22:41 ` Mark H Weaver
2017-04-21 16:18 ` Kei Kebreau
4 siblings, 1 reply; 9+ messages in thread
From: Maxim Cournoyer @ 2017-04-20 15:12 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
Hi Mark!
Mark H Weaver <mhw@netris.org> writes:
> Hello Guix,
>
> Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
> additional fixes cherry-picked from upstream ESR 52.1. It seems to work
> well on my system, except that my GNOME 3 session has locked up a couple
> of times while testing it[*]. I'm not yet sure whether the problem is
> caused by IceCat or something else. I'd appreciate it if other people
> could try it out.
[...]
> I've also attached a patch to add autoconf-2.13 (from 1999!), since it
> appears to be a build requirement of IceCat 52.x. I haven't tested it
> for anything except building IceCat.
Thanks for working on this. I'd reckon you first tried using current
autoconf before resorting to using this 1999 flavor? I'm having a hard
time understanding why such old software could be made a hard
requirement :)
Maxim
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 15:12 ` Maxim Cournoyer
@ 2017-04-20 19:44 ` ng0
0 siblings, 0 replies; 9+ messages in thread
From: ng0 @ 2017-04-20 19:44 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: guix-devel
Maxim Cournoyer transcribed 1.8K bytes:
> Hi Mark!
>
> Mark H Weaver <mhw@netris.org> writes:
>
> > Hello Guix,
> >
> > Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
> > additional fixes cherry-picked from upstream ESR 52.1. It seems to work
> > well on my system, except that my GNOME 3 session has locked up a couple
> > of times while testing it[*]. I'm not yet sure whether the problem is
> > caused by IceCat or something else. I'd appreciate it if other people
> > could try it out.
>
> [...]
>
> > I've also attached a patch to add autoconf-2.13 (from 1999!), since it
> > appears to be a build requirement of IceCat 52.x. I haven't tested it
> > for anything except building IceCat.
>
> Thanks for working on this. I'd reckon you first tried using current
> autoconf before resorting to using this 1999 flavor? I'm having a hard
> time understanding why such old software could be made a hard
> requirement :)
>
> Maxim
Sometimes logic doesn't apply to development. I packaged the very same version when
I was working on palemoon-browser because they somehow depended on it.
--
PGP and more: https://people.pragmatique.xyz/ng0/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 7:43 [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 Mark H Weaver
` (2 preceding siblings ...)
2017-04-20 15:12 ` Maxim Cournoyer
@ 2017-04-20 22:41 ` Mark H Weaver
2017-04-21 4:23 ` Mark H Weaver
2017-04-21 16:18 ` Kei Kebreau
4 siblings, 1 reply; 9+ messages in thread
From: Mark H Weaver @ 2017-04-20 22:41 UTC (permalink / raw)
To: guix-devel
Mark H Weaver <mhw@netris.org> writes:
> Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
> additional fixes cherry-picked from upstream ESR 52.1. It seems to work
> well on my system, except that my GNOME 3 session has locked up a couple
> of times while testing it[*].
I built a slightly modified version of this package with 'libnotify'
support removed (removing it from both 'inputs' and from the
'arrange-to-link-libxul-with-libraries-it-might-dlopen' phase), and also
attempting (but failing) to downgrade to gtk+-2. The resulting IceCat
still uses gtk+-3, but so far it has not locked up my GNOME session.
My hypothesis is that when 'libnotify' support is enabled, somehow a bug
in gnome-shell is triggered.
Mark
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 22:41 ` Mark H Weaver
@ 2017-04-21 4:23 ` Mark H Weaver
0 siblings, 0 replies; 9+ messages in thread
From: Mark H Weaver @ 2017-04-21 4:23 UTC (permalink / raw)
To: guix-devel
Mark H Weaver <mhw@netris.org> writes:
> Mark H Weaver <mhw@netris.org> writes:
>> Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
>> additional fixes cherry-picked from upstream ESR 52.1. It seems to work
>> well on my system, except that my GNOME 3 session has locked up a couple
>> of times while testing it[*].
>
> I built a slightly modified version of this package with 'libnotify'
> support removed (removing it from both 'inputs' and from the
> 'arrange-to-link-libxul-with-libraries-it-might-dlopen' phase), and also
> attempting (but failing) to downgrade to gtk+-2. The resulting IceCat
> still uses gtk+-3, but so far it has not locked up my GNOME session.
>
> My hypothesis is that when 'libnotify' support is enabled, somehow a bug
> in gnome-shell is triggered.
My experiments so far seem to support this hypothesis. Since removing
'libnotify' support, I've had no problems with IceCat 52 in GNOME 3.
I've now pushed the IceCat 52 update to master, along with the related
security updates for NSS and Graphite2.
Mark
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
2017-04-20 7:43 [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 Mark H Weaver
` (3 preceding siblings ...)
2017-04-20 22:41 ` Mark H Weaver
@ 2017-04-21 16:18 ` Kei Kebreau
4 siblings, 0 replies; 9+ messages in thread
From: Kei Kebreau @ 2017-04-21 16:18 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
Mark H Weaver <mhw@netris.org> writes:
> Hello Guix,
>
> Here's a draft patch to update GNU IceCat to 52.0.2-gnu1, with
> additional fixes cherry-picked from upstream ESR 52.1. It seems to work
> well on my system, except that my GNOME 3 session has locked up a couple
> of times while testing it[*]. I'm not yet sure whether the problem is
> caused by IceCat or something else. I'd appreciate it if other people
> could try it out.
>
> [*] The mouse cursor still moves, and I can switch to text VTs, but
> otherwise the GUI is unresponsive. Killing icecat is not sufficient
> to unfreeze the graphical session, but I'm able to restart the X
> server without rebooting.
I haven't tried this patch with GNOME 3, but I'm having no problems with
IceCat 52 on Window Maker.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1.
@ 2017-04-20 17:21 Petter
0 siblings, 0 replies; 9+ messages in thread
From: Petter @ 2017-04-20 17:21 UTC (permalink / raw)
To: guix-devel
Hi Mark,
I've been running Icecat 52 for a couple of hours now on Xfce. No
problems!
Memory and CPU usage is normal.
Well done, thanks!
Petter
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-04-21 16:19 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-20 7:43 [PATCH] DRAFT: gnu: icecat: Update to 52.0.2-gnu1; add fixes from ESR 52.1 Mark H Weaver
2017-04-20 8:34 ` Mark H Weaver
2017-04-20 13:17 ` Clément Lassieur
2017-04-20 15:12 ` Maxim Cournoyer
2017-04-20 19:44 ` ng0
2017-04-20 22:41 ` Mark H Weaver
2017-04-21 4:23 ` Mark H Weaver
2017-04-21 16:18 ` Kei Kebreau
-- strict thread matches above, loose matches on Subject: below --
2017-04-20 17:21 Petter
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).