Disable webrtc during compilation

4 files changed, 8 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4fbc0f4213a..a8cbce6bb168 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.0.0
-# Wed Jun 14 08:36:08 UTC 2017
+# Wed Jun 14 09:42:13 UTC 2017
 pkgbase = firefox-esr-privacy
 	pkgdesc = Standalone web browser from mozilla.org
 	pkgver = 52.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mozilla.org/firefox/
 	install = firefox.install
 	arch = i686
@@ -54,13 +54,13 @@ pkgbase = firefox-esr-privacy
 	sha256sums = 8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103
 	sha256sums = d6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96
 	sha256sums = a72c657784dc5804509456d9ba39ccc8d5e5998c847f49abbcfeb2a547290815
-	sha256sums = 79739259cd856fb28641849f438dde7dd138458c8a4ac190d828d5976d88984d
+	sha256sums = 80d6181d11c200aca2781f69ffeafb59ea23952304d161c2812a2f5a98b273b0
 	sha256sums = b661dcaa00323119e58a3b9d5b6e732291a107fbd29d242fb1ddcd36ea50106e
 	sha256sums = 52a94f48e562f98ba0b22b43b1684f6a813872b9c310d6f7567fe91aaab4944b
 	sha256sums = 7f171b7d69866ac6d8945ab0867b2646964362c791875c6428b4c2c8e3f3fb5b
 	sha256sums = 0bcfe168964338ec9c6e781479f2f8d06aa44f2262d6405ff8fa42983be89630
 	sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213
-	sha256sums = ebdef46b41262aad298d19b022396e937a7267bee4b93d0ec9dcd0c8072c4be7
+	sha256sums = 0ab9c4d33e88ab6fa8fdeab7e80e39876115413af1b344f67cf766614359069e
 
 pkgname = firefox-esr-privacy
 
diff --git a/PKGBUILD b/PKGBUILD
index 40e9d45ce0d6..90f8dcf59cce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=firefox-esr-privacy
 _basever=52
 pkgver=52.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -31,13 +31,13 @@ sha256sums=('a2f180e4109b15d86d58444134996c1d49eb52e7702d89510508fbd7bddb9381'
             '8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103'
             'd6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96'
             'a72c657784dc5804509456d9ba39ccc8d5e5998c847f49abbcfeb2a547290815'
-            '79739259cd856fb28641849f438dde7dd138458c8a4ac190d828d5976d88984d'
+            '80d6181d11c200aca2781f69ffeafb59ea23952304d161c2812a2f5a98b273b0'
             'b661dcaa00323119e58a3b9d5b6e732291a107fbd29d242fb1ddcd36ea50106e'
             '52a94f48e562f98ba0b22b43b1684f6a813872b9c310d6f7567fe91aaab4944b'
             '7f171b7d69866ac6d8945ab0867b2646964362c791875c6428b4c2c8e3f3fb5b'
             '0bcfe168964338ec9c6e781479f2f8d06aa44f2262d6405ff8fa42983be89630'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
-            'ebdef46b41262aad298d19b022396e937a7267bee4b93d0ec9dcd0c8072c4be7')
+            '0ab9c4d33e88ab6fa8fdeab7e80e39876115413af1b344f67cf766614359069e')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 prepare() {
diff --git a/firefox-52-prefs.patch b/firefox-52-prefs.patch
index 01d60cd8d5be..e9406e32f1bc 100644
--- a/firefox-52-prefs.patch
+++ b/firefox-52-prefs.patch
@@ -107,24 +107,6 @@
  
  // maximum number of dated backups to keep at any time
  pref("browser.bookmarks.max_backups",       5);
-@@ -441,7 +441,7 @@
- #ifdef MOZ_WIDGET_GONK
- pref("media.navigator.video.default_width", 320);
- pref("media.navigator.video.default_height", 240);
--pref("media.peerconnection.enabled", true);
-+pref("media.peerconnection.enabled", false);
- pref("media.peerconnection.video.enabled", true);
- pref("media.navigator.video.max_fs", 1200); // 640x480 == 1200mb
- pref("media.navigator.video.max_fr", 30);
-@@ -454,7 +454,7 @@
- #else
- pref("media.navigator.video.default_width",0);  // adaptive default
- pref("media.navigator.video.default_height",0); // adaptive default
--pref("media.peerconnection.enabled", true);
-+pref("media.peerconnection.enabled", false);
- pref("media.peerconnection.video.enabled", true);
- pref("media.navigator.video.max_fs", 12288); // Enough for 2048x1536
- pref("media.navigator.video.max_fr", 60);
 @@ -1523,7 +1523,7 @@
  
  // The maximum number of current global half open sockets allowable
diff --git a/mozconfig b/mozconfig
index 7e8934b733b1..4a0dfe0ea262 100644
--- a/mozconfig
+++ b/mozconfig
@@ -2,8 +2,7 @@
 ac_add_options --disable-necko-wifi
 
 # Disable webrtc, dangerous, leaks internal IP address (and external on Win)
-# This option no longer works on version >= 52.1.0
-#ac_add_options --disable-webrtc
+ac_add_options --disable-webrtc
 
 # Disable safe browsing, prevent sending visited URLs to other parties
 ac_add_options --disable-safe-browsing