X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=firefox.spec;h=6167226c5c62b11ce583e31e5cf4defaefd41143;hb=0aa83a3;hp=e14e34852481abd478ddc7586f33b4e40e3a2206;hpb=f666e925d7edea7cc04cea4ea1b601902621376a;p=packages%2Ffirefox60-esr.git

diff --git a/firefox.spec b/firefox.spec
index e14e348..6167226 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -4,13 +4,14 @@
 #
 # Conditional build:
 %bcond_with	tests		# enable tests (whatever they check)
-%bcond_without	gtk3		# GTK+ 3.x instead of 2.x
 %bcond_without	kerberos	# disable krb5 support
 %bcond_without	official	# official Firefox branding
 %bcond_with	pgo		# PGO-enabled build (requires working $DISPLAY == :100)
+%bcond_without	geckodriver	# WebDriver
 # - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
 %bcond_with	shared_js	# shared libmozjs library [broken]
 %bcond_without	system_icu	# build without system ICU
+%bcond_with	system_cairo	# build with system cairi (not supported in 60.0)
 %bcond_without	clang		# build using Clang/LLVM
 
 # On updating version, grab CVE links from:
@@ -29,226 +30,228 @@ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p'
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
 
-%define		nspr_ver	4.17
-%define		nss_ver		3.34.1
+%define		nspr_ver	4.19
+%define		nss_ver		3.37
 
 Summary:	Firefox web browser
 Summary(hu.UTF-8):	Firefox web böngésző
 Summary(pl.UTF-8):	Firefox - przeglądarka WWW
 Name:		firefox
-Version:	58.0
+Version:	61.0.1
 Release:	1
 License:	MPL v2.0
 Group:		X11/Applications/Networking
-Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
-# Source0-md5:	0d5b70d2cf074ed6716b13c3e8d43a18
+# http://archive.mozilla.org/pub/firefox/releases/%{version}/SOURCE
+Source0:	http://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
+# Source0-md5:	984f5d9067ead278b7a304e3d7648486
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
 Source5:	vendor.js
 Source6:	vendor-ac.js
-Source100:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ach.xpi
-# Source100-md5:	be60d26b1af0066461b8dc4aa18c560f
+Source100:	http://archive.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ach.xpi
+# Source100-md5:	df1ab4ae550fb63ab3a708a63af9fcce
 Source101:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/af.xpi
-# Source101-md5:	26c45c3b4931ef3a6cb17bda6234f1c9
+# Source101-md5:	f78c8405f5bf829c2646a7f9da247bde
 Source102:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/an.xpi
-# Source102-md5:	8c931fb7138a0323556255142a1fd895
+# Source102-md5:	10785a89e9a802da3a786e07a45690b9
 Source103:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ar.xpi
-# Source103-md5:	c4fb68eedde02bbf70b176fe6caa0795
+# Source103-md5:	6ac731acc3919e315008797b83f9e9e6
 Source104:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/as.xpi
-# Source104-md5:	ed4ce18932fcefe1cfe7006d02e1a71f
+# Source104-md5:	1354ac6885106ba01592a131b2e4a5fa
 Source105:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ast.xpi
-# Source105-md5:	6f501f820c0e0385229150843b1968ab
+# Source105-md5:	d2cdd10af38235e8f6b7f01eb7947799
 Source106:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/az.xpi
-# Source106-md5:	18b72df8eb91ae10884f4ea554c02dbc
+# Source106-md5:	8acd00529497c4e7083449917eb015ee
 Source107:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bg.xpi
-# Source107-md5:	6faf1a02f0b1870c71ada748d1cbc530
+# Source107-md5:	d7e845fc5c0af264bfaf78ed3179ec90
 Source108:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bn-BD.xpi
-# Source108-md5:	61d4b85ae8bd77068d484ce06a929058
+# Source108-md5:	6851d4725b0033ee5af7c88d0d41dfc0
 Source109:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bn-IN.xpi
-# Source109-md5:	f96cc6454f646a9f46b7e15345b2f8b2
+# Source109-md5:	ced1e67b41a3f0f04da7ed5f3e723338
 Source110:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/br.xpi
-# Source110-md5:	0ac9f404f0205e4b5a0b7a47dc9d1326
+# Source110-md5:	89caa98420a85d5e67e7c6c1eb2cb2ef
 Source111:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bs.xpi
-# Source111-md5:	91b7c432559c21d2db3179d38c668088
+# Source111-md5:	c9ade30fe8399972064e63064947b7af
 Source112:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ca.xpi
-# Source112-md5:	24c043c52a37e881b8c74846a7c36c84
+# Source112-md5:	a24f6a0a0c54ad09e1a78f7189bfb9eb
 Source113:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cak.xpi
-# Source113-md5:	c15ce9fdbfe770df20eb838f0d43a119
+# Source113-md5:	5a13cb99936f5eccaa942a8600244eca
 Source114:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cs.xpi
-# Source114-md5:	d024c883d4be57b9acf0d104342ebdd4
+# Source114-md5:	76aac9e4ca089e3aa72108ffc895e153
 Source115:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cy.xpi
-# Source115-md5:	2c5b3db3bb0928740714757d119ebaeb
+# Source115-md5:	d5433aef381138db27d6003442a34fa0
 Source116:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/da.xpi
-# Source116-md5:	334825481d9d5f7efab149e3f7837bd4
+# Source116-md5:	4b808d22898fac1aa5def57b1deb5008
 Source117:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/de.xpi
-# Source117-md5:	99fd406b784c8ddff8503d13fb97d3df
+# Source117-md5:	4ed0d54bc2592b06f4916b0ecd037ce7
 Source118:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/dsb.xpi
-# Source118-md5:	85be988fff0b21eef714af92fe852fc0
+# Source118-md5:	9a8c582a018c05a04e6fc401dde5db6b
 Source119:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/el.xpi
-# Source119-md5:	f4bc667ae2568437f88824b31ba4650e
+# Source119-md5:	54404fe7efe82faa07496b137e67c8f8
 Source120:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-GB.xpi
-# Source120-md5:	6c94eca43d6a97ee84586db3d759baca
+# Source120-md5:	882266e02462eb0204ff0039029f4632
 Source121:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-US.xpi
-# Source121-md5:	5b73d04f25a89b68b101fcfd29772cf3
+# Source121-md5:	c51c5a7e1373654001c6e18ce911f55d
 Source122:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-ZA.xpi
-# Source122-md5:	2b064f28538d090e4ee2177539804def
+# Source122-md5:	448134c829a1e4c6d4eec023d690ab69
 Source123:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/eo.xpi
-# Source123-md5:	846d952f1e6edf4258430697da553cce
+# Source123-md5:	faf816fe92ec0a538c85fe5dc9ff7c2b
 Source124:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-AR.xpi
-# Source124-md5:	a9bd88c633c09f7bdf05e0bb9dd24a9c
+# Source124-md5:	e5d91761b7fd3831dfba5cbfbb6f3a2d
 Source125:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-CL.xpi
-# Source125-md5:	2ff1e27c8ca9e0f7c142b3c0628d1ebf
+# Source125-md5:	ab7167eb3b247a54000340e14965a615
 Source126:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-ES.xpi
-# Source126-md5:	4ed65e154e7808d796afef56669ebb57
+# Source126-md5:	33e3ce90ee65ee4c98e422a1c11f2156
 Source127:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-MX.xpi
-# Source127-md5:	c2e33220d648f494f9ebeba59b8c8939
+# Source127-md5:	256b2ac57096411144fffa4d51717598
 Source128:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/et.xpi
-# Source128-md5:	d3aa39f71a6b26facb6427bb7d88ab7a
+# Source128-md5:	e968e46b97db2e0102ed305fb4201639
 Source129:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/eu.xpi
-# Source129-md5:	ca7f9ee6c382625f2c7247bc9ff8c550
+# Source129-md5:	ea206b635e924db3d5bfbd852d9d9104
 Source130:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fa.xpi
-# Source130-md5:	b2b6ef175022f5c98f208fef113bb869
+# Source130-md5:	9e2f916a0ad00d8648b9379b27ecf771
 Source131:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ff.xpi
-# Source131-md5:	480acf8957752da276ef0b4f143fa25e
+# Source131-md5:	23ef8f5c311e6ffc0dc33509150c0b90
 Source132:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fi.xpi
-# Source132-md5:	19671d452cc5413e40f64e52a325ca5a
+# Source132-md5:	55c4875e15444e93f017ecf668b750a0
 Source133:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fr.xpi
-# Source133-md5:	2758b9a2ed4af8dd78789a0aa14a2878
+# Source133-md5:	7490ac3b681c6897f62a177a7882d027
 Source134:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fy-NL.xpi
-# Source134-md5:	9066ec25fbdbc39112cc8b86636b097c
+# Source134-md5:	7f61ad71e85bf777f604e9ebf6073c68
 Source135:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ga-IE.xpi
-# Source135-md5:	da1d6ef3d1ac3bf8afc887c2aafc5c9c
+# Source135-md5:	401d2e87b44210ecfdecb7b2d5c90697
 Source136:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gd.xpi
-# Source136-md5:	91f0caa2af6fa1eb67ef83d63e0776c1
+# Source136-md5:	db9e88c503a3a98486dc1018f5f56741
 Source137:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gl.xpi
-# Source137-md5:	6f8d6bfd380c23c698c2e0566a891832
+# Source137-md5:	c1dc45b323cb026e854a986d2e419ff9
 Source138:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gn.xpi
-# Source138-md5:	f2576ad9d3169a6675bb715e9dbda458
+# Source138-md5:	85667768c4cc96a02e1d238f214e9003
 Source139:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gu-IN.xpi
-# Source139-md5:	6dfc5baf6f06ac279ca5bede285c088a
+# Source139-md5:	001b61dcaf1899748c1b55ef970f5f73
 Source140:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/he.xpi
-# Source140-md5:	8d6823325baaf3beea01c530f5e41f5d
+# Source140-md5:	949f551098539a90e09dc2e8ece16433
 Source141:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hi-IN.xpi
-# Source141-md5:	068f6ef5dfee755e2555aade62ee473b
+# Source141-md5:	e1c0e7e2ca20c269d00a3937d0b0fbcf
 Source142:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hr.xpi
-# Source142-md5:	af10589c907abe8115067fc825dad060
+# Source142-md5:	d76121c11116f070185a12e0791d6b2c
 Source143:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hsb.xpi
-# Source143-md5:	33053a391aaa08e4be522007c14fd888
+# Source143-md5:	706196c26b42cfb2d097bdf891ee92e7
 Source144:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hu.xpi
-# Source144-md5:	4432c805b280f3cd3c521a1da962e77e
+# Source144-md5:	774d66600ef26c11c0be02662324660c
 Source145:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hy-AM.xpi
-# Source145-md5:	a318447ed9055f72e71ac98d4f06d64c
+# Source145-md5:	c26019c799e8213f29e44459baf9ed01
 Source146:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/id.xpi
-# Source146-md5:	b6d970233ccad563bb2742315fdfcd13
+# Source146-md5:	2b26399d23cc9cc567e0923ecd45a75c
 Source147:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/is.xpi
-# Source147-md5:	3b0f054a87fd48ba69de08b58c21cf4e
+# Source147-md5:	7bd6c52ed2f6dced65df350cb49d7a5f
 Source148:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/it.xpi
-# Source148-md5:	70faf7cee7d19c1852d91622c8476a7c
+# Source148-md5:	a0b9df0ff028a5043a16a80350c0e12f
 Source149:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ja.xpi
-# Source149-md5:	c0c993e4dc78e3684beb8a5f05981ddb
+# Source149-md5:	4179e1987c1dee26f011358c04d9bfff
 Source150:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ka.xpi
-# Source150-md5:	888487f9cd1a980cd01c8990fe9237c0
+# Source150-md5:	53416e5286d1fd7236db163b7038cb44
 Source151:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kab.xpi
-# Source151-md5:	074b4cbf2fdfd92678c4af7864fe0683
+# Source151-md5:	ce6710154bb9190e9eef10b21b7bd8ea
 Source152:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kk.xpi
-# Source152-md5:	14255df3ebb38c3f4ced50e3dde74820
+# Source152-md5:	1eaf3e5b89c2f672ae784de1121595af
 Source153:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/km.xpi
-# Source153-md5:	322217905178dd0fb2179a838abba219
+# Source153-md5:	50fe3c7a0076a463b56222452a0cf9b8
 Source154:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kn.xpi
-# Source154-md5:	e3b38a2f2e61939cd0780e9232ab94bb
+# Source154-md5:	6b5835418945de4b4a4c95780baf7e3f
 Source155:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ko.xpi
-# Source155-md5:	ee40cc0033abd47b75906a67216998ee
+# Source155-md5:	8e0f367d638e15ddbdb4f37de5d68ec0
 Source156:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lij.xpi
-# Source156-md5:	a3507b94caffeadb7d6cdd6e6e6896ec
+# Source156-md5:	588ebfbfe45173f16a2aa229eb680f81
 Source157:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lt.xpi
-# Source157-md5:	240398b68d0e72d1619e4636f9019bf0
+# Source157-md5:	11f70c4175635e519e899265b9c1e371
 Source158:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lv.xpi
-# Source158-md5:	964e6b4d5a557ba5b6daaef6efcafc21
+# Source158-md5:	74905ae31f8ffc8dd2d3754b58a2c782
 Source159:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mai.xpi
-# Source159-md5:	e4c877302790e4c06928a073e4869ddd
+# Source159-md5:	1483b3d21440b9701390c140985a8bec
 Source160:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mk.xpi
-# Source160-md5:	4f8ff56663af9fb42bdc2bd3b16644ed
+# Source160-md5:	3d69971bda31c01301ac38d6c510586f
 Source161:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ml.xpi
-# Source161-md5:	632bd675cdcb0ece5f3fbcd0f073e49d
+# Source161-md5:	0450d255560de5299e1c84e885a3f0d7
 Source162:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mr.xpi
-# Source162-md5:	1c21ff193894bd366c7533b800e69961
+# Source162-md5:	ca4ecb4a844b7373e8381e7d9d9c290b
 Source163:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ms.xpi
-# Source163-md5:	4ec64c7a45573ac7169711e973556e14
+# Source163-md5:	e82f2135fae655539980a18e4df3b3f7
 Source164:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/my.xpi
-# Source164-md5:	4af0c0594776aab7b9ce755ec5277147
+# Source164-md5:	f295c2b32eb4a0bbca0919dac5c16670
 Source165:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nb-NO.xpi
-# Source165-md5:	d347f5866c75490aedc58b3e144e485d
+# Source165-md5:	c181d9fa7427d98f18cc0b149ec27c50
 Source166:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nl.xpi
-# Source166-md5:	53e0008e9a9f2c93646ca8f94010341f
+# Source166-md5:	de4aa7e0e253d73502581f94ba447e40
 Source167:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nn-NO.xpi
-# Source167-md5:	f6bcab4624df3497f65c2f8688a8942a
+# Source167-md5:	1d893e0c6f1e4b8661f07ca9aa5de505
 Source168:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/or.xpi
-# Source168-md5:	d0e997f7d7e410f001d323f630d23cf8
+# Source168-md5:	fbff7f380fcd3ebca01faa7187c995e4
 Source169:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pa-IN.xpi
-# Source169-md5:	558bf30b97a674bf0b352ebb129af137
+# Source169-md5:	68bd3c9579628ace9c514a89fe3605ae
 Source170:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pl.xpi
-# Source170-md5:	6a1789f84b8f026346b046339608cf29
+# Source170-md5:	27efea1de6ee38b8a65d2c6e261c4142
 Source171:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pt-BR.xpi
-# Source171-md5:	de1cb851f668eadbcfce108ff690df03
+# Source171-md5:	2f03a96c90a4adb03e326fb4b373b032
 Source172:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pt-PT.xpi
-# Source172-md5:	73826accd81628ca2c3a40f54a910612
+# Source172-md5:	cf7c0492d1b2a86a58ab74b30f989209
 Source173:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/rm.xpi
-# Source173-md5:	ce0b5c481fcdf5e03155ef3817f4a28b
+# Source173-md5:	f65660319bb11d542c6c0ccb95de5f91
 Source174:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ro.xpi
-# Source174-md5:	e8ea18a0a516aad6b88bd76dc322677e
+# Source174-md5:	b1e0c2dfd9dcb5615b0e589616eb9e3b
 Source175:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ru.xpi
-# Source175-md5:	e7a64a8b61dd8417a104d655593843dd
+# Source175-md5:	127e6c6b588bf7863e657d7e05cc8fde
 Source176:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/si.xpi
-# Source176-md5:	835372d4833a79673da85661002dcd13
+# Source176-md5:	200dc51748e4503843ece2f1b95471c4
 Source177:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sk.xpi
-# Source177-md5:	be8efd4665476676602d0189a5ad78f8
+# Source177-md5:	03b394cd0530c0278216bd2cbdb447cf
 Source178:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sl.xpi
-# Source178-md5:	e8a2c28cff6769ff5ea04550ad49049f
+# Source178-md5:	9c40eee9c2296d36576932bedc5c53c0
 Source179:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/son.xpi
-# Source179-md5:	17032e8b2352e7d173d289a6621ee8fb
+# Source179-md5:	b846c5db7dc77897a5f60067bdafcf6c
 Source180:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sq.xpi
-# Source180-md5:	4227a06d141fea2f6323ce34da002a08
+# Source180-md5:	9219e983f09720a10daa0fc95af03af4
 Source181:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sr.xpi
-# Source181-md5:	7139c961eca3299eb4eefc94bff57a21
+# Source181-md5:	6b01611a5bca390a5a1b711bcc3b82c0
 Source182:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sv-SE.xpi
-# Source182-md5:	aafd825695ce3b34a14a068f06d3932e
+# Source182-md5:	42b0193620cc46fd1f6021b0dbf03fad
 Source183:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ta.xpi
-# Source183-md5:	0944e91440152e49319e1a944d31f195
+# Source183-md5:	7ecd6bc09263aafff29b3e64ebb96594
 Source184:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/te.xpi
-# Source184-md5:	7cec3beb99da1f96251ea6fa35adac9e
+# Source184-md5:	593b6ad4af27a5db80087a9ca0a7639d
 Source185:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/th.xpi
-# Source185-md5:	f65d976f315315962eb81286da918b0e
+# Source185-md5:	c98355aa12f96272ef49fc1678e28da6
 Source186:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/tr.xpi
-# Source186-md5:	fc0c1e8fca0b75c98c2e5b04365e54ae
+# Source186-md5:	3e08e35145cca8e40f5e1a0db6e2935b
 Source187:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/uk.xpi
-# Source187-md5:	0b1af6f6100f16e3da3a3fd981cb24c3
+# Source187-md5:	df37007ea769aaccebb43e506fa6ad96
 Source188:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ur.xpi
-# Source188-md5:	52f1cd15f0beb6cf43a5787e8b7f5710
+# Source188-md5:	9737541388e4e51809c5d83ca8d25be1
 Source189:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/uz.xpi
-# Source189-md5:	1da40c84df9f95d4d8725a502bf25fb4
+# Source189-md5:	9e5758e0611b0a5104a2cb5be4e3279d
 Source190:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/vi.xpi
-# Source190-md5:	01c3e46c27829e8458583d46c9146e12
+# Source190-md5:	a7508481d84771543efd00740e5f69c6
 Source191:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/xh.xpi
-# Source191-md5:	cb432a69e58978c43c4445b155f02044
+# Source191-md5:	ce65045793df26a43746ab4ce6d92020
 Source192:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-CN.xpi
-# Source192-md5:	63a2bf981381824c8061bef270e1504e
+# Source192-md5:	7342baf29f6e932ddc330d4932573934
 Source193:	http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-TW.xpi
-# Source193-md5:	cea71455bd8b62bbf18b7d631388da97
+# Source193-md5:	f165bb2490aac1bbeec6bf567f5dd496
 Patch0:		idl-parser.patch
-Patch2:		xulrunner-paths.patch
+Patch1:		ffmpeg4.patch
 Patch4:		%{name}-prefs.patch
 Patch5:		%{name}-pld-bookmarks.patch
 Patch6:		%{name}-no-subshell.patch
 Patch7:		%{name}-middle_click_paste.patch
 Patch8:		%{name}-system-virtualenv.patch
 Patch9:		%{name}-Disable-Firefox-Health-Report.patch
+Patch10:	system-cairo.patch
 URL:		https://www.mozilla.org/firefox/
 BuildRequires:	OpenGL-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf2_13
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-BuildRequires:	cairo-devel >= 1.10.2-5
+%{?with_system_cairo:BuildRequires:	cairo-devel >= 1.10.2-5}
 BuildRequires:	cargo
 %{?with_clang:BuildRequires:	clang}
 BuildRequires:	clang-devel
@@ -259,8 +262,8 @@ BuildRequires:	freetype-devel >= 1:2.1.8
 BuildRequires:	glib2-devel >= 1:2.22
 BuildRequires:	gstreamer-devel >= 1.0
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0
-%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.18.0}
-%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.4.0}
+BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	gtk+3-devel >= 3.4.0
 %{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
 BuildRequires:	hunspell-devel >= 1.6.1
 BuildRequires:	libIDL-devel >= 0.8.0
@@ -294,7 +297,7 @@ BuildRequires:	python-virtualenv >= 15
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
-BuildRequires:	rust >= 1.19.0
+BuildRequires:	rust >= 1.22.1
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.20.1
 BuildRequires:	startup-notification-devel >= 0.8
@@ -316,16 +319,16 @@ BuildRequires:	zlib-devel >= 1.2.3
 BuildConflicts:	%{name}-devel < %{version}
 Requires(post):	mktemp >= 1.5-18
 Requires:	browser-plugins >= 2.0
-Requires:	cairo >= 1.10.2-5
+%{?with_system_cairo:Requires:	cairo >= 1.10.2-5}
 Requires:	dbus-glib >= 0.60
 Requires:	desktop-file-utils
 Requires:	fontconfig-libs >= 1:2.7.0
 Requires:	glib2 >= 1:2.22
-%{!?with_gtk3:Requires:	gtk+2 >= 2:2.18.0}
-%{?with_gtk3:Requires:	gtk+3 >= 3.4.0}
+Requires:	gtk+2 >= 2:2.18.0
+Requires:	gtk+3 >= 3.4.0
 Requires:	hicolor-icon-theme
 Requires:	libjpeg-turbo
-Requires:	libpng >= 2:1.6.31
+Requires:	libpng >= 2:1.6.34
 Requires:	libpng(APNG) >= 0.10
 Requires:	libvpx >= 1.5.0
 Requires:	myspell-common
@@ -1998,6 +2001,16 @@ Zulu resources for Firefox.
 %description lang-zu -l pl.UTF-8
 Zuluskie pliki językowe dla Firefoksa.
 
+%package geckodriver
+Summary:	WebDriver for Firefox
+Group:		Applications
+Requires:	firefox >= %{version}
+
+%description geckodriver
+WebDriver is an open source tool for automated testing of webapps
+across many browsers. It provides capabilities for navigating to web
+pages, user input, JavaScript execution, and more.
+
 %prep
 unpack() {
 	local args="$1" file="$2"
@@ -2012,13 +2025,14 @@ unpack() {
 echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
 %patch0 -p2
-%patch2 -p2
+%patch1 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p2
 %patch7 -p1
 %patch8 -p2
 %patch9 -p1
+%{?with_system_cairo:%patch10 -p1}
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 
@@ -2074,12 +2088,13 @@ ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-alsa
 ac_add_options --enable-chrome-format=omni
-ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
+ac_add_options --enable-default-toolkit=cairo-gtk3
 ac_add_options --enable-extensions=default
+%{?with_geckodriver:ac_add_options --enable-geckodriver}
 ac_add_options --enable-readline
 %{?with_shared_js:ac_add_options --enable-shared-js}
 ac_add_options --enable-startup-notification
-ac_add_options --enable-system-cairo
+%{?with_system_cairo:ac_add_options --enable-system-cairo}
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
@@ -2131,18 +2146,17 @@ OBJDIR=obj-%{_target_cpu}
 	PKG_SKIP_STRIP=1
 
 cp -aL ${OBJDIR}/dist/firefox/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
+%{?with_geckodriver:cp -aL ${OBJDIR}/dist/bin/geckodriver $RPM_BUILD_ROOT%{_bindir}/}
 
 # move arch independant ones to datadir
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/chrome
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/icons
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/{pref,preferences}
 
 ln -s ../../../share/%{name}/browser/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome
 ln -s ../../../share/%{name}/browser/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults
 ln -s ../../../share/%{name}/browser/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/extensions
-ln -s ../../../share/%{name}/browser/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons
 
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
@@ -2228,12 +2242,10 @@ fi
 %dir %{_datadir}/%{name}/browser/extensions
 %{_datadir}/%{name}/browser/chrome
 %{_datadir}/%{name}/browser/defaults
-%{_datadir}/%{name}/browser/icons
 
 # symlinks
 %{_libdir}/%{name}/browser/extensions
 %{_libdir}/%{name}/browser/chrome
-%{_libdir}/%{name}/browser/icons
 %{_libdir}/%{name}/browser/defaults
 
 %attr(755,root,root) %{_libdir}/%{name}/firefox
@@ -2254,7 +2266,6 @@ fi
 %{_libdir}/%{name}/browser/features/formautofill@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/onboarding@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/shield-recipe-client@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
 
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
@@ -2279,11 +2290,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/omni.ja
-%if %{with gtk3}
 %dir %{_libdir}/%{name}/gtk2
 %attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so
-%endif
 
 %files -n gmp-api
 %defattr(644,root,root,755)
@@ -2676,3 +2685,9 @@ fi
 #%files lang-zu
 #%defattr(644,root,root,755)
 #%{_datadir}/%{name}/browser/extensions/langpack-zu@firefox.mozilla.org.xpi
+
+%if %{with geckodriver}
+%files geckodriver
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/geckodriver
+%endif