summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-31 14:11:57 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-31 14:11:57 -0200
commitc7555a26857f08cecb2fb7c2a695c7aaf964dbbb (patch)
tree86390069abe064c22d3378c62e0ca79b29cfde17
parentb4be00b7e935128449201c131f1aaa728cfecca1 (diff)
remove iceape-libre and iceape-l10n because the sources aren't maintained anymore
-rw-r--r--libre/iceape-l10n/PKGBUILD101
-rw-r--r--libre/iceape-l10n/region.properties32
-rw-r--r--libre/iceape-libre/PKGBUILD147
-rw-r--r--libre/iceape-libre/clrf.patch260
-rw-r--r--libre/iceape-libre/gcc47.patch63
-rw-r--r--libre/iceape-libre/iceape-2.0-lang.patch11
-rw-r--r--libre/iceape-libre/iceape.desktop11
-rw-r--r--libre/iceape-libre/iceape.install12
-rw-r--r--libre/iceape-libre/libre.patch285
-rw-r--r--libre/iceape-libre/mozconfig38
10 files changed, 0 insertions, 960 deletions
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
deleted file mode 100644
index 00341af26..000000000
--- a/libre/iceape-l10n/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceape
-_debver=2.7.12
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
-
-pkgbase=iceape-l10n
-pkgname=($(for lang in ${_langpacks[@]}
- do echo $pkgbase-$lang | tr A-Z a-z
- done))
-epoch=1
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceape."
-arch=('any')
-url="http://packages.debian.org/sid/iceape"
-license=('MPL' 'GPL')
-depends=("iceape-libre>=$epoch:$pkgver")
-makedepends=('unzip' 'zip')
-source=('region.properties')
-for lang in ${_langpacks[@]}
-do
- source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
-done
-
-_path="/usr/lib/iceape/extensions"
-
-build() {
- cd "${srcdir}"
- for f in *.deb
- do
- bsdtar xf $f
- bsdtar xf data.tar.gz
- done
-
- cd $srcdir/$_path
-
- for i in ${_langpacks[@]}
- do
- cd $srcdir/$_path
- unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i
- rm langpack-$i@iceape.mozilla.org.xpi
- install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
- cd $i
- zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi .
- done
-
- cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
- eval "
-package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
- replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z))
- conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z))
- provides=(iceape-i18n-$(echo $lang | tr A-Z a-z))
- install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('7558c5a34cc5f661d4e96885300d0c41'
- '22a14a6a2f03d0004a1fa990892094ef'
- 'af2379ea50672fe37ff8550d5c9e20a0'
- 'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
- '21fcbd011acc382f5ec7a32aa04562ef'
- '8fbf821c811c55514a100ae5d5e9e844'
- 'bd8f18e0d0f233e0a1c1a518537798a5'
- '037cbb6fe0576f7f5bbbf956928f01e1'
- '56964b577fcb077a9b81d07c59cc5af3'
- 'd2fb622717114a921efb37f028f31c6c'
- '6abe2dbab7fcbdaf43e77290ca6853c9'
- '558a2d29be749f6506f774703c58952f'
- '7abdc6eb4154b88509a6c4f119c943a7'
- '5a4fad9c23c8d19833ac5c76ad9aca4a'
- '8d45110acc90f388923f01fb9cfca947'
- 'd1acbe2ef1120e70d5365476aa8679f9'
- '604de00ea6ee06565212804b0d499df3'
- 'ceee78a29bd2f947558f04489ee50f54'
- 'afc6e343f0635a3ee5b7a22af947e8b8'
- '455bab7a596cb43ac4ad80cb89a78b25'
- '92a985b40aec8b3726ba22f45667994d'
- 'bc8c98f0518617ed2220fb3bfb03e165'
- '449c91720751538f09ad3d555dbe2fce'
- '8843be8937963d094d4272ac33019082')
diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties
deleted file mode 100644
index 551605dd7..000000000
--- a/libre/iceape-l10n/region.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=DuckDuckGo HTML
-browser.search.order.2=DuckDuckGo Lite
-browser.search.order.3=Seeks Search
-
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
-# increment this number when anything gets changed in the list below. This will
-# cause Firefox to re-read these prefs and inject any new handlers into the
-# profile database. Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so
-# don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=3
-
-# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
-
-# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
deleted file mode 100644
index 601de26b9..000000000
--- a/libre/iceape-libre/PKGBUILD
+++ /dev/null
@@ -1,147 +0,0 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@parabola.nu>
-
-# We're getting this from Debian Sid
-_debname=iceape
-_debver=2.7.12
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=${_debname}
-pkgname=${_debname}-libre
-epoch=1
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-replaces=('seamonkey')
-conflicts=('seamonkey')
-provides=('seamonkey')
-install=$_pkgname.install
-url="http://packages.debian.org/sid/${_pkgname}"
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
- mozconfig
- ${_pkgname}.desktop
- ${_pkgname}-2.0-lang.patch
- clrf.patch
- libre.patch)
-md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
- '1fb9c4affad5f030c4e3544aadeaeea2'
- '70575e76b339fa7e17274a8ed84429fc'
- '7266333e31731af8bb50c2eca8d0bd26'
- '25b6fe16ac24cd5c852213e5c1adb272'
- 'c395d443a8c4c16880c7322bcf174743'
- '14e2f08fb1b98ff287e74de54baf44fe')
-
-prepare() {
- export DEBIAN_BUILD="comm-release"
- export DEBIAN_BRANDING_DIR="debian/branding"
-
- export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-
- export QUILT_PATCHES=debian/patches
- export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
- export QUILT_DIFF_ARGS='--no-timestamps'
-
- mv comm-esr10 "${DEBIAN_BUILD}"
- mv debian "${srcdir}/${DEBIAN_BUILD}"
- cd "${srcdir}/${DEBIAN_BUILD}"
- quilt push -av
-
- patch -Np1 -i "$srcdir/$_pkgname-2.0-lang.patch"
- patch -Np1 -i "$srcdir/clrf.patch"
- patch -Np1 -i "$srcdir/libre.patch"
-
- # set up a simple non-animated throbber from the icon
- install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber-anim.png
- install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber-single.png
- install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber16-anim.png
- install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber16-single.png
- install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber-anim.png
- install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber-single.png
- install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber16-anim.png
- install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber16-single.png
-
- install -m644 debian/extras/preview.png suite/themes/classic/preview.png
-
- # Converting svg file to png and replacing seamonkey by iceape icons
- rsvg-convert -w 300 -h 280 -o ${ICEAPE_ICONS_BRANDING}/content/about.png ${DEBIAN_BRANDING_DIR}/iceape_logo_plain.svg
- rsvg-convert -w 64 -h 64 -o ${ICEAPE_ICONS_BRANDING}/content/icon64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 128 -h 128 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-
- # Creating app-icons Folder for iceape*.png icons
-
- install -m755 -d "${DEBIAN_BRANDING_DIR}/app-icons"
-
- # Icons for /usr/share/icons/hicolor
- rsvg-convert -w 16 -h 16 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 32 -h 32 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape32.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 48 -h 48 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 64 -h 64 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
- rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-
- cp "${srcdir}/mozconfig" .mozconfig
-
- # configure script misdetects the preprocessor without an optimization level
- # https://bugs.archlinux.org/task/34644
- sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-}
-
-build() {
- export DEBIAN_BUILD="comm-release"
- export DEBIAN_BRANDING_DIR="debian/branding"
-
- export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-
- cd "${srcdir}/${DEBIAN_BUILD}"
-
- export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
- export MOZ_MAKE_FLAGS="$MAKEFLAGS"
- unset MAKEFLAGS
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i suite/installer/Makefile.in
-
- make -j1 -f client.mk build
-}
-
-package() {
- export DEBIAN_BUILD="comm-release"
- export DEBIAN_BRANDING_DIR="debian/branding"
-
- export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-
- cd "${srcdir}/${DEBIAN_BUILD}"
-
- make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
- rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation,searchplugins}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
- ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
-
- install -m755 -d "$pkgdir/usr/share/applications"
- install -m755 -d "$pkgdir/usr/share/pixmaps"
- install -m644 ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png \
- "$pkgdir/usr/share/pixmaps/"
-
- for i in 16x16 32x32 48x48 64x64 128x128; do
- install -Dm644 "${DEBIAN_BRANDING_DIR}/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
- done
- install -Dm644 "${DEBIAN_BRANDING_DIR}/${_pkgname}_icon_plain.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-
- install -m644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/"
-}
diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch
deleted file mode 100644
index 375708ac4..000000000
--- a/libre/iceape-libre/clrf.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-12 23:37:12.000000000 -0300
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-05-07 12:33:58.517612453 -0300
-@@ -688,7 +688,7 @@
- PL_strcat(encoding, "{");
- lengthStr.AppendInt((PRInt32) strlen(value));
- PL_strcat(encoding, lengthStr.get());
-- PL_strcat(encoding, "}"CRLF);
-+ PL_strcat(encoding, "}" CRLF);
- PL_strcat(encoding, value);
- return NS_OK;
- }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-05-07 12:41:08.003264793 -0300
-@@ -753,7 +753,7 @@
- }
- }
- }
--#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK
-
- // if status offset isn't in the first block, this code won't work. There's no good reason
- // for the status offset not to be at the beginning of the message anyway.
-@@ -1203,7 +1203,7 @@
- // check if there's an envelope header; if not, write one.
- if (strncmp(m_dataBuffer, "From ", 5))
- {
-- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
- m_offlineMsgSize += bytesWritten;
- }
- }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-05-07 12:44:43.127347489 -0300
-@@ -1722,7 +1722,7 @@
- {
- m_sendDone = PR_TRUE;
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-- SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+ SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_DONE;
- return(0);
-@@ -1969,7 +1969,7 @@
- {
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
- // send a quit command to close the connection with the server.
-- if (SendData(url, "QUIT"CRLF) == NS_OK)
-+ if (SendData(url, "QUIT" CRLF) == NS_OK)
- {
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-05-07 12:48:29.417179064 -0300
-@@ -8298,7 +8298,7 @@
- bool needMoreData = false;
- char * newLine = nsnull;
- PRUint32 numBytesInLine = 0;
-- const char *envelope = "From "CRLF;
-+ const char *envelope = "From " CRLF;
- offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
- fileSize += bytesWritten;
- do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-05-07 15:45:58.551202719 -0300
-@@ -1410,7 +1410,7 @@
- {
- // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
- nsCAutoString commandBuffer(GetServerCommandTag());
-- commandBuffer.Append(" IDLE"CRLF);
-+ commandBuffer.Append(" IDLE" CRLF);
-
- do
- {
-@@ -3290,7 +3290,7 @@
- commandString.Append(messageIds);
- commandString.Append(" (");
- commandString.Append(attribute);
-- commandString.Append(")"CRLF);
-+ commandString.Append(")" CRLF);
- nsresult rv = SendData(commandString.get());
-
- if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
-
- IncrementCommandTagNumber();
- nsCAutoString command(GetServerCommandTag());
-- command.Append(" expunge"CRLF);
-+ command.Append(" expunge" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
- command.Append(gAppName);
- command.Append("\" \"version\" \"");
- command.Append(gAppVersion);
-- command.Append("\")"CRLF);
-+ command.Append("\")" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
- nsCAutoString correctedPassword;
- EscapeUserNamePasswordString(password.get(), &correctedPassword);
- command.Append(correctedPassword);
-- command.Append("\""CRLF);
-+ command.Append("\"" CRLF);
- rv = SendData(command.get(), PR_TRUE /* suppress logging */);
- NS_ENSURE_SUCCESS(rv, rv);
- ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@
- nsCString command(GetServerCommandTag());
- command += " create \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@
- nsCString command (GetServerCommandTag());
- command += " lsub \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7578,7 +7578,7 @@
- command += useXLIST ?
- " xlist \"\" \"" : " list \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7599,7 +7599,7 @@
- nsCString command (GetServerCommandTag());
- command += " subscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@
- nsCString command (GetServerCommandTag());
- command += " unsubscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@
- if (m_urlInProgress)
- return;
- nsCAutoString command (GetServerCommandTag());
-- command += " IDLE"CRLF;
-+ command += " IDLE" CRLF;
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
- {
-@@ -7658,7 +7658,7 @@
- nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
- if (asyncInputStream)
- asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
-- nsresult rv = SendData("DONE"CRLF);
-+ nsresult rv = SendData("DONE" CRLF);
- // set a short timeout if we don't want to wait for a response
- if (m_transport && !waitForResponse)
- m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7727,8 +7727,8 @@
- PRUint32 msgsHandled = 0;
- const char *formatString;
- formatString = (idsAreUid)
-- ? "%s uid store %s %s"CRLF
-- : "%s store %s %s"CRLF;
-+ ? "%s uid store %s %s" CRLF
-+ : "%s store %s %s" CRLF;
-
- do
- {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-05-07 12:57:22.050615120 -0300
-@@ -185,7 +185,7 @@
-
- NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
- *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
-- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
- if (sendingIdleDone)
- fWaitingForMoreClientInput = PR_FALSE;
-
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-05-07 12:59:45.857182813 -0300
-@@ -2483,7 +2483,7 @@
- return(MK_OUT_OF_MEMORY);
- m_pop3ConData->next_state_after_response = POP3_GET_LIST;
- m_listpos = 0;
-- return SendData(m_url, "LIST"CRLF);
-+ return SendData(m_url, "LIST" CRLF);
- }
-
-
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-05-07 13:01:42.912022177 -0300
-@@ -1473,7 +1473,7 @@
- *newbody = 0;
- PL_strcatn(newbody, newbodylen, "<PRE>");
- PL_strcatn(newbody, newbodylen, body);
-- PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+ PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
- PR_Free(body);
- body = newbody;
- }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-05-07 13:04:41.511265477 -0300
-@@ -280,7 +280,7 @@
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
- MimeWriteAString(obj, obj->options->state->detachedFilePath);
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
- status = MimeWriteAString(obj, header);
- if (status < 0)
- return status;
-- status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
- }
- nsCString result;
- char timeBuffer[128];
-@@ -306,8 +306,8 @@
- "%a %b %d %H:%M:%S %Y",
- &now);
- MimeWriteAString(obj, nsDependentCString(timeBuffer));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
- MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
- }
- PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/iceape-libre/gcc47.patch b/libre/iceape-libre/gcc47.patch
deleted file mode 100644
index 115d65131..000000000
--- a/libre/iceape-libre/gcc47.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
-
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -6,6 +6,9 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
-
-+#include <unistd.h>
-+
- #include <limits>
-
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
- $(STDCXX_COMPAT) \
- $(NULL)
-
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
diff --git a/libre/iceape-libre/iceape-2.0-lang.patch b/libre/iceape-libre/iceape-2.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/iceape-libre/iceape-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector", "chrome://global/locale/intl.properties");
- pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS", false);
-+pref("intl.locale.matchOS", true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop
deleted file mode 100644
index 0868e5058..000000000
--- a/libre/iceape-libre/iceape.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=iceape %u
-Icon=iceape
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Iceape Internet Suite
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/iceape-libre/iceape.install b/libre/iceape-libre/iceape.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/libre/iceape-libre/iceape.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
deleted file mode 100644
index 6473412e4..000000000
--- a/libre/iceape-libre/libre.patch
+++ /dev/null
@@ -1,285 +0,0 @@
---- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-02-16 12:08:39.000000000 -0200
-+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-29 22:19:37.998383034 -0200
-@@ -1,23 +1,16 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
-+browser.search.order.3=Seeks Search
-
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -26,20 +19,10 @@
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
-
--# The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
--gecko.handlerService.schemes.mailto.1.name=Gmail
--gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
--
- # The default set of protocol handlers for irc:
--gecko.handlerService.schemes.irc.0.name=Mibbit
--gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
-
- # The default set of protocol handlers for ircs:
--gecko.handlerService.schemes.ircs.0.name=Mibbit
--gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
---- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300
-+++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
---- comm-release.orig/mozilla/toolkit/content/plugins.html 2012-02-16 12:09:35.000000000 -0200
-+++ comm-release/mozilla/toolkit/content/plugins.html 2012-05-12 03:56:16.599192244 -0300
-@@ -98,18 +98,6 @@
- else
- document.writeln("<h1 id=\"noplugs\">" + pluginsbundle.GetStringFromName("nopluginsareenabled_label") + "<\/h1>");
-
-- document.writeln("<div id=\"findmore\">" + pluginsbundle.GetStringFromName("findmore_label") + " ");
-- document.writeln("<a href=\"" + regionbundle.GetStringFromName("more_plugins_url") + "\">" + regionbundle.GetStringFromName("more_plugins_label") + "<\/a>.");
-- document.writeln("<\/div>");
--
-- document.writeln("<div id=\"findpluginupdates\">" + pluginsbundle.GetStringFromName("findpluginupdates_label") + " ");
-- document.writeln("<a href=\"" + regionbundle.GetStringFromName("pluginupdates_url") + "\">" + regionbundle.GetStringFromName("pluginupdates_label") + "<\/a>.");
-- document.writeln("<\/div>");
--
-- document.writeln("<div id=\"installhelp\">" + pluginsbundle.GetStringFromName("installhelp_label") + " ");
-- document.writeln("<a href=\"" + regionbundle.GetStringFromName("plugindoc_url") + "\">" + regionbundle.GetStringFromName("plugindoc_label") + "<\/a>.");
-- document.writeln("<\/div><hr>");
--
- for (var i = 0; i < numPlugins; i++)
- {
- var plugin = navigator.plugins[i];
---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js 2012-02-16 12:09:38.000000000 -0200
-+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js 2012-05-12 03:59:11.639451163 -0300
-@@ -107,6 +107,7 @@
- this.mPluginInfoArrayLength++;
- } else {
- this.mPluginNotFoundArray[aPluginRequestItem.mimetype] = aPluginRequestItem;
-+ this.mPluginNotFoundArray[aPluginRequestItem.mimetype].pluginsPage = null;
- this.mPluginNotFoundArrayLength++;
- }
-
---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul 2012-02-16 12:09:38.000000000 -0200
-+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul 2012-05-12 04:01:29.208462907 -0300
-@@ -138,10 +138,6 @@
-
- <description id="pluginSummaryRestartNeeded" style="padding-top:10px;"
- value="&pluginWizard.finalPage.restart.label;"/>
-- <spacer flex="1" />
-- <description id="moreInfoLink"
-- style="color:rgb(0, 0, 255); cursor:pointer; text-decoration:underline;"
-- value="&pluginWizard.finalPage.moreInfo.label;"/>
- </wizardpage>
-
- </wizard>
---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 21:25:41.879931999 -0200
-+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 22:25:15.125790092 -0200
-@@ -4,18 +4,11 @@
- #
- browser.startup.homepage=about:
- browser.throbber.url=about:
--browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=https://duckduckgo.com/html/?q=
-
--browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
--browser.translation.serviceDomain=translate.google.com
-+browser.translation.service=about:
-+browser.translation.serviceDomain=
-
- #config.js
- #
- startup.homepage_override_url=about:
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
---- comm-release.orig/suite/locales/en-US/chrome/common/region.properties 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-11-29 22:26:25.271781371 -0200
-@@ -1,10 +1,10 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
-
- # Search engine order (order displayed in the search bar dropdown)
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
-
- # More information about this update link available in the update wizard.
- # Only change this if you are providing localized release notes.
--app.update.url.details=http://www.seamonkey-project.org/releases/
-+app.update.url.details=about:
---- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties 2012-05-12 04:28:05.202481512 -0300
-@@ -2,9 +2,9 @@
- # messenger.properties
- # mailnews.js
- mailnews.start_page.url=chrome://messenger/content/start.xhtml
--messenger.throbber.url=http://www.seamonkey-project.org/
--compose.throbber.url=http://www.seamonkey-project.org/
--addressbook.throbber.url=http://www.seamonkey-project.org/
-+messenger.throbber.url=about:
-+compose.throbber.url=about:
-+addressbook.throbber.url=about:
- # To make mapit buttons to disappear in the addressbook, specify empty string. For example:
- # mail.addr_book.mapit_url.format=
- # The format for "mail.addr_book.mapit_url.format" is:
---- comm-release.orig/suite/locales/en-US/profile/bookmarks.extra 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/profile/bookmarks.extra 2012-05-12 04:34:50.172992393 -0300
-@@ -9,9 +9,7 @@
-
- <DT><H3>Search the Web</H3>
- <DL><p>
-- <DT><A HREF="http://www.google.com/">Google</A>
-- <DT><A HREF="http://groups.google.com/">Google Groups</A>
-- <DT><A HREF="http://news.google.com/">Google News</A>
-+ <DT><A HREF="https://duckduckgo.com/html/">Duck Duck Go (HTML)</A>
- </DL><p>
-
- #unfilter emptyLines
---- comm-release.orig/suite/browser/browser-prefs.js 2012-10-17 11:29:38.687716662 -0200
-+++ comm-release/suite/browser/browser-prefs.js 2012-10-17 11:39:01.778002338 -0200
-@@ -110,7 +110,7 @@
- pref("browser.doorhanger.enabled", true);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
-@@ -587,10 +587,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&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%/seamonkey/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // getMoreThemes is used by our UI under our switch theme menu
- pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -715,7 +715,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%");
-+pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
- pref("plugins.update.notifyUser", false);
- pref("plugins.hide_infobar_for_outdated_plugin", false);
---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.dtd 2012-05-12 05:14:55.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/branding/brand.dtd 2012-05-12 05:32:18.992033502 -0300
-@@ -1,4 +1,4 @@
- <!ENTITY brandFullName "Iceape">
- <!ENTITY brandShortName "Iceape">
--<!ENTITY vendorShortName "Debian">
-+<!ENTITY vendorShortName "Parabola">
- <!ENTITY sidebarName "Sidebar">
---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.properties 2012-05-12 05:14:55.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/branding/brand.properties 2012-05-12 05:36:38.640803397 -0300
-@@ -1,9 +1,9 @@
- brandFullName=Iceape
- brandShortName=Iceape
--vendorShortName=Debian
-+vendorShortName=Parabola
- sidebarName=Sidebar
--extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes
-+extensions.getMoreThemesURL=http://www.gnu.org/software/gnuzilla/addons.html#themes
- extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
- spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
--app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
--app.vendorURL=http://www.seamonkey-project.org/
-+app.releaseNotesURL=about:
-+app.vendorURL=about:
---- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/generic/profile/bookmarks.html.in 2012-05-12 04:40:19.221095752 -0300
-@@ -11,37 +11,14 @@
- <DL><p>
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">@personal_toolbarfolder@</H3>
- <DL><p>
-- <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey@</a>
-- @seamonkey_l10n@
-- <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A>
-- <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
-- <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
-+ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
-+ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A>
- </DL><p>
-- <DT><H3>@seamonkey_and_mozilla@</H3>
-+ <DT><H3>GNUzilla</H3>
- <DL><p>
-- <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey_long@</a>
-- @seamonkey_l10n_long@
-- <DT><H3>@mozilla_org@</H3>
-- <DL><p>
-- <DT><A HREF="http://www.mozilla.org/">@mozilla_org_long@</A>
-- <DT><A HREF="http://www.mozilla.org/projects/">@mozilla_projects@</A>
-- <DT><A HREF="http://www.mozilla.org/about/">@mozilla_about@</A>
-- </DL><p>
-- <DT><H3>@extend_seamonkey@</H3>
-- <DL><p>
-- <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
-- <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
-- <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
-- <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
-- <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
-- <DT><A HREF="http://www.mozdev.org/projects/applications/SeaMonkey.html">@mozdev_seamonkey@</A>
-- </DL><p>
-- <DT><H3>@community_support@</H3>
-- <DL><p>
-- <DT><A HREF="http://www.seamonkey-project.org/community">@seamonkey_community@</a>
-- <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
-- <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
-- </DL><p>
-+ <DT><A HREF="http://www.gnu.org/software/gnuzilla/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">GNUzilla and IceCat</a>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</a>
- </DL><p>
- #include bookmarks.extra
- <HR>
diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig
deleted file mode 100644
index 3093d20ee..000000000
--- a/libre/iceape-libre/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# Iceape
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-export MOZILLA_OFFICIAL=1
-
-# Parabola features
-ac_add_options --disable-safe-browsing