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

4 files changed, 35 insertions, 10 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index b450b632f..6f7eea4e4 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -58,7 +58,7 @@ md5sums=('cfc55fb35f740f90736381c6060534de'
          'bf737a17c17b2ac01742b84921bbc5d0'
          '2f5cb3df42b09fbfeaee5e72e5433ab9'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '27f6c4f656600d559629013427f7fa7d'
+         '02c2e18fe7d2f2a496fbcd64477fd8ec'
          'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
@@ -101,10 +101,6 @@ prepare() {
           \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player|
           \|installLinux| s|true|false|
          ' browser/base/content/browser-plugins.js
-  sed -i '\|URL of the GeoLocation backend|d;
-          \|geo[.]wifi[.]uri|d;
-         ' browser/app/profile/firefox.js \
-           browser/metro/profile/metro.js
   rm -v browser/base/content/abouthome/snippet*.png || true
   sed -i '\|abouthome/snippet|d
          ' browser/base/jar.mn
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 7884ec5ba..ff2d53499 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-05 17:00:02.762187158 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2014-09-05 17:02:57.786772902 -0300
+--- 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
 @@ -282,11 +282,6 @@
  pref("browser.slowStartup.timeThreshold", 45000);
  pref("browser.slowStartup.maxSamples", 5);
@@ -27,6 +27,21 @@ 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 @@
+ // before content.
+ pref("dom.debug.propagate_gesture_events_through_content", false);
+ 
+-// The request URL of the GeoLocation backend.
+-pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%");
+-#ifdef RELEASE_BUILD
+-pref("geo.wifi.logging.enabled", false);
+-#else
+-pref("geo.wifi.logging.enabled", true);
+-#endif
+-
+ // Necko IPC security checks only needed for app isolation for cookies/cache/etc:
+ // currently irrelevant for desktop e10s
+ pref("network.disable.ipc.security", true);
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
 --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2014-07-16 22:45:05.000000000 -0300
 +++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2014-07-23 13:21:52.223313722 -0300
@@ -786,6 +801,20 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </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 @@
+ pref("privacy.sanitize.sanitizeOnShutdown", false);
+ pref("privacy.sanitize.migrateFx3Prefs",    false);
+ 
+-// enable geo
+-pref("geo.enabled", true);
+-pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%");
+-
+ // snapped view
+ pref("browser.ui.snapped.maxWidth", 600);
+ 
 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
diff --git a/libre/java-common/test_parabola-java b/libre/java-common/test_parabola-java
index 1051186d6..1051186d6 100644..100755
--- a/libre/java-common/test_parabola-java
+++ b/libre/java-common/test_parabola-java
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index e27b7f848..bfe3f2c9a 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu
 license=('GPL3')
 #url="https://projects.parabolagnulinux.org/blacklist.git"
 url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
-pkgver=20140904
-_gitver=8b7c626777a548aeebb8f07ea6b319afc4047900
+pkgver=20140906
+_gitver=bc8173ffcfdb17226b8c955cfaf25da3ec0f4c6d
 pkgrel=1
 
 arch=('any')
@@ -16,7 +16,7 @@ install=${pkgname}.install
 makedepends=(librelib)
 #source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt?id=${_gitver})
 source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('cf0a074934a604c77c9895f520671a46')
+md5sums=('e81eff9ec4b1f0af95f9ac59386eec60')
 
 package() {
 	cd "$srcdir"