diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 9d75d4c..5d28f28 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 6 17:15:40 CET 2010 - wr@rosenauer.org + +- major update to 3.6rc1 + ------------------------------------------------------------------- Fri Dec 25 09:39:42 CET 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 2e46e1b..fef8af8 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,8 +1,8 @@ # -# spec file for package MozillaFirefox (Version 3.5.7) +# spec file for package MozillaFirefox (Version 3.6rc1) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2009 Wolfgang Rosenauer +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2010 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,23 @@ Name: MozillaFirefox -BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel orbit-devel python unzip update-desktop-files zip -BuildRequires: mozilla-xulrunner191-devel = 1.9.1.7 +%define xulrunner mozilla-xulrunner192 +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel orbit-devel python unzip update-desktop-files zip +BuildRequires: %{xulrunner}-devel = 1.9.2rc1 %if %suse_version > 1020 BuildRequires: fdupes %endif +%if %suse_version > 1110 +BuildRequires: libiw-devel +%else +BuildRequires: wireless-tools +%endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser Provides: firefox -Version: 3.5.7 +Version: 3.6rc1 Release: 1 +%define releasedate 2010010500 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -38,7 +45,6 @@ Source1: MozillaFirefox.desktop Source2: %{name}-rpmlintrc Source3: mozilla.sh.in Source4: find-external-requires.sh -# this needs to be shipped when lockdown changes are back Source5: firefox.schemas Source6: kde.js Source7: l10n-%{version}.tar.bz2 @@ -47,36 +53,37 @@ Source9: firefox-lockdown.js Source16: firefox.1 Source17: firefox-suse-default-prefs.js Patch1: firefox-libxul-sdk.patch -Patch2: firefox-no-update.patch +Patch2: firefox-credits.patch Patch3: toolkit-download-folder.patch -Patch4: mozilla-linkorder.patch -Patch5: firefox-ui-lockdown.patch +Patch4: firefox-linkorder.patch +Patch5: firefox-browser-css.patch Patch6: firefox-cross-desktop.patch -Patch7: firefox-kde.patch -Patch8: firefox-no-gnomevfs.patch -Patch9: firefox-browser-css.patch -Patch10: mozilla-abi.patch -Patch14: credits.patch -Patch17: firefox-appname.patch +Patch7: firefox-no-gnomevfs.patch +Patch8: firefox-appname.patch +Patch9: firefox-kde.patch +Patch10: firefox-ui-lockdown.patch +Patch11: firefox-crashreporter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: coreutils /bin/sh gconf2 shared-mime-info desktop-file-utils -Requires: mozilla-xulrunner191 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191) -%requires_eq mozilla-xulrunner191 +Requires(post): coreutils shared-mime-info desktop-file-utils +Requires(postun): shared-mime-info desktop-file-utils +Requires: %{xulrunner} >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner}) +%requires_eq %{xulrunner} %ifarch %ix86 -Requires: mozilla-xulrunner191-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191) -Requires: mozilla-xulrunner191-32bit = %(rpm -q --queryformat '%{VERSION}' mozilla-xulrunner191) +Requires: %{xulrunner}-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner}) +Requires: %{xulrunner}-32bit = %(rpm -q --queryformat '%{VERSION}' %{xulrunner}) %endif -Requires: %{name}-branding = 3.5 -%define _unpackaged_files_terminate_build 0 +Requires: %{name}-branding >= 3.5 %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 2009122200 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} +%if %suse_version > 1020 %define gnome_dir %{_prefix} -%define gconf_confdir %{_sysconfdir}/gconf +%else +%define gnome_dir /opt/gnome +%endif ### build options %define branding 1 %define localize 1 @@ -89,14 +96,13 @@ plethora of extensions. %if %localize - %package translations-common Summary: Common translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Group: System/Localization -PreReq: %{name} = %{version} -Requires: mozilla-xulrunner191-translations-common +Requires: %{name} = %{version} +Requires: %{xulrunner}-translations-common Obsoletes: %{name}-translations < %{version}-%{release} %description translations-common @@ -106,10 +112,10 @@ of MozillaFirefox. %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mn;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) +Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) Group: System/Localization -PreReq: %{name} = %{version} -Requires: mozilla-xulrunner191-translations-other +Requires: %{name} = %{version} +Requires: %{xulrunner}-translations-other Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -125,9 +131,6 @@ Group: Productivity/Networking/Web/Browsers Provides: %{name}-branding = 3.5 Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) -%if %suse_version > 1020 -%gconf_schemas_prereq -%endif #BRAND: Provide three files - #BRAND: /usr/lib/firefox/browserconfig.properties that contains the #BRAND: default homepage and some other default configuration options @@ -153,18 +156,15 @@ cd $RPM_BUILD_DIR/mozilla %patch4 -p1 %patch5 -p1 %patch6 -p1 -%if %suse_version >= 1110 -# copy current files and patch them later to keep them in sync -cp browser/base/content/browser.xul browser/base/content/browser-kde.xul %patch7 -p1 +%patch8 -p1 +%if %suse_version >= 1110 +%patch9 -p1 # install kde.js install -m 644 %{SOURCE6} browser/app/profile/kde.js %endif -%patch8 -p1 -%patch9 -p1 %patch10 -p1 -%patch14 -p1 -%patch17 -p1 +%patch11 -p1 %build export MOZ_BUILD_DATE=%{releasedate} @@ -198,9 +198,9 @@ 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 ac_add_options --disable-installer +ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-debug -ac_add_options --disable-crashreporter EOF %if %branding cat << EOF >> $MOZCONFIG @@ -271,31 +271,23 @@ EOF # ADDONS # mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -%if %branding ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png +%if %branding for size in 16 32 48; do mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/ ln -sf %{progdir}/chrome/icons/default/default$size.png \ $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png done -%else -cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm %endif %suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK -# SCHEMA file -mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas -install -m 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{gconf_confdir}/schemas/ -%if %suse_version > 1020 -%find_gconf_schemas -%endif # 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 +rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE # fdupes %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{progdir} @@ -307,14 +299,6 @@ rm -rf $RPM_BUILD_ROOT %if %localize rm -rf %{_tmppath}/translations.* %endif -%if %suse_version > 1020 - -%pre branding-upstream -f %{name}.schemas_pre - -%preun branding-upstream -f %{name}.schemas_preun - -%posttrans branding-upstream -f %{name}.schemas_posttrans -%endif %post # update mime and desktop database @@ -354,7 +338,7 @@ if [ -f opt/gnome/bin/update-mime-database ] ; then fi %endif -%files +%files %defattr(-,root,root) %dir %{progdir} %dir %{progdir}/chrome/ @@ -374,6 +358,9 @@ fi %{progdir}/%{progname} %{progdir}/application.ini %{progdir}/blocklist.xml +%ifarch %ix86 +%{progdir}/crashreporter-override.ini +%endif %{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* @@ -382,22 +369,23 @@ fi %endif %{_bindir}/%{progname} %doc %{_mandir}/man1/%{progname}.1.gz -%if %localize +%if %localize %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) +%dir %{progdir} +%dir %{progdir}/chrome/ %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) +%dir %{progdir} +%dir %{progdir}/chrome/ %endif -%if %suse_version > 1020 -%files branding-upstream -f %{name}.schemas_list -%else - -%files branding-upstream -%endif +%files branding-upstream %defattr(-,root,root) +%dir %{progdir} +%dir %{progdir}/defaults/ %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html diff --git a/firefox-3.5.7-source.tar.bz2 b/firefox-3.5.7-source.tar.bz2 deleted file mode 100644 index d806787..0000000 --- a/firefox-3.5.7-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06d5d60fd87e5df49217a83a01409394570b9a743a9394172a33a1294c5f6570 -size 46585379 diff --git a/firefox-3.6rc1-source.tar.bz2 b/firefox-3.6rc1-source.tar.bz2 new file mode 100644 index 0000000..ccf23a9 --- /dev/null +++ b/firefox-3.6rc1-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:789105d5e1eab90e529dd16bc646a11f17faf4bb64da8ef6f2c0e05898f5d3d9 +size 47878768 diff --git a/firefox-appname.patch b/firefox-appname.patch index 88e8daa..912a592 100644 --- a/firefox-appname.patch +++ b/firefox-appname.patch @@ -1,7 +1,10 @@ +From: Wolfgang Rosenauer +Subject: Hardcode app starter for default check + diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp --- a/browser/components/shell/src/nsGNOMEShellService.cpp +++ b/browser/components/shell/src/nsGNOMEShellService.cpp -@@ -129,17 +129,21 @@ nsGNOMEShellService::Init() +@@ -127,17 +127,21 @@ nsGNOMEShellService::Init() nsCOMPtr appPath; rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(appPath)); diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch index 81caa9d..ddae611 100644 --- a/firefox-browser-css.patch +++ b/firefox-browser-css.patch @@ -9,13 +9,13 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027 diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css --- a/browser/themes/gnomestripe/browser/browser.css +++ b/browser/themes/gnomestripe/browser/browser.css -@@ -837,16 +837,30 @@ toolbar[iconsize="small"] #paste-button[ - #PopupAutoComplete[chromedir="rtl"] > tree > treerows { - direction: rtl; +@@ -788,16 +788,30 @@ toolbar[iconsize="small"] #fullscreen-bu + display: none; } - #PopupAutoComplete .autocomplete-treebody { - direction: ltr; + #PopupAutoComplete, + #PopupAutoCompleteRichResult { + direction: ltr !important; } +#PopupAutoCompleteRichResult .autocomplete-richlistitem { @@ -32,11 +32,11 @@ diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gno + color: -moz-Fieldtext !important; +} + - /* Favicon */ - #page-proxy-favicon, - #urlbar-throbber { - width: 16px; - height: 16px; + #PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows { + direction: rtl; + } + + #PopupAutoComplete .autocomplete-treebody { + direction: ltr; } - #page-proxy-stack { diff --git a/firefox-crashreporter.patch b/firefox-crashreporter.patch new file mode 100644 index 0000000..7c87cfc --- /dev/null +++ b/firefox-crashreporter.patch @@ -0,0 +1,49 @@ +diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in +--- a/browser/app/Makefile.in ++++ b/browser/app/Makefile.in +@@ -223,22 +223,16 @@ endif + ifdef DEBUG + RCFLAGS += -DDEBUG + endif + RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\" + endif + + include $(topsrcdir)/config/rules.mk + +-DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" +- +-ifdef MOZILLA_OFFICIAL +-DEFINES += -DMOZILLA_OFFICIAL +-endif +- + ifdef BUILD_STATIC_LIBS + include $(topsrcdir)/config/static-rules.mk + + DEFINES += -DIMPL_XREAPI + endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),photon) + LIBS += -lphexlib +@@ -277,16 +271,22 @@ install:: $(MOZ_APP_NAME) + + GARBAGE += $(MOZ_APP_NAME) + GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) + + endif + + endif # LIBXUL_SDK + ++ifdef MOZILLA_OFFICIAL ++DEFINES += -DMOZILLA_OFFICIAL ++endif ++ ++DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" ++ + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + libs:: + $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons + $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default + endif diff --git a/credits.patch b/firefox-credits.patch similarity index 100% rename from credits.patch rename to firefox-credits.patch diff --git a/firefox-cross-desktop.patch b/firefox-cross-desktop.patch index ef9da9a..4b7b9e7 100644 --- a/firefox-cross-desktop.patch +++ b/firefox-cross-desktop.patch @@ -24,3 +24,46 @@ diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsCont haveSetDesktopBackground && this.onLoadedImage); if (haveSetDesktopBackground && this.onLoadedImage) { +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 +@@ -594,20 +594,38 @@ var gAdvancedPane = { + var brandShortName = brandBundle.getString("brandShortName"); + var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); + var promptMessage; + const IPS = Components.interfaces.nsIPromptService; + var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + .getService(IPS); ++ ++ var env = Components.classes["@mozilla.org/process/environment;1"] ++ .getService(Components.interfaces.nsIEnvironment); ++ var kde_session = 0; ++ if (env.get('KDE_FULL_SESSION') == "true") ++ kde_session = 1; ++ + if (!shellSvc.isDefaultBrowser(false)) { + promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", + [brandShortName]); + var rv = psvc.confirmEx(window, promptTitle, promptMessage, + IPS.STD_YES_NO_BUTTONS, + null, null, null, null, { }); +- if (rv == 0) ++ if (rv == 0) { + shellSvc.setDefaultBrowser(true, false); ++ if (kde_session == 1) { ++ var shellObj = Components.classes["@mozilla.org/file/local;1"] ++ .createInstance(Components.interfaces.nsILocalFile); ++ shellObj.initWithPath("/usr/bin/kwriteconfig"); ++ var process = Components.classes["@mozilla.org/process/util;1"] ++ .createInstance(Components.interfaces.nsIProcess); ++ process.init(shellObj); ++ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"]; ++ process.run(false, args, args.length); ++ } ++ } + } + else { + promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", + [brandShortName]); + psvc.alert(window, promptTitle, promptMessage); + } diff --git a/firefox-kde.patch b/firefox-kde.patch index 870fdbc..0b3cd30 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,28 +1,203 @@ ---- mozilla/browser/app/Makefile.in.sav 2009-10-01 22:03:56.000000000 +0200 -+++ mozilla/browser/app/Makefile.in 2009-10-01 22:04:57.000000000 +0200 -@@ -49,6 +49,7 @@ DIRS = profile/extensions +diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in +--- a/browser/app/Makefile.in ++++ b/browser/app/Makefile.in +@@ -44,16 +44,17 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + + include $(DEPTH)/config/autoconf.mk + + DIRS = profile/extensions PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ $(srcdir)/profile/channel-prefs.js \ + $(srcdir)/profile/kde.js \ $(NULL) - ifndef MOZ_BRANDING_DIRECTORY ---- mozilla/browser/base/content/browser-kde.xul.sav 2009-07-31 08:29:32.000000000 +0200 -+++ mozilla/browser/base/content/browser-kde.xul 2009-10-01 22:34:03.000000000 +0200 -@@ -157,7 +157,7 @@ -