nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icecat: Update to 60.5.0-guix1 [security-fixes]. 

Includes fixes for CVE-2018-18500, CVE-2018-18501, and CVE-2018-18505.

* gnu/packages/gnuzilla.scm (icecat): Update to 60.5.0-guix1.
[version]: Use %icecat-version.
[source]: Inherit from 'icecat-source'.  Remove obsolete patches.
* gnu/packages/patches/icecat-avoid-bundled-libraries.patch,
gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch,
gnu/packages/patches/icecat-use-system-media-libs.patch: Adapt to 60.5.0.
This commit is contained in:
Mark H Weaver 2019-01-29 21:21:20 -05:00
parent 948879eeda
commit 24886c1389
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
4 changed files with 81 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnu/packages/gnuzilla.scm
View File

@ -735,53 +735,13 @@ from forcing GEXP-PROMISE."
(define-public icecat (define-public icecat
(package (package
(name "icecat") (name "icecat")
(version "60.3.0-gnu1") (version %icecat-version)
(source (source
(origin (origin
(method url-fetch) (inherit icecat-source)
(uri (string-append "mirror://gnu/gnuzilla/" (patches (search-patches "icecat-avoid-bundled-libraries.patch"
(first (string-split version #\-)) "icecat-use-system-graphite2+harfbuzz.patch"
"/" name "-" version ".tar.bz2")) "icecat-use-system-media-libs.patch"))
(sha256
(base32
"0icnl64nxcyf7dprpdpygxhabsvyhps8c3ixysj9bcdlj9q34ib1"))
(patches
(list
(search-patch "icecat-avoid-bundled-libraries.patch")
(search-patch "icecat-use-system-graphite2+harfbuzz.patch")
(search-patch "icecat-use-system-media-libs.patch")
(mozilla-patch "icecat-bug-1464061.patch" "d28761dbff18" "1f58rzwx4s1af66fdwn9lgkcd1ksmq8kn8imvf78p90jqi24h7b4")
(mozilla-patch "icecat-bug-1479853.patch" "4faeb696dd06" "12891xx9c15s6kby6d3zk64v5nqgaq7sw597zv1fkd3a6x69hlva")
(mozilla-patch "icecat-CVE-2018-17466.patch" "12ba39f69876" "1piyq44f0xa0a9z2748aqwpaziaxwp61d86gyhalbyag8lcxfb3p")
(mozilla-patch "icecat-CVE-2018-18498.patch" "a0adabeedf26" "0f5wazha3zxzhy2j8f93hx62l9p02b1p40vi07qah3ar67h4ccj9")
(mozilla-patch "icecat-CVE-2018-12405-pt01.patch" "19604eb26230" "1wqxgph4z14ijhk2j2m4av5p6gx72d02lzz83q6yy0k065kw8psb")
(mozilla-patch "icecat-CVE-2018-18492.patch" "98737ab09270" "0fyl6wv0jxcxpkfpsff46y93k49n8lrw0k7c1p45g8da015dx27a")
(mozilla-patch "icecat-CVE-2018-18493.patch" "1cf7d80355d5" "19jp4x32vyxam54d1r9fm7jwf6krhhf3xazfqmxb9aw4iwdil7dl")
(mozilla-patch "icecat-CVE-2018-12405-pt02.patch" "c264774b8913" "1hxyi131x8jwawrq90cgkph833iv9ixrdrgzl1r978gbzwq10xz2")
(mozilla-patch "icecat-bug-1477773.patch" "ec13fda7c9b0" "0zj7aylgw55g0y7plaafn5gq8jwcsdr1bpdxacs0hq914nm8zy9z")
(mozilla-patch "icecat-CVE-2018-12405-pt03.patch" "5e1a9644aeef" "1qimrpgyrd8zkiri7w57j0aymk20y9b34am5w7rvr6qj1lhrbfla")
(mozilla-patch "icecat-bug-1485655.patch" "9055726e2d89" "1pppxr94zqh6zmi2mn1ih21qap09vk5ivbhnwxqr8iszvygjg44g")
(mozilla-patch "icecat-bug-1410214.patch" "9e641345e2ef" "0542xss2jdb8drh4g50cfy32l300x69dyywgx3dqs03vgr3qplxy")
(mozilla-patch "icecat-CVE-2018-12405-pt04.patch" "6398541ec302" "1c2yi7mkg3d5afxsgj9fp3zq8yhkmphrll5d60d5xsdv88kqqiyf")
(mozilla-patch "icecat-bug-1496736.patch" "3bed863ee656" "038k7jk3yp16410crwfdvhyb2vis49c6bplrfr83v51885cqldar")
(mozilla-patch "icecat-bug-1498765.patch" "a08c8493ba19" "0bwg4vg03j962lb9q8ihpiy4rmygykf1q9ij8x7h34q7hg43yjya")
(mozilla-patch "icecat-CVE-2018-12405-pt05.patch" "ee204e26690e" "1scs45xhlr1mwv6x2q6n22363f42by8cjmifqwzlikggs21f5mcq")
(mozilla-patch "icecat-bug-1507035.patch" "cec8b58ab3fe" "1f131ibpkrhsa44l822hnm5qgvapbs3i9pj25iimdwvr933winz8")
(mozilla-patch "icecat-bug-1501680.patch" "282c6bb81562" "1zgw7l5zmni8468y3f6cip1nlw63cfdd9vv9b00cbrgy96d1q2cp")
(mozilla-patch "icecat-bug-1500310.patch" "b3a439a26186" "0mrjxcmrlv04fyl36dwxk97dw08g2hlikvw2hfa1l0y8zsc4bgw8")
(mozilla-patch "icecat-bug-1500366.patch" "abd59256c4e3" "1jgwh2v4kwb6kf2h7mwf128w1k1jj119bfhlgqpmn9ami35wpzf3")
(mozilla-patch "icecat-bug-1493080.patch" "a7cabf306d05" "1n7wv67rcaz8wj31jc77ssjdj3kb61gdg7pigj828c5z2cgns1k5")
(mozilla-patch "icecat-CVE-2018-12405-pt06.patch" "8bbf80948b50" "1nvc69zgz9nvbw1pwxkil1fx4cxxpr6bsjrpp6l2kv7jhgax1bqk")
(mozilla-patch "icecat-bug-1507564.patch" "60619cc47b10" "09fanqr08kqgraw4xp7y2az4jc7ia8nn200rqjfj20vmkyjz97j3")
(mozilla-patch "icecat-bug-1507730.patch" "dd0f01818b9c" "14ziq1bm72n58xrvsgzpjj5z6ifpvi70r5jfhbkbj69mf4y4cx2z")
(mozilla-patch "icecat-CVE-2018-12405-pt07.patch" "a73a46ddc848" "1bvvyav3xyn6rgn6haicinxn0dasl9dyc1i37fyb7wr5wcpahybs")
(mozilla-patch "icecat-CVE-2018-18494.patch" "a72ec8e21577" "095zghmwdcbaid5426p9vpl757d8sfbsvgn201bjm7nhm03m4z7i")
(mozilla-patch "icecat-CVE-2018-12405-pt08.patch" "b6d0fc61fd0b" "0059avawxi4s4747plybjsjq8j2h4z7amw05p28xyg95a2njwnaa")
(mozilla-patch "icecat-bug-1499028.patch" "a62ede2dd3bc" "0ikmnibni8bdvpr9p42wskyyic08vzqdz5qr028bqzyg5119gily")
(mozilla-patch "icecat-bug-1426574.patch" "0db86656655b" "0kmccb4ccdzbzncwklx7w1bg7r61zwl2wnfp67vl27hm9xykbck7")
(mozilla-patch "icecat-CVE-2018-12405-pt09.patch" "20e31905de62" "0b5a441645wy3q4asaygvdq0inrxmxrh33cpgdp6ngflq9p2i6h0")
(mozilla-patch "icecat-CVE-2018-12405-pt10.patch" "c2832f98fe51" "0b4jfjfdyrihwjdfavd54hn9kdg2f017lmfr7mj2llp71flxwwj7")
(mozilla-patch "icecat-bug-1511495.patch" "d428d2b8f585" "1f9xs0bjhbphvkv60cnvz34sr2rv38jzvi47wh3nablg41yjpdrk")))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

16
gnu/packages/patches/icecat-avoid-bundled-libraries.patch
View File

@ -1,7 +1,7 @@
Fixes needed when avoiding bundled libraries. Fixes needed when avoiding bundled libraries.
--- icecat-60.2.0/xpcom/build/moz.build.orig 2018-09-13 17:46:49.000000000 -0400 --- icecat-60.5.0/xpcom/build/moz.build.orig 2018-09-13 17:46:49.000000000 -0400
+++ icecat-60.2.0/xpcom/build/moz.build 2018-09-22 04:26:50.659564554 -0400 +++ icecat-60.5.0/xpcom/build/moz.build 2018-09-22 04:26:50.659564554 -0400
@@ -99,10 +99,5 @@ @@ -99,10 +99,5 @@
'/docshell/base', '/docshell/base',
] ]
@ -13,8 +13,8 @@ Fixes needed when avoiding bundled libraries.
- -
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
CXXFLAGS += CONFIG['TK_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS']
--- icecat-60.2.0/storage/moz.build.orig 2018-09-13 17:51:11.000000000 -0400 --- icecat-60.5.0/storage/moz.build.orig 2018-09-13 17:51:11.000000000 -0400
+++ icecat-60.2.0/storage/moz.build 2018-09-22 04:26:50.659564554 -0400 +++ icecat-60.5.0/storage/moz.build 2018-09-22 04:26:50.659564554 -0400
@@ -117,7 +117,6 @@ @@ -117,7 +117,6 @@
DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True
@ -23,8 +23,8 @@ Fixes needed when avoiding bundled libraries.
'/dom/base', '/dom/base',
] ]
--- icecat-60.2.0/dom/indexedDB/moz.build.orig 2018-09-13 17:49:42.000000000 -0400 --- icecat-60.5.0/dom/indexedDB/moz.build.orig 2018-09-13 17:49:42.000000000 -0400
+++ icecat-60.2.0/dom/indexedDB/moz.build 2018-09-22 04:26:50.663564574 -0400 +++ icecat-60.5.0/dom/indexedDB/moz.build 2018-09-22 04:26:50.663564574 -0400
@@ -102,7 +102,6 @@ @@ -102,7 +102,6 @@
CXXFLAGS += ['-Wno-error=shadow'] CXXFLAGS += ['-Wno-error=shadow']
@ -33,8 +33,8 @@ Fixes needed when avoiding bundled libraries.
'/dom/base', '/dom/base',
'/dom/storage', '/dom/storage',
'/ipc/glue', '/ipc/glue',
--- icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build.orig 2018-09-13 17:40:54.000000000 -0400 --- icecat-60.5.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build.orig 2018-09-13 17:40:54.000000000 -0400
+++ icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build 2018-09-23 21:33:12.319975105 -0400 +++ icecat-60.5.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build 2018-09-23 21:33:12.319975105 -0400
@@ -130,11 +130,6 @@ @@ -130,11 +130,6 @@
DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_POSIX"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64" DEFINES["_FILE_OFFSET_BITS"] = "64"

50
gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch
View File

@ -4,8 +4,8 @@ Based on:
https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co
Modified for use with patch -p1, and to apply cleanly to GNU IceCat. Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
--- icecat-60.2.0/config/system-headers.mozbuild --- icecat-60.5.0/config/system-headers.mozbuild
+++ icecat-60.2.0/config/system-headers.mozbuild +++ icecat-60.5.0/config/system-headers.mozbuild
@@ -1311,6 +1311,19 @@ @@ -1311,6 +1311,19 @@
'pixman.h', 'pixman.h',
] ]
@ -26,8 +26,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
if CONFIG['MOZ_SYSTEM_LIBVPX']: if CONFIG['MOZ_SYSTEM_LIBVPX']:
system_headers += [ system_headers += [
'vpx_mem/vpx_mem.h', 'vpx_mem/vpx_mem.h',
--- icecat-60.2.0/dom/base/moz.build --- icecat-60.5.0/dom/base/moz.build
+++ icecat-60.2.0/dom/base/moz.build +++ icecat-60.5.0/dom/base/moz.build
@@ -474,6 +474,9 @@ @@ -474,6 +474,9 @@
if CONFIG['MOZ_X11']: if CONFIG['MOZ_X11']:
CXXFLAGS += CONFIG['TK_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS']
@ -38,8 +38,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
GENERATED_FILES += [ GENERATED_FILES += [
'PropertyUseCounterMap.inc', 'PropertyUseCounterMap.inc',
'UseCounterList.h', 'UseCounterList.h',
--- icecat-60.2.0/gfx/graphite2/moz-gr-update.sh --- icecat-60.5.0/gfx/graphite2/moz-gr-update.sh
+++ icecat-60.2.0/gfx/graphite2/moz-gr-update.sh +++ icecat-60.5.0/gfx/graphite2/moz-gr-update.sh
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
@ -66,8 +66,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
echo echo
echo If gfx/graphite2/src/files.mk has changed, please make corresponding echo If gfx/graphite2/src/files.mk has changed, please make corresponding
--- icecat-60.2.0/gfx/moz.build --- icecat-60.5.0/gfx/moz.build
+++ icecat-60.2.0/gfx/moz.build +++ icecat-60.5.0/gfx/moz.build
@@ -10,6 +10,12 @@ with Files('**'): @@ -10,6 +10,12 @@ with Files('**'):
if CONFIG['MOZ_TREE_CAIRO']: if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo'] DIRS += ['cairo']
@ -90,8 +90,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
'ots/src', 'ots/src',
'thebes', 'thebes',
'ipc', 'ipc',
--- icecat-60.2.0/gfx/skia/generate_mozbuild.py --- icecat-60.5.0/gfx/skia/generate_mozbuild.py
+++ icecat-60.2.0/gfx/skia/generate_mozbuild.py +++ icecat-60.5.0/gfx/skia/generate_mozbuild.py
@@ -148,6 +148,9 @@ @@ -148,6 +148,9 @@
'-Wno-unused-private-field', '-Wno-unused-private-field',
] ]
@ -102,8 +102,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
--- icecat-60.2.0/gfx/skia/moz.build --- icecat-60.5.0/gfx/skia/moz.build
+++ icecat-60.2.0/gfx/skia/moz.build +++ icecat-60.5.0/gfx/skia/moz.build
@@ -822,6 +822,9 @@ @@ -822,6 +822,9 @@
'-Wno-unused-private-field', '-Wno-unused-private-field',
] ]
@ -114,8 +114,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
--- icecat-60.2.0/gfx/thebes/moz.build --- icecat-60.5.0/gfx/thebes/moz.build
+++ icecat-60.2.0/gfx/thebes/moz.build +++ icecat-60.5.0/gfx/thebes/moz.build
@@ -272,7 +272,13 @@ @@ -272,7 +272,13 @@
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
@ -131,8 +131,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
if CONFIG['CC_TYPE'] == 'clang': if CONFIG['CC_TYPE'] == 'clang':
# Suppress warnings from Skia header files. # Suppress warnings from Skia header files.
--- icecat-60.2.0/intl/unicharutil/util/moz.build --- icecat-60.5.0/intl/unicharutil/util/moz.build
+++ icecat-60.2.0/intl/unicharutil/util/moz.build +++ icecat-60.5.0/intl/unicharutil/util/moz.build
@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ @@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
'nsUnicodeProperties.cpp', 'nsUnicodeProperties.cpp',
] ]
@ -141,8 +141,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+ +
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
--- icecat-60.2.0/netwerk/dns/moz.build --- icecat-60.5.0/netwerk/dns/moz.build
+++ icecat-60.2.0/netwerk/dns/moz.build +++ icecat-60.5.0/netwerk/dns/moz.build
@@ -76,3 +76,6 @@ @@ -76,3 +76,6 @@
if CONFIG['CC_TYPE'] in ('clang', 'gcc'): if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
@ -150,9 +150,9 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
+ +
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
--- icecat-60.2.0/old-configure.in --- icecat-60.5.0/old-configure.in
+++ icecat-60.2.0/old-configure.in +++ icecat-60.5.0/old-configure.in
@@ -3995,6 +3995,27 @@ @@ -3971,6 +3971,27 @@
AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
dnl ======================================================== dnl ========================================================
@ -180,8 +180,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
dnl Check for pixman and cairo dnl Check for pixman and cairo
dnl ======================================================== dnl ========================================================
--- icecat-60.2.0/toolkit/library/moz.build --- icecat-60.5.0/toolkit/library/moz.build
+++ icecat-60.2.0/toolkit/library/moz.build +++ icecat-60.5.0/toolkit/library/moz.build
@@ -235,6 +235,12 @@ @@ -235,6 +235,12 @@
if CONFIG['MOZ_SYSTEM_PNG']: if CONFIG['MOZ_SYSTEM_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS'] OS_LIBS += CONFIG['MOZ_PNG_LIBS']
@ -195,8 +195,8 @@ Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
if CONFIG['MOZ_SYSTEM_HUNSPELL']: if CONFIG['MOZ_SYSTEM_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
--- icecat-60.2.0/toolkit/moz.configure --- icecat-60.5.0/toolkit/moz.configure
+++ icecat-60.2.0/toolkit/moz.configure +++ icecat-60.5.0/toolkit/moz.configure
@@ -1051,6 +1051,26 @@ @@ -1051,6 +1051,26 @@
add_old_configure_assignment('FT2_CFLAGS', add_old_configure_assignment('FT2_CFLAGS',
ft2_info.cflags) ft2_info.cflags)

87
gnu/packages/patches/icecat-use-system-media-libs.patch
View File

@ -8,8 +8,8 @@ Changes to files within the bundled libraries are omitted, since those files
are removed from Guix sources. Modified for use with patch -p1, and to apply are removed from Guix sources. Modified for use with patch -p1, and to apply
cleanly to GNU IceCat. cleanly to GNU IceCat.
--- icecat-60.2.0/build/moz.configure/old.configure --- icecat-60.5.0/build/moz.configure/old.configure
+++ icecat-60.2.0/build/moz.configure/old.configure +++ icecat-60.5.0/build/moz.configure/old.configure
@@ -273,7 +273,12 @@ @@ -273,7 +273,12 @@
'--with-system-libvpx', '--with-system-libvpx',
'--with-system-nspr', '--with-system-nspr',
@ -23,8 +23,8 @@ cleanly to GNU IceCat.
'--with-system-zlib', '--with-system-zlib',
'--with-thumb', '--with-thumb',
'--with-thumb-interwork', '--with-thumb-interwork',
--- icecat-60.2.0/config/external/moz.build --- icecat-60.5.0/config/external/moz.build
+++ icecat-60.2.0/config/external/moz.build +++ icecat-60.5.0/config/external/moz.build
@@ -23,12 +23,21 @@ @@ -23,12 +23,21 @@
external_dirs += ['modules/xz-embedded'] external_dirs += ['modules/xz-embedded']
@ -61,8 +61,8 @@ cleanly to GNU IceCat.
'media/mp4parse-rust', 'media/mp4parse-rust',
'media/psshparser' 'media/psshparser'
] ]
--- icecat-60.2.0/config/system-headers.mozbuild --- icecat-60.5.0/config/system-headers.mozbuild
+++ icecat-60.2.0/config/system-headers.mozbuild +++ icecat-60.5.0/config/system-headers.mozbuild
@@ -1324,6 +1324,28 @@ @@ -1324,6 +1324,28 @@
'harfbuzz/hb.h', 'harfbuzz/hb.h',
] ]
@ -92,19 +92,19 @@ cleanly to GNU IceCat.
if CONFIG['MOZ_SYSTEM_LIBVPX']: if CONFIG['MOZ_SYSTEM_LIBVPX']:
system_headers += [ system_headers += [
'vpx_mem/vpx_mem.h', 'vpx_mem/vpx_mem.h',
--- icecat-60.2.0/dom/media/AudioStream.cpp --- icecat-60.5.0/dom/media/AudioStream.cpp
+++ icecat-60.2.0/dom/media/AudioStream.cpp +++ icecat-60.5.0/dom/media/AudioStream.cpp
@@ -121,7 +121,9 @@ @@ -128,7 +128,9 @@
: mMonitor("AudioStream") : mMonitor("AudioStream"),
, mChannels(0) mChannels(0),
, mOutChannels(0) mOutChannels(0),
+#ifndef MOZ_SYSTEM_SOUNDTOUCH +#ifndef MOZ_SYSTEM_SOUNDTOUCH
, mTimeStretcher(nullptr) mTimeStretcher(nullptr),
+#endif +#endif
, mDumpFile(nullptr) mDumpFile(nullptr),
, mState(INITIALIZED) mState(INITIALIZED),
, mDataSource(aSource) mDataSource(aSource),
@@ -142,9 +144,11 @@ @@ -147,9 +149,11 @@
if (mDumpFile) { if (mDumpFile) {
fclose(mDumpFile); fclose(mDumpFile);
} }
@ -116,8 +116,8 @@ cleanly to GNU IceCat.
#if defined(XP_WIN) #if defined(XP_WIN)
if (XRE_IsContentProcess()) { if (XRE_IsContentProcess()) {
audio::AudioNotificationReceiver::Unregister(this); audio::AudioNotificationReceiver::Unregister(this);
@@ -168,7 +172,11 @@ @@ -170,7 +174,11 @@
{ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() {
mMonitor.AssertCurrentThreadOwns(); mMonitor.AssertCurrentThreadOwns();
if (!mTimeStretcher) { if (!mTimeStretcher) {
+#ifdef MOZ_SYSTEM_SOUNDTOUCH +#ifdef MOZ_SYSTEM_SOUNDTOUCH
@ -128,8 +128,8 @@ cleanly to GNU IceCat.
mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); mTimeStretcher->setSampleRate(mAudioClock.GetInputRate());
mTimeStretcher->setChannels(mOutChannels); mTimeStretcher->setChannels(mOutChannels);
mTimeStretcher->setPitch(1.0); mTimeStretcher->setPitch(1.0);
--- icecat-60.2.0/dom/media/AudioStream.h --- icecat-60.5.0/dom/media/AudioStream.h
+++ icecat-60.2.0/dom/media/AudioStream.h +++ icecat-60.5.0/dom/media/AudioStream.h
@@ -15,7 +15,11 @@ @@ -15,7 +15,11 @@
#include "mozilla/TimeStamp.h" #include "mozilla/TimeStamp.h"
#include "mozilla/UniquePtr.h" #include "mozilla/UniquePtr.h"
@ -142,7 +142,7 @@ cleanly to GNU IceCat.
#if defined(XP_WIN) #if defined(XP_WIN)
#include "mozilla/audio/AudioNotificationReceiver.h" #include "mozilla/audio/AudioNotificationReceiver.h"
@@ -297,7 +301,11 @@ @@ -293,7 +297,11 @@
uint32_t mChannels; uint32_t mChannels;
uint32_t mOutChannels; uint32_t mOutChannels;
AudioClock mAudioClock; AudioClock mAudioClock;
@ -154,8 +154,8 @@ cleanly to GNU IceCat.
// Output file for dumping audio // Output file for dumping audio
FILE* mDumpFile; FILE* mDumpFile;
--- icecat-60.2.0/dom/media/moz.build --- icecat-60.5.0/dom/media/moz.build
+++ icecat-60.2.0/dom/media/moz.build +++ icecat-60.5.0/dom/media/moz.build
@@ -327,6 +327,21 @@ @@ -327,6 +327,21 @@
DEFINES['MOZILLA_INTERNAL_API'] = True DEFINES['MOZILLA_INTERNAL_API'] = True
@ -178,8 +178,8 @@ cleanly to GNU IceCat.
if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
--- icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp --- icecat-60.5.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
+++ icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp +++ icecat-60.5.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
@@ -15,9 +15,13 @@ @@ -15,9 +15,13 @@
#include <windows.h> #include <windows.h>
#endif #endif
@ -194,7 +194,7 @@ cleanly to GNU IceCat.
namespace mozilla { namespace mozilla {
@@ -64,6 +68,12 @@ @@ -60,6 +64,12 @@
sLinkStatus = LinkStatus_FAILED; sLinkStatus = LinkStatus_FAILED;
@ -207,17 +207,17 @@ cleanly to GNU IceCat.
// We retrieve the path of the lgpllibs library as this is where mozavcodec // We retrieve the path of the lgpllibs library as this is where mozavcodec
// and mozavutil libs are located. // and mozavutil libs are located.
PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs");
@@ -73,6 +83,7 @@ @@ -68,6 +78,7 @@
PathString path = }
GetLibraryFilePathname(lgpllibsname.get(), PathString path = GetLibraryFilePathname(
(PRFuncPtr)&soundtouch::SoundTouch::getVersionId); lgpllibsname.get(), (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
+#endif +#endif
if (path.IsEmpty()) { if (path.IsEmpty()) {
return false; return false;
} }
--- icecat-60.2.0/old-configure.in --- icecat-60.5.0/old-configure.in
+++ icecat-60.2.0/old-configure.in +++ icecat-60.5.0/old-configure.in
@@ -2451,6 +2451,111 @@ @@ -2417,6 +2417,111 @@
fi fi
fi # COMPILE_ENVIRONMENT fi # COMPILE_ENVIRONMENT
@ -329,8 +329,8 @@ cleanly to GNU IceCat.
dnl system libvpx Support dnl system libvpx Support
dnl ======================================================== dnl ========================================================
MOZ_ARG_WITH_BOOL(system-libvpx, MOZ_ARG_WITH_BOOL(system-libvpx,
--- icecat-60.2.0/toolkit/library/moz.build --- icecat-60.5.0/toolkit/library/moz.build
+++ icecat-60.2.0/toolkit/library/moz.build +++ icecat-60.5.0/toolkit/library/moz.build
@@ -244,6 +244,21 @@ @@ -244,6 +244,21 @@
if CONFIG['MOZ_SYSTEM_HUNSPELL']: if CONFIG['MOZ_SYSTEM_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
@ -353,9 +353,9 @@ cleanly to GNU IceCat.
if CONFIG['MOZ_SYSTEM_LIBEVENT']: if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
--- icecat-60.2.0/xpcom/build/XPCOMInit.cpp --- icecat-60.5.0/xpcom/build/XPCOMInit.cpp
+++ icecat-60.2.0/xpcom/build/XPCOMInit.cpp +++ icecat-60.5.0/xpcom/build/XPCOMInit.cpp
@@ -138,7 +138,9 @@ @@ -139,7 +139,9 @@
#include "mozilla/ipc/GeckoChildProcessHost.h" #include "mozilla/ipc/GeckoChildProcessHost.h"
@ -365,16 +365,15 @@ cleanly to GNU IceCat.
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
#if defined(HAVE_STDINT_H) #if defined(HAVE_STDINT_H)
// mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in
@@ -639,11 +641,13 @@ @@ -635,10 +637,12 @@
// this oddness. // this oddness.
mozilla::SetICUMemoryFunctions(); mozilla::SetICUMemoryFunctions();
+#ifndef MOZ_OGG_NO_MEM_REPORTING +#ifndef MOZ_OGG_NO_MEM_REPORTING
// Do the same for libogg. // Do the same for libogg.
ogg_set_mem_functions(OggReporter::CountingMalloc, ogg_set_mem_functions(
OggReporter::CountingCalloc, OggReporter::CountingMalloc, OggReporter::CountingCalloc,
OggReporter::CountingRealloc, OggReporter::CountingRealloc, OggReporter::CountingFree);
OggReporter::CountingFree);
+#endif +#endif
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)