create [mozilla-testing]: icecat9, iceweasel9, i18n for each, and mozilla-searchplugins.

author: Luke Shumaker <LukeShu@sbcglobal.net> 2011-12-27 02:20:15 -0500
committer: Luke Shumaker <LukeShu@sbcglobal.net> 2011-12-27 02:20:15 -0500
commit: 8cc645d54287761cc9b2e57a537c307967d6ed40 (patch)
tree: a9cf72c3cd5a523c39f2adcfae358bf139d94804
parent: e184a60312988975147531b3dd0a59573056a380 (diff)
33 files changed, 1003 insertions, 57 deletions
diff --git a/mozilla-testing/.gitignore b/mozilla-testing/.gitignore
new file mode 100644
index 000000000..db32297d9
--- /dev/null
+++ b/mozilla-testing/.gitignore
@@ -0,0 +1,6 @@
+# probably source downloads
+*.tar.gz
+*.tar.xz
+*.tar.bz2
+*.tgz
+*.zip
diff --git a/mozilla-testing/icecat-i18n/.gitignore b/mozilla-testing/icecat-i18n/.gitignore
new file mode 100644
index 000000000..3987fdafb
--- /dev/null
+++ b/mozilla-testing/icecat-i18n/.gitignore
@@ -0,0 +1,3 @@
+index.html
+langpacks.txt
+*.xpi
diff --git a/mozilla-testing/icecat-i18n/Makefile b/mozilla-testing/icecat-i18n/Makefile
new file mode 100644
index 000000000..5dd818e62
--- /dev/null
+++ b/mozilla-testing/icecat-i18n/Makefile
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - grep
+#  - pacman
+#  - sed
+#  - wget
+
+pkgver=9.0.1
+
+default: PHONY all
+all: PHONY PKGBUILD
+.PRECIOUS: PKGBUILD
+
+index.html: Makefile
+	rm -f $@
+	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
+langpacks.txt: index.html Makefile
+	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
+PKGBUILD: langpacks.txt Makefile
+	sed \
+	  -e 's/^pkgver=.*/pkgver=$(pkgver)/' \
+	  -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \
+	  -e '/md5sums/,$$d' \
+	  $@ > $@.$$$$ && \
+	makepkg -g >> $@.$$$$ && \
+	mv $@.$$$$ $@
+
+clean: PHONY
+	rm -f index.html langpacks.txt *.xpi
+
+.PHONY: PHONY FORCE
diff --git a/mozilla-testing/icecat-i18n/PKGBUILD b/mozilla-testing/icecat-i18n/PKGBUILD
new file mode 100644
index 000000000..117d6a6bf
--- /dev/null
+++ b/mozilla-testing/icecat-i18n/PKGBUILD
@@ -0,0 +1,127 @@
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit pkgver= in Makefile.
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US 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-LK ta te th tr uk vi zh-CN zh-TW zu)
+
+pkgbase='icecat-i18n'
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo icecat-i18n-$lang | tr A-Z a-z
+        done))
+_pkgver=9.0
+pkgver=9.0.1
+pkgrel=1
+pkgdesc="Language packs for GNUzilla IceCat."
+arch=('any')
+license=('MPL')
+url="http://www.gnu.org/software/gnuzilla/"
+depends=("icecat=${pkgver}")
+source=($(for lang in ${_langpacks[@]}
+        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+        done))
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+}
+
+_path="/usr/lib/icecat-$_pkgver/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
+md5sums=('20e67c29a5e666c102b04a1e60b7f5a6'
+         'f2bb72158cd9a9e26d682dcdff297e86'
+         '31daa3abbe40461f5292b6521ba45179'
+         '38ed2043b03f27bf9c6c30956c90f0af'
+         'c263a1d5a3560c9a4538561ebe1bd332'
+         '9e19e7a56922d3df37844067d6c59a23'
+         '665ae571412f563f562c556cb6790bca'
+         '598725cd42bad8beec856525cd9d85c0'
+         '3e45f1097a1453ef6f3615d5826ff508'
+         '8388434818c995ae50b977d2e7f36996'
+         'fa0afac9df234a977fd8da2905c0eda2'
+         '258d9b993065f3860c2f8d79ed86aa20'
+         'dadeb5e0e03ac6c4a58104ae60c4214a'
+         '17edd78ea185761e3ac1ab69947aa483'
+         '6544c77cb37f97e1eb5c9180902f9767'
+         '579a5a4f3a98f47cba481242faece354'
+         '7a47d59e8a90b852a852d3d8182636e3'
+         '5e5f806e1f6f386dddd32136a9ea0c44'
+         '5985bb817858d6fffad0158df60b926b'
+         '9a9048af47cf7e1eff4a901287321cbf'
+         'ecf628acf988b4efee254f5dd43ed839'
+         '0879552d267febf40ab51a25fd56e126'
+         'd0054611a7cb17f265bbbb2145fa24fd'
+         '86dc6ac2c9fa2d891449dc0fee74925d'
+         '672433eda992ca42468ce736fb679233'
+         '7c1722a1a7b36259b170c601122a025b'
+         'd315044c39fa8e3e404355a12a065cf2'
+         '2e498d9076b814887f0da334fda1e289'
+         'b4c42b439c3db8e77e53f2c0e03197cb'
+         '1c356d82117d92d19474ab0a6c804c6b'
+         'bb2a2bc43106be951ef51b62719f1213'
+         'eda3b14c45b3dd6cc95f93b5fa0fd6cf'
+         '5521ad4ab8cdf1f8863fc0f454c02ee2'
+         '38f8d1533f7d1a6123eb80555e719f6f'
+         '14bb8cf18b6d24f103da376c5d8580b5'
+         '1d0ea799b72c59b9a6922d66c84e63d2'
+         '57a457aaa98d7d93667cfce913632976'
+         '90d589d5cd4d199f579e882c1b1e9287'
+         'a0d354fb2b69828777642ef5abd0e963'
+         'cce959f03a6357ee7a1d2efc6c6af309'
+         '4c9b695d540fb5289600a089e2972aca'
+         'f4e3330139f500b0e37207bd00ad7e81'
+         'e41ca6ea7716bec98956a4138bb091ce'
+         'd59931f40b6e62dc2899eff46da2ac1e'
+         'b21a2c345c8c74d8c4da80273aecd083'
+         '147357710c4712439c646f18b27bf4d0'
+         'f90e382593e105ff697145338162c64e'
+         'c6517c6002fe56527b7a773b8060f553'
+         '52bd84145281204c23b3c608a597f9e8'
+         'e79089b54a3c8401afc7fbd48565d373'
+         'ce49b2490566964e786e2f8c03560bb8'
+         'ec943a3e4e531f8295f03131f2056053'
+         '99ea4eaae77a8c680949e673ef5ff1b7'
+         '74f4139ea78aee64c054468d5cf5528b'
+         'efbd2c801479fbfd82d3da168e582a67'
+         '490f7390148623d6e6805aa04c8dc6f3'
+         '5b51ca012f369e61d505d4f05342b1a7'
+         '90a9774bfe34428b915bda7f5701e8d9'
+         '784924bb0615debf3eba37ea9edced69'
+         'b2be9f59bdf8c2d0e35a4ab2e944f73e'
+         '5607205459f9db6d229235070e45e866'
+         '396231537b4e51b15fa8c781deb27988'
+         '96274f3f8a2bb807f79e896e28132f58'
+         'a31bc07e9bd969665dcf6fe99ac89415'
+         '29bb94f65797299ca5355f0cb64142aa'
+         '9f0d68e0fa81beb81a3f905118f02c55'
+         'af200de2fc6126e10e73d81dd05047ea'
+         '60b7717d3306e2fb18b22804719d0fd2'
+         '15c789baa59d27786d6d1d4c4a7a24ee'
+         '48841ff67fee9f3e1f1ee8ff485a1bbc'
+         '77af86e85548ec10486d23c6e2436d46'
+         '3e6bee3482370be47fd3128f468b806f'
+         '36d41a4885ebf5d04548a9c38e2d2e9c'
+         'fea6e7c1c9f743e348ee5409e0182693'
+         'ddea2e6de27762f1ad505e6c43a87349'
+         '759c0a37cc97aac128b52ec14bc86bb6'
+         'bc2e3922c92c3b4fe49fae5ef46a7f7b'
+         '0a6e0092e9c052b8571ba09bd40b6d4a'
+         'db1c3a4581fc893deba60322350593fb'
+         'b79bdfa5ef8c65de1787fe1be6c48afa'
+         'e4878942c64c3b6da87a84bd87918511'
+         '77e7b5d62449d5be99865c8ba43183b8'
+         '878ab3f21c1ae1fef8eb1198ee3e9af6')
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
new file mode 100644
index 000000000..3b7fad104
--- /dev/null
+++ b/mozilla-testing/icecat/PKGBUILD
@@ -0,0 +1,121 @@
+# Maintainer: Figue <ffigue at gmail>
+# Contributor: Figue <ffigue at gmail>
+# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Thank you very much to the older contributors:
+# Contributor: evr <evanroman at gmail>
+# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
+
+# If you are updating this package, don't forget to update the version number in
+# the value for 'browser.dictionaries.download.url' in 'libre.patch'
+
+pkgname=icecat
+_pkgver=9.0
+pkgver=9.0.1
+pkgrel=1
+pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/gnuzilla/"
+license=('MPL' 'GPL' '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'
+  'sqlite3'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'libidl2'
+  'mesa'
+  'p7zip-libre'
+  'pkg-config'
+  'python2'
+  'wireless_tools'
+  'xorg-server-xvfb'
+  'yasm'
+  'zip'
+)
+options=(!buildflags !distcc)
+install=icecat.install
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
+        mozconfig
+	mozconfig.old
+	mozconfig.default
+	libre.patch
+	parabola.patch
+        icecat.desktop
+        icecat-safe.desktop)
+
+build() {
+  ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
+  patch -Np1 -i "$srcdir/parabola.patch" # Parabola settings
+
+  # Fix PRE_RELEASE_SUFFIX
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR"
+  export PYTHON="/usr/bin/python2"
+
+  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  kill $! || true
+}
+
+package() {
+  ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  msg2 "Finishing..."
+  install -m755 -d                                        "${pkgdir}/usr/share/pixmaps"
+  install -m644 browser/branding/unofficial/default48.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+
+  install -m755 -d                              "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icecat.desktop"      "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icecat-safe.desktop" "${pkgdir}/usr/share/applications"
+
+  ln -s "${pkgname}-${_pkgver}" "${pkgdir}/usr/lib/${pkgname}"
+
+  rm -rf "${pkgdir}${ICECATDIR}/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            "${pkgdir}${ICECATDIR}/dictionaries"
+  ln -sf /usr/share/hyphen              "${pkgdir}${ICECATDIR}/hyphenation"
+  ln -sf /usr/lib/mozilla/plugins       "${pkgdir}${ICECATDIR}/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}${ICECATDIR}/searchplugins"
+
+  # We don't want the development stuff
+  rm -rf "${pkgdir}/usr/include"
+  rm -rf "${pkgdir}/usr/lib/${pkgname}-devel-${pkgver}"
+  rm -rf "${pkgdir}/usr/share/idl"
+
+  # Workaround for now:
+  #  https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf "${ICECATDIR}/${pkgname}-bin" "${pkgdir}${ICECATDIR}/$pkgname"
+}
+
+md5sums=('a135581da2fd2845f268d7ca91054c06'
+         'b565d8f806a03ba83d32bf20aaa5c4dc'
+         '0e5057d9427c6cd5e2f3b78fe34f50d9'
+         '44959606e4a704e68a913e73fc941926'
+         '07e65752416e615fe04ce586bc58f86b'
+         '037b44b6e07d7115e0fb221d67b94272'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         'd93fe402b87cd000a869e1fd6badc6c9')
diff --git a/mozilla-testing/icecat/icecat-safe.desktop b/mozilla-testing/icecat/icecat-safe.desktop
new file mode 100644
index 000000000..87acc970c
--- /dev/null
+++ b/mozilla-testing/icecat/icecat-safe.desktop
@@ -0,0 +1,78 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/icecat -safe-mode %u
+Icon=icecat
+Type=Application
+Terminal=false
+MultipleArgs=false
+Name=GNU IceCat - Safe Mode
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет 
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr]=Веб претраживач
+GenericName[sr@Latn]=Veb pretraživač
+GenericName[ss]=Ibrawuza yeWeb 
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
+MimeType=text/html
+StartupNotify=false
+Categories=Application;Network;
diff --git a/mozilla-testing/icecat/icecat.desktop b/mozilla-testing/icecat/icecat.desktop
new file mode 100644
index 000000000..8a7cad93d
--- /dev/null
+++ b/mozilla-testing/icecat/icecat.desktop
@@ -0,0 +1,78 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/icecat %u
+Icon=icecat
+Type=Application
+Terminal=false
+MultipleArgs=false
+Name=GNU IceCat
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет 
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr]=Веб претраживач
+GenericName[sr@Latn]=Veb pretraživač
+GenericName[ss]=Ibrawuza yeWeb 
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
+MimeType=text/html
+StartupNotify=false
+Categories=Application;Network;
diff --git a/mozilla-testing/icecat/icecat.install b/mozilla-testing/icecat/icecat.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/mozilla-testing/icecat/icecat.install
@@ -0,0 +1,13 @@
+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/mozilla-testing/icecat/libre.patch b/mozilla-testing/icecat/libre.patch
new file mode 100644
index 000000000..c5f59d858
--- /dev/null
+++ b/mozilla-testing/icecat/libre.patch
@@ -0,0 +1,66 @@
+--- icecat-9.0.1.orig/browser/app/profile/firefox.js	2011-12-26 23:11:39.000000000 -0500
++++ icecat-9.0.1/browser/app/profile/firefox.js	2011-12-26 23:12:15.000000000 -0500
+@@ -74,7 +76,7 @@
+ pref("extensions.update.autoUpdateDefault", true);
+ 
+ // 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/");
+ 
+ // The minimum delay in seconds for the timer to fire.
+ // default=2 minutes
+@@ -876,7 +878,7 @@
+ pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
+ 
+ // base url for the wifi geolocation network provider
+-pref("geo.wifi.uri", "https://www.google.com/loc/json");
++pref("geo.wifi.uri", "http://geomena.org");
+ pref("geo.wifi.protocol", 0);
+ 
+ // Whether to use a panel that looks like an OS X sheet for customization
+--- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-26 07:34:23.000000000 -0500
++++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-26 19:59:04.000000000 -0500
+@@ -1,27 +1,19 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (SSL)
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
+-browser.search.order.2=Yahoo
++browser.search.order.1=Duck Duck Go (SSL)
++browser.search.order.2=Duck Duck Go (Lite)
+ 
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
+-browser.contentHandlers.types.0.title=Bloglines
+-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
+-browser.contentHandlers.types.1.title=My Yahoo
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.2.title=Google
+-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+ 
+ # Keyword URL (for location bar searches)
+-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
++keyword.URL=https://duckduckgo.com/?q=
+ 
+ # 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/?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 
+--- icecat-9.0.1.orig/browser/app/Makefile.in	2011-12-27 00:22:26.000000000 -0500
++++ icecat-9.0.1/browser/app/Makefile.in	2011-12-27 00:23:10.000000000 -0500
+@@ -269,7 +269,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
+ endif
+ endif
+ 
diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig
new file mode 100644
index 000000000..da53ad9e4
--- /dev/null
+++ b/mozilla-testing/icecat/mozconfig
@@ -0,0 +1,94 @@
+# We are building the browser
+ac_add_options --enable-application=browser
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+# Branding
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+
+# GNUzilla things
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Operating system things
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+ac_add_options --with-pthreads
+
+ac_add_options --enable-toolkit-cairo-gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-svg-renderer=cairo
+
+ac_add_options --disable-toolkit-qt
+
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
+ac_add_options --enable-freetype2
+ac_add_options --enable-pango
+ac_add_options --enable-startup-notification
+
+
+# Enable/Disable web technologies
+ac_add_options --enable-canvas
+ac_add_options --enable-canvas3d
+ac_add_options --enable-places
+ac_add_options --enable-smil
+ac_add_options --enable-svg
+
+# Enable/Disable "user-y" features
+ac_add_options --enable-extensions="default spellcheck"
+
+ac_add_options --disable-safe-browsing
+ac_add_options --enable-url-classifier
+ac_add_options --disable-chatzilla
+ac_add_options --disable-accessibility
+ac_add_options --disable-calendar
+ac_add_options --disable-composer
+
+# Enable/Disable "system-y" features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-installer
+# Does anyone know which is effective?
+ac_add_options --disable-update
+ac_add_options --disable-updater
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-gio
+ac_add_options --enable-libnotify
+ac_add_options --enable-printing
+ac_add_options --enable-xinerama
+ac_add_options --enable-xterm-updates
+
+# Build settings
+ac_add_options --disable-mochitest
+ac_add_options --disable-pedantic
+ac_add_options --disable-static
+ac_add_options --disable-tests
+ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default
new file mode 100644
index 000000000..21aaa0edd
--- /dev/null
+++ b/mozilla-testing/icecat/mozconfig.default
@@ -0,0 +1,70 @@
+# This is a better commented version of the default .mozconfig from 9.0.1
+
+# We are building the browser
+ac_add_options --enable-application=browser
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+# Branding
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+
+# GNUzilla things
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Operating system things
+ac_add_options --prefix=/usr/local
+#ac_add_options --with-default-mozilla-five-home=/usr/local/lib
+#ac_add_options --with-pthreads
+
+ac_add_options --enable-toolkit-cairo-gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-svg-renderer=cairo
+
+ac_add_options --disable-toolkit-qt
+
+ac_add_options --disable-system-cairo 
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
+ac_add_options --enable-freetype2
+ac_add_options --enable-pango
+
+# Enable/Disable web technologies
+ac_add_options --enable-crypto
+#ac_add_options --enable-postscript
+ac_add_options --enable-svg
+ac_add_options --enable-xft
+
+# Enable/Disable "user-y" features
+ac_add_options --enable-extensions="default spellcheck"
+
+ac_add_options --disable-chatzilla
+ac_add_options --disable-accessibility
+ac_add_options --disable-calendar
+ac_add_options --disable-composer
+
+# Enable/Disable "system-y" features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+
+#ac_add_options --disable-jsd
+#ac_add_options --disable-libxul
+ac_add_options --disable-ipc
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --disable-negotiateauth
+ac_add_options --disable-profilesharing
+ac_add_options --disable-xinerama
+ac_add_options --disable-xprint
+
+# Build settings
+ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-mochitest 
+ac_add_options --disable-tests
+ac_add_options --enable-optimize="-pipe -O3"
+ac_add_options --enable-strip
diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old
new file mode 100644
index 000000000..3ae3e1c2e
--- /dev/null
+++ b/mozilla-testing/icecat/mozconfig.old
@@ -0,0 +1,85 @@
+# This is a better commented version of the .mozconfig used by the Parabola
+# package < v9
+
+# We are building the browser
+. $topsrcdir/browser/config/mozconfig
+
+# Branding
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+
+# GNUzilla things
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Operating system things
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+ac_add_options --with-pthreads
+
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
+
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
+ac_add_options --enable-pango
+ac_add_options --enable-startup-notification
+
+
+# Enable/Disable web technologies
+ac_add_options --enable-canvas
+ac_add_options --enable-canvas3d
+ac_add_options --enable-places
+ac_add_options --enable-smil
+ac_add_options --enable-svg
+
+# Enable/Disable "user-y" features
+ac_add_options --enable-extensions=default
+
+ac_add_options --disable-safe-browsing
+ac_add_options --enable-url-classifier
+
+# Enable/Disable "system-y" features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-installer
+ac_add_options --disable-update
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-gio
+ac_add_options --enable-libnotify
+ac_add_options --enable-printing
+ac_add_options --enable-xinerama
+ac_add_options --enable-xterm-updates
+
+# Build settings
+ac_add_options --disable-mochitest
+ac_add_options --disable-pedantic
+ac_add_options --disable-static
+ac_add_options --disable-tests
+ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/mozilla-testing/icecat/parabola.patch b/mozilla-testing/icecat/parabola.patch
new file mode 100644
index 000000000..b8000c3ea
--- /dev/null
+++ b/mozilla-testing/icecat/parabola.patch
@@ -0,0 +1,22 @@
+diff -ru icecat-9.0.1.orig/browser/app/profile/firefox.js icecat-9.0.1/browser/app/profile/firefox.js
+--- icecat-9.0.1.orig/browser/app/profile/firefox.js	2011-12-27 00:11:30.000000000 -0500
++++ icecat-9.0.1/browser/app/profile/firefox.js	2011-12-27 00:11:39.000000000 -0500
+@@ -48,6 +48,8 @@
+ #endif
+ #endif
+ 
++pref("general.startup.browser", true);
++
+ pref("browser.chromeURL","chrome://browser/content/");
+ pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
+ 
+@@ -487,6 +489,9 @@
+ pref("browser.gesture.twist.left", "");
+ pref("browser.gesture.tap", "cmd_fullZoomReset");
+ 
++// Use LANG environment variable to choose locale
++pref("intl.locale.matchOS", true);
++
+ // 0=lines, 1=pages, 2=history , 3=text size
+ #ifdef XP_MACOSX
+ // On OS X, if the wheel has one axis only, shift+wheel comes through as a
diff --git a/mozilla-testing/iceweasel-i18n/.gitignore b/mozilla-testing/iceweasel-i18n/.gitignore
new file mode 100644
index 000000000..bff578e20
--- /dev/null
+++ b/mozilla-testing/iceweasel-i18n/.gitignore
@@ -0,0 +1,3 @@
+PKGBUILD.*
+langpacks.txt
+*.diff.gz
diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile
new file mode 100644
index 000000000..a0a767c3d
--- /dev/null
+++ b/mozilla-testing/iceweasel-i18n/Makefile
@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - pacman
+#  - sed
+
+default: PHONY all
+all: PHONY
+	$(MAKE) clean
+	$(MAKE) PKGBUILD
+.PRECIOUS: PKGBUILD
+
+PKGBUILD.g: Makefile
+	sed \
+	  -e '/This line is here/,$$d' \
+	  -e 's/^pkgname=/_pkgname=/' \
+	  PKGBUILD > $@
+	echo 'pkgname=foo' >> $@
+	echo 'package() { exit 0; }' >> $@
+	makepkg -gp $@ >> $@
+langpacks.txt: PKGBUILD.g Makefile
+	makepkg -dp $<
+	ls src/*/upstream | sed 's/\.xpi//' > $@
+PKGBUILD: langpacks.txt Makefile
+	sed \
+	  -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \
+	  -e '/md5sums/,$$d' \
+	  $@ > $@.$$$$ && \
+	makepkg -g >> $@.$$$$ && \
+	mv $@.$$$$ $@
+
+clean: PHONY
+	rm -f PKGBUILD.g langpacks.txt
+
+.PHONY: PHONY FORCE
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
new file mode 100644
index 000000000..45555b019
--- /dev/null
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+# When updating to a newer upstream release:
+# - Update pkgver= and _deb*= below.
+# - Run "make". This will do everything else for you.
+
+# We're getting this from Debian Sid
+_debname=iceweasel-l10n
+_debver=9.0+debian
+_debrel=1
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_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)
+
+pkgbase=iceweasel-i18n
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+_pkgver=9.0
+pkgver=${_debver}.${_debrel}
+pkgrel=1
+
+
+pkgdesc="Language packs for Debian Iceweasel."
+arch=('any')
+url="http://www.geticeweasel.org/"
+license=('MPL')
+depends=("iceweasel=${_pkgver}")
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz")
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  cd "${_debname}-${_debver}"
+  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+}
+
+_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+
+# This line is here for auto-regeneration purposes. DO NOT EDIT!
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
+md5sums=('d0dc0653b9d7642e6d346b54fb1782ae'
+         '493920a716fa40daeb5bd8cdfdbfe6a6')
diff --git a/~lukeshu/iceweasel-libre-current/PKGBUILD b/mozilla-testing/iceweasel/PKGBUILD
index b09d42d90..992476d43 100644
--- a/~lukeshu/iceweasel-libre-current/PKGBUILD
+++ b/mozilla-testing/iceweasel/PKGBUILD
@@ -1,39 +1,60 @@
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Henry Jensen <hjensen@connochaetos.org>
 
-_pkgname=iceweasel
-_pkgver=9.0
+# We're getting this from Debian Sid
+_debname=iceweasel
 _debver=9.0.1
-_debrel='1~bpo60+1' # bpo=backport (from sid to sqeeze)
-_repo_url=http://mozilla.debian.net/pool/iceweasel-release/i/iceweasel
+_debrel=1
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
-pkgname=$_pkgname-libre-current
+_pkgname=iceweasel
+pkgname=iceweasel
+_pkgver=9.0
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64')
+arch=('i586' 'i686' 'x86_64' 'mips64el')
 url="http://www.geticeweasel.org/"
 license=('GPL2' 'MPL' 'LGPL')
-depends=('desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa' 'quilt')
-provides=("${_pkgname}")
-conflicts=('firefox' 'icecat' "${_pkgname}")
-replaces=('firefox' 'icecat')
+depends=(
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
+  'nss'
+  'sqlite3'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'libidl2'
+  'mesa'
+  'p7zip-libre'
+  'pkg-config'
+  'python2'
+  'quilt'
+  'wireless_tools'
+  'yasm'
+  'zip'
+)
+options=(!buildflags !distcc)
 install=iceweasel.install
-source=("${_repo_url}/iceweasel_${_debver}.orig.tar.bz2"
-        "${_repo_url}/iceweasel_${_debver}-${_debrel}.debian.tar.gz"
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
         libre.patch
-        # Search engines
-        arch-linux-wiki.xml
-        internet-archive.xml
-        jamendo-en.xml
-        logless-search.xml
-        scroogle-ssl-english.xml
-        yacy.xml
-        duck-duck-go-ssl.xml
-        duck-duck-go-lite.xml
         # Default configuration
         mozilla-firefox-1.0-lang.patch
         xulrunner-copy-stub.patch
@@ -42,21 +63,21 @@ source=("${_repo_url}/iceweasel_${_debver}.orig.tar.bz2"
 build() {
   msg2 "Applying Debian patches..."
   cd "${srcdir}"
-  # This will simulate dpkg-source -x iceweasel_${_debver}-${_debrel}.dsc
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-  mv mozilla-release "${_pkgname}-${_debver}"
-  mv debian "${_pkgname}-${_debver}"
-  cd "${_pkgname}-${_debver}"
+  mv mozilla-release "${_debname}-${_debver}"
+  mv debian "${_debname}-${_debver}"
+  cd "${_debname}-${_debver}"
   quilt push -a
   find .pc -name .timestamp -delete # why isn't --no-timestamps doing this?
 
   # This will make life more sane
   cd "${srcdir}"
-  ln -s "${_pkgname}-${_debver}" "${_pkgname}-${pkgver}"
+  ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
 
-  msg2 "Applying Parabola/ConnochaetOS patches..."
+  msg2 "Starting normal build..."
   cd "${srcdir}/${_pkgname}-${pkgver}/"
   patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch"
@@ -69,7 +90,7 @@ build() {
   cp "${srcdir}/mozconfig" .mozconfig
   #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   ./configure
-#  touch config*
+  #touch config*
   make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
 
   msg2 "Build complete"
@@ -97,28 +118,18 @@ package() {
   install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg
   
 
-  msg2 "Removing proprietary and anti-privacy search engines"
-  rm -f ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
-  msg2 "And provide better ones..."
-  install -m755 -d ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/
-  install -m644 ${srcdir}/*.xml ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/
+  rm -rf ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
+  ln -sf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
+
   rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver}
   rm -rvf ${pkgdir}/usr/include
 
 }
 
 md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
-         '8846b9cce4ce7a82ec9995510efce867'
+         '6cde9fe38df1434fdcc0f3a078b0238e'
          '5e2574eef71ee1437e2f8e7481c67893'
          '9609e77182cc300e3fe9d4b0c7e7efb4'
-         '3403175087e584a8c5e840cc62310cd9'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '2d492295c4308f9bba9ece28d8b3af2d'
-         '937ac0e5392b060d93bd33e761fbfa51'
-         'cf97082e77e3ef5f1bd74b1db9329965'
-         '24528ca3f7f1e1a0ba735231aa3ac1de'
-         'c5f00b6b24222aacd5a749d1f59c4d24'
-         'e1bda0854de7d764f7401c81bb82b5ef'
          'bd5db57c23c72a02a489592644f18995'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          'f1c76e7e244257856a386ca2de69bdf0')
diff --git a/~lukeshu/iceweasel-libre-current/iceweasel.install b/mozilla-testing/iceweasel/iceweasel.install
index 376600ec2..376600ec2 100644
--- a/~lukeshu/iceweasel-libre-current/iceweasel.install
+++ b/mozilla-testing/iceweasel/iceweasel.install
diff --git a/~lukeshu/iceweasel-libre-current/libre.patch b/mozilla-testing/iceweasel/libre.patch
index e29e22a67..e29e22a67 100644
--- a/~lukeshu/iceweasel-libre-current/libre.patch
+++ b/mozilla-testing/iceweasel/libre.patch
diff --git a/~lukeshu/iceweasel-libre-current/mozconfig b/mozilla-testing/iceweasel/mozconfig
index 8344f6967..8344f6967 100644
--- a/~lukeshu/iceweasel-libre-current/mozconfig
+++ b/mozilla-testing/iceweasel/mozconfig
diff --git a/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch
index f0f7325a5..f0f7325a5 100644
--- a/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch
+++ b/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch
diff --git a/~lukeshu/iceweasel-libre-current/region.properties b/mozilla-testing/iceweasel/region.properties
index 2e980987e..2e980987e 100644
--- a/~lukeshu/iceweasel-libre-current/region.properties
+++ b/mozilla-testing/iceweasel/region.properties
diff --git a/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel/xulrunner-copy-stub.patch
index e3b8e9376..e3b8e9376 100644
--- a/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch
+++ b/mozilla-testing/iceweasel/xulrunner-copy-stub.patch
diff --git a/mozilla-testing/mozilla-searchplugins/PKGBUILD b/mozilla-testing/mozilla-searchplugins/PKGBUILD
new file mode 100644
index 000000000..c86c9514a
--- /dev/null
+++ b/mozilla-testing/mozilla-searchplugins/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Contributor: Figue <ffigue at gmail>
+# Contributor: Figue <ffigue at gmail>
+# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): vando <facundo@esdebian.org>
+# Thank you very much to the older contributors:
+# Contributor: evr <evanroman at gmail>
+# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
+
+pkgname=mozilla-searchplugins
+pkgver=1.0
+pkgrel=1
+pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
+arch=('any')
+license=('MPL' 'GPL' 'LGPL')
+url="https://parabolagnulinux.org/"
+source=(
+  duck-duck-go-lite.xml
+  duck-duck-go-ssl.xml
+  internet-archive.xml
+  jamendo-en.xml
+  logless-search.xml
+  scroogle-ssl-english.xml
+  wikipedia.xml
+  yacy.xml
+)
+
+package() {
+  install -m755 -d                "${pkgdir}/usr/lib/mozilla/searchplugins"
+  install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
+}
+
+md5sums=('e1bda0854de7d764f7401c81bb82b5ef'
+         'c5f00b6b24222aacd5a749d1f59c4d24'
+         '462c68585461f8cdc23c93c46f6ee4cf'
+         '2d492295c4308f9bba9ece28d8b3af2d'
+         '937ac0e5392b060d93bd33e761fbfa51'
+         'cf97082e77e3ef5f1bd74b1db9329965'
+         'c35f4971feff8387e0570d7a165eb6fa'
+         '24528ca3f7f1e1a0ba735231aa3ac1de')
diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml b/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml
index 3142d3410..3142d3410 100644
--- a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml
+++ b/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml
diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml b/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml
index 4fb1391ab..4fb1391ab 100644
--- a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml
+++ b/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml
diff --git a/~lukeshu/iceweasel-libre-current/internet-archive.xml b/mozilla-testing/mozilla-searchplugins/internet-archive.xml
index 1556a2d8c..1556a2d8c 100644
--- a/~lukeshu/iceweasel-libre-current/internet-archive.xml
+++ b/mozilla-testing/mozilla-searchplugins/internet-archive.xml
diff --git a/~lukeshu/iceweasel-libre-current/jamendo-en.xml b/mozilla-testing/mozilla-searchplugins/jamendo-en.xml
index 91d6df6e4..91d6df6e4 100644
--- a/~lukeshu/iceweasel-libre-current/jamendo-en.xml
+++ b/mozilla-testing/mozilla-searchplugins/jamendo-en.xml
diff --git a/~lukeshu/iceweasel-libre-current/logless-search.xml b/mozilla-testing/mozilla-searchplugins/logless-search.xml
index 1538d1ef0..1538d1ef0 100644
--- a/~lukeshu/iceweasel-libre-current/logless-search.xml
+++ b/mozilla-testing/mozilla-searchplugins/logless-search.xml
diff --git a/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml b/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml
index f817dce40..f817dce40 100644
--- a/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml
+++ b/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml
diff --git a/mozilla-testing/mozilla-searchplugins/wikipedia.xml b/mozilla-testing/mozilla-searchplugins/wikipedia.xml
new file mode 100644
index 000000000..36b8ed494
--- /dev/null
+++ b/mozilla-testing/mozilla-searchplugins/wikipedia.xml
@@ -0,0 +1,15 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Wikipedia (en)</ShortName>
+<Description>Wikipedia, the free encyclopedia</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
+<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
+  <Param name="action" value="opensearch"/>
+  <Param name="search" value="{searchTerms}"/>
+</Url>
+<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search">
+  <Param name="search" value="{searchTerms}"/>
+  <Param name="sourceid" value="Mozilla-search"/>
+</Url>
+<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
+</SearchPlugin>
diff --git a/~lukeshu/iceweasel-libre-current/yacy.xml b/mozilla-testing/mozilla-searchplugins/yacy.xml
index 61201ad20..61201ad20 100644
--- a/~lukeshu/iceweasel-libre-current/yacy.xml
+++ b/mozilla-testing/mozilla-searchplugins/yacy.xml
diff --git a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml
deleted file mode 100644
index 9e21b92e2..000000000
--- a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Arch Linux Wiki</os:ShortName>
-<os:Description>searches on the arch linux wiki</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII=</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png</IconUpdateUrl>
-<SearchForm>http://wiki.archlinux.org/index.php/Main_Page</SearchForm>
-<os:Url type="text/html" method="GET" template="http://wiki.archlinux.org/index.php/Special:Search?go=Go&amp;search={searchTerms}">
-</os:Url>
-</SearchPlugin>
-\ No newline at end of file
author	Luke Shumaker <LukeShu@sbcglobal.net>	2011-12-27 02:20:15 -0500
committer	Luke Shumaker <LukeShu@sbcglobal.net>	2011-12-27 02:20:15 -0500
commit	8cc645d54287761cc9b2e57a537c307967d6ed40 (patch)
tree	a9cf72c3cd5a523c39f2adcfae358bf139d94804
parent	e184a60312988975147531b3dd0a59573056a380 (diff)