summaryrefslogtreecommitdiff
path: root/mozilla-testing
diff options
context:
space:
mode:
Diffstat (limited to 'mozilla-testing')
-rw-r--r--mozilla-testing/icecat/PKGBUILD15
-rw-r--r--mozilla-testing/icecat/libre.patch2
-rw-r--r--mozilla-testing/icecat/libvpx.patch12
-rw-r--r--mozilla-testing/iceweasel-i18n/PKGBUILD136
-rw-r--r--mozilla-testing/iceweasel-libre/PKGBUILD72
-rw-r--r--mozilla-testing/iceweasel-libre/libre.patch53
6 files changed, 174 insertions, 116 deletions
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
index 4379ee60c..5946af42f 100644
--- a/mozilla-testing/icecat/PKGBUILD
+++ b/mozilla-testing/icecat/PKGBUILD
@@ -14,8 +14,8 @@
_pgo=false
_pkgname=icecat
-pkgver=9.0.1
-pkgrel=2
+pkgver=10.0
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -69,7 +69,8 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
icecat-safe.desktop
libre.patch
firefox-install-dir.patch
- vendor.js)
+ vendor.js
+ libvpx.patch)
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname")
@@ -83,6 +84,7 @@ build() {
cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
+ patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch
if $_pgo; then
cat "$srcdir/mozconfig.pgo" >> .mozconfig
@@ -136,11 +138,12 @@ package() {
ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
}
-md5sums=('a135581da2fd2845f268d7ca91054c06'
+md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
'6f3a8fd65c416216a1b56b0c2d2d81aa'
'ac29b01c189f20abae2f3eef1618ffc0'
'e81ad01dbc16ba28bf92ba4b7c309ca7'
'd93fe402b87cd000a869e1fd6badc6c9'
- '07e65752416e615fe04ce586bc58f86b'
+ '145f453ef82f643711c10d97ec57a805'
'1e4bcac59e93d21fffa6a1d1ad235247'
- 'c382e35315047e4ca368d09383b39b8d')
+ 'c382e35315047e4ca368d09383b39b8d'
+ '5d418ecdbdb9f40597df6b978b0b5ee5')
diff --git a/mozilla-testing/icecat/libre.patch b/mozilla-testing/icecat/libre.patch
index c5f59d858..3dca93ee7 100644
--- a/mozilla-testing/icecat/libre.patch
+++ b/mozilla-testing/icecat/libre.patch
@@ -5,7 +5,7 @@
// Dictionary download preference
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/9.0.1/");
++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/");
// The minimum delay in seconds for the timer to fire.
// default=2 minutes
diff --git a/mozilla-testing/icecat/libvpx.patch b/mozilla-testing/icecat/libvpx.patch
new file mode 100644
index 000000000..f883b8e08
--- /dev/null
+++ b/mozilla-testing/icecat/libvpx.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
+--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000
++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000
+@@ -5629,7 +5629,7 @@
+ dnl v0.9.6 one to check for.
+ AC_TRY_COMPILE([
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+ ],
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
index fd56f38bb..1194c170d 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD
@@ -8,53 +8,40 @@
# - (optionally) edit PKGBUILD.in
# - Run 'make'. It will take care of everything else for you.
-_debname=iceweasel-l10n
-_debver=9.0+debian
-_debrel=1
+_debname=iceweasel
+_debver=10.0
+_debrel=2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-# echo $(ls src/iceweasel-l10n-*+debian/upstream/ | sed 's/\.xpi/ /')
-_langpacks=(af ak ar ast as be bg bn-BD bn-IN br bs ca cs cy da de dz-BT el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa-IR fa fi fr fur-IT fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja ka kk kn ko ku lg lt lv mai mk ml mn mr nb-NO ne-NP nl nn-NO nso oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=9.0
+_pkgver=10.0
pkgver=${_debver}.${_debrel}
-pkgrel=2.1
+pkgrel=1
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
url="http://www.geticeweasel.org/"
license=('MPL')
depends=("iceweasel-libre>=$_pkgver")
-makedepends=("mozilla-devscripts" "xmlstarlet")
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
-noextract=($(for lang in ${_langpacks[@]}
- do echo $lang.xpi
- done))
-
-dpkg-source() {
- # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
- cd "${_debname}-${_debver}"
- patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
- cd ..
-}
+source=()
+for lang in ${_langpacks[@]}
+do
+ source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+done
build() {
cd "${srcdir}"
- dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
- patch -Np0 -i ${_debname}_${_debver}-${_debrel}.diff
- cd ${_debname}-${_debver}
- # Fix broken files or avoid unnecessary dependencies.
- sed -i 's/$TARGET/$TARGET ; exit/' debian/build-script.sh
- # Langpacks initially state to support exactly one browser version,
- # Debian fixes this.
- sh debian/build-script.sh override_dh_auto_build 9 21
+ for f in *.deb
+ do
+ bsdtar xf $f
+ bsdtar xf data.tar.gz
+ done
}
_path="/usr/lib/iceweasel/extensions"
@@ -63,12 +50,93 @@ _path="/usr/lib/iceweasel/extensions"
for lang in ${_langpacks[@]}
do
eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
- install -Dm644 '$srcdir/'*'/build/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
+ install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
}
"
done
-md5sums=('d0dc0653b9d7642e6d346b54fb1782ae'
- '493920a716fa40daeb5bd8cdfdbfe6a6'
- 'd03f6db3a354e9208500898738506e50')
+md5sums=('793a94a6e885aaf4d8e6f19d0eeb521d'
+ 'f7456e45c7f6ba5920d6a5ac7bc79e0f'
+ 'cb61542372b3ffc673dc0d7bd2daeb64'
+ 'd50d7eafe754a719ecfa34a633b8934a'
+ '69269ecb9349e43f2394c80d79395252'
+ '84697940978ce0cb435e3cef7c0a899b'
+ '2c3322b32d77ba0558bfaa90895c5159'
+ '9915009fecabb5e61bb607643d873725'
+ '474241d6e43c553c497818b871793935'
+ 'ebc92d813eefc7de71e1cce905c02905'
+ 'a6d5d79e133740d4f3c718c834192497'
+ '89e21920d652c3fc62778279ef7bd7e9'
+ '512202725a96e551838b50126b61b399'
+ 'd2585b6724f7ddbde640168955d5751a'
+ 'a69d9d2a1507160b0a50bf19f9bc724e'
+ 'b4fa0cd1d1f821be0a80df25c66ecb7f'
+ '56c8ccddd4d7bb8d33f3ca4da5f11e7f'
+ 'b57896dedb380d1c4c88016855d92def'
+ 'b676f044077fb0ba0d1f906da959bb2d'
+ 'fe121bd9cd1014ce665369a8f8514915'
+ '6f089b06fee2fa96546cf588882d307b'
+ 'b79affe803cf1d27194ebf34408de68b'
+ '8bd6ba3e617dc567b91fa9e05f87fa63'
+ 'ddba2e2e8784091fa251a256e0d979e3'
+ 'cb5450a6b86215c50d34168fb8999546'
+ '990dd3f87bb5872cb34d1f4aa596c1a7'
+ '4702e63ee804e9df0de0ad3997a73fe0'
+ '4e9e0dea57ddf7fd5a295798ebd4c8ff'
+ '8d157f7d71deee985414da0b2a31deb1'
+ 'afb03c513129c864762748ee7a43dfea'
+ '21b94e104f358af6fff96eddb25c0be5'
+ '8804dca0055bb40918bd2fa53cbf9f46'
+ '65cf3f2b62e74e5263ddd3c0aeae6efc'
+ '75b0601628af786086ade2d19f7a7dbd'
+ 'b41e48029475606210ba2386a516eea5'
+ '3a175250397bd9a12e111b0cae9b8bc9'
+ '8816aded7a74fa44d07d7aba1cc5cd24'
+ '781fc19740d15689c34124f6ce2d0c37'
+ 'a1310e77625e8c0b2fa79482776ae0b7'
+ '6eda69c80e7667f2f18e33542ae58ab9'
+ '99d03faaeb4c14b4b8e24a70b51c88e6'
+ '08a7afeefe6ce58e088ab630e5888de9'
+ 'afbfd8430dd79e0c2d8a232601ef590f'
+ '35a1d92021eb05e4aca0d16d4fbad6bb'
+ 'ce6c430d1fbae0d01431055f62aa2e17'
+ '015fce7a57e94736a0971893495c25a4'
+ 'ba5f035417146bcb83d78288871974c8'
+ 'b72a8bc535d8d8d75e2527fcc183c063'
+ '29c04ac90494ad91dfb084ef665c647a'
+ '10b5da824adf7c95868fb9bc8f0a1c13'
+ '30f846e358a33c75f1fa34ae1c8f6152'
+ 'b66f05ffe4f9ac891434758c65201692'
+ '7b3e9c60508ebb5ad38288fd4d271564'
+ '4a37b546faeba4db56c537859d246c9e'
+ '32e372e04d47347ca7915388d0c28856'
+ '5051b69589aefb0672afcfc53f13d5e6'
+ '951d765d9bb5fde4de7e9a0a7b2d86fa'
+ 'c7d4a0e0ea5de23101bec63cd0d16a79'
+ 'c9b5782c573c45ba5966f6731ab74919'
+ 'feb93641c8a5bdbc3d2c0a7a984301ec'
+ '3ee2f65ce0a81280bca493046de34e36'
+ '531aa070f985ad04f2956223baa3eadd'
+ 'e1d5ba35f740cb3cc53ac7ddfeecc53d'
+ '6d51c6c4196b8fd1a0ef28a26be9a7c8'
+ 'cc9a129a663b3e557f4b7af3a362f849'
+ '68647b56c8383a961d1a548755b8ed3e'
+ '2ff3b25510bc7dae3ace16275149604e'
+ 'd151521d572d4c34cdc0781f79397a28'
+ 'b4cbf748b686fed239c54747cf980114'
+ '144b7b1856cb5edbfe6bb1b46ed7ebce'
+ '6ddd3e1752225b85481ea9a6a92bc771'
+ 'b40300590d475e4732db173dcbacbacd'
+ 'c52ae8f37f21cb7fe8af84fc3d11f5be'
+ 'd565ad7989e912fcdc25ace8ebcc4d03'
+ 'f839187be23fd08dfd92f49a0e84a280'
+ '54a0a8e37c4f9b73635b1602f16d7deb'
+ '7abfb562c214f69123988274ff3278a1'
+ '2a0691d6282b55adb59fee29633598df'
+ '15ff4db6870007e5eebb7de314ed95ca'
+ '04ab9dbe13f6c09bfedeb248d77ad409'
+ '2f60fa5185dd337f69d2db7d0b290e22'
+ '0097341a10cb8cb47b37642b05effc04'
+ '7c3f6bcad90774d5f55d429ef61ccdba'
+ '4b2e077aa01023fde8a6611f89d69b5d')
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index 9ade92f8b..c630fbb35 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -12,15 +12,15 @@ _pgo=false
# We're getting this from Debian Sid
_debname=iceweasel
-_debver=9.0.1
-_debrel=1
+_debver=10.0
+_debrel=2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2.1
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -30,40 +30,8 @@ fi
pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
arch=('i586' 'i686' 'x86_64' 'mips64el')
license=('GPL2' 'MPL' 'LGPL')
-depends=(
- 'alsa-lib'
- 'dbus-glib'
- 'desktop-file-utils'
- 'gtk2'
- 'hicolor-icon-theme'
- 'hunspell'
- 'libevent'
- 'libnotify'
- 'libvpx'
- 'libxt'
- 'mime-types'
- 'mozilla-common'
- 'mozilla-searchplugins'
- 'nss>=3.13.1'
- 'sqlite3'
- 'startup-notification'
-)
-makedepends=(
- 'autoconf2.13'
- 'diffutils'
- 'imagemagick'
- 'libidl2'
- 'librsvg'
- 'libxslt'
- 'mesa'
- 'pkg-config'
- 'python2'
- 'quilt'
- 'unzip'
- 'wireless_tools'
- 'yasm'
- 'zip'
-)
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification')
+makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'yasm' 'zip')
if $_pgo; then
makedepends+=('xorg-server-xvfb')
options=(!ccache)
@@ -81,6 +49,16 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
iceweasel-install-dir.patch
region.properties
vendor.js)
+md5sums=('bc86bf0d74649f9b3fcde6dfa914141e'
+ '131782b1ca9d24f40dff8f456558988d'
+ '659b08b8f14429dd1b7f9229b6fbd1b2'
+ 'eab149c1994ab14392e55af3abb08e80'
+ 'ac29b01c189f20abae2f3eef1618ffc0'
+ 'a485a2b5dc544a8a2bd40c985d2e5813'
+ '24fb7dba021ef94a351ebd3750cc0451'
+ 'e529742c0a425648087bc3ce537fe4c5'
+ 'f1c76e7e244257856a386ca2de69bdf0'
+ '0d053487907de4376d67d8f499c5502b')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
@@ -95,12 +73,18 @@ dpkg-source() {
mv mozilla-release "${_debname}-${_debver}"
mv debian "${_debname}-${_debver}"
cd "${_debname}-${_debver}"
+
+# Doesn't apply and seems unimportant
+ rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
+
quilt push -a
find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
cd ..
}
build() {
+# Don't run this if we're using -e
+if [ $NOEXTRACT -eq 0 ]; then
msg2 "Applying Debian patches..."
cd "${srcdir}"
dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
@@ -113,6 +97,9 @@ build() {
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
patch -Np1 -i "$srcdir/libre.patch"
+fi
+
+ cd "$srcdir/mozilla-build"
cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
if $_pgo; then
@@ -167,14 +154,3 @@ package() {
# Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
}
-
-md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
- '6cde9fe38df1434fdcc0f3a078b0238e'
- 'd9b5f2a893ad80da492aec8c9a7cbb7c'
- 'eab149c1994ab14392e55af3abb08e80'
- 'ac29b01c189f20abae2f3eef1618ffc0'
- 'a485a2b5dc544a8a2bd40c985d2e5813'
- '3c1a7d6984b47a0ab36a5d8e6672cb2b'
- 'e529742c0a425648087bc3ce537fe4c5'
- 'f1c76e7e244257856a386ca2de69bdf0'
- '0d053487907de4376d67d8f499c5502b')
diff --git a/mozilla-testing/iceweasel-libre/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch
index b99174a16..935df297b 100644
--- a/mozilla-testing/iceweasel-libre/libre.patch
+++ b/mozilla-testing/iceweasel-libre/libre.patch
@@ -1,14 +1,15 @@
diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- iceweasel-9.0.1.orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0.1/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000
-@@ -57,10 +57,10 @@
+--- iceweasel-10.0.orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000
++++ iceweasel-10.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000
+@@ -64,10 +64,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%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&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%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "");
+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
@@ -96,29 +97,6 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio
# 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
-diff -urN iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in
---- iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000
-@@ -11,14 +11,13 @@
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
- <DL><p>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-- <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A>
-+ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A>
-+ <DT><A HREF="https://parabolagnulinux.org/">Parabola</A>
- </DL><p>
- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
- <DL><p>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
-+ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
- </DL><p>
- </DL><p>
diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
--- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000
+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000
@@ -240,3 +218,24 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region
+plugindoc_label=gnuzilla.gnu.org
+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
+--- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:34.279657460 -0300
++++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:19.226324812 -0300
+@@ -11,13 +11,13 @@
+ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
+ <DD>@bookmarks_toolbarfolder_description@
+ <DL><p>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
++ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A>
++ <DT><A HREF="https://parabolagnulinux.org/">Parabola</A>
+ </DL><p>
+ <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
+ <DL><p>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
++ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
++ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
++ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
+ </DL><p>
+ </DL><p>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 10:56:59 +0000