Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fish/PKGBUILD
	community/python2-cchardet/PKGBUILD
	extra/cpio/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD

4 files changed, 30 insertions, 20 deletions

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index c1fb0c776..9ff811c5a 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=4
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,7 +26,6 @@ install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
-        replace-urls.txt
         vendor.js
         makefile.patch
         branding.patch
@@ -36,8 +35,7 @@ options=(!emptydirs)
 md5sums=('0c68298c17757257da79b6bb39e3fd10'
          'eb2a5e1877d87a16e10388f533c081a6'
          '5cf95ea94f69cdd36604890cfbf7b954'
-         '3bf8aefb861095caa45649c118163454'
-         '4eecc4fc5aafaf0da651a09eadc90bee'
+         'da090618f0d207d4f603a07b7b36dbe9'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
          'e785e0c267f4435ae1a9aa0b03bcacfb'
@@ -72,17 +70,6 @@ prepare() {
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
-  # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$free_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g"
-    fi
-  done
-
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
index 32c94b018..67ffcf119 100644
--- a/libre/icedove-libre/replace-urls.txt
+++ b/libre/icedove-libre/replace-urls.txt
@@ -13,7 +13,12 @@ https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[
 
 https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://trisquel.info/browser-plain
+https?://services.addons.mozilla.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://trisquel.info/browser-plain
+https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION% https://trisquel.info/browser-plain
+https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIR
+ST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED% https://trisquel.info/browser-plain
+https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox https://trisquel.info/browser-plain
+https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE% https://trisquel.info/browser-plain
 
 https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
index 279bdc158..5284fab54 100644
--- a/libre/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js
@@ -10,3 +10,18 @@ pref("mail.shell.checkDefaultMail", false);
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
+// Preferences for the Get Add-ons panel
+pref ("extensions.update.notifyUser", false);
+pref ("extensions.getAddons.showPane", false);
+pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain");
+pref ("extensions.getAddons.maxResults", 5);
+pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain");
+pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain");
+pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain");
+pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain");
+pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain");
+pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain");
+pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain");
+
+// Dictionary download preference
+pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain");
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 774d80f92..f84c8e745 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -142,20 +142,23 @@ build() {
   if $_pgo; then
     export DISPLAY=:99
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+ 
+    if ! make -f client.mk build MOZ_PGO=1; then
+      kill $!
+      return 1
+    fi
 
-    make -f client.mk build MOZ_PGO=1
+    kill $! || true
   else
     make -f client.mk build
   fi
-
-  kill $! || true
 }
 
 package() {
   cd "$srcdir/$DEBIAN_BUILD"
   make -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
 
   # I don't even know why we're hitting the objdir, and ConnOS didn't
   _brandingdir=debian/branding