6 files changed, 1 insertions, 99 deletions
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index 9d2f0bb73..12a2c6e46 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -4,7 +4,7 @@ pkgname=firefox
 pkgver=4.0
 _pkgver=4.0
 _xulver=2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="firefox web browser"
 url="http://www.firefox.com"
 arch="all"
@@ -45,9 +45,6 @@ subpackages=""
 source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2
 	mozconfig
 
-	firefox-defaults.patch
-	firefox-version.patch
-
 	firefox.desktop
 	firefox-safe.desktop"
 
@@ -91,7 +88,5 @@ package() {
 
 md5sums="3468a2c463b4fc2788ba621e4b511c30  firefox-4.0.source.tar.bz2
 36f80035fc44ae4de4319def3dfec026  mozconfig
-475a0870730c88f48158a4d4ca9812d0  firefox-defaults.patch
-0e296aabf8c2b5fd5ef5b3a989bab03a  firefox-version.patch
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
diff --git a/main/firefox/firefox-agent.patch b/main/firefox/firefox-agent.patch
deleted file mode 100644
index 299f327e2..000000000
--- a/main/firefox/firefox-agent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-1.9.2.orig/browser/app/profile/firefox.js mozilla-1.9.2/browser/app/profile/firefox.js
---- mozilla-1.9.2.orig/browser/app/profile/firefox.js	2010-04-14 01:21:35.000000000 +0300
-+++ mozilla-1.9.2/browser/app/profile/firefox.js	2010-04-21 00:16:59.673528609 +0300
-@@ -183,7 +183,7 @@
- 
- pref("general.useragent.locale", "@AB_CD@");
- pref("general.skins.selectedSkin", "classic/1.0");
--pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
-+pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");
- 
- pref("general.smoothScroll", false);
- #ifdef UNIX_BUT_NOT_MAC
diff --git a/main/firefox/firefox-defaults.patch b/main/firefox/firefox-defaults.patch
deleted file mode 100644
index cce60cd5d..000000000
--- a/main/firefox/firefox-defaults.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur mozilla-1.9.2.old//browser/branding/unofficial/pref/firefox-branding.js mozilla-1.9.2/browser/branding/unofficial/pref/firefox-branding.js
---- mozilla-1.9.2.old//browser/branding/unofficial/pref/firefox-branding.js	2010-04-14 01:21:35.000000000 +0300
-+++ mozilla-1.9.2/browser/branding/unofficial/pref/firefox-branding.js	2010-04-20 23:55:01.290102941 +0300
-@@ -1,5 +1,5 @@
--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
-@@ -14,7 +14,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.vendorURL", "http://www.mozilla.org/projects/%APP%/");
-+pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/");
-+pref("app.vendorURL", "http://www.mozilla.com/%APP%/");
- 
- // Search codes belong only in builds with official branding
- pref("browser.search.param.yahoo-fr", "");
diff --git a/main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch b/main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch
deleted file mode 100644
index a9102a65b..000000000
--- a/main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/browser/base/content/browser.xul
-+++ mozilla-2.0/browser/base/content/browser.xul
-@@ -470,7 +470,7 @@
- #else
-            iconsize="large"
- #endif
--           tabsontop="true"
-+           tabsontop="false"
-            persist="tabsontop">
-     <!-- Menu -->
-     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
diff --git a/main/firefox/firefox-restore-status-bar.patch b/main/firefox/firefox-restore-status-bar.patch
deleted file mode 100644
index f492abb59..000000000
--- a/main/firefox/firefox-restore-status-bar.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mozilla-2.0.orig/browser/base/content/browser.xul
-+++ mozilla-2.0/browser/base/content/browser.xul
-@@ -992,12 +992,18 @@
-                   contentcontextmenu="contentAreaContextMenu"
-                   autocompletepopup="PopupAutoComplete"
-                   onclick="return contentAreaClick(event, false);"/>
--      <statuspanel id="statusbar-display" label=""/>
-     </vbox>
-     <vbox id="browser-border-end" hidden="true" layer="true"/>
-   </hbox>
- 
-   <vbox id="browser-bottombox" layer="true">
-+    <statusbar id="status-bar" ordinal="1000"
-+#ifdef WINCE
-+               hidden="true"
-+#endif
-+               class="chromeclass-status">
-+      <statusbarpanel id="statusbar-display" label=""/>
-+    </statusbar>
-     <toolbar id="addon-bar"
-              toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
-              collapsed="true"
-@@ -1005,13 +1011,12 @@
-              context="toolbar-context-menu" toolboxid="navigator-toolbox"
-              mode="icons" iconsize="small" defaulticonsize="small"
-              lockiconsize="true"
--             defaultset="addonbar-closebutton,spring,status-bar"
-+             defaultset="addonbar-closebutton,spring"
-              customizable="true"
-              key="key_toggleAddonBar">
-       <toolbarbutton id="addonbar-closebutton"
-                      tooltiptext="&addonBarCloseButton.tooltip;"
-                      oncommand="setToolbarVisibility(this.parentNode, false);"/>
--      <statusbar id="status-bar" ordinal="1000"/>
-     </toolbar>
-   </vbox>
- 
diff --git a/main/firefox/firefox-version.patch b/main/firefox/firefox-version.patch
deleted file mode 100644
index 2b1aeb41d..000000000
--- a/main/firefox/firefox-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/browser/installer/Makefile.in	2009-07-18 13:32:35.000000000 +0200
-+++ mozilla-2.0/browser/installer/Makefile.in	2009-07-18 13:33:12.000000000 +0200
-@@ -43,6 +43,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+MOZ_APP_VERSION="3.6"
-+
- include $(topsrcdir)/config/rules.mk
- 
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in