diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index ed025330..e1f87751 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon May 4 07:57:50 CEST 2009 - wr@rosenauer.org + +- update to new major version 3.5b4 + * based on Gecko 1.9.1 (mozilla-xulrunner191) + * Private Browsing Mode + * TraceMonkey JavaScript engine + * Geolocation support + * native JSON and web worker threads support + * speculative parsing for faster content rendering + * Some HTML5 support +- updated firefox.schemas +- improved firefox-no-update.patch + ------------------------------------------------------------------- Tue Apr 28 10:47:54 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index b7a104c3..371fee68 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.0.10) +# spec file for package MozillaFirefox (Version 3.5b4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,14 @@ Name: MozillaFirefox -BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-xulrunner190-devel orbit-devel python unzip update-desktop-files zip +BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel mozilla-xulrunner191-devel orbit-devel python unzip update-desktop-files zip %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox -Version: 3.0.10 +Version: 3.5b4 Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ @@ -36,7 +36,6 @@ Source1: MozillaFirefox.desktop Source2: %{name}-rpmlintrc Source3: mozilla.sh.in Source4: find-external-requires.sh -Source5: firefox-lockdown.js Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml Source11: firefox48.png @@ -46,21 +45,19 @@ Patch1: firefox-libxul-sdk.patch Patch2: firefox-no-update.patch Patch14: credits.patch Patch17: firefox-appname.patch -# PATCH-FEATURE-SLED firefox-ui-lockdown.patch FATE#302023, FATE#302024 - hfiguiere@novell.com -Patch20: firefox-ui-lockdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils /bin/sh gconf2 shared-mime-info desktop-file-utils -Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) +Requires: mozilla-xulrunner191 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191) %ifarch %ix86 -Requires: mozilla-xulrunner190-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) +Requires: mozilla-xulrunner191-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191) %endif -Requires: %{name}-branding >= 3.0 +Requires: %{name}-branding = 3.5 %define _unpackaged_files_terminate_build 0 %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define releasedate 2009042700 +%define releasedate 2009042600 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 @@ -70,7 +67,7 @@ Requires: %{name}-branding >= 3.0 %endif ### build options %define branding 1 -%define localize 1 +%define localize 1 ### build options end %description @@ -89,10 +86,10 @@ Authors: %package translations Summary: Translations for MozillaFirefox License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Provides: locale(%{name}:af;ar;be;bg;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_ES;et;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;lv;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW) +Provides: locale(%{name}:af;ar;as;be;bg;bn_BD;bn_IN;ca;cs;cy;da;de;el;en_GB;es_AR;es_ES;ex_MX;et;eu;fa;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;hu;id;is;it;ja;ka;kk;kn;ko;ku;lt;lv;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;ta;te;th;tr;uk;vi;zh_CN;zh_TW) Group: System/Localization PreReq: %{name} = %{version} -Requires: mozilla-xulrunner190-translations +Requires: mozilla-xulrunner191-translations %description translations This package contains several optional languages for the user interface @@ -106,13 +103,13 @@ Authors: %endif -%package branding-upstream +%package branding-upstream License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Upstream branding for MozillaFirefox Group: Productivity/Networking/Web/Browsers -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(MozillaFirefox-branding) -Supplements: packageand(%{name}:branding-upstream) +Provides: %{name}-branding = 3.5 +Conflicts: otherproviders(%{name}-branding) +Supplements: packageand(%{name}:branding-upstream) #BRAND: Provide three files - #BRAND: /usr/lib/firefox/browserconfig.properties that contains the #BRAND: default homepage and some other default configuration options @@ -125,7 +122,7 @@ Supplements: packageand(%{name}:branding-upstream) #BRAND: custom preference overrides. #BRAND: It's also possible to drop files in /usr/lib/firefox/searchplugins -%description branding-upstream +%description branding-upstream This package provides upstream look and feel for MozillaFirefox. @@ -137,11 +134,10 @@ Authors: %prep %setup -q -n mozilla -b 7 cd $RPM_BUILD_DIR/mozilla -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 %patch14 %patch17 -%patch20 %build export MOZ_BUILD_DATE=%{releasedate} @@ -149,6 +145,12 @@ export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" +# 10.3-x86_64 build fails probably because gcc bug +%if %suse_version == 1030 +%ifarch x86_64 +export ac_cv_visibility_hidden="no" +%endif +%endif export MOZCONFIG=$RPM_BUILD_DIR/mozconfig SDKDIR=$(pkg-config --variable=sdkdir libxul) cat << EOF > $MOZCONFIG @@ -164,6 +166,7 @@ ac_add_options --includedir=%{_includedir} ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-libxul-sdk=$SDKDIR +ac_add_options --with-l10n-base=../l10n ac_add_options --with-system-jpeg #ac_add_options --with-system-png # doesn't work because of missing APNG support ac_add_options --with-system-zlib @@ -226,7 +229,6 @@ sed -e 's,RPM_VERSION,%{version}-%{release},g' \ %{SOURCE17} > suse-default-prefs cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-build.js rm suse-default-prefs -cp %{SOURCE5} $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/ # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); @@ -310,8 +312,8 @@ fi %{progdir}/searchplugins/ %{progdir}/modules/ %attr(755,root,root) %{progdir}/%{progname}.sh +%{progdir}/%{progname} %{progdir}/application.ini -%{progdir}/firefox %{progdir}/blocklist.xml %exclude %{progdir}/updater.ini %exclude %{progdir}/removed-files @@ -319,7 +321,6 @@ fi %exclude %{progdir}/old-homepage-default.properties %exclude %{progdir}/components/libnkgnomevfs.so %exclude %{progdir}/run-mozilla.sh -%exclude %{progdir}/libjemalloc.so %{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* @@ -338,8 +339,18 @@ fi %defattr(-,root,root) %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html - %changelog +* Mon May 04 2009 wr@rosenauer.org +- update to new major version 3.5b4 + * based on Gecko 1.9.1 (mozilla-xulrunner191) + * Private Browsing Mode + * TraceMonkey JavaScript engine + * Geolocation support + * native JSON and web worker threads support + * speculative parsing for faster content rendering + * Some HTML5 support +- updated firefox.schemas +- improved firefox-no-update.patch * Tue Apr 28 2009 wr@rosenauer.org - security update to 3.0.10 * MFSA 2009-23/CVE-2009-1313 (bmo#489647) diff --git a/firefox-3.0.10-source.tar.bz2 b/firefox-3.0.10-source.tar.bz2 deleted file mode 100644 index e50b0261..00000000 --- a/firefox-3.0.10-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f1f3812828affa75314d55f6e0eae211d2de845e21449fad8963fc0994e7288 -size 36964636 diff --git a/firefox-3.5b4-source.tar.bz2 b/firefox-3.5b4-source.tar.bz2 new file mode 100644 index 00000000..99006ef3 --- /dev/null +++ b/firefox-3.5b4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:922154fda7d7f67709792fd05a30cfb01c493a8fbcdeeb9075394ac79c50b176 +size 45231698 diff --git a/firefox-libxul-sdk.patch b/firefox-libxul-sdk.patch index 43a50b02..f4e81cca 100644 --- a/firefox-libxul-sdk.patch +++ b/firefox-libxul-sdk.patch @@ -1,20 +1,22 @@ -Index: browser/locales/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/browser/locales/Makefile.in,v -retrieving revision 1.59 -diff -u -r1.59 Makefile.in ---- browser/locales/Makefile.in 10 Feb 2008 06:09:54 -0000 1.59 -+++ browser/locales/Makefile.in 29 Feb 2008 08:48:09 -0000 -@@ -172,9 +172,11 @@ - endif +diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in +--- a/browser/locales/Makefile.in ++++ b/browser/locales/Makefile.in +@@ -188,15 +188,17 @@ endif + + clobber-%: + $(RM) -rf $(DIST)/xpi-stage/locale-$* libs-%: + $(NSINSTALL) -D $(DIST)/install +ifndef LIBXUL_SDK - @$(MAKE) -C ../../toolkit/locales libs-$* -- @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 ++ @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +endif -+ @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref + @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +- @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 ifdef MOZ_BRANDING_DIRECTORY - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + endif + @$(MAKE) tests AB_CD=$* + diff --git a/firefox-lockdown.js b/firefox-lockdown.js deleted file mode 100644 index 053fc61a..00000000 --- a/firefox-lockdown.js +++ /dev/null @@ -1,16 +0,0 @@ -// UI lockdown settings -pref("config.lockdown.printing", false); -pref("config.lockdown.printsetup", false); -pref("config.lockdown.savepage", false); -pref("config.lockdown.history", false); -pref("config.lockdown.toolbarediting", false); -pref("config.lockdown.urlbar", false); -pref("config.lockdown.bookmark", false); -pref("config.lockdown.searchbar", false); -pref("config.lockdown.hidebookmark", false); -pref("config.lockdown.setwallpaper", false); -pref("config.lockdown.showsavedpasswords", false); - -pref("config.lockdown.disable_themes", false); -pref("config.lockdown.disable_extensions", false); - diff --git a/firefox-no-update.patch b/firefox-no-update.patch index 8ca1c025..1ceaeb6a 100644 --- a/firefox-no-update.patch +++ b/firefox-no-update.patch @@ -1,149 +1,26 @@ -Index: browser/app/profile/firefox.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v -retrieving revision 1.338 -diff -u -p -6 -r1.338 firefox.js ---- browser/app/profile/firefox.js 21 Jul 2008 18:47:20 -0000 1.338 -+++ browser/app/profile/firefox.js 15 Sep 2008 13:50:07 -0000 -@@ -83,72 +83,12 @@ pref("extensions.blocklist.interval", 86 - pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); - pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/blocklist/"); +diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js +--- a/browser/base/content/utilityOverlay.js ++++ b/browser/base/content/utilityOverlay.js +@@ -487,7 +487,11 @@ function buildHelpMenu() + // administrator or if we cannot update for some other reason + var checkForUpdates = document.getElementById("checkForUpdates"); + var canUpdate = updates.canUpdate; ++ var updateEnabled = getBoolPref("app.update.enabled", true); + checkForUpdates.setAttribute("disabled", !canUpdate); ++ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled); ++ var updateSeparator = document.getElementById("updateSeparator"); ++ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled); + if (!canUpdate) + return; - // Dictionary download preference - pref("browser.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/dictionaries/"); - --// App-specific update preferences -- --// Whether or not app updates are enabled --pref("app.update.enabled", true); -- --// This preference turns on app.update.mode and allows automatic download and --// install to take place. We use a separate boolean toggle for this to make --// the UI easier to construct. --pref("app.update.auto", true); -- --// Defines how the Application Update Service notifies the user about updates: --// --// AUM Set to: Minor Releases: Major Releases: --// 0 download no prompt download no prompt --// 1 download no prompt download no prompt if no incompatibilities --// 2 download no prompt prompt --// --// See chart in nsUpdateService.js.in for more details --// --pref("app.update.mode", 1); -- --// If set to true, the Update Service will present no UI for any event. --pref("app.update.silent", false); -- --// Update service URL: --pref("app.update.url", "https://aus2.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); --// app.update.url.manual is in branding section --// app.update.url.details is in branding section -- --// User-settable override to app.update.url for testing purposes. --//pref("app.update.url.override", ""); -- --// Interval: Time between checks for a new version (in seconds) --// default=1 day --pref("app.update.interval", 86400); --// Interval: Time before prompting the user again to restart to install the --// latest download (in seconds) default=1 day --pref("app.update.nagTimer.restart", 86400); --// Interval: When all registered timers should be checked (in milliseconds) --// default=10 minutes --pref("app.update.timer", 600000); --// Give the user x seconds to react before showing the big UI. default=12 hrs --pref("app.update.promptWaitTime", 43200); --// Show the Update Checking/Ready UI when the user was idle for x seconds --pref("app.update.idletime", 60); -- --// Whether or not we show a dialog box informing the user that the update was --// successfully applied. This is off in Firefox by default since we show a --// upgrade start page instead! Other apps may wish to show this UI, and supply --// a whatsNewURL field in their brand.properties that contains a link to a page --// which tells users what's new in this new update. --pref("app.update.showInstalledUI", false); -- --// 0 = suppress prompting for incompatibilities if there are updates available --// to newer versions of installed addons that resolve them. --// 1 = suppress prompting for incompatibilities only if there are VersionInfo --// updates available to installed addons that resolve them, not newer --// versions. --pref("app.update.incompatible.mode", 0); -- - // Symmetric (can be overridden by individual extensions) update preferences. - // e.g. - // extensions.{GUID}.update.enabled - // extensions.{GUID}.update.url - // extensions.{GUID}.update.interval - // .. etc .. -Index: browser/base/content/baseMenuOverlay.xul -=================================================================== -RCS file: /cvsroot/mozilla/browser/base/content/baseMenuOverlay.xul,v -retrieving revision 1.21 -diff -u -p -6 -r1.21 baseMenuOverlay.xul ---- browser/base/content/baseMenuOverlay.xul 6 May 2008 04:07:24 -0000 1.21 -+++ browser/base/content/baseMenuOverlay.xul 15 Sep 2008 13:50:07 -0000 -@@ -94,17 +94,17 @@ - #endif - -- -