Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

2 files changed, 47 insertions, 10 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 6f7eea4e4..1153282e1 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -58,7 +58,7 @@ md5sums=('cfc55fb35f740f90736381c6060534de'
          'bf737a17c17b2ac01742b84921bbc5d0'
          '2f5cb3df42b09fbfeaee5e72e5433ab9'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '02c2e18fe7d2f2a496fbcd64477fd8ec'
+         '49dc620c3e6190417138a2709c596ab1'
          'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index ff2d53499..6b677a604 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,6 +1,6 @@
 diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
 --- mozilla-release.orig/browser/app/profile/firefox.js	2014-09-06 03:49:57.595535603 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2014-09-06 03:51:28.789627375 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2014-09-06 19:02:37.099979919 -0300
 @@ -282,11 +282,6 @@
  pref("browser.slowStartup.timeThreshold", 45000);
  pref("browser.slowStartup.maxSamples", 5);
@@ -13,7 +13,16 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  pref("browser.enable_automatic_image_resizing", true);
  pref("browser.chrome.site_icons", true);
  pref("browser.chrome.favicons", true);
-@@ -1540,12 +1535,7 @@
+@@ -1001,8 +996,6 @@
+ #endif
+ #endif
+ 
+-pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
+-
+ pref("browser.EULA.version", 3);
+ pref("browser.rights.version", 3);
+ pref("browser.rights.3.shown", false);
+@@ -1540,12 +1533,7 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
@@ -27,7 +36,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  
  // Turn on the CSP 1.0 parser for Content Security Policy headers
  pref("security.csp.speccompliant", true);
-@@ -1563,14 +1553,6 @@
+@@ -1563,14 +1551,6 @@
  // before content.
  pref("dom.debug.propagate_gesture_events_through_content", false);
  
@@ -802,9 +811,17 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
      </DL><p>
  </DL><p>
 diff -Nur mozilla-release.orig/browser/metro/profile/metro.js mozilla-release/browser/metro/profile/metro.js
---- mozilla-release.orig/browser/metro/profile/metro.js	2014-07-16 22:45:07.000000000 -0300
-+++ mozilla-release/browser/metro/profile/metro.js	2014-09-06 03:38:28.416464687 -0300
-@@ -402,10 +402,6 @@
+--- mozilla-release.orig/browser/metro/profile/metro.js	2014-08-26 00:37:46.000000000 -0300
++++ mozilla-release/browser/metro/profile/metro.js	2014-09-06 19:04:07.470577250 -0300
+@@ -386,7 +386,6 @@
+ pref("privacy.item.downloads", true);
+ pref("privacy.item.passwords", true);
+ pref("privacy.item.sessions", true);
+-pref("privacy.item.geolocation", true);
+ pref("privacy.item.siteSettings", true);
+ pref("privacy.item.syncAccount", true);
+ 
+@@ -402,10 +401,6 @@
  pref("privacy.sanitize.sanitizeOnShutdown", false);
  pref("privacy.sanitize.migrateFx3Prefs",    false);
  
@@ -815,6 +832,16 @@ diff -Nur mozilla-release.orig/browser/metro/profile/metro.js mozilla-release/br
  // snapped view
  pref("browser.ui.snapped.maxWidth", 600);
  
+@@ -614,9 +609,6 @@
+ pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}");
+ pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
+ 
+-// FAQ URLs
+-pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
+-
+ // Name of the about: page contributed by safebrowsing to handle display of error
+ // pages on phishing/malware hits.  (bug 399233)
+ pref("urlclassifier.alternate_error_page", "blocked");
 diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm
 --- mozilla-release.orig/browser/modules/AboutHome.jsm	2014-08-26 00:37:46.000000000 -0300
 +++ mozilla-release/browser/modules/AboutHome.jsm	2014-09-05 17:07:48.222390205 -0300
@@ -914,9 +941,19 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
          target.messageManager.sendAsyncMessage("AboutHome:Update", data);
        } else {
 diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
---- mozilla-release.orig/modules/libpref/src/init/all.js	2014-09-05 17:00:02.748853744 -0300
-+++ mozilla-release/modules/libpref/src/init/all.js	2014-09-05 17:02:57.840106668 -0300
-@@ -4024,19 +4024,6 @@
+--- mozilla-release.orig/modules/libpref/src/init/all.js	2014-09-06 03:49:57.585535519 -0300
++++ mozilla-release/modules/libpref/src/init/all.js	2014-09-06 19:00:54.215970597 -0300
+@@ -3863,9 +3863,6 @@
+ // Force all possible layers to be always active layers
+ pref("layers.force-active", false);
+ 
+-// Enable/Disable the geolocation API for content
+-pref("geo.enabled", true);
+-
+ // Enable/Disable the orientation API for content
+ pref("device.sensors.enabled", true);
+ 
+@@ -4024,19 +4021,6 @@
  // Number of stack frames to capture in createObjectURL for about:memory.
  pref("memory.blob_report.stack_frames", 0);