From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-975589-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 431B91396D0
	for <garchives@archives.gentoo.org>; Fri, 29 Sep 2017 18:42:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E93C9E0823;
	Fri, 29 Sep 2017 18:42:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 905A6E0823
	for <gentoo-commits@lists.gentoo.org>; Fri, 29 Sep 2017 18:42:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 45E6C3416D1
	for <gentoo-commits@lists.gentoo.org>; Fri, 29 Sep 2017 18:41:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D49568F9D
	for <gentoo-commits@lists.gentoo.org>; Fri, 29 Sep 2017 18:41:56 +0000 (UTC)
From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" <axs@gentoo.org>
Message-ID: <1506710496.9ba04b4a8d31804d052e173200d9ca49f3aad4a9.axs@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-52.4.0.ebuild www-client/firefox/firefox-56.0.ebuild
X-VCS-Directories: www-client/firefox/
X-VCS-Committer: axs
X-VCS-Committer-Name: Ian Stakenvicius
X-VCS-Revision: 9ba04b4a8d31804d052e173200d9ca49f3aad4a9
X-VCS-Branch: master
Date: Fri, 29 Sep 2017 18:41:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9cda4dba-edcd-48c3-b737-48e7bf46574c
X-Archives-Hash: 053214b603a5bc4f7e51c9807057ea18

commit:     9ba04b4a8d31804d052e173200d9ca49f3aad4a9
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 18:41:36 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 18:41:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=9ba04b4a

firefox: add patch to avoid nICEr implicit declarations

 www-client/firefox/Manifest              | 2 +-
 www-client/firefox/firefox-52.4.0.ebuild | 2 +-
 www-client/firefox/firefox-56.0.ebuild   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 67c0019..b644d30 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -159,7 +159,7 @@ DIST firefox-56.0-nl.xpi 469052 SHA256 0f3d94f7f7b93d516656160d6bfa589bd77813e4f
 DIST firefox-56.0-nn-NO.xpi 466206 SHA256 4778700a808a7155b967e585578e41fab71e671c9dc3c0f5331c40bfe5e323f9 SHA512 0d77e8cca402edaf2343acf207f6b34f2943a9510f5414ed74c51e20aaeaaa503df9018ccb18d1aa086b2173ff96144d0852afef173d4405d5f89c0eab6015f7 WHIRLPOOL 37643227f38cc474b777ae0706405fa73a2f24622f200ec68809a71789cef2012b03a8b10eaddb1d4a956f31291455b7e9c8f0ece75b5142a4c992aa7dca2501
 DIST firefox-56.0-or.xpi 518164 SHA256 39ee3d9f5b8c0e0ba24fe2a9e14ce6c8470a28f362c5d7e4bcf3835e7728f234 SHA512 d25ac3e1bbc71094e842e121e2e3d77bf7a94c9641724d0dfd0be08e30b09c8b5ce1e5c5d78f3a690bc5661bacf039d2c70021c63c67d36c61e08220e66ca6ba WHIRLPOOL 243ee10d80bde9f9d82438c6809851a4ae2c596000715d91e5d7c6a52d863c7580a01d6c91236f2b63ea13e280799e2aa115ad22aa44ff4103e2d34fa8df2f0f
 DIST firefox-56.0-pa-IN.xpi 509045 SHA256 1c89fc9e307bfe597d91648bdcae9bf528e43b260770bef23315c9e9c359287c SHA512 e3152ef09c70dcb862396a3e7247612964e8af1526c547de46ac51e681bad987c803c79625318e50f36ad73311aad4081d3c7919c5e50a7e32e5563f8113c170 WHIRLPOOL fe3005e9a89bf39ec2b732a00343d4aa4593ff265d29a16e81764aa36c4721f4aae207f8784175e1cdcf568a77a949196e1718293836206ef1e2a6a2a8a0829a
-DIST firefox-56.0-patches-05.tar.xz 11616 SHA256 e2566d3a6139a312858a22fde51aa5ddfaee6dceb5a97eb28ad028048fcd5508 SHA512 7dd5a51cee17c2d3253dc1fc22d20bb45c15b31d7bd1e2b7e7b49c5759c5cbf9c9682111451fa2a42a39514e37ef78afc94c5389f69150707b3d26e7bdcc3f9a WHIRLPOOL 013884892771033ad5b9435a7e919f9fd3fb81db226423e09b0ec3dd694f3ce6026c7fe4f8d3d3d3e9d7ef9d406e0bc54365c801170c1f0fd60e8e58cd4d918e
+DIST firefox-56.0-patches-06.tar.xz 12096 SHA256 a4ca5059cc329315fce49bc353a985c6fafed518fd27377fa5a24d119fcf7b3d SHA512 3086b94c2db1e8ce929ffaea2223464b4195ab0ea02a37240544f312c3d8bdf08c8fb30f5d671fab798c6b002cf27d96682717fa4baefdff2c46864815536f3a WHIRLPOOL 4b9327aff0eb5bc1665f1b01cc7c2a4605f4d67a88dd9364381dc47faff7e6853122193424e14c9fcd5360dbad6fb04d1b6d13024552becde94f7bda16f76e0b
 DIST firefox-56.0-pl.xpi 377523 SHA256 8e38c9f5ec52a6138c882455db5ddbe4efa7f846fbbcddfa53055953abef989d SHA512 92cb88806bf2d133901d5eac234bae912262b23714347b786c23cff4c450ac4ef8c54d7eb7d6cf4d2764d6b19c2b4cac8d7a7e6dc67e78c6ee00db547fc32273 WHIRLPOOL fb8e14403bef5600ab5f308c3379af8a0e122c55ddc7bbc18e09389ecd91264ca7d1b12160aff417df0158e44356e1da5aed6f120ac3c88a0818dd172a73005e
 DIST firefox-56.0-pt-BR.xpi 470952 SHA256 407dc8e947de858814c551426cf67af0757b0348caa97703bd25ed136cd06f4c SHA512 f9d5e8d96270c51357504bc453348c437a563fa292293c4a32e999fbd82feb6ac8b9ae1936bd32a66b0e15550355d4a6955a52df32baec06eb638a531865287a WHIRLPOOL a5c012af6af93318aca1f3b3575da8d4b07b35247b005770cb06637e7d296dbe73fe4b0bda3d06231da137690070ebf3d12d854564baf5cf3a35fe32a0c2bcad
 DIST firefox-56.0-pt-PT.xpi 472802 SHA256 afd9bb70a2f3567c3ee16e3f2291c1757f2645891210ba027188710ef1bcde30 SHA512 1caaddbd9737e1fc8f7d4f825cc50df9fffd66feb9c04fe2e4a3e9c8b590a3cdebd45cd44155e07ce8dc7fcfe3aefd6fda9bffcb30105b11ff45679b80526fdb WHIRLPOOL ea5509bc64baf4102ef96e255850ae85d856c401cb7dabd858d9ec7ebc067bbde3174336f8f6f537abe621336935ae0c1f26d3c446c808eb1eebe94afa1f6bf9

diff --git a/www-client/firefox/firefox-52.4.0.ebuild b/www-client/firefox/firefox-52.4.0.ebuild
index 4c967d6..fa7c110 100644
--- a/www-client/firefox/firefox-52.4.0.ebuild
+++ b/www-client/firefox/firefox-52.4.0.ebuild
@@ -124,8 +124,8 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
-	rm -f "${WORKDIR}"/firefox/2004_fix_skia_freetype-2_8.patch
 	eapply "${WORKDIR}/firefox"
+	eapply "${FILESDIR}"/nICEr*patch
 
 	# Enable gnomebreakpad
 	if use debug ; then

diff --git a/www-client/firefox/firefox-56.0.ebuild b/www-client/firefox/firefox-56.0.ebuild
index b970878..956b07a 100644
--- a/www-client/firefox/firefox-56.0.ebuild
+++ b/www-client/firefox/firefox-56.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-56.0-patches-05"
+PATCH="${PN}-56.0-patches-06"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
 MOZCONFIG_OPTIONAL_WIFI=1
@@ -119,7 +119,6 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
-	rm -f "${WORKDIR}"/firefox/2005_fix_skia_freetype-2_8.patch
 	eapply "${WORKDIR}/firefox"
 
 	# Enable gnomebreakpad