icedove-libre: fix build issues

3 files changed, 54 insertions, 15 deletions

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 9ff811c5a..65ea89724 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -30,6 +30,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         makefile.patch
         branding.patch
         ${_pkgname}.desktop
+        libre.patch
         Icedove-branding.patch)
 options=(!emptydirs)
 md5sums=('0c68298c17757257da79b6bb39e3fd10'
@@ -39,6 +40,7 @@ md5sums=('0c68298c17757257da79b6bb39e3fd10'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
          'e785e0c267f4435ae1a9aa0b03bcacfb'
+         '2e36075067ddec9304b00ffe077705c2'
          'ea5f7a06967f561d47d7e5c35b23de6f')
 
 prepare() {
@@ -70,6 +72,9 @@ prepare() {
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
+  # Patch anything that's left
+  patch -Np1 -i "$srcdir/libre.patch"
+
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch
new file mode 100644
index 000000000..a6f23bdcd
--- /dev/null
+++ b/libre/icedove-libre/libre.patch
@@ -0,0 +1,49 @@
+diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js
+--- comm-esr17.orig/mail/app/profile/all-thunderbird.js	2013-05-18 18:46:27.290732014 -0300
++++ comm-esr17/mail/app/profile/all-thunderbird.js	2013-05-18 18:10:57.239376924 -0300
+@@ -160,11 +160,11 @@
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
++pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
+ 
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+@@ -189,7 +189,7 @@
+ pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
+                                             // Themes every day
+ 
+-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
++pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain");
+ pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
+ pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
+ 
+@@ -390,7 +390,7 @@
+ 
+ pref("spellchecker.dictionary", "");
+ // Dictionary download preference
+-pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
++pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain");
+ 
+ // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
+ // mail application without any user intervention. Possible values are: 
+@@ -747,9 +747,7 @@
+ #endif
+ 
+ // plugin finder service url
+-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.
+-php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=
+-%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
++pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+ 
+ // By default we show an infobar message when pages require plugins the user has
+ // not installed, or are outdated.
diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
index 5284fab54..279bdc158 100644
--- a/libre/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js
@@ -10,18 +10,3 @@ 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");