Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Fri Jan 8 01:32:34 CET 2010. -------- --- MozillaFirefox/MozillaFirefox.changes 2010-01-05 09:31:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2010-01-07 14:40:06.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 6 17:15:40 CET 2010 - wr@rosenauer.org + +- major update to 3.6rc1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- credits.patch firefox-3.5.7-source.tar.bz2 firefox-no-update.patch l10n-3.5.7.tar.bz2 mozilla-abi.patch mozilla-linkorder.patch New: ---- firefox-3.6rc1-source.tar.bz2 firefox-crashreporter.patch firefox-credits.patch firefox-linkorder.patch l10n-3.6rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -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 +# 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 @@ 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 @@ 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 @@ -95,8 +102,8 @@ 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 +113,10 @@ %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 +132,6 @@ 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 +157,15 @@ %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 +199,9 @@ #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 +272,23 @@ # 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 +300,6 @@ %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 @@ -374,6 +359,9 @@ %{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* @@ -386,18 +374,19 @@ %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 %defattr(-,root,root) +%dir %{progdir} +%dir %{progdir}/defaults/ %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html ++++++ firefox-appname.patch ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -1,7 +1,10 @@ +From: Wolfgang Rosenauer <wr@rosenauer.org> +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<nsILocalFile> appPath; rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(appPath)); ++++++ firefox-browser-css.patch ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -9,13 +9,13 @@ 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 @@ + 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 { ++++++ firefox-crashreporter.patch ++++++ 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 ++++++ firefox-credits.patch ++++++ diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml --- a/browser/base/content/credits.xhtml +++ b/browser/base/content/credits.xhtml @@ -579,16 +579,19 @@ <li>Satoko Takita Yamaguchi (Chibi)</li> <li>Christine Yen</li> <li>Kohei Yoshino</li> <li>Shigeru Yoshitake</li> <li>Boris Zbarsky</li> <li>Marco Zehe</li> <li>Matthew Zeier</li> </ul> + + <h3>openSUSE RPM packaging</h3> + <ul><li>Wolfgang Rosenauer</li></ul> <div dir="&locale.dir;"> &credit.translation; </div> </div> <!-- organizational supporters --> <div class="creditsGroup"> ++++++ firefox-cross-desktop.patch ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -24,3 +24,46 @@ 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); + } ++++++ firefox-kde.patch ++++++ ++++ 888 lines (skipped) ++++ between MozillaFirefox/firefox-kde.patch ++++ and /mounts/work_src_done/STABLE/MozillaFirefox/firefox-kde.patch ++++++ firefox-libxul-sdk.patch ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -1,10 +1,7 @@ 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-$* +@@ -192,9 +192,11 @@ endif libs-%: $(NSINSTALL) -D $(DIST)/install @@ -15,8 +12,5 @@ @$(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-$* BOTH_MANIFESTS=1 - endif @$(MAKE) tests AB_CD=$* - ++++++ firefox-linkorder.patch ++++++ From: Wolfgang Rosenauer Subject: Build fails with --as-needed References: diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -78,19 +78,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) endif # This has to come after the above chunk, because mozreg_s has dependencies on # stuff in MOZ_COMPONENT_LIBS. EXTRA_DSO_LDOPTS += \ $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(MOZ_COMPONENT_LIBS) \ $(NULL) +# if built with --as-needed the NSPR libs need to be linked after mozreg_s +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) # GTK2: Need to link with glib for GNOME shell service ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += \ $(TK_LIBS) \ $(NULL) endif ++++++ firefox-no-gnomevfs.patch ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -1,25 +1,22 @@ +From: Wolfgang Rosenauer <wr@rosenauer.org> +Subject: Do not build nkgnomevfs in xul app builds +References: +https://bugzilla.mozilla.org/show_bug.cgi?id=512671 + diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -5632,16 +5632,21 @@ done], - if test -z "$MOZ_ENABLE_GNOMEVFS" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then - # Suppress warning on non-X11 platforms - if test -n "$MOZ_X11"; then - AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) - fi +@@ -5744,6 +5744,13 @@ if test -z "$MOZ_ENABLE_GNOMEVFS" && tes MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` fi -+dnl Do not build gnomevfs with libxul based apps -+if test -n "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test ! -z "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++ if test -n "$MOZ_X11"; then ++ AC_MSG_WARN([nkgnomevfs is already part of xulrunner. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` +fi + if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` - fi - - dnl This might be temporary: build tridentprofile only on Windows - if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then - AC_MSG_WARN([tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS.]) ++++++ firefox-suse-default-prefs.js ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -1,3 +1,2 @@ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); -pref("app.update.enabled", false); ++++++ firefox-ui-lockdown.patch ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -1,34 +1,10 @@ -diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc ---- a/browser/base/content/browser-menubar.inc -+++ b/browser/base/content/browser-menubar.inc -@@ -64,21 +64,19 @@ - <menuitem id="menu_closeWindow" hidden="true" command="cmd_closeWindow" key="key_closeWindow" label="&closeWindow.label;" accesskey="&closeWindow.accesskey;"/> - <menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/> - <menuseparator/> - <menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage" - id="menu_savePage" /> - <menuitem id="menu_saveFrame" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" command="Browser:SaveFrame" hidden="true"/> - <menuitem id="menu_sendLink" label="&sendPageCmd.label;" accesskey="&sendPageCmd.accesskey;" command="Browser:SendLink"/> - <menuseparator/> -- <menuitem label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_pageSetup" -- id="menu_printSetup" /> -+ <menuitem id="menu_printSetup" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_pageSetup"/> - #ifndef XP_MACOSX -- <menuitem label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="cmd_printPreview" -- id="menu_printPreview" /> -+ <menuitem id="menu_printPreview" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" oncommand="PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview);"/> - #endif - <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="cmd_print" - id="menu_print" /> - <menuseparator/> - <menuitem label="&import.label;" accesskey="&import.accesskey;" oncommand="BrowserImport();" - id="menu_import"/> - #ifndef XP_MACOSX - <menuseparator/> +From: various contributors +Subject: Firefox chrome lockdown hooks + diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -1192,32 +1192,186 @@ function prepareForStartup() { +@@ -1174,32 +1174,186 @@ function prepareForStartup() { // setup our MozApplicationManifest listener gBrowser.addEventListener("MozApplicationManifest", OfflineApps, false); @@ -216,7 +192,7 @@ PlacesStarButton.init(); // called when we go into full screen, even if it is -@@ -1401,16 +1555,18 @@ function BrowserShutdown() +@@ -1399,16 +1553,18 @@ function BrowserShutdown() Components.utils.reportError(ex); } @@ -235,8 +211,8 @@ PlacesStarButton.uninit(); -@@ -3200,16 +3356,22 @@ const BrowserSearch = { - function FillHistoryMenu(aParent) { +@@ -3208,16 +3364,23 @@ function FillHistoryMenu(aParent) { + // Remove old entries if any var children = aParent.childNodes; for (var i = children.length - 1; i >= 0; --i) { @@ -245,20 +221,21 @@ } + // lockdown. Don't display anything if locked down. -+ var disableHistory = gPrefService.getBoolPref("config.lockdown.history"); -+ if (disableHistory) { -+ return false; -+ } ++ try { ++ var disableHistory = gPrefService.getBoolPref("config.lockdown.history"); ++ if (disableHistory) ++ return false; ++ } catch (ex) {} + var webNav = getWebNavigation(); var sessionHistory = webNav.sessionHistory; - var bundle_browser = document.getElementById("bundle_browser"); var count = sessionHistory.count; - var index = sessionHistory.index; - var end; + if (count <= 1) // don't display the popup for a single item + return false; -@@ -3346,16 +3508,17 @@ function BrowserCustomizeToolbar() + const MAX_HISTORY_MENU_ITEMS = 15; +@@ -3357,16 +3520,17 @@ function BrowserCustomizeToolbar() { // Disable the toolbar context menu items var menubar = document.getElementById("main-menubar"); @@ -274,35 +251,41 @@ splitter.parentNode.removeChild(splitter); var customizeURL = "chrome://global/content/customizeToolbar.xul"; - #ifdef TOOLBAR_CUSTOMIZATION_SHEET - var sheetFrame = document.getElementById("customizeToolbarSheetIFrame"); -@@ -3381,16 +3544,25 @@ function BrowserCustomizeToolbar() - #else - window.openDialog(customizeURL, - "CustomizeToolbar", - "chrome,titlebar,toolbar,location,resizable,dependent", - gNavToolbox); - #endif + gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false); + +@@ -3394,16 +3558,31 @@ function BrowserCustomizeToolbar() + } else { + return window.openDialog(customizeURL, + "CustomizeToolbar", + "chrome,titlebar,toolbar,location,resizable,dependent", + gNavToolbox); + } } +function BrowserRestoreCustomizationDisabledState() +{ + var cmd = document.getElementById("cmd_CustomizeToolbars"); -+ if (!gPrefService.getBoolPref("config.lockdown.toolbarediting")) { ++ try { ++ var disableToolBarEditing = ++ gPrefService.getBoolPref("config.lockdown.toolbarediting"); ++ } catch (ex) { ++ var disableToolBarEditing = false; ++ } ++ if (!disableToolBarEditing) { + cmd.removeAttribute("disabled", "true"); + } + cmd.removeAttribute("inCustomization"); +} + function BrowserToolboxCustomizeDone(aToolboxChanged) { - #ifdef TOOLBAR_CUSTOMIZATION_SHEET - document.getElementById("customizeToolbarSheetIFrame").hidden = true; - document.getElementById("customizeToolbarSheetPopup").hidePopup(); - #endif + if (gCustomizeSheet) { + document.getElementById("customizeToolbarSheetIFrame").hidden = true; + document.getElementById("customizeToolbarSheetPopup").hidePopup(); + } // Update global UI elements that may have been added or removed if (aToolboxChanged) { -@@ -3398,16 +3570,23 @@ function BrowserToolboxCustomizeDone(aTo +@@ -3411,16 +3590,27 @@ function BrowserToolboxCustomizeDone(aTo if (gURLBar) gURLBar.emptyText = gURLBarEmptyText.value; @@ -312,7 +295,11 @@ window.XULBrowserWindow.init(); + // make sure the search bar is not put back if locked down -+ var disableSearchBar = gPrefService.getBoolPref("config.lockdown.searchbar"); ++ try { ++ var disableSearchBar = gPrefService.getBoolPref("config.lockdown.searchbar"); ++ } catch (ex) { ++ var disableSearchBar = false; ++ } + if (disableSearchBar) { + document.getElementById("search-container") + .setAttribute("style", (disableSearchBar) ? "display: none;" : ""); @@ -326,7 +313,7 @@ // support downgrading to Firefox 2.0 var navBar = document.getElementById("nav-bar"); -@@ -3432,18 +3611,17 @@ function BrowserToolboxCustomizeDone(aTo +@@ -3445,18 +3635,17 @@ function BrowserToolboxCustomizeDone(aTo XULBrowserWindow.asyncUpdateUI(); PlacesStarButton.updateState(); } @@ -339,19 +326,19 @@ - cmd.removeAttribute("disabled"); + BrowserRestoreCustomizationDisabledState(); - // XXXmano bug 287105: wallpaper to bug 309953, - // the reload button isn't in sync with the reload command. - var reloadButton = document.getElementById("reload-button"); - if (reloadButton) { - reloadButton.disabled = - document.getElementById("Browser:Reload").getAttribute("disabled") == "true"; - } -@@ -4568,16 +4746,19 @@ function onViewToolbarsPopupShowing(aEve - var toolbar = gNavToolbox.childNodes[i]; + #ifdef XP_MACOSX + // make sure to re-enable click-and-hold + if (!getBoolPref("ui.click_hold_context_menus", false)) + SetClickAndHoldHandlers(); + #endif + + // XXX Shouldn't have to do this, but I do +@@ -4544,16 +4733,19 @@ function onViewToolbarsPopupShowing(aEve var toolbarName = toolbar.getAttribute("toolbarname"); - var type = toolbar.getAttribute("type"); - if (toolbarName && type != "menubar") { - var menuItem = document.createElement("menuitem"); + if (toolbarName) { + let menuItem = document.createElement("menuitem"); + let hidingAttribute = toolbar.getAttribute("type") == "menubar" ? + "autohide" : "collapsed"; menuItem.setAttribute("toolbarindex", i); menuItem.setAttribute("type", "checkbox"); menuItem.setAttribute("label", toolbarName); @@ -359,14 +346,14 @@ + menuItem.setAttribute("disabled", "true"); + } menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey")); - menuItem.setAttribute("checked", toolbar.getAttribute("collapsed") != "true"); + menuItem.setAttribute("checked", toolbar.getAttribute(hidingAttribute) != "true"); popup.insertBefore(menuItem, firstMenuItem); menuItem.addEventListener("command", onViewToolbarCommand, false); } toolbar = toolbar.nextSibling; } -@@ -6521,17 +6702,17 @@ BookmarkAllTabsHandler.prototype = { +@@ -6421,17 +6613,23 @@ BookmarkAllTabsHandler.prototype = { _updateCommandState: function BATH__updateCommandState(aTabClose) { var numTabs = gBrowser.tabContainer.childNodes.length; @@ -376,7 +363,13 @@ numTabs--; - if (numTabs > 1) -+ if (numTabs > 1 && !gPrefService.getBoolPref("config.lockdown.bookmark")) ++ try { ++ var disableBookmarks = ++ gPrefService.getBoolPref("config.lockdown.bookmark"); ++ } catch (ex) { ++ var disableBookmarks = false; ++ } ++ if (numTabs > 1 && !disableBookmarks) this._command.removeAttribute("disabled"); else this._command.setAttribute("disabled", "true"); ++++++ firefox.schemas ++++++ --- /var/tmp/diff_new_pack.5VAQZY/_old 2010-01-08 01:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5VAQZY/_new 2010-01-08 01:32:10.000000000 +0100 @@ -137,7 +137,7 @@ <applyto>/apps/firefox/general/homepage_url</applyto> <owner>firefox</owner> <type>string</type> - <default>www.mozilla.com</default> + <default>www.novell.com/linux</default> <locale name="C"> <short>Home Page URL</short> <long>Home Page URL</long> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org