drop browser-defaulturls.patch and organize mozconfig

PKGBUILD

@@ -2,13 +2,13 @@
 
 pkgname=firefox
 pkgver=4.0rc1
-pkgrel=1
+pkgrel=2
 _xulver=2.0rc1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui' 'python2' 'wireless_tools' 'yasm' 'mesa')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
@@ -16,20 +16,17 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/s
         firefox.desktop
         firefox-safe.desktop
         mozilla-firefox-1.0-lang.patch
-        browser-defaulturls.patch
         firefox-version.patch)
 md5sums=('511828dcc226f38602c6c67bd192ef40'
-         '250ea468715b9c0dd65ce9544e4413ce'
+         '8f8b86cd0cc36a3f60c0d287a2c0b9fb'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
          '6f38a5899034b7786cb1f75ad42032b8'
          'bd5db57c23c72a02a489592644f18995'
-         '099d61174d2a08951ea1d083d7684fa5'
          'cea73894617d0e12362db294864fb87f')
 
 build() {
   cd "${srcdir}/mozilla-2.0"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-  patch -Np1 -i "${srcdir}/browser-defaulturls.patch"
   patch -Np1 -i "${srcdir}/firefox-version.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig

browser-defaulturls.patch

-diff -Nur mozilla-2.0.orig//browser/branding/unofficial/pref/firefox-branding.js mozilla-2.0/browser/branding/unofficial/pref/firefox-branding.js
---- mozilla-2.0.orig//browser/branding/unofficial/pref/firefox-branding.js	2011-03-03 14:11:19.000000000 -0800
-+++ mozilla-2.0/browser/branding/unofficial/pref/firefox-branding.js	2011-03-13 10:02:02.950027389 -0700
-@@ -1,5 +1,6 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
--pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("startup.homepage_override_url","http://www.mozilla.com/%APP%/%VERSION%/whatsnew/");
-+
-+pref("startup.homepage_welcome_url","http://www.mozilla.com/%APP%/%VERSION%/firstrun/");
- pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/");
- // The time interval between checks for a new version (in seconds)
- // nightly=8 hours, official=24 hours
-@@ -15,7 +16,7 @@
- pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
- 
- // Release notes and vendor URLs
--pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/");
- pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
- 
- // Search codes belong only in builds with official branding

mozconfig

@@ -12,42 +12,44 @@ ac_add_options --with-system-libevent
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-cairo
-
 ac_add_options --with-pthreads
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --enable-places
+
 ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-xprint
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-extensions=default
+ac_add_options --enable-startup-notification
 ac_add_options --enable-pango
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
-ac_add_options --enable-startup-notification
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-extensions=default
 ac_add_options --enable-smil
 ac_add_options --enable-canvas3d
+ac_add_options --enable-places
+ac_add_options --enable-shared-js
 ac_add_options --enable-url-classifier
+
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-xterm-updates
+ac_add_options --enable-printing
+ac_add_options --enable-xinerama
 ac_add_options --enable-libxul
 ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0
 ac_add_options --with-branding=browser/branding/unofficial
 
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-xprint
+ac_add_options --disable-mochitest
+ac_add_options --disable-debug
+ac_add_options --disable-installer
+ac_add_options --disable-pedantic
+
 ac_add_options --enable-gio
-ac_add_options --enable-gnomevfs
-ac_add_options --enable-gnomeui
+ac_add_options --disable-gnomevfs
 ac_add_options --enable-gconf
 ac_add_options --enable-libnotify