From f41715ea0155e4b90ae1faf9ac3c350b4f12cde6 Mon Sep 17 00:00:00 2001
From: Chaoting Liu <brli@chakralinux.org>
Date: Tue, 28 Mar 2017 17:34:27 +0100
Subject: [PATCH] firefox: update to 52.0.2

---
 firefox-i18n/PKGBUILD | 184 +++++++++++++++++++++---------------------
 firefox-kde/PKGBUILD  |  36 ++++-----
 firefox-kde/mozconfig |  11 ++-
 3 files changed, 118 insertions(+), 113 deletions(-)

diff --git a/firefox-i18n/PKGBUILD b/firefox-i18n/PKGBUILD
index 98ff5e7..8fee69d 100644
--- a/firefox-i18n/PKGBUILD
+++ b/firefox-i18n/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=firefox-i18n
-pkgver=52.0.1
+pkgver=52.0.2
 pkgrel=1
 pkgdesc="Language pack for Firefox"
 arch=('any')
@@ -133,94 +133,94 @@ _package() {
     "$pkgdir/usr/lib/firefox/browser/extensions/langpack-$1@firefox.mozilla.org.xpi"
 }
 
-sha256sums=('a1f5861e1de14a7e7552301767ae44b3c399396f8e62c5a6bbb0af9e0c61e636'
-            'a1cd4223b5e1d1ef2d199006af9a907bf0eea2788c358261e6efbe0bc48d7dd7'
-            'f5faed97b2eb2222f5dc13aae14f8d236d19eacb7cc3d1d8b547b950559691c1'
-            '1b8f7656ed3d5c97823e1c9367f6fec1dfb24b31974cb94e1789e23c668cd4ff'
-            'e6681a4e86aed4c964ac4328c4f875ba2851dfdbdd4af5e59aad8d8b7880b201'
-            'edc61fb56470e8ae14b79a2a239a0f90a429ff3f003e5cfaec1f80fd8aa079c8'
-            'fa4e14f3fc822d3271e0656fbb41b4a6eaa851735a5390844be386941300cbff'
-            '166b4d1311d0ea7623ed98c6e520f92c9e9774c7d812b48331223d80478cd8d8'
-            '4d36c68ee7112e610b07f21a34869aa9aefa76638ba00cc69f6ba7b1a33ea132'
-            '372831a24fb11e01a8dbdb4d06d4455a996e1adae351a34fc68e752ec8e0c77f'
-            'a25ad0eb785b22fc88d42df0e082b4ab3547394ab6d0b1ed2e9147266a73f802'
-            'c19d3781c550c87e9cb87337eeaeea7a7e6e2a672855499c7712bfb6a9b78ea3'
-            'aedec8841b84f4d7a9d5f1cd666720ce30e23d7b7cd1cf4bba763850758fb8cc'
-            'c36e27f7ae2834a58875ccb9fd36022cde1a212cba0da0223998c45d56718a8a'
-            '4bdb68cd04f0c89e460cf111f22c94c41d0ceb59d8408d6bd0fe80a35807b7f6'
-            '0ab41b44123c968fab87637934600b1481718b191d0c651bcd427c54774571f5'
-            '3acf2fc74905069b602d5731dec37bec8b85ad5036a5fa3444de3e4ce878de89'
-            '11940b67c5b33415eb4e6f0d234b9f3038e10c5ad7da212e5dee6c774631b503'
-            '798f435018d6d67f6596207b200c21ae4cb0876268b5e665a25e2161d9e4c610'
-            '616531799d7c2409369c730c52b03c46e9fd05d935ba460ac31ac8a2b6df9320'
-            'ae650ca20172ae91e02e90ab5d7c69379e91360b53b855dce12156a3375e32fd'
-            '7256098551419080cdd680ef4a758216be8347af33e30be7c0bd8855798a1bfe'
-            '8c7aec2b2d733e8f1fa6ea19ecc3acec13ff21f0c5355ec2127ae851e1cd6386'
-            'baa2ee8c3a6970033f4441baf5674a7d0963fb396b73833873610cec32a1927b'
-            '027f738605fd7e7a82f4911ae4f1d2124e5ee5977acaf49046d4ddd26c1ad84b'
-            '48b82cd7c649f2cc5c663be4a14246f52dd3440fed27277986dcfc2803251a7d'
-            'c5d8dc33fad2b015df36efe8fcb48f772c872b6495b1da30d31a3a76831123fd'
-            'd02cad27606bf2b0044c320e1c948163a71b5b7038ab27fdca5ce950aec1da4b'
-            '3da86a7c60526ddd199506436af36f06e43680ff42a0dfde74fcef127bc78049'
-            '3848657e4599c4b80cc709e938936d30dd41059ec7d03a0dc717cf3e575da487'
-            '43ac7da9ccaab6fe52f7501b5c93301c88dce269401c336ba494e41e4321d2ea'
-            '1ac2820dbb05bcd2f87572bb8af8f10653280e8970cad3797a0f0737eff63fbc'
-            'd3fefe51a9271e4ce8c69971247b3a1405048fefb3d433bbb3a1798f11906a92'
-            '00dad8753fcf2c872fdc2df4276b8ae17ebd142afa1b52a745e29e68bd499e82'
-            'ffa53a5f08531eacdf0b55afbaf8e4d48793c7f7b55dbe836557cdd58261cd2c'
-            'f9319de53cafb9c333595769ee4344d09e50913ae76fa70c0f25315a80dfb692'
-            '6ce6e027cd46589b9ea0bf6a4f38f80b01872dd2de243c2a75e9645ec3953075'
-            'fcfa0e5e32026fea66085b988f3766e69185c19d62180273d56be1e5091b0cb9'
-            '1494b977dce94f384f37855df3e1e38aa9412aa26329c49d18e9edd046734fe2'
-            '84932c89ef5c6c88dc5f255625a25e7c3fcb072e80e8e89dbd3ef7a9d5e0b0f3'
-            '01bddde017b56233e606262622bae13e3e68d7ec41f2a6426f41285ce6c6ca53'
-            '24075073b6bd805bb695bf7ab2766483afe8bb0e21edca213e4bee6f0ede298c'
-            '420f99e46988318716285111811c983aea31ebe7962ef91c95eef4d6606dc977'
-            'c8ca35569a9542c32a2002d757a0f472a265ba7f0eb4eb6068a28d7f3664e870'
-            '1b6f2387ff226eabba6f53e48aef92b02f6eec8f4e0a552f4fb26b08baad0747'
-            '346802ec33f3a6926070482af52e327ebcb50226317068bc6efe84f96102d296'
-            'f8bda8031aca72d050ae9161b30ce619b6dd59e799b61d7859e3c8e560ec9a21'
-            '68860206302b330a20f87ae8aff8a0fc758f5220d719bc9c99cd7ca1cea9d4b1'
-            '64523c861269271e389c3bcc309dc59f980708317e3af0de7438336ef3ae0347'
-            'e4d000248b9145bc97263959f00f7c3f7af7053e95e319589e625220e8db072e'
-            '829a2678458f78a60a4afbf088010fe6b420ff16ecec62496357c0bfd44aa08f'
-            'b1baf7e6f15066f4a987efd40eba6e90dcbb1bd582ab199adc11ac62afa3259a'
-            'cc7f559d421f91f2a44711104ffdab2b71942164b3e9018c39677c381117bcda'
-            'e27d2587381604f2ba542aa52bb716f15b1d39c5b477df9abaffdf1d413fa794'
-            'c5d90691dd9b6c993e4afecdce94a86517592ecc3db349dea2d0cad7ffc421e2'
-            '9b0ad18fa4e6530a15d85ef8d2e51615c66fdad09ed0d08b16ea960321be964d'
-            'd5578e33f40d70ee576d3091ae702d0b1e28bbbb22ded2616ab69e53008ba81e'
-            '9ebb872ec1314e6d5344ea3ac4be9681fa8ba9dd3b716cebba3da70688fe5be9'
-            '29e434eb538a1823f9f3da44d6e08cb1ad9874041a823e51da1d7b598482df27'
-            '76670e8c9dcaeca29d4f57b50a0e7a79b544a586fd25db5472d36be36cc7ee31'
-            '31e5b38273c8822f85b9d58f2abc63087923eb71872732d28496ccffb5a80a49'
-            '61343b63e7259b347e777174b4c843682c57e6f3b9dbae9e2d8a402a76280970'
-            'e89273d8c38d668d8eaebcb79f6037cea0d43b404862d7d2328f4dd1cdd70b40'
-            '5cd2a90dc4983b0163967791d8724497a0246fd33916afa5abd2153fbb9fbdae'
-            'a5844ad08e406815a814b572b11825ab892ce9ad4f2281d6c25ae1056914006e'
-            'a8f8dc93d62e019c413559b4f87cc8a4921969e665605decac6fb84ff204708d'
-            'f66737d46beff38f2310db360391b312060e55edafb192daa9864dd6b86a97a7'
-            '06b7a1ce760efe761c06d3c4fb047996fcb263aa62cff48ec060e3bd6ae842df'
-            'a31bfe8bf64a3b9f16d1b44bbceecb211733e372430df0d49dc73d79bf89aae0'
-            '7b3ead94275faa18e28a469f7761a89f53dec9b375d8dcc26c542dbbaaeca582'
-            'd5820ebca083687591712a48ddfde8f995c7b45705439ec15e6134da68be022a'
-            '042104a5df3de1b23a3fa7e33619de5f41a3d7e5cd86cbebc7fb779ab1a603f9'
-            'cf1106b9050a5723d07dfb8c05b91b1b719412e297cba82fb7e1495ff553f18e'
-            '5a8886d8c10ed9917bf407889d2f02f01925e6f6d16093ff099b0edad6511404'
-            '0e75bd6aaac3f3067f3726d82bb61b632a44489f62629d20801a5ed8d4dda6d1'
-            'acf97c976d87cb3f3465c740bce46d7339d735ccbb7e3ed6fc7a7e362275c220'
-            'e3cc09411dcb7b699885f921437b16195f62ba86ecd86bfe76c81099a49d459e'
-            'f75ab62b79d15211cb121d3819dba0ba330dbbad79b7e851a2c8acbb026f3e61'
-            'e4403d1ee09badb8cad9f045729d37825be695a2e59e041dba46f173860b9e33'
-            'edb01cf2e47a57b3f479773c677fb25eb8c07556e3cf5ccc96de8f8be0074d10'
-            '707ef19ae2dffa2f93ca5bb9756cd59fdfa23643b8d89791519264f9ae295e18'
-            '0d275d561de981b4268b72b5fdc419f21ee0d8125685bfd49eefa1ddcfd0b10f'
-            'cc2dbc628df7b0a13db55968dee8cc5d306fd65b8d10b089bfbfd2a1369877f0'
-            'a42f34f13ffce959ef329f45ef96d923cfb0580aa49cb79d6d51c19419c316a1'
-            '5e4db9b92e2b8291311387382d3569237a565351a0407b02df75c05780a03bc3'
-            'fe70893809656434e30969f5da716e6c02de68b39879ca4ea2d34666cf668bea'
-            '90c9a1b0be6b454a3e77c052d8f31d4bf108eee8e1b8b60929da17eea0660eff'
-            '4ff3a28a0ff23a332f0ca236cf4bbd170e80c68af32c9f51726d3963a7471d4a'
-            'ab552abbe09d7307d062aaa62050d5425a8869362b2beb422ad47aa54d17afe5'
-            'f235097640e034328698250e69f00c32d47c68c4d9da858acb4a706ef4d41df8'
-            '9f3f6d5e6e494be6ab4e51af59112b8319e5bc7e6c33addc82d9103dd73b52ac')
+sha256sums=('d9067d33827b13bca10aac9130b94ad615ae9cae68f27d4a49d5970e590f0120'
+            '1371aa54ebb68f1a3865e2f53698c4f40feac80ac6004533855c45316b4a3c98'
+            'b09d5aeb3439edf8647774e2eeec0ebd056d33df582c4398050c4b902fe3d09a'
+            '076791531cbce9c785b1c909664dac917385004da0e71d6fa69293971d149199'
+            '166f6c34b937066e6608051b8afb05c6930b0b859de4ff4751f81c76bcb5e346'
+            '63a782a0560042fb80d3302ba94faae5396975818c86f1f36a718af7adf373df'
+            'c4b66fce8e1075406c6eedbddf47f7cd40c45472bb342b135c992e9a95389ae7'
+            '7c11e59d67a75d5a166c5fab65afb0548551858491a49ff4c440f9ddd5bb58d7'
+            'a2e10b22c43ed431e4d604b53e1db803931f75b08d562b7e166ce90e0cd8ff97'
+            'f7f52717331bc40bf6a83eb21a2e98d676a078465b85406e94f5077fb62904e4'
+            '068b1a776a7d61e0c3f6ef46e01b02a576605eb9a985ed03a4926b4ca07c8848'
+            'b004793248ae76885c43dae88ebbbf2fc7d1c192d1e9a6a377d81f98af0a914a'
+            'f7143e212958ac28f7d4626443d90bca06a03cb860203e12c04052084408d583'
+            '2b12def9aab5b3b52550257fd16c83d84307fa6cf61c743245c96b7b419d2396'
+            'ee609b76448388acf86cd6245b023cb551f5251b35794bb3f5d4f3a403ba3571'
+            '7ef68c7994052fef8c63c2466267710efd4e9920ea0b1eaa1fb4c84d9697f310'
+            'd997c4edc073f6187ad379aab795cf6b38c0dc3c99afb426350e3c8ea25ac448'
+            'f81a90979efd6f814dc691a4c6a5e72dfef9580aa2deaebe7d579505adf75fed'
+            'b58b13a8bbde8d911633aaeb2b7a168b9a600137d59693076226f4bff78505b9'
+            '70b60c3a9af2e7430da59e03e26086c060da83898240dbceabe633a8d4e2fcd7'
+            '4e7bff04b22e6a3b6518887d49d0332330da72111bfc5a889cc2f03bfdc61df7'
+            'e3e95a649ec0daa2d5582812a0fee6a65a037da89888c1de69b6e614e3d7132a'
+            'd95d92b6e9a9c2d9bed13feb7e91fa0bad73e1cb25957624f79f4a63ae9f68d5'
+            'd59f4489381b5e47f2db958d6337263dc6346d5e595c9dff0d39bef0548d89f3'
+            '55f1936b0c69dec8122641ca81725904623abc4be4ce9b2faedee622703155db'
+            '14f1617ac5dc702b176d90b17ab3915bdbf79f962f8935813197dc8615213437'
+            '6300ad5e9b0a777cad774eb4a84f579ddc6a5bcceac144441762374d57d84849'
+            'f9ba978768d95f6ec1ec4cfcb8f800da30b85ab62638bcceefab830dd2a32510'
+            '23d78c773b62b8995e7703f500c950625055d2243903d957e2a9e6e26a6b1482'
+            '7377d104f5a2d4f612921ef016683140a379b50896394b920e93995b5832c851'
+            '50230e7ed9084dde9a1e55557947d945be639798a655e1f549236132399eb034'
+            '1ee00ba8a9e272db6e6c4db93fe1aed3b724aa10aa3592b832fab727dde5e14f'
+            '6f19928dca2afb50f4d12f490850f1ad056eb4cadfc3ce150f9a44ab0bc00e75'
+            '7a7488923336d3f26c3ca982052fb0a5d583eb1b1d6351405e58e09dadc59223'
+            '4e3836809972acba43b9d467836093273b7d4edecbe12d13f205d9b19e80799c'
+            '3c4b675c0df0a08461b623c3e0524f506e6828de68623b9f99239f7848b9ed69'
+            '60e8358dec4d55e6eb30c99bc7c9c4da3db5d2b0be8613e7ce652afe13c26aaf'
+            '17ea41517f55ed8e4b2b849fa65ddc68ee6448b98d35e9bdaaac6c444913c5bc'
+            '1d25cf60b982ab3ac05b54fd5ed50582c5a59915c8850a8b0611bb3777d0e8c8'
+            'ee99934d445d50245c3e39e276febe4ed34f05b2948a71dd558f830a76cd3d03'
+            '003f0c2659be7b0c115fc52fb6bc18d850def64bb5f68a451c791386a0e56b16'
+            '896aeda4604b9063a37242c6c3208fac18d0c0fe6dff76412bd40f2b1a0d2050'
+            'f7aeb66685fa932e9e504401b50d016701a66b7b5f994ac025476f8c8ad3e67d'
+            'a96bdb086cb8afc9b089d27ed102667574ecb3936df107df5d332691d5941f74'
+            'd8aa03a8bffb6b5091e39b3a803d8080933d43b9637cc82f3960a7720a19c7b1'
+            'f41a6cebeb1bdf73033c6e5532c3b1aaafca3293afeb6db3f5c912658cfbd875'
+            '951babf7c91016936e1906e7812e39fd5f8f018ce12fd4842047a6700acd910a'
+            '9d1c3a2d444640cb920f363acb843ed6874dad0d6815435f95a07129cd624d4e'
+            '9ba09ee0a5a9cea864885718a08e1edeab52108e1e0c758d6128f625cf46ba8d'
+            '31674336db039481b43a636f85057246de660530e97cb99b3697ea5f7351d046'
+            'a598eb15288df0932110b8ebb82a9c7654cbd8b73462da32d09b8ed654c66580'
+            'c3aebdc4778da9b06dfdad8d8b4ebcac0f9161c61412bc90f8f0ede2eb8ab9e9'
+            '21d6ce5be73e348156588f84552b03c60f3f462281211f456c2439773e01c229'
+            '37e9b78390a2b147ed07b9b91d61eddb3bf20c511e35443111b83a870acc0b7f'
+            '0d040eab9233ed2a2d3008b18848cd36db51774f115fb8eb79111468bbf5b3be'
+            'c3aa236b74aed558678a0f421f8b287374b1c335f08da598455211661e40f5ae'
+            'cbe6ad2d8e143f4207b8ccfa0de1c42c7c466bf6498637ca8411b119e04450a5'
+            '401f6de5ee704e99b83c56324b05bf21e469c3d983bf47356ad2f318becce187'
+            'fb7aeb1e8bb582843b6fa5c2fa0248341ea0402a38a5ad263504fae4c87df305'
+            'b7547581f8e521c7fc210f460c80ca9dd89bc1afbc8ca45b211e220d32aa212a'
+            '8c084817f99caa52372c033e8f9f5a4673dac7fc8cba6d9d51da26ce4ab51c9d'
+            'f2ccd897eb5f4177276f46874b6c566e114d16bfc11672e0dda792be6981f2e0'
+            'fd5afc84ba39369e7a907fcb3a46120c69f15944b20d04f06273f5e6c0120aa1'
+            'd98218c62bd056546254668ee66d3670e26e7c76ef0dcfa5b9ae70e17c307ca0'
+            '96d4eaba3122689d88df16e10702da785ffc4208a7efeddcd2b55443827a0a87'
+            '00624e59d688bfa47259a99fa900f67002aaf69cd9e4c48b793b6b5838356317'
+            'a493501ad0be58bf3e56f4570183f0a875db3c9f13266075bbb760c6cf38a4d8'
+            'c0aed522e992f7d589afe35c89242556500292d659a4a4f806d801976c151351'
+            'd5563cc06d1933d2efce0ce8afab0c3b235d8b33a998bfcf240e5ac097da5377'
+            'ac65021071c51a1de3c3f3c2b1e8362af253a6d41156e3eb9968a070a4ad4620'
+            '3164471f95fa2b98c5b9db76ad34dea99e37148532e7ec95328c68ba7e32e030'
+            'bbefcaf93d7a695ce7f4a3483104020d1ddd72c2574e769ca2e23b47902a052e'
+            'd7a8ec5d3a160bd45a114a75411ca0ca6869b42b5aa1f5fbddc974153d4af882'
+            'da2dd4e6e2c27121d8bf05b614603f15cfeba2f07919600dd593f7f95be98863'
+            '8aa23c20a7e13a86a74f32b0f1627431f65d0a6834149a4668d723c54a5dafd5'
+            '486da727824852613d37d0cf95713cd4824c1e948f22dbef495b83cd64138b54'
+            'dedd5e7be137b5310682e79d224503b3a8cc6a80e8197d2bbf586acb92030dcc'
+            '146987469b356fd533ca249167e781170c1341910b8d5d503f34e59ecd702f76'
+            '57739feeb19808dac2266807a2bc7da6603e3491bbafc598ad642a96d1bf16d6'
+            '5854e971e9dfffb474332c3265106dcec247eb3b1e4eb887330f09e49b42f488'
+            'dabae83d5769bf85c3ff9d0f125c3b9a3cbb80fffb15504b5c75b45661477ded'
+            '160172adea7cfc829e7cb8db0efc519142e1e2ff821e30e4bf851171d4a03737'
+            '2494b9479959a6d10e71c876d4d5c98620f2d553bad9438d95a9912d7d665404'
+            'd11e94cda884cab23f85e9c4b5708afb9a9af817915fee03450d5e611c434d71'
+            'b9d9271f14403868e159d5746bc125144f8eb1b2bb205caf156339435f7d9a26'
+            'a309ed4f8256a7b8ffce3a18644c5dc70419c77ad4022f03a5578cf9023ebf43'
+            '855986dcdfc65bdd5bedb09343f80e5f512607911e52bd2778f9a1ff4967f95f'
+            '36278027e96b84ed66995795f479f4aadb0c3ba097d3f76ab3bbc6c9e17acdc2'
+            '8110ab6cf1c82a4a3f5e9680f8bec3fba3198a3bc49e27b93a9f45a7f89bdb85'
+            '416da27dfff1ef2db160b61471912c4004e9818915f4020a3b37683e2aacd674'
+            '742562f457e1dceef1d1cb5da3828dc0786c37b81f9ab77a8172f31a85e02509')
diff --git a/firefox-kde/PKGBUILD b/firefox-kde/PKGBUILD
index f3568ec..31b724a 100644
--- a/firefox-kde/PKGBUILD
+++ b/firefox-kde/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=firefox-kde
-pkgver=52.0.1
+pkgver=52.0.2
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('x86_64')
@@ -16,7 +16,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'upower: Battery API'
             'firefox-i18n: for multilanguage support')
-options=(!emptydirs !makeflags)
+options=(!emptydirs)
 screenshot="http://img864.imageshack.us/img864/5116/firefoxm.png"
 provides=("firefox=${pkgver}" "kmozillahelper")
 conflicts=('kmozillahelper')
@@ -35,7 +35,7 @@ install=firefox.install
 #
 # Usually, we also port non-openSUSE specific patch together.
 #
-_patchrev=34bd1eb1cbd7
+_patchrev=266ac4247974
 _kmozillahelper_commit=21af64b
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz"
@@ -71,9 +71,9 @@ source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgve
         #"$_patchurl/mozilla-language.patch" # making use of LANGUAGE= env var which isn't part of our standard
         #"$_patchurl/mozilla-prefer_plugin_pref.patch" removed from opensuse. reason: dropped mozilla-prefer_plugin_pref.patch as this feature is likely not worth maintaining further
 )
-sha1sums=('1d0871889fd57a51ffa38c3ec9e7a2125b38e6bf'
+sha1sums=('5631e49d8ae064764b64643534acfdd619061ba9'
           'SKIP'
-          'c2d4e8c39bc1b33339eb2778b59dac9c90e7ec03'
+          'c87a74fb86990ba0860a6f5bd68c80d2d13a7a21'
           '1a8ecc6d2cfd97791d8182882a74929f2a7289e9'
           '693b54b9206ad854e4d75cbbf393029b77e82153'
           '05b3a893e422ff579663c351f275f71010fa9dca'
@@ -120,15 +120,6 @@ prepare() {
   echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig
 
 
-  # make makepkg -R easier
-  msg "Patching for KDE"
-  rm -f content/media/gstreamer/nsGStreamerFormatHelper.{h,cpp}
-  rm -f browser/components/shell/{nsKDEShellService,nsUnixShellService}.{h,cpp}
-  rm -f browser/base/content/browser-kde.xul
-  rm -f toolkit/xre/nsKDEUtils.{h,cpp}
-  rm -f uriloader/exthandler/unix/{nsCommonRegistry,nsKDERegistry}.{h,cpp}
-  rm -f toolkit/content/widgets/{dialog,preferences}-kde.xml
-
   msg "Gecko/toolkit patchset"
   patch -Np1 -i "$srcdir/mozilla-nongnome-proxies.patch"
   patch -Np1 -i "$srcdir/mozilla-kde.patch" 
@@ -147,9 +138,6 @@ prepare() {
 
   # WebRTC build tries to execute "python" and expects Python 2
   ln -sf /usr/bin/python2 "$srcdir/path/python"
-
-  # fix GTK3
-  # sed -i 's|parent->group|gtk_window_get_group(const_cast<GtkWindow*>(parent))|g' toolkit/xre/nsKDEUtils.cpp 
 }
 
 build() {
@@ -204,6 +192,19 @@ package() {
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/vendor.js"
   install -Dm644 ../kde.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/kde.js"
 
+  _distini="$pkgdir/usr/lib/firefox/distribution/distribution.ini"
+  install -Dm644 /dev/stdin "$_distini" <<END
+[Global]
+id=chakralinux
+version=1.0
+about=Mozilla Firefox for Chakra GNU/Linux
+
+[Preferences]
+app.distributor=chakralinux
+app.distributor.channel=${pkgname%-kde}
+app.partner.chakralinux=chakralinux
+END
+
   for i in 16 22 24 32 48 256; do
     install -Dm644 browser/branding/official/default$i.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
@@ -220,7 +221,6 @@ package() {
   install -Dm644 ../firefox.desktop \
     "$pkgdir/usr/share/applications/firefox.desktop"
 
-  rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
   # Use system-provided dictionaries
   rm -r "$pkgdir"/usr/lib/firefox/dictionaries
   ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
diff --git a/firefox-kde/mozconfig b/firefox-kde/mozconfig
index 149f7c9..bcf1157 100644
--- a/firefox-kde/mozconfig
+++ b/firefox-kde/mozconfig
@@ -14,17 +14,23 @@ ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
 ac_add_options --enable-rust
+ac_add_options --enable-skia
 
 # Release branding
+ac_add_options --enable-application=browser
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
+ac_add_options --with-distribution-id=org.chakralinux
 ac_add_options --enable-default-toolkit=cairo-gtk3
-MOZ_ADDON_SIGNING=1
-MOZ_REQUIRE_SIGNING=1
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+export MOZ_ADDON_SIGNING=1
+export MOZ_REQUIRE_SIGNING=1
 
 # System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
+# our icu is too old
 #ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
@@ -41,7 +47,6 @@ ac_add_options --disable-libproxy
 
 # Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-alsa
 ac_add_options --disable-gconf
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter