forked from pool/MozillaFirefox
This commit is contained in:
parent
350dafb2ec
commit
e580d2a6de
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 28 14:54:46 CEST 2009 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- fixed %exclude usage
|
||||||
|
- fixed preferences' advanced pane for fresh profiles (bmo#506901)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jul 15 20:13:19 CEST 2009 - wr@rosenauer.org
|
Wed Jul 15 20:13:19 CEST 2009 - wr@rosenauer.org
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
|||||||
Provides: web_browser
|
Provides: web_browser
|
||||||
Provides: firefox
|
Provides: firefox
|
||||||
Version: 3.5.1
|
Version: 3.5.1
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Mozilla Firefox Web Browser
|
Summary: Mozilla Firefox Web Browser
|
||||||
Url: http://www.mozilla.org/
|
Url: http://www.mozilla.org/
|
||||||
Group: Productivity/Networking/Web/Browsers
|
Group: Productivity/Networking/Web/Browsers
|
||||||
@ -48,6 +48,7 @@ Patch1: firefox-libxul-sdk.patch
|
|||||||
Patch2: firefox-no-update.patch
|
Patch2: firefox-no-update.patch
|
||||||
Patch3: toolkit-download-folder.patch
|
Patch3: toolkit-download-folder.patch
|
||||||
Patch4: mozilla-linkorder.patch
|
Patch4: mozilla-linkorder.patch
|
||||||
|
Patch5: firefox-bug506901.patch
|
||||||
Patch14: credits.patch
|
Patch14: credits.patch
|
||||||
Patch17: firefox-appname.patch
|
Patch17: firefox-appname.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -129,6 +130,7 @@ cd $RPM_BUILD_DIR/mozilla
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
%patch14
|
%patch14
|
||||||
%patch17
|
%patch17
|
||||||
|
|
||||||
@ -242,6 +244,13 @@ done
|
|||||||
cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm
|
cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm
|
||||||
%endif
|
%endif
|
||||||
%suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
|
%suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
|
||||||
|
# excludes
|
||||||
|
rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini
|
||||||
|
rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
|
||||||
|
rm -f $RPM_BUILD_ROOT%{progdir}/README.txt
|
||||||
|
rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties
|
||||||
|
rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh
|
||||||
|
# fdupes
|
||||||
%if %suse_version > 1020
|
%if %suse_version > 1020
|
||||||
%fdupes $RPM_BUILD_ROOT%{progdir}
|
%fdupes $RPM_BUILD_ROOT%{progdir}
|
||||||
%fdupes $RPM_BUILD_ROOT%{_datadir}
|
%fdupes $RPM_BUILD_ROOT%{_datadir}
|
||||||
@ -308,12 +317,7 @@ fi
|
|||||||
%{progdir}/%{progname}
|
%{progdir}/%{progname}
|
||||||
%{progdir}/application.ini
|
%{progdir}/application.ini
|
||||||
%{progdir}/blocklist.xml
|
%{progdir}/blocklist.xml
|
||||||
%exclude %{progdir}/updater.ini
|
|
||||||
%exclude %{progdir}/removed-files
|
|
||||||
%exclude %{progdir}/README.txt
|
|
||||||
%exclude %{progdir}/old-homepage-default.properties
|
|
||||||
%exclude %{progdir}/components/libnkgnomevfs.so
|
%exclude %{progdir}/components/libnkgnomevfs.so
|
||||||
%exclude %{progdir}/run-mozilla.sh
|
|
||||||
%{_datadir}/applications/%{name}.desktop
|
%{_datadir}/applications/%{name}.desktop
|
||||||
%{_datadir}/mime/packages/%{progname}.xml
|
%{_datadir}/mime/packages/%{progname}.xml
|
||||||
%{_datadir}/pixmaps/firefox*
|
%{_datadir}/pixmaps/firefox*
|
||||||
|
43
firefox-bug506901.patch
Normal file
43
firefox-bug506901.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
|
||||||
|
--- a/browser/components/preferences/advanced.js
|
||||||
|
+++ b/browser/components/preferences/advanced.js
|
||||||
|
@@ -46,32 +46,32 @@ var gAdvancedPane = {
|
||||||
|
/**
|
||||||
|
* Brings the appropriate tab to the front and initializes various bits of UI.
|
||||||
|
*/
|
||||||
|
init: function ()
|
||||||
|
{
|
||||||
|
this._inited = true;
|
||||||
|
var advancedPrefs = document.getElementById("advancedPrefs");
|
||||||
|
|
||||||
|
+#ifdef MOZ_UPDATER
|
||||||
|
+ this.updateAppUpdateItems();
|
||||||
|
+ this.updateAutoItems();
|
||||||
|
+ this.updateModeItems();
|
||||||
|
+#endif
|
||||||
|
+ this.updateOfflineApps();
|
||||||
|
+
|
||||||
|
var extraArgs = window.arguments[1];
|
||||||
|
if (extraArgs && extraArgs["advancedTab"]){
|
||||||
|
advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
|
||||||
|
} else {
|
||||||
|
var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
|
||||||
|
if (preference.value === null)
|
||||||
|
return;
|
||||||
|
advancedPrefs.selectedIndex = preference.value;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-#ifdef MOZ_UPDATER
|
||||||
|
- this.updateAppUpdateItems();
|
||||||
|
- this.updateAutoItems();
|
||||||
|
- this.updateModeItems();
|
||||||
|
-#endif
|
||||||
|
- this.updateOfflineApps();
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stores the identity of the current tab in preferences so that the selected
|
||||||
|
* tab can be persisted between openings of the preferences window.
|
||||||
|
*/
|
||||||
|
tabSelectionChanged: function ()
|
||||||
|
{
|
Loading…
Reference in New Issue
Block a user