commit 2028cb321b5f76c968fb9b0bf0357eb19409888ef29ff624e38a34ee72a51ae0 Author: OBS User unknown Date: Mon Jan 8 11:23:18 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..9b03811c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/358797.patch b/358797.patch new file mode 100644 index 00000000..df184bee --- /dev/null +++ b/358797.patch @@ -0,0 +1,37 @@ +Index: parser/htmlparser/src/nsParser.cpp +=================================================================== +RCS file: /cvsroot/mozilla/parser/htmlparser/src/nsParser.cpp,v +retrieving revision 3.370.4.4 +diff -u -p -6 -r3.370.4.4 nsParser.cpp +--- parser/htmlparser/src/nsParser.cpp 13 Jul 2006 17:28:08 -0000 3.370.4.4 ++++ parser/htmlparser/src/nsParser.cpp 1 Nov 2006 23:28:14 -0000 +@@ -1870,19 +1870,27 @@ nsParser::ParseFragment(const nsAString& + if (NS_FAILED(result)) { + mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED; + return result; + } + + nsCOMPtr fragSink = do_QueryInterface(mSink); +- NS_ASSERTION(fragSink, "ParseFragment requires a fragment content sink"); ++ if (!fragSink) { ++ NS_ERROR("ParseFragment requires a fragment content sink"); ++ mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED; ++ return kUnknownError; ++ } + + if (!aXMLMode) { + // First, we have to flush any tags that don't belong in the head if there + // was no in the context. + // XXX This is extremely ugly. Maybe CNavDTD should have FlushMisplaced()? +- NS_ASSERTION(mParserContext, "Parsing didn't create a parser context?"); ++ if (!mParserContext) { ++ NS_ERROR("Parsing didn't create a parser context?"); ++ mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED; ++ return kInvalidParserContext; ++ } + nsCOMPtr dtd = do_QueryInterface(mParserContext->mDTD); + + if (dtd) { + CStartToken bodyToken(NS_LITERAL_STRING("BODY"), eHTMLTag_body); + nsCParserNode bodyNode(&bodyToken, 0); + diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes new file mode 100644 index 00000000..c8c01e44 --- /dev/null +++ b/MozillaFirefox.changes @@ -0,0 +1,1238 @@ +------------------------------------------------------------------- +Mon Jan 8 11:16:08 CET 2007 - meissner@suse.de + +- Do not provide MozillaFirebird, just obsolete it. + +------------------------------------------------------------------- +Fri Dec 1 02:22:49 CET 2006 - maw@suse.de + +- Update gecko-lockdown.patch (#220616). + +------------------------------------------------------------------- +Thu Nov 30 19:02:54 CET 2006 - maw@suse.de + +- Update firefox-suse-default-prefs.js, adding + 'pref("browser.backspace_action", 2);' (#217374) + +------------------------------------------------------------------- +Thu Nov 30 08:17:28 CET 2006 - aj@suse.de + +- Fix last change (#224431). + +------------------------------------------------------------------- +Wed Nov 29 11:45:47 CET 2006 - aj@suse.de + +- Change download bookmark (#224431). +- Rename bookmark folder to openSUSE. + +------------------------------------------------------------------- +Tue Nov 28 08:09:48 CET 2006 - aj@suse.de + +- Sync from Buildservice with following critical fixes (thanks + Wolfgang Rosenauer!): + * fixed system-proxies.patch to actually work (#223881). + * Rearrange Bookmarks to pass trademark review. + +------------------------------------------------------------------- +Mon Nov 27 19:40:44 CET 2006 - aj@suse.de + +- Fix tango theme (#223796). + +------------------------------------------------------------------- +Mon Nov 27 17:40:50 CET 2006 - aj@suse.de + +- Use www.opensuse.org as home page. + +------------------------------------------------------------------- +Sun Nov 12 11:28:00 CET 2006 - aj@suse.de + +- Set novell.com as home page. +- Update from BuildService (thanks Wolfgang!): + - fixed crash in htmlparser (#217257, bmo #358797) + - added gconf2 as PreReq (#212505) + - added 32bit libaoss.so as requirement (#216266) + - Removed SUSE searchplugin (Portal not available anymore) + (#216054) + - Removed obsolete xul-picker.patch and system-nspr.patch + - Fixed building on 10.1 and 10.0 (dbus) + - Removed obsolete throbber preference + +------------------------------------------------------------------- +Thu Nov 9 19:09:46 CET 2006 - jhargadon@suse.de + +- updated tango theme + +------------------------------------------------------------------- +Sun Oct 29 12:05:46 CET 2006 - aj@suse.de + +- Another fix for 214125, patch by Wolfgang Rosenauer. + +------------------------------------------------------------------- +Thu Oct 26 06:58:59 CEST 2006 - aj@suse.de + +- Fix gcc warnings about undefined operations, patch by + Robert O'Callahan. +- Update system-proxies.patch to fix error box (214125), patch by + Robert O'Callahan. + +------------------------------------------------------------------- +Mon Oct 23 21:54:54 CEST 2006 - aj@suse.de + +- Update to current CVS version of 2.0. +- Use www.opensuse.org as default home page for now (#203547). + +------------------------------------------------------------------- +Sat Oct 21 08:53:50 CEST 2006 - aj@suse.de + +- Disable non-working plasticfox and tango themes. + +------------------------------------------------------------------- +Fri Oct 20 20:16:29 CEST 2006 - aj@suse.de + +- Fix building of locales. + +------------------------------------------------------------------- +Fri Oct 20 11:27:23 CEST 2006 - mkoenig@suse.de + +- update to version 2.0rc3: + * New features: Visual Refresh, Built-in phishing protection, + Enhanced search capabilities, Improved tabbed browsing, + Resuming your browsing session, Previewing and subscribing + to Web feeds, Inline spell checking, Live Titles, + Improved Add-ons manager, JavaScript 1.7, Extended search + plugin format, Updates to the extension system, + Client-side session and persistent storage, SVG text + +------------------------------------------------------------------- +Tue Oct 17 11:26:44 CEST 2006 - meissner@suse.de + +- disabled debugging. + +-------------------------------------------------------------------- +Tue Sep 12 20:27:02 CEST 2006 - stark@suse.de + +- security update to version 1.5.0.7 + +------------------------------------------------------------------- +Mon Aug 21 12:53:50 CEST 2006 - stark@suse.de + +- added greasemonkey helper change (#199920) +- fixed packager.mk for new make version + +------------------------------------------------------------------- +Fri Aug 11 20:51:48 CEST 2006 - stark@suse.de + +- fixed crash in dbus component (patch by thoenig #197928) +- use external adresses for PAC configuration (#196506) + +------------------------------------------------------------------- +Mon Aug 7 09:26:58 CEST 2006 - stark@suse.de + +- added symlink for Firefox 1.0.x compatibility + +------------------------------------------------------------------- +Sat Jul 29 08:48:53 CEST 2006 - stark@suse.de + +- update to regression release 1.5.0.6 (#195043) + +------------------------------------------------------------------- +Thu Jul 27 06:20:36 CEST 2006 - stark@suse.de + +- security update to version 1.5.0.5 (#195043) + * observer-lock.patch integrated now +- fixed leak in JS' liveconnect (#186066) +- fixed desktop file for old distributions + (StartupNotify=false) + +------------------------------------------------------------------- +Thu Jun 29 20:13:28 CEST 2006 - stark@suse.de + +- fixed printing crash if the last used printer is not available + anymore (#187013) + +------------------------------------------------------------------- +Fri Jun 16 22:11:22 CEST 2006 - stark@suse.de + +- added 48x48 icon (#185777) + +------------------------------------------------------------------- +Mon Jun 12 20:20:02 CEST 2006 - stark@suse.de + +- fix overwrite confirmation for GTK filesaver (#179531) +- get network.negotiate-auth.trusted-uris and + network.negotiate-auth.delegation-uris from gconf if + system-settings are enabled (#184489) + +------------------------------------------------------------------- +Thu Jun 1 20:34:43 CEST 2006 - stark@suse.de + +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) + +------------------------------------------------------------------- +Tue May 23 21:11:11 CEST 2006 - stark@suse.de + +- complete implementation of startup-notification (#115417) + (including autoconf and remote support) +- different home-pages for SLE10 and SL (#177881) + +------------------------------------------------------------------- +Tue May 16 06:27:26 CEST 2006 - stark@suse.de + +- fixed potential deadlock in nsObserverList::RemoveObserver + (#173986, bmo #338069) +- base startup notification on libstartup-notification (#115417) + +------------------------------------------------------------------- +Thu May 11 09:39:27 CEST 2006 - stark@suse.de + +- save printer settings properly (#174082, bmo #324072) +- added startup notification support for showing load activity + in Gnome and to avoid focus stealing prevention (#115417) +- added StartupNotify=true to desktop file (#115417) +- provide legacy symlink for NLD9 update compatibility (#173138) +- fixed system-proxies patch to avoid unwanted wpad requests + (#171743, #167613) + +------------------------------------------------------------------- +Mon May 8 14:55:52 CEST 2006 - stark@suse.de + +- preconfigure the theme according to the used desktop (#151163) + +------------------------------------------------------------------- +Thu Apr 27 10:24:07 CEST 2006 - stark@suse.de + +- last minute change for 1.5.0.3 + +------------------------------------------------------------------- +Wed Apr 26 14:23:33 CEST 2006 - stark@suse.de + +- security update to 1.5.0.3 +- fix for typo in postscript.patch + +------------------------------------------------------------------- +Tue Apr 25 14:14:51 CEST 2006 - stark@suse.de + +- fixed iframe crash (#169039, bmo #334515) +- fixed img tag misuse (#168710, bmo #334341) + +------------------------------------------------------------------- +Mon Apr 24 08:04:16 CEST 2006 - stark@suse.de + +- improved postscript output (bmo #334485) +- changed defaults for printer properties (#6534) +- overwrite gnome-vfs' file protocol by providing "desktop-launch" + (#131501) +- get available paper sizes from CUPS (#65482) +- replaced/removed complicated gconfd reload in %post (#167989) +- fixed memory leak in clipboard caching (bmo #289897) + +------------------------------------------------------------------- +Tue Apr 11 08:35:53 CEST 2006 - stark@suse.de + +- added (optional) plastikfox theme (#151163) +- get some more security related patches (#148876) +- finally fixed the default proxy configuration by adding a new + UI option (#132398) + +------------------------------------------------------------------- +Mon Apr 3 11:41:13 CEST 2006 - stark@suse.de + +- fixed keyword fixup patch (#162532) + +------------------------------------------------------------------- +Tue Mar 28 07:17:04 CEST 2006 - stark@suse.de + +- don't use keyword fixup for pasted text (#160034, bmo #331522) + +------------------------------------------------------------------- +Mon Mar 20 09:28:58 CET 2006 - stark@suse.de + +- added Tango theme +- fixed reading proxies from gconf (#132398) + +------------------------------------------------------------------- +Sun Mar 12 09:04:05 CET 2006 - stark@suse.de + +- tweaked bookmarks (fixed URLs) +- added Khmer (km-*) to pango locales (#157397) + +------------------------------------------------------------------- +Sat Mar 4 21:08:45 CET 2006 - stark@suse.de + +- fixed crash with multipart JPEGs (bmo #328684) (#140416) +- got latest security fixes from upstream (#148876) + +------------------------------------------------------------------- +Wed Feb 22 13:24:58 CET 2006 - stark@suse.de + +- fixed plugin loading when launched from Thunderbird (#151614) +- merged dbus reconnection patch (#150042) +- default to autodetect proxy (network.proxy.type=4) (#151811) +- added GTK category to desktop file + +------------------------------------------------------------------- +Tue Feb 14 06:45:24 CET 2006 - stark@suse.de + +- modified lockdown patches (#67281, #67282) +- applied set of security patches (#148876) + bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947 + +------------------------------------------------------------------- +Tue Feb 7 20:09:43 CET 2006 - stark@suse.de + +- fixed disabling of Pango (#148788) + +------------------------------------------------------------------- +Thu Feb 2 21:51:30 CET 2006 - stark@suse.de + +- define gssapi lib explicitely (#147670) +- use only official Firefox-Icon +- changed home-download patch + +------------------------------------------------------------------- +Sun Jan 29 09:54:49 CET 2006 - stark@suse.de + +- throbber URL is default again +- removed firefox-showpass patch +- removed additional CA certs from builtin NSS + +------------------------------------------------------------------- +Fri Jan 27 17:55:21 CET 2006 - stark@suse.de + +- got some l10n changes from 1.8.0 branch + +------------------------------------------------------------------- +Fri Jan 27 08:15:09 CET 2006 - stark@suse.de + +- final 1.5.0.1 version +- make it possible to choose $HOME as download directory + (#144894, bmo #300856) + +------------------------------------------------------------------- +Wed Jan 25 21:33:43 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Sun Jan 22 17:06:57 CET 2006 - stark@suse.de + +- disable Pango if MOZ_ENABLE_PANGO is not set + and no typical language which needs Pango is used (#143428) + +------------------------------------------------------------------- +Wed Jan 18 10:27:30 CET 2006 - stark@suse.de + +- fixed DumpStackToFile() for glibc 2.4 +- added default (font) settings + +------------------------------------------------------------------- +Thu Jan 12 10:23:58 CET 2006 - stark@suse.de + +- update to 1.5.0.1pre (20060111) +- updated man-page +- fixed hovered tab close button +- only Requires mozilla-nspr instead of PreReq since + there is no postinstall registration necessary anymore +- use system NSS from CODE10 on +- use -fstack-protector where available +- changed unixproxy component to work on older distributions + +------------------------------------------------------------------- +Mon Jan 2 13:39:09 CET 2006 - stark@suse.de + +- added unixproxy component written by Robert O'Callahan (#132398) + (bmo #66057) +- added official translations +- preload libaoss for plugin sound (#117079) + +------------------------------------------------------------------- +Wed Dec 28 08:16:03 CET 2005 - stark@suse.de + +- get some patches from 1.8.0 branch +- readded modification to gconf-backend (bmo #321315) +- readded lockdown stuff +- enable additional extension install directory (#120329) + (/usr/lib/browser-extensions/firefox) +- added patch to make the XUL filechooser optional + (MOZ_XUL_PICKER) + +------------------------------------------------------------------- +Wed Dec 14 16:08:12 CET 2005 - stark@suse.de + +- fixed patch for parsing -remote parameter +- removed default-plugin patch (not needed anymore) + +------------------------------------------------------------------- +Fri Dec 9 17:21:29 CET 2005 - stark@suse.de + +- fix to ignore X composite extension (#135373) +- fixed parsing of -remote parameters (#134396) +- activated locales as released + +------------------------------------------------------------------- +Tue Nov 29 21:33:13 CET 2005 - stark@suse.de + +- update to 1.5 (20051128) +- don't override startup URL when changing Gecko versions (#135314) +- added patch for GTK2 handling (#134831) +- readded add-plugins stuff for compatibility + +------------------------------------------------------------------- +Fri Nov 18 07:41:41 CET 2005 - stark@suse.de + +- update to 1.5rc3 (20051117) + +------------------------------------------------------------------- +Mon Oct 31 08:58:14 CET 2005 - stark@suse.de + +- updated l10n archive (20051030) +- fixed postinstall script to copy plugin links instead of files + +------------------------------------------------------------------- +Fri Oct 28 06:43:27 CEST 2005 - stark@suse.de + +- update to 1.5rc1 (20051027) +- fixed profile locking on FAT partitions (bmo #313360) +- introduced an rpath again + +------------------------------------------------------------------- +Wed Oct 19 20:03:48 CEST 2005 - stark@suse.de + +- update to snapshot 1.5 (20051019) +- moved installation to /usr/%{_lib}/firefox +- added dbus component to be able to get network status from + NetworkManager (bmo #312793) +- remove all update UI for application +- removed diable-gconf (no registration at build time anymore) +- removed rebuild-databases.sh (no system registration anymore) +- open links in new windows (#128087) + +------------------------------------------------------------------- +Thu Oct 6 20:44:53 CEST 2005 - stark@suse.de + +- update to Firefox 1.5b2 (20051005) +- added supported translations + +------------------------------------------------------------------- +Sat Oct 1 15:09:18 CEST 2005 - stark@suse.de + +- update to Firefox 1.5b1 (20050930) RPM version 1.4.1 +- removed rebuild-databases.sh calls +- removed add-plugins.sh calls and corresponding triggers +- enabled SVG and Canvas support +- fixed gconf urlhandler registration + +------------------------------------------------------------------- +Tue Sep 20 10:24:16 CEST 2005 - stark@suse.de + +- security update to 1.0.7 (#117619) + * MFSA 2005-57: IDN heap overrun using soft-hyphens (bmo #307259) + (enabled IDN pref again) + * MFSA 2005-58: + CAN-2005-2701 Heap overrun in XBM image processing + CAN-2005-2702 Crash on "zero-width non-joiner" sequence + CAN-2005-2703 XMLHttpRequest header spoofing + CAN-2005-2704 Object spoofing using XBL + CAN-2005-2705 JavaScript integer overflow + CAN-2005-2706 Privilege escalation using about: scheme + CAN-2005-2707 Chrome window spoofing + Regression fixes +- register beagle extension if it gets installed (#116787) + +------------------------------------------------------------------- +Tue Sep 13 15:41:37 CEST 2005 - aj@suse.de + +- Change SUSE bookmarks. + +------------------------------------------------------------------- +Sun Sep 11 17:05:07 CEST 2005 - stark@suse.de + +- disable IDN per default (#116070) +- unlocalize bookmarks (#114279) + +------------------------------------------------------------------- +Thu Sep 8 08:52:13 CEST 2005 - stark@suse.de + +- fixed some filemodes (#114849) + +------------------------------------------------------------------- +Sun Sep 4 00:03:53 CEST 2005 - stark@suse.de + +- fixed gconf-backend patch to be able to use + system prefs (#114054) + +------------------------------------------------------------------- +Thu Sep 1 13:22:17 CEST 2005 - stark@suse.de + +- changed default font to sans-serif (#114464) +- removed de-de parts of the bookmark-links (#114279) + +------------------------------------------------------------------- +Mon Aug 22 06:10:12 CEST 2005 - stark@suse.de + +- install gconf schema for lockdown also on non-NLD +- added backports (firefox-backports.patch) + * gtk_im_context_set_cursor_location() is not used (bmo #281339) + * fixed crash in imgCacheValidator::OnStartRequest() + (bmo #293307) +- workaround for linking with pangoxft and pangox + (broken by gtk 2.8 update) (#105764) +- remove extensions on deinstallation +- include dragonegg (kparts) plugin (#105468) + +------------------------------------------------------------------- +Thu Aug 18 13:08:55 CEST 2005 - stark@suse.de + +- fixed regression in profile locking change (bmo #303633) +- added rtsp handler to global config (#104434) +- don't blacklist help: protocol (bmo #304833) +- fixed Gdk-WARNING at startup (gtk.patch) +- fixed crash with gtk 2.7 (bmo #300226, bnc #104586) +- fixed installation of the beagle plugin +- update industrial theme to 1.0.11 (#104564) +- included lockdownV2 (removed obsolete gconf.diff) +- linked firefox-bin with rpath to progdir + +------------------------------------------------------------------- +Fri Aug 5 09:51:26 CEST 2005 - stark@suse.de + +- fixed profile locking (bmo #151188) +- install beagle extension globally + +------------------------------------------------------------------- +Fri Jul 29 06:58:24 CEST 2005 - stark@suse.de + +- don't require and provide NSS libs (#98002) +- fixed printing error 'You cannot print while in print preview' + (#96991, bmo #302445) + +------------------------------------------------------------------- +Wed Jul 27 09:34:12 CEST 2005 - stark@suse.de + +- fixed Firefox on ppc (stack-direction.patch) (#97359) +- removed open-pref from startscript as it is done + automatically now (#73042) +- updated Novell searchplugins + +------------------------------------------------------------------- +Mon Jul 25 12:32:13 CEST 2005 - stark@suse.de + +- GTK filechooser is now modal (#8533) +- backed out patch to add tooltips to print-preview + because it breaks localization + +------------------------------------------------------------------- +Fri Jul 22 10:54:39 CEST 2005 - stark@suse.de + +- fixed another problem in printing patch + +------------------------------------------------------------------- +Tue Jul 19 10:44:59 CEST 2005 - stark@suse.de + +- fixed error in ft-xft-ps2.patch +- disabled stripping in spec instead of patch +- added NSPR to PreReq + +------------------------------------------------------------------- +Mon Jul 18 08:43:24 CEST 2005 - stark@suse.de + +- fixed some more regressions with final 1.0.6 +- fixed width calculation in Postscript module (bmo #290292) +- fixed plugin event starvation (bnc #94749, #94751, bmo #301161) + +------------------------------------------------------------------- +Fri Jul 15 11:24:47 CEST 2005 - stark@suse.de + +- searchplugins can now be installed per profile (#8176) + +------------------------------------------------------------------- +Fri Jul 15 06:54:02 CEST 2005 - stark@suse.de + +- update to 1.0.6 which restores API compatibility + +------------------------------------------------------------------- +Tue Jul 12 06:20:37 CEST 2005 - stark@suse.de + +- update to 1.0.5 final (#88509) +- don't strip explicitely +- don't ship beagle.xpi + +------------------------------------------------------------------- +Wed Jul 6 14:13:09 CEST 2005 - stark@suse.de + +- update to 1.0.5-pre (20050705) +- use RPM_OPT_FLAGS for NSS component +- fixed implicit declarations and uninitialized used variables +- added patch for bmo #87969 + +------------------------------------------------------------------- +Tue Jul 5 10:17:16 CEST 2005 - stark@suse.de + +- fixed regression from security update (#95069, bmo #298478) + +------------------------------------------------------------------- +Mon Jun 27 21:46:58 CEST 2005 - stark@suse.de + +- don't use system-prefs by default on NLD +- removed basic lockdown stuff for SUSE Linux + (it's not needed and caused problems: bnc #75418) +- fixed NLD lockdown patch (bnc #75418) +- don't write prefs back to gconf for now + +------------------------------------------------------------------- +Wed Jun 22 07:32:42 CEST 2005 - stark@suse.de + +- new NLD lockdown patch which is syncing user prefs to gconf +- update to 1.0.5pre security-release + +------------------------------------------------------------------- +Thu Jun 9 06:56:02 CEST 2005 - stark@suse.de + +- new revision of NLD lockdown patch +- fixed remote usage behaviour in start script (bnc #41903) +- got more bugfixes from the branch + +------------------------------------------------------------------- +Thu Jun 2 10:31:48 CEST 2005 - stark@suse.de + +- fixed neededforbuild + +------------------------------------------------------------------- +Wed Jun 1 20:15:25 CEST 2005 - stark@suse.de + +- fixed IDN for 64bit platforms (bmo #236425, bnc #46268) + +------------------------------------------------------------------- +Fri May 20 15:12:06 CEST 2005 - stark@suse.de + +- fixed keybinding for KP separator (bnc #84147) +- pulled security related patch from upstream branch +- update plastikfox theme to version 1.6 + +------------------------------------------------------------------- +Thu May 12 06:16:25 CEST 2005 - stark@suse.de + +- update to final 1.0.4 release + +------------------------------------------------------------------- +Tue May 10 06:38:05 CEST 2005 - stark@suse.de + +- update to 1.0.4 security release +- removed s390(x) patches (upstream) +- made two more files %verify (81692) +- updated NLD lockdown patch (81304) + +------------------------------------------------------------------- +Thu Apr 28 09:45:53 CEST 2005 - stark@suse.de + +- use static NSPR libs from new location + +------------------------------------------------------------------- +Sat Apr 23 15:56:08 CEST 2005 - stark@suse.de + +- activate usage of system NSPR for distributions after 9.3 +- add patch to be able to use systen NSPR at all + +------------------------------------------------------------------- +Fri Apr 22 02:06:06 CEST 2005 - ro@suse.de + +- use mozilla-gcc4.patch + +------------------------------------------------------------------- +Thu Apr 21 12:51:19 CEST 2005 - stark@suse.de + +- don't execute gconf magic within build environment + +------------------------------------------------------------------- +Sat Apr 16 13:05:37 CEST 2005 - stark@suse.de + +- update to final 1.0.3 release + +------------------------------------------------------------------- +Fri Apr 15 00:10:54 CEST 2005 - ro@suse.de + +- fix problem in postinstall script + +------------------------------------------------------------------- +Wed Apr 14 09:20:02 CEST 2005 - stark@suse.de + +- included fixed lockdown patch for NLD +- linked proxies within Firefox with gnome settings (NLD) +- added gconfd restart procedure to install script + (only needed if gconf changes are done) (#76852) + +------------------------------------------------------------------- +Sat Apr 2 21:03:11 CEST 2005 - stark@suse.de + +- update to security pre-release 1.0.3 (#75692) + * Manual plug-in install, javascript vulnerability (bmo #288556) + * Access memory vulnerability (bmo #288688) + +------------------------------------------------------------------- +Fri Apr 1 11:32:44 CEST 2005 - stark@suse.de + +- added advanced lockdown features for ZLM integration (NLD-only) + +------------------------------------------------------------------- +Tue Mar 22 12:33:15 CET 2005 - stark@suse.de + +- update to final 1.0.2 +- use new theme handling on NLD +- added default-plugin-less-annoying from mozilla +- use GTK2 for Flash +- use system NSPR on SUSE releases after 9.3 +- made startscript PIS aware +- set g-application-name correctly (bmo #281979) +- added man-page +- use GTK system colors +- modify useragent string and add vendor id +- activate smooth-scrolling by default (#74310) + +------------------------------------------------------------------- +Tue Mar 22 08:59:06 CET 2005 - stark@suse.de + +- don't register beagle automatically (#74062) +- added default bookmarks for SUSE LINUX + +------------------------------------------------------------------- +Mon Mar 21 18:20:39 CET 2005 - max@suse.de + +- Fixed a typo in the shell code that handles inclusion of the + Acrobat Reader plugin (#70861). + +------------------------------------------------------------------- +Thu Mar 17 21:01:11 CET 2005 - stark@suse.de + +- updates from upcoming 1.0.2 +- added again logic to use Adobe Reader 7 (#70861) +- fixed crash in ICO decoding (#67142, bmo #245631) +- preinstall beagle extension (#72920) +- bugfixes in trigger scripts +- fixed industrial theming for Gnome (#72918) + +------------------------------------------------------------------- +Sat Mar 12 12:42:16 CET 2005 - stark@suse.de + +- fixed more security related bugs + (bmo #284551, #284627, #285595) + +------------------------------------------------------------------- +Wed Mar 9 21:42:05 CET 2005 - stark@suse.de + +- update also GNOME desktop file (#71810) +- added firefox-gnome.png to filelist +- use correct Firefox icon + +------------------------------------------------------------------- +Mon Mar 7 16:13:29 CET 2005 - adrian@suse.de + +- use standard icon again for the default desktop file and + add a Gnome-only desktop file for the Gnome icon +- add plastikfox chrome theme to fix button order within KDE +- add patch for automatic theme selection for KDE and Gnome +- do register extensions in rebuild-databases.sh instead of %install, + to fix needed timestamps + +------------------------------------------------------------------- +Mon Mar 7 20:47:00 CET 2005 - stark@suse.de + +- disable inclusion of acrobat plugin again (#70861) +- don't use gconfd in registration phase (#66381) + +------------------------------------------------------------------- +Fri Mar 4 07:54:47 CET 2005 - stark@suse.de + +- extend add-plugins to recognize Java 1.5 (#66909) +- changed comment in desktop-file (#66867) + +------------------------------------------------------------------- +Tue Feb 22 09:33:44 CET 2005 - stark@suse.de + +- make --display parameter working in all cases (bnc #66043) +- revised postscript patch +- final 1.0.1 codebase + +------------------------------------------------------------------- +Mon Feb 21 13:09:30 CET 2005 - stark@suse.de + +- added patch to create Postscript level 2 (instead of 3) + (special thanks to Jungshik Shin) +- disabled freetype explicitly to be able to use the above patch + (freetype wasn't used anymore since some time anyway) + +------------------------------------------------------------------- +Fri Feb 18 09:10:10 CET 2005 - stark@suse.de + +- got more patches from branch to get another IDN fix and to + fix bug #51019 +- enabled IDN again + +------------------------------------------------------------------- +Wed Feb 16 09:20:39 CET 2005 - stark@suse.de + +- bumped version number to 1.0.1 + +------------------------------------------------------------------- +Tue Feb 15 10:26:04 CET 2005 - stark@suse.de + +- got updates from 1.0.1 branch + +------------------------------------------------------------------- +Thu Feb 10 06:57:33 CET 2005 - stark@suse.de + +- additional fireflashing fix (#50635, bmo #280664) +- some more security related fixes + (bmo #268483, #273498, #277322) +- fire up GTK2 filepicker if GNOME is running + +------------------------------------------------------------------- +Tue Feb 8 07:51:13 CET 2005 - stark@suse.de + +- some prefs are ignored (bmo #261934) +- disabled default IDN (#50566) +- fixed some more bugzilla.mozilla.org bugs: + #276482, #280056, #280603 + +------------------------------------------------------------------- +Sun Feb 6 13:10:12 CET 2005 - stark@suse.de + +- use same desktop categories for Professional and NLD +- added some lockdown stuff for printing and page saving + (bmo #280488) + +------------------------------------------------------------------- +Wed Feb 2 13:58:53 CET 2005 - stark@suse.de + +- modified gconf.diff to honor ignore_hosts (bmo #280742) +- added a JS crasher fix (bmo #268535) +- added more fixes (bmo #255441, #273024, #275405, #275634) + +------------------------------------------------------------------- +Fri Jan 28 12:39:37 CET 2005 - stark@suse.de + +- added gplflash inclusion +- improved JRE inclusion +- reactivated usage of Acrobat Reader plugin + (ready for acroread 7) + +------------------------------------------------------------------- +Sat Jan 22 13:16:47 CET 2005 - stark@suse.de + +- added some backported bugfixes + +------------------------------------------------------------------- +Sat Dec 18 10:30:11 CET 2004 - stark@suse.de + +- updated industrial theme to 1.0.9 +- use slightly changed icon for menu-entry (bnc #275) +- use original desktop file for NLD again + +------------------------------------------------------------------- +Thu Dec 16 19:37:48 CET 2004 - stark@suse.de + +- newer patch for GNOME associations (bnc #362) +- fix overwriting of files with GTK picker (Ximian #65068) +- readded the industrial default theme patch for NLD + +------------------------------------------------------------------- +Wed Dec 15 11:50:56 CET 2004 - stark@suse.de + +- activate GTK filepicker for NLD again +- fix for GNOME helper applications with parameters +- make GNOME associations the default on NLD + +------------------------------------------------------------------- +Sat Dec 4 16:11:01 CET 2004 - stark@suse.de + +- fixed build on s390/s390x +- added patch to be able to install-global without running X + (bmo #265859) + +------------------------------------------------------------------- +Thu Nov 18 21:48:05 CET 2004 - stark@suse.de + +- update industrial theme to 1.0.8 (still not activated) +- added patch to make home-directory the default download dir + (on NLD is still used Desktop) + +------------------------------------------------------------------- +Thu Nov 11 09:01:58 CET 2004 - stark@suse.de + +- made initial window height smaller again + +------------------------------------------------------------------- +Tue Nov 9 09:09:06 CET 2004 - stark@suse.de + +- update to final 1.0 release (20041109) + +------------------------------------------------------------------- +Thu Nov 4 08:22:36 CET 2004 - stark@suse.de + +- update to 1.0rc2 + +------------------------------------------------------------------- +Sat Oct 30 21:27:29 CEST 2004 - stark@suse.de + +- added missing s390(x) patch + +------------------------------------------------------------------- +Wed Oct 27 07:26:25 CEST 2004 - stark@suse.de + +- update to 1.0rc1 codebase +- printing via XFT/fontconfig +- freetype changes to avoid API conflicts with newer freetype2 +- fixed build for s390/s390x +- removed AMD64 patch (included upstream) +- added translations sub-package +- removed "Show folder" patch for NLD (resolved upstream) +- don't use gnome-filepicker patch for NLD for now +- removed hppa buildfix (included upstream) +- removed untitled.patch (bmo #24068) resolved by (bmo #262478) +- use make -C browser/installer now to prepare installation +- don't check for default browser at startup (#47587) +- updated industrial.jar (0.99.13) (disabled) + +------------------------------------------------------------------- +Fri Oct 15 13:51:54 CEST 2004 - stark@suse.de + +- inherit locale from system +- fixed chrome registration + +------------------------------------------------------------------- +Wed Oct 6 23:11:01 CEST 2004 - joeshaw@suse.de + + - disable gconf settings as default (Ximian #67718) + +------------------------------------------------------------------- +Wed Oct 6 07:04:05 CEST 2004 - stark@suse.de + +- fixed inclusion of RealPlayer plugin again + +------------------------------------------------------------------- +Tue Oct 5 10:09:04 CEST 2004 - stark@suse.de + +- small important fix in firefox-download.patch (Ximian #65472) + +------------------------------------------------------------------- +Sun Oct 3 00:02:09 CEST 2004 - stark@suse.de + +- added security-fix from 0.10.1 (mozilla.org #259708) (#46687) + +------------------------------------------------------------------- +Fri Oct 1 12:49:38 CEST 2004 - stark@suse.de + +- final fix for downloading to Desktop folder (Ximian #65756) +- remove Postscript from printer names (Ximian #65560) + +------------------------------------------------------------------- +Thu Sep 30 16:14:10 CEST 2004 - shprasad@suse.de + +- Modified the MozillaFirefox.desktop file. + Changed the name 'Firefox' to 'Firefox Web Browser'. + Also changed it for all languages. + +------------------------------------------------------------------- +Wed Sep 29 15:54:46 CEST 2004 - stark@suse.de + +- fix inclusion of RealPlayer plugin (Ximian #65711) + +------------------------------------------------------------------- +Mon Sep 27 17:51:24 CEST 2004 - joeshaw@suse.de + +- Update the industrial default patch, for some reason it didn't + take before. + +------------------------------------------------------------------- +Fri Sep 24 07:34:48 CEST 2004 - stark@suse.de + +- fix for Ximian #65176 (mozilla.org #240068) +- revised patch for update function (Ximian #65615) + +------------------------------------------------------------------- +Thu Sep 23 20:21:39 CEST 2004 - joeshaw@suse.de + +- Uncomment the patch which tells the UI that industrial is the + default. + +------------------------------------------------------------------- +Thu Sep 23 12:38:06 CEST 2004 - stark@suse.de + +- open Nautilus on NLD for 'Show folder' in download settings + (Ximian #65472) by sragavan@novell.com +- save to Desktop folder if selected (Ximian #65756) + by sragavan@novell.com + +------------------------------------------------------------------- +Wed Sep 22 10:23:01 CEST 2004 - stark@suse.de + +- synced NLD package with 9.2 version +- GTK2 filepicker does now ask for confirmation when overwriting + files (Ximian #65068) by sagarwala@novell.com +- no direct update function (Ximian #65615) by rganesan@novell.com +- throbber linked to Novell (Ximian #66283) by rganesan@novell.com +- make industrial the default theme for NLD + (Ximian #65542) by joeshaw@suse.de + +------------------------------------------------------------------- +Mon Sep 20 22:00:55 CEST 2004 - joeshaw@suse.de + +- Add default bookmarks. Ximian #65546. +- Add the industrial theme, but it's not the default yet. +- Remove acroread from add-plugins because it's badly behaved. + Ximian #65499. + +------------------------------------------------------------------- +Mon Sep 20 17:57:38 CEST 2004 - federico@ximian.com + +- Added MozillaFirefox-toplevel-window-height.diff for + http://bugzilla.ximian.com/show_bug.cgi?id=65543 + +------------------------------------------------------------------- +Sun Sep 19 15:42:30 CEST 2004 - stark@suse.de + +- use GNOME system prefs only for NLD by default + (fixes bug #45575) + +------------------------------------------------------------------- +Fri Sep 17 08:59:32 CEST 2004 - stark@suse.de + +- joeshaw@suse.de: Update GConf patch so that proxy settings work + correctly (Ximian #64461) +- don't search Java on every path (Ximian #65383) +- added some missing fixes for official release +- added new java package name for triggers (#45257) + +------------------------------------------------------------------- +Sat Sep 11 13:25:41 CEST 2004 - stark@suse.de + +- update to official 1.0PR (0.10) +- adopted gnome-filepicker patch +- removed obsolete CUPS hack from start-script + (Ximian #65635, #65560) + +------------------------------------------------------------------- +Thu Sep 9 21:35:42 CEST 2004 - stark@suse.de + +- fixed endianess on AMD64 in JS component (#34743) + +------------------------------------------------------------------- +Mon Sep 6 17:33:07 CEST 2004 - stark@suse.de + +- fixed filelist + +------------------------------------------------------------------- +Mon Sep 6 13:48:03 CEST 2004 - stark@suse.de + +- update to 1.0PR (aka 0.10) + +------------------------------------------------------------------- +Fri Sep 3 21:35:47 CEST 2004 - stark@suse.de + +- added ppc64 patch + +------------------------------------------------------------------- +Thu Sep 2 03:08:59 CEST 2004 - dave@suse.de + +- Fixed up the .desktop installation on nld + +------------------------------------------------------------------- +Wed Sep 1 15:05:48 CEST 2004 - shprasad@suse.de + +- Doesn't ask to set Firefox as default web-browser. + +------------------------------------------------------------------- +Tue Aug 31 14:01:18 CEST 2004 - stark@suse.de + +- next new version for filepicker stuff +- deactivated native filepicker for NLD +- update to snapshot (20040831) + +------------------------------------------------------------------- +Tue Aug 24 17:35:52 CEST 2004 - stark@suse.de + +- new version of gnome-filepicker patch +- added patch for config + +------------------------------------------------------------------- +Fri Aug 20 17:12:48 CEST 2004 - stark@suse.de + +- update to snapshot (20040820) + +------------------------------------------------------------------- +Thu Aug 19 08:46:42 CEST 2004 - stark@suse.de + +- added workaround for mozilla bug #246313 + (Firefox does not start: getting "cannot open display" error) + +------------------------------------------------------------------- +Wed Aug 18 15:07:22 CEST 2004 - stark@suse.de + +- added some patches from Ximian + - use GNOME filepicker + - use more gconf settings + - set startup homepage to Novell + +------------------------------------------------------------------- +Tue Aug 17 13:12:35 CEST 2004 - stark@suse.de + +- update to pre-1.0.0 (20040817) + +------------------------------------------------------------------- +Thu Aug 5 06:27:41 CEST 2004 - stark@suse.de + +- security update to 0.9.3 + (including #43312 and others) +- handle RealPlayer 9 plugin + +------------------------------------------------------------------- +Mon Aug 2 15:11:51 CEST 2004 - ro@suse.de + +- recode desktop file to utf-8 + +------------------------------------------------------------------- +Wed Jul 28 08:46:31 CEST 2004 - stark@suse.de + +- added fix against certificate spoofing (#43312) + +------------------------------------------------------------------- +Fri Jul 23 06:31:41 CEST 2004 - stark@suse.de + +- update to 0.9.2 +- added workaround for extension registry +- removed old (incompatible) mozex extension + +------------------------------------------------------------------- +Tue Jun 29 06:27:59 CEST 2004 - stark@suse.de + +- update to 0.9.1 +- added hint to run as root first + +------------------------------------------------------------------- +Tue Jun 15 12:42:28 CEST 2004 - stark@suse.de + +- update to 0.9 +- added patch for newer freetype + +------------------------------------------------------------------- +Mon Mar 29 11:43:51 CEST 2004 - stark@suse.de + +- update to 0.8.0+ (20040503) +- removed firefox logos and activate official branding for + milestone builds +- changed profile-dir to .firefox +- added some needed files +- enabled gnomevfs extension + +------------------------------------------------------------------- +Fri Apr 2 10:31:45 CEST 2004 - stark@suse.de + +- removing relocation of TEMP directory (#34391) + +------------------------------------------------------------------- +Fri Mar 26 18:09:34 CET 2004 - uli@suse.de + +- fixed hang during build on s390* (bug #35440) + +------------------------------------------------------------------- +Wed Mar 3 06:52:00 CET 2004 - stark@suse.de + +- removed unused patches for GTK2 build +- more fixes for (#35179) + +------------------------------------------------------------------- +Mon Mar 1 07:32:52 CET 2004 - stark@suse.de + +- improved start-script to interact with thunderbird (#35179) + +------------------------------------------------------------------- +Thu Feb 26 06:57:05 CET 2004 - stark@suse.de + +- use official releasedate +- added official (trademarked) artwork +- added firefox icon to /usr/share/pixmaps +- cleaned up spec-file (there will be no GTK1 version) + +------------------------------------------------------------------- +Tue Feb 24 16:43:17 CET 2004 - stark@suse.de + +- fixed optimization for non-x86 archs + +------------------------------------------------------------------- +Tue Feb 24 07:43:35 CET 2004 - stark@suse.de + +- adopted file-list and build options to original distribution +- added prdtoa fix (#32963) +- added hook for static firefox build to rebuild-databases.sh +- added compiler flags for security/ (nss-opt.patch) +- included mozex (mozex.mozdev.org) +- added -Os as optimization flag + +------------------------------------------------------------------- +Mon Feb 9 21:59:37 CET 2004 - stark@suse.de + +- renamed to MozillaFirefox +- update to final version 0.8 + +------------------------------------------------------------------- +Fri Feb 6 08:39:15 CET 2004 - stark@suse.de + +- update to Firebird 0.8 (20040205) +- added mips build fix +- set PS printer list in MozillaFirebird.sh +- use lib64 again for biarch platforms + +------------------------------------------------------------------- +Sat Jan 10 10:33:54 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Fri Aug 22 11:32:07 CEST 2003 - stark@suse.de + +- upstream sync for 0.6.1post + +------------------------------------------------------------------- +Sun Aug 10 22:01:12 CEST 2003 - stark@suse.de + +- removed dmoz from searchplugins-filelist + +------------------------------------------------------------------- +Fri Aug 8 10:30:50 CEST 2003 - stark@suse.de + +- update to 0.6.1post (TRUNK) +- use -fno-strict-aliasing + +------------------------------------------------------------------- +Thu Jul 31 11:25:39 CEST 2003 - stark@suse.de + +- update to 0.6.1 (MOZILLA_1_4_BRANCH) +- synchronized with mozilla-source +- created file-list + +------------------------------------------------------------------- +Thu Jul 10 09:45:49 CEST 2003 - stark@suse.de + +- update to snapshot 20030709 +- fixed generation of symlink MozillaFirebird-xremote-client + +------------------------------------------------------------------- +Fri Jun 20 06:53:08 CEST 2003 - stark@suse.de + +- update to snapshot 20030622 (0.7pre) + +------------------------------------------------------------------- +Mon May 19 08:54:46 CEST 2003 - stark@suse.de + +- update to snapshot 20030518 (0.6) + +------------------------------------------------------------------- +Sun May 7 10:11:16 CEST 2003 - stark@suse.de + +- update to snapshot 20030507 + +------------------------------------------------------------------- +Wed Apr 30 13:26:43 CEST 2003 - stark@suse.de + +- initial SuSE package + diff --git a/MozillaFirefox.desktop b/MozillaFirefox.desktop new file mode 100644 index 00000000..b6df4375 --- /dev/null +++ b/MozillaFirefox.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Firefox +GenericName=Web Browser +Comment=Web Browser +TryExec=firefox +Exec=firefox %u +Icon=firefox +Terminal=false +StartupNotify=true +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +Type=Application diff --git a/MozillaFirefox.desktop.nld b/MozillaFirefox.desktop.nld new file mode 100644 index 00000000..a7a3227f --- /dev/null +++ b/MozillaFirefox.desktop.nld @@ -0,0 +1,35 @@ +[Desktop Entry] +Name=Firefox Web Browser +Name[en]=Firefox Web Browser +Name[cs]=Firefox +Name[de]=Firefox-Webbrowser +Name[fr]=Navigateur Web Firefox +Name[es]=Navegador Web Firefox +Name[hu]=Firefox webböngésző +Name[it]=Browser Web Firefox +Name[ja]=Firefox Webブラウザ +Name[pl]=Przeglądarka WWW Firefox +Name[pt_BR]=Browser da Web Firefox +Name[sk]=Firefox +Name[zh_CN]=Firefox 万维网浏览器 +Name[zh_TW]=Firefox 網頁瀏覽器 +Comment=Firefox Web Browser +Comment[en]=Firefox Web Browser +Comment[cs]=Prohlížeč Firefox +Comment[de]=Firefox-Webbrowser +Comment[fr]=Navigateur Web Firefox +Comment[es]=Navegador Web Firefox +Comment[hu]=Firefox webböngésző +Comment[it]=Browser Web Firefox +Comment[ja]=Firefox Webブラウザ +Comment[pl]=Przeglądarka WWW Firefox +Comment[pt_BR]=Browser da Web Firefox +Comment[sk]=Firefox Web Browser +Comment[zh_CN]=Firefox 万维网浏览器 +Comment[zh_TW]=Firefox 網頁瀏覽器 +TryExec=firefox +Exec=firefox %u +Icon=firefox +Terminal=false +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +Type=Application diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec new file mode 100644 index 00000000..0e16ace0 --- /dev/null +++ b/MozillaFirefox.spec @@ -0,0 +1,1213 @@ +# +# spec file for package MozillaFirefox (Version 2.0) +# +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: MozillaFirefox +BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel update-desktop-files zip +%if %suse_version <= 1010 +BuildRequires: dbus-1-devel +%else +BuildRequires: dbus-1-glib-devel +%endif +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Provides: web_browser +Provides: firefox +Obsoletes: MozillaFirebird +%if %sles_version == 10 +Obsoletes: mozilla +%endif +Version: 2.0 +Release: 41 +Summary: Mozilla Firefox Web Browser +URL: http://www.mozilla.org/ +Group: Productivity/Networking/Web/Browsers +# Creation of firefox and l10n tarballs: +# cvs -d :pserver:anonymous:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r MOZILLA_1_8_BRANCH mozilla/client.mk +# cd mozilla +# export MOZ_CO_PROJECT=browser +# export MOZ_CO_LOCALES=all +# make -f client.mk checkout +# cd .. +# tar cjf l10n.tar.bz2 l10n; tar cjf firefox-2.0-source.tar.bz2 mozilla +Source: firefox-%{version}-source.tar.bz2 +Source1: MozillaFirefox.desktop +Source2: add-plugins.sh.in +Source3: mozilla.sh.in +Source4: tango-theme.tar.bz2 +Source5: search-addons.tar.bz2 +Source6: MozillaFirefox.desktop.nld +Source7: l10n.tar.bz2 +Source8: plastikfox-theme.tar.bz2 +Source9: bookmarks.html.nld +Source10: bookmarks.html.suse +Source11: firefox48.png +Source16: firefox.1 +Source17: firefox-suse-default-prefs.js +Source18: firefox.schemas +Patch1: visibility.patch +Patch2: rpath.patch +Patch3: gcc-undefined-ops.patch +Patch4: pango-cairo.patch +Patch5: abuild.patch +# NSPR bmo #270502 +Patch6: nspr-prdtoa.patch +Patch7: locale.patch +# lockdown infrastructure +Patch8: firefox-ui-lockdown.patch +Patch9: gecko-lockdown.patch +Patch10: gconf-backend.patch +Patch11: gnome-vfs.patch +Patch12: misc.dif +Patch13: nss-opt.patch +Patch14: credits.patch +# bmo #273524 (only for NLD) +Patch16: gnome-vfs-default.patch +# integration +Patch17: firefox-appname.patch +Patch18: firefox-no-update.patch +Patch19: dbus.patch +# customization +Patch22: cjk-postscript-fonts.dif +Patch23: startup.patch +# bmo #324060 +Patch24: cups-paper.patch +Patch25: system-extensions.patch +Patch27: system-proxies.patch +# bmo #307877 +Patch28: tab-close.patch +# bmo #331522 +Patch32: postscript.patch +Patch33: proxy-dev.patch +# integration +Patch34: skin-selection.patch +Patch36: greasemonkey.patch +Patch37: make-perl.patch +Patch38: 358797.patch +# pango-cairo.patch dbus.patch startup.patch +Patch100: configure.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: libstdc++ fileutils textutils /bin/sh gconf2 +Requires: /usr/lib/libaoss.so +%define opensuse_bs 0 +%if %sles_version == 10 +%define default_home_page http://www.novell.com/linux/sle10 +%else +%define default_home_page http://www.opensuse.org +%endif +%define has_system_nspr 0 +%define has_system_nss 0 +%define has_system_cairo 0 +%if %suse_version > 930 || %opensuse_bs +%define has_system_nspr 1 +%define has_system_cairo 1 +%endif +%if %suse_version > 1010 || %opensuse_bs +%define has_system_nss 1 +%endif +%if %has_system_nspr +Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) +%endif +%if %has_system_nss +Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) +%endif +%define _unpackaged_files_terminate_build 0 +%define releasedate 2006102300 +%define progname firefox +%if %suse_version < 1010 +%define progdir /opt/MozillaFirefox/%_lib +%else +%define progdir %{_prefix}/%_lib/firefox +%endif +%define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi) +%define my_provides /tmp/my-provides +%define my_requires /tmp/my-requires +%if %suse_version > 920 +%define libgssapi libgssapi_krb5.so.2 +%else +%define libgssapi libgssapi.so.1 +%endif +### build options +%define milestone 1 +%define localize 1 +%define broken 0 +### build options end + +%description +Mozilla Firefox, formerly known as Phoenix and Firebird, is a redesign +of the Mozilla browser component, similar to Galeon, K-Meleon and +Camino, but written using the XUL user interface language and designed +to be cross-platform. It is a stand-alone application instead of part +of the Mozilla Application Suite. + + + +Authors: +-------- + Mozilla Foundation + +%package translations +Summary: Translations for MozillaFirefox +Group: Productivity/Networking/Web/Browsers +PreReq: %{name} = %{version} + +%description translations +This package contains several optional languages for the user interface +of MozillaFirefox. + + + +Authors: +-------- + Mozilla Foundation + +%prep +%setup -q -n mozilla -b 7 -b 4 -b 8 +cd $RPM_BUILD_DIR/mozilla +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +# lockdown stuff +%patch8 +%patch9 +%patch10 +%patch11 +%patch12 +%patch13 +%patch14 +%patch17 +%patch18 +%patch19 +# system NSS +%patch22 +%patch23 +%patch24 +%patch25 +%patch27 +%patch28 +%if %nld9 +%patch16 +%endif +%patch32 +%patch33 +%patch34 +%patch36 +%patch37 +%patch38 +%patch100 +%if %has_system_nss +#%patch101 +%endif +# custom bookmarks +%if %nld9 +cp -f %{SOURCE9} $RPM_BUILD_DIR/mozilla/browser/locales/en-US/profile/bookmarks.html +%else +cp -f %{SOURCE10} $RPM_BUILD_DIR/mozilla/browser/locales/en-US/profile/bookmarks.html +%endif + +%build +export MOZ_BUILD_DATE=%{releasedate} +export MOZILLA_OFFICIAL=1 +export BUILD_OFFICIAL=1 +export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" +%if %suse_version > 1000 +export CFLAGS="$CFLAGS -fstack-protector" +%endif +export CXXFLAGS="$CFLAGS" +export RPATH="-Wl,-rpath -Wl,%{progdir}" +export MOZCONFIG=$RPM_BUILD_DIR/mozconfig +cat << EOF > $MOZCONFIG +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} +. \$topsrcdir/browser/config/mozconfig +ac_add_options --prefix=%{_prefix} +ac_add_options --libdir=%{_libdir} +ac_add_options --sysconfdir=%{_sysconfdir} +ac_add_options --mandir=%{_mandir} +ac_add_options --includedir=%{_includedir} +ac_add_options --enable-optimize="$CFLAGS" +ac_add_options --with-system-jpeg +ac_add_options --with-system-png +ac_add_options --with-system-mng +ac_add_options --with-system-zlib +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-gconf +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-xft +ac_add_options --disable-freetype2 +ac_add_options --disable-installer +ac_add_options --enable-static +ac_add_options --disable-shared +ac_add_options --disable-tests +ac_add_options --disable-debug +EOF +%if %is_plus || %suse_version >= 930 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-pango +EOF +%endif +%if %has_system_nspr +cat << EOF >> $MOZCONFIG +ac_add_options --with-system-nspr +EOF +%endif +%if %has_system_nss +cat << EOF >> $MOZCONFIG +ac_add_options --with-system-nss +EOF +%endif +%if %has_system_cairo +cat << EOF >> $MOZCONFIG +ac_add_options --enable-system-cairo +EOF +%endif +%if %suse_version >= 1000 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-dbus +ac_add_options --enable-extensions="dbus default" +EOF +%endif +%if %suse_version >= 1010 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-startup-notification +EOF +%endif +%if %milestone +cat << EOF >> $MOZCONFIG +ac_add_options --enable-official-branding +EOF +%endif +make -f client.mk build + +%install +make -C browser/installer STRIP=/bin/true +# copy tree into RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{progdir} +cp -rf $RPM_BUILD_DIR/mozilla/dist/firefox/* $RPM_BUILD_ROOT/%{progdir} +# install additional locales +%if %localize +echo %defattr$-,root,root$ > %{_tmppath}/translations.list +for locale in $(cat browser/locales/all-locales); do +# Removed he since it's broken +#for locale in ar bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE hu it ja ko lt mk nb-NO nl pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW ; do + case $locale in + he|hy-AM|ro|sq) + # broken locales, do not work + ;; + *) + make -C browser/locales libs-$locale + cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ + $RPM_BUILD_ROOT/%{progdir}/chrome + cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ + $RPM_BUILD_ROOT/%{progdir}/chrome + echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list + echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list + esac +done +%endif +# overwrite the mozilla start-script and link it to /usr/bin +mkdir --parents $RPM_BUILD_ROOT/usr/bin +sed "s:%%PREFIX:%{_prefix}:g +s:%%PROGDIR:%{progdir}:g +s:%%APPNAME:%{progname}:g +s:%%PROFILE:.mozilla/firefox:g" \ + %{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh +chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh +ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT/usr/bin/%{progname} +# desktop definition +%if %nld9 +mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/applications +install -m 644 %{SOURCE6} \ + $RPM_BUILD_ROOT/opt/gnome/share/applications/%{name}.desktop +%else +mkdir -p $RPM_BUILD_ROOT/usr/share/applications +%if %suse_version < 1010 +# no startup notification for 10.0 and older +sed "s:StartupNotify=true:StartupNotify=false:g" \ + %{SOURCE1} > $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop +%else +install -m 644 %{SOURCE1} \ + $RPM_BUILD_ROOT/usr/share/applications +%endif +%endif +# SCHEMA File +mkdir -p $RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas +install -m 644 %{SOURCE18} \ + $RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas/ +# Themes +cp -a $RPM_BUILD_DIR/tango\@novell.com $RPM_BUILD_ROOT%{progdir}/extensions/ +%if %broken +cp -a $RPM_BUILD_DIR/\{4674e8a2-eb7e-4822-b517-b18328b3e8e8\} $RPM_BUILD_ROOT%{progdir}/extensions/ +%endif +# install add-plugins.sh +%if %suse_version <= 1000 +sed "s:%%PROGDIR:%{progdir}:g +s:%%APPNAME:%{progname}:g" \ + %{SOURCE2} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh +chmod 755 $RPM_BUILD_ROOT%{progdir}/add-plugins.sh +%endif +# install man-page +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ +cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/ +# apply SUSE defaults +sed -e 's,RPM_VERSION,%{version}-%{release},g +s,GSSAPI,%{libgssapi},g' \ + %{SOURCE17} > suse-default-prefs +cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/pref/firefox-novell.js +rm suse-default-prefs +# use correct locale for useragent +cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox-l10n.js << EOF +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +EOF +########## +# ADDONS +# +(cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE5}) +# browserconfig.properties +sed "s;browser.startup.homepage=.*;browser.startup.homepage=%{default_home_page};g +s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=%{default_home_page};g" \ + dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +startup.homepage_override_url=%{default_home_page} +EOF +mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ +%if %milestone +cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png +mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/48x48/apps/ +install %{SOURCE11} $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/48x48/apps/firefox.png +ln -sf firefox.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox-gnome.png +%else +cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.xpm +%endif +%suse_update_desktop_file %{name} Application Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK +%if %has_system_nspr && !%has_system_nss +# modify provides and requires lists (don't export NSS) +cat << EOF > %{my_provides} +grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so" | %{__find_provides} +EOF +chmod 755 %{my_provides} +%define __find_provides %{my_provides} +cat << EOF > %{my_requires} +grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|firefox-bin" | %{__find_requires} +EOF +chmod 755 %{my_requires} +%define __find_requires %{my_requires} +%endif + +%clean +rm -rf $RPM_BUILD_ROOT +%if %has_system_nspr && !%has_system_nss +rm -f %{my_provides} +rm -f %{my_requires} +%endif + +%post +%if %suse_version >= 1010 +# move plugins to new location +if [ "$1" = "2" ]; then + if [ -d /opt/MozillaFirefox/%{_lib}/plugins ]; then + rm -rf /opt/MozillaFirefox/%{_lib}/plugins/libnullplugin.so + cp -fud /opt/MozillaFirefox/%{_lib}/plugins/* %{progdir}/plugins + rm -rf /opt/MozillaFirefox/%{_lib}/plugins + fi +fi +%endif +if [ ! -f /.buildenv ]; then + export GCONF_CONFIG_SOURCE=`/opt/gnome/bin/gconftool-2 --get-default-source` + /opt/gnome/bin/gconftool-2 --makefile-install-rule /etc/opt/gnome/gconf/schemas/firefox.schemas > /dev/null 2>&1 +%if %suse_version <= 1000 + # restart gconfd + killall -HUP gconfd-2 2>&1 >/dev/null +%endif +fi +%if %suse_version <= 1000 +%{progdir}/add-plugins.sh > /dev/null 2>&1 +%endif +exit 0 +%if %suse_version <= 1000 + +%triggerin -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin +%{progdir}/add-plugins.sh > /dev/null 2>&1 +exit 0 + +%triggerpostun -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin +if [ -L %{progdir}/plugins/libjavaplugin_oji.so -a ! -f %{progdir}/plugins/libjavaplugin_oji.so ]; then + rm -f %{progdir}/plugins/libjavaplugin_oji.so +fi +%{progdir}/add-plugins.sh > /dev/null 2>&1 +exit 0 +%endif + +%files +%defattr(-,root,root) +%if %suse_version < 1010 +%dir /opt/MozillaFirefox +%endif +%dir %{progdir} +%dir %{progdir}/chrome/ +%{progdir}/chrome/browser.* +%{progdir}/chrome/classic.* +%{progdir}/chrome/comm.* +%{progdir}/chrome/en-US.* +%{progdir}/chrome/pippki.* +%{progdir}/chrome/toolkit.* +%{progdir}/chrome/reporter.* +%{progdir}/chrome/icons +%{progdir}/components/ +%{progdir}/greprefs/ +%{progdir}/defaults/ +%{progdir}/dictionaries/ +%{progdir}/extensions/ +%{progdir}/icons/ +#%{progdir}/init.d/ +%dir %{progdir}/plugins +%{progdir}/plugins/libnullplugin.so +%{progdir}/res/ +%{progdir}/searchplugins/ +%if %suse_version <= 1000 +%{progdir}/add-plugins.sh +%endif +%{progdir}/%{progname}-bin +%attr(755,root,root) %{progdir}/%{progname}.sh +%{progdir}/browserconfig.properties +# NSPR +%if ! %has_system_nspr +%{progdir}/libnspr4.so +%{progdir}/libplc4.so +%{progdir}/libplds4.so +%endif +# NSS +%if ! %has_system_nss +%{progdir}/libnssckbi.so +%{progdir}/libnss3.so +%{progdir}/libsmime3.so +%{progdir}/libsoftokn3.chk +%{progdir}/libsoftokn3.so +%{progdir}/libssl3.so +%endif +# +%{progdir}/libmozjs.so +%{progdir}/libxpcom.so +%{progdir}/libxpcom_core.so +%{progdir}/libxpcom_compat.so +%{progdir}/libxpistub.so +%{progdir}/mozilla-xremote-client +%{progdir}/run-mozilla.sh +%{progdir}/updater +%{progdir}/updater.ini +%{progdir}/xpicleanup +%exclude %{progdir}/removed-files +%exclude %{progdir}/firefox +%{progdir}/readme.txt +%if %nld9 +/opt/gnome/share/applications/%{name}.desktop +%else +/usr/share/applications/%{name}.desktop +%endif +/etc/opt/gnome/gconf/schemas/firefox.schemas +/usr/share/pixmaps/firefox* +%if %milestone +/opt/gnome/share/icons/hicolor/ +%endif +/usr/bin/%{progname} +%doc %{_mandir}/man1/firefox.1.gz +%if %localize + +%files translations -f %{_tmppath}/translations.list +%defattr(-,root,root) +%endif + +%changelog -n MozillaFirefox +* Mon Jan 08 2007 - meissner@suse.de +- Do not provide MozillaFirebird, just obsolete it. +* Fri Dec 01 2006 - maw@suse.de +- Update gecko-lockdown.patch (#220616). +* Thu Nov 30 2006 - maw@suse.de +- Update firefox-suse-default-prefs.js, adding + 'pref("browser.backspace_action", 2);' (#217374) +* Thu Nov 30 2006 - aj@suse.de +- Fix last change (#224431). +* Wed Nov 29 2006 - aj@suse.de +- Change download bookmark (#224431). +- Rename bookmark folder to openSUSE. +* Tue Nov 28 2006 - aj@suse.de +- Sync from Buildservice with following critical fixes (thanks + Wolfgang Rosenauer!): + * fixed system-proxies.patch to actually work (#223881). + * Rearrange Bookmarks to pass trademark review. +* Mon Nov 27 2006 - aj@suse.de +- Fix tango theme (#223796). +* Mon Nov 27 2006 - aj@suse.de +- Use www.opensuse.org as home page. +* Sun Nov 12 2006 - aj@suse.de +- Set novell.com as home page. +- Update from BuildService (thanks Wolfgang!): + - fixed crash in htmlparser (#217257, bmo #358797) + - added gconf2 as PreReq (#212505) + - added 32bit libaoss.so as requirement (#216266) + - Removed SUSE searchplugin (Portal not available anymore) + (#216054) + - Removed obsolete xul-picker.patch and system-nspr.patch + - Fixed building on 10.1 and 10.0 (dbus) + - Removed obsolete throbber preference +* Thu Nov 09 2006 - jhargadon@suse.de +- updated tango theme +* Sun Oct 29 2006 - aj@suse.de +- Another fix for 214125, patch by Wolfgang Rosenauer. +* Thu Oct 26 2006 - aj@suse.de +- Fix gcc warnings about undefined operations, patch by + Robert O'Callahan. +- Update system-proxies.patch to fix error box (214125), patch by + Robert O'Callahan. +* Mon Oct 23 2006 - aj@suse.de +- Update to current CVS version of 2.0. +- Use www.opensuse.org as default home page for now (#203547). +* Sat Oct 21 2006 - aj@suse.de +- Disable non-working plasticfox and tango themes. +* Fri Oct 20 2006 - aj@suse.de +- Fix building of locales. +* Fri Oct 20 2006 - mkoenig@suse.de +- update to version 2.0rc3: + * New features: Visual Refresh, Built-in phishing protection, + Enhanced search capabilities, Improved tabbed browsing, + Resuming your browsing session, Previewing and subscribing + to Web feeds, Inline spell checking, Live Titles, + Improved Add-ons manager, JavaScript 1.7, Extended search + plugin format, Updates to the extension system, + Client-side session and persistent storage, SVG text +* Tue Oct 17 2006 - meissner@suse.de +- disabled debugging. +* Tue Sep 12 2006 - stark@suse.de +- security update to version 1.5.0.7 +* Mon Aug 21 2006 - stark@suse.de +- added greasemonkey helper change (#199920) +- fixed packager.mk for new make version +* Fri Aug 11 2006 - stark@suse.de +- fixed crash in dbus component (patch by thoenig #197928) +- use external adresses for PAC configuration (#196506) +* Mon Aug 07 2006 - stark@suse.de +- added symlink for Firefox 1.0.x compatibility +* Sat Jul 29 2006 - stark@suse.de +- update to regression release 1.5.0.6 (#195043) +* Thu Jul 27 2006 - stark@suse.de +- security update to version 1.5.0.5 (#195043) + * observer-lock.patch integrated now +- fixed leak in JS' liveconnect (#186066) +- fixed desktop file for old distributions + (StartupNotify=false) +* Thu Jun 29 2006 - stark@suse.de +- fixed printing crash if the last used printer is not available + anymore (#187013) +* Fri Jun 16 2006 - stark@suse.de +- added 48x48 icon (#185777) +* Mon Jun 12 2006 - stark@suse.de +- fix overwrite confirmation for GTK filesaver (#179531) +- get network.negotiate-auth.trusted-uris and + network.negotiate-auth.delegation-uris from gconf if + system-settings are enabled (#184489) +* Thu Jun 01 2006 - stark@suse.de +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) +* Tue May 23 2006 - stark@suse.de +- complete implementation of startup-notification (#115417) + (including autoconf and remote support) +- different home-pages for SLE10 and SL (#177881) +* Tue May 16 2006 - stark@suse.de +- fixed potential deadlock in nsObserverList::RemoveObserver + (#173986, bmo #338069) +- base startup notification on libstartup-notification (#115417) +* Thu May 11 2006 - stark@suse.de +- save printer settings properly (#174082, bmo #324072) +- added startup notification support for showing load activity + in Gnome and to avoid focus stealing prevention (#115417) +- added StartupNotify=true to desktop file (#115417) +- provide legacy symlink for NLD9 update compatibility (#173138) +- fixed system-proxies patch to avoid unwanted wpad requests + (#171743, #167613) +* Mon May 08 2006 - stark@suse.de +- preconfigure the theme according to the used desktop (#151163) +* Thu Apr 27 2006 - stark@suse.de +- last minute change for 1.5.0.3 +* Wed Apr 26 2006 - stark@suse.de +- security update to 1.5.0.3 +- fix for typo in postscript.patch +* Tue Apr 25 2006 - stark@suse.de +- fixed iframe crash (#169039, bmo #334515) +- fixed img tag misuse (#168710, bmo #334341) +* Mon Apr 24 2006 - stark@suse.de +- improved postscript output (bmo #334485) +- changed defaults for printer properties (#6534) +- overwrite gnome-vfs' file protocol by providing "desktop-launch" + (#131501) +- get available paper sizes from CUPS (#65482) +- replaced/removed complicated gconfd reload in %%post (#167989) +- fixed memory leak in clipboard caching (bmo #289897) +* Tue Apr 11 2006 - stark@suse.de +- added (optional) plastikfox theme (#151163) +- get some more security related patches (#148876) +- finally fixed the default proxy configuration by adding a new + UI option (#132398) +* Mon Apr 03 2006 - stark@suse.de +- fixed keyword fixup patch (#162532) +* Tue Mar 28 2006 - stark@suse.de +- don't use keyword fixup for pasted text (#160034, bmo #331522) +* Mon Mar 20 2006 - stark@suse.de +- added Tango theme +- fixed reading proxies from gconf (#132398) +* Sun Mar 12 2006 - stark@suse.de +- tweaked bookmarks (fixed URLs) +- added Khmer (km-*) to pango locales (#157397) +* Sat Mar 04 2006 - stark@suse.de +- fixed crash with multipart JPEGs (bmo #328684) (#140416) +- got latest security fixes from upstream (#148876) +* Wed Feb 22 2006 - stark@suse.de +- fixed plugin loading when launched from Thunderbird (#151614) +- merged dbus reconnection patch (#150042) +- default to autodetect proxy (network.proxy.type=4) (#151811) +- added GTK category to desktop file +* Tue Feb 14 2006 - stark@suse.de +- modified lockdown patches (#67281, #67282) +- applied set of security patches (#148876) + bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947 +* Tue Feb 07 2006 - stark@suse.de +- fixed disabling of Pango (#148788) +* Thu Feb 02 2006 - stark@suse.de +- define gssapi lib explicitely (#147670) +- use only official Firefox-Icon +- changed home-download patch +* Sun Jan 29 2006 - stark@suse.de +- throbber URL is default again +- removed firefox-showpass patch +- removed additional CA certs from builtin NSS +* Fri Jan 27 2006 - stark@suse.de +- got some l10n changes from 1.8.0 branch +* Fri Jan 27 2006 - stark@suse.de +- final 1.5.0.1 version +- make it possible to choose $HOME as download directory + (#144894, bmo #300856) +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Sun Jan 22 2006 - stark@suse.de +- disable Pango if MOZ_ENABLE_PANGO is not set + and no typical language which needs Pango is used (#143428) +* Wed Jan 18 2006 - stark@suse.de +- fixed DumpStackToFile() for glibc 2.4 +- added default (font) settings +* Thu Jan 12 2006 - stark@suse.de +- update to 1.5.0.1pre (20060111) +- updated man-page +- fixed hovered tab close button +- only Requires mozilla-nspr instead of PreReq since + there is no postinstall registration necessary anymore +- use system NSS from CODE10 on +- use -fstack-protector where available +- changed unixproxy component to work on older distributions +* Mon Jan 02 2006 - stark@suse.de +- added unixproxy component written by Robert O'Callahan (#132398) + (bmo #66057) +- added official translations +- preload libaoss for plugin sound (#117079) +* Wed Dec 28 2005 - stark@suse.de +- get some patches from 1.8.0 branch +- readded modification to gconf-backend (bmo #321315) +- readded lockdown stuff +- enable additional extension install directory (#120329) + (/usr/lib/browser-extensions/firefox) +- added patch to make the XUL filechooser optional + (MOZ_XUL_PICKER) +* Wed Dec 14 2005 - stark@suse.de +- fixed patch for parsing -remote parameter +- removed default-plugin patch (not needed anymore) +* Fri Dec 09 2005 - stark@suse.de +- fix to ignore X composite extension (#135373) +- fixed parsing of -remote parameters (#134396) +- activated locales as released +* Tue Nov 29 2005 - stark@suse.de +- update to 1.5 (20051128) +- don't override startup URL when changing Gecko versions (#135314) +- added patch for GTK2 handling (#134831) +- readded add-plugins stuff for compatibility +* Fri Nov 18 2005 - stark@suse.de +- update to 1.5rc3 (20051117) +* Mon Oct 31 2005 - stark@suse.de +- updated l10n archive (20051030) +- fixed postinstall script to copy plugin links instead of files +* Fri Oct 28 2005 - stark@suse.de +- update to 1.5rc1 (20051027) +- fixed profile locking on FAT partitions (bmo #313360) +- introduced an rpath again +* Wed Oct 19 2005 - stark@suse.de +- update to snapshot 1.5 (20051019) +- moved installation to /usr/%%{_lib}/firefox +- added dbus component to be able to get network status from + NetworkManager (bmo #312793) +- remove all update UI for application +- removed diable-gconf (no registration at build time anymore) +- removed rebuild-databases.sh (no system registration anymore) +- open links in new windows (#128087) +* Thu Oct 06 2005 - stark@suse.de +- update to Firefox 1.5b2 (20051005) +- added supported translations +* Sat Oct 01 2005 - stark@suse.de +- update to Firefox 1.5b1 (20050930) RPM version 1.4.1 +- removed rebuild-databases.sh calls +- removed add-plugins.sh calls and corresponding triggers +- enabled SVG and Canvas support +- fixed gconf urlhandler registration +* Tue Sep 20 2005 - stark@suse.de +- security update to 1.0.7 (#117619) + * MFSA 2005-57: IDN heap overrun using soft-hyphens (bmo #307259) + (enabled IDN pref again) + * MFSA 2005-58: + CAN-2005-2701 Heap overrun in XBM image processing + CAN-2005-2702 Crash on "zero-width non-joiner" sequence + CAN-2005-2703 XMLHttpRequest header spoofing + CAN-2005-2704 Object spoofing using XBL + CAN-2005-2705 JavaScript integer overflow + CAN-2005-2706 Privilege escalation using about: scheme + CAN-2005-2707 Chrome window spoofing + Regression fixes +- register beagle extension if it gets installed (#116787) +* Tue Sep 13 2005 - aj@suse.de +- Change SUSE bookmarks. +* Sun Sep 11 2005 - stark@suse.de +- disable IDN per default (#116070) +- unlocalize bookmarks (#114279) +* Thu Sep 08 2005 - stark@suse.de +- fixed some filemodes (#114849) +* Sun Sep 04 2005 - stark@suse.de +- fixed gconf-backend patch to be able to use + system prefs (#114054) +* Thu Sep 01 2005 - stark@suse.de +- changed default font to sans-serif (#114464) +- removed de-de parts of the bookmark-links (#114279) +* Mon Aug 22 2005 - stark@suse.de +- install gconf schema for lockdown also on non-NLD +- added backports (firefox-backports.patch) + * gtk_im_context_set_cursor_location() is not used (bmo #281339) + * fixed crash in imgCacheValidator::OnStartRequest() + (bmo #293307) +- workaround for linking with pangoxft and pangox + (broken by gtk 2.8 update) (#105764) +- remove extensions on deinstallation +- include dragonegg (kparts) plugin (#105468) +* Thu Aug 18 2005 - stark@suse.de +- fixed regression in profile locking change (bmo #303633) +- added rtsp handler to global config (#104434) +- don't blacklist help: protocol (bmo #304833) +- fixed Gdk-WARNING at startup (gtk.patch) +- fixed crash with gtk 2.7 (bmo #300226, bnc #104586) +- fixed installation of the beagle plugin +- update industrial theme to 1.0.11 (#104564) +- included lockdownV2 (removed obsolete gconf.diff) +- linked firefox-bin with rpath to progdir +* Fri Aug 05 2005 - stark@suse.de +- fixed profile locking (bmo #151188) +- install beagle extension globally +* Fri Jul 29 2005 - stark@suse.de +- don't require and provide NSS libs (#98002) +- fixed printing error 'You cannot print while in print preview' + (#96991, bmo #302445) +* Wed Jul 27 2005 - stark@suse.de +- fixed Firefox on ppc (stack-direction.patch) (#97359) +- removed open-pref from startscript as it is done + automatically now (#73042) +- updated Novell searchplugins +* Mon Jul 25 2005 - stark@suse.de +- GTK filechooser is now modal (#8533) +- backed out patch to add tooltips to print-preview + because it breaks localization +* Fri Jul 22 2005 - stark@suse.de +- fixed another problem in printing patch +* Tue Jul 19 2005 - stark@suse.de +- fixed error in ft-xft-ps2.patch +- disabled stripping in spec instead of patch +- added NSPR to PreReq +* Mon Jul 18 2005 - stark@suse.de +- fixed some more regressions with final 1.0.6 +- fixed width calculation in Postscript module (bmo #290292) +- fixed plugin event starvation (bnc #94749, #94751, bmo #301161) +* Fri Jul 15 2005 - stark@suse.de +- searchplugins can now be installed per profile (#8176) +* Fri Jul 15 2005 - stark@suse.de +- update to 1.0.6 which restores API compatibility +* Tue Jul 12 2005 - stark@suse.de +- update to 1.0.5 final (#88509) +- don't strip explicitely +- don't ship beagle.xpi +* Wed Jul 06 2005 - stark@suse.de +- update to 1.0.5-pre (20050705) +- use RPM_OPT_FLAGS for NSS component +- fixed implicit declarations and uninitialized used variables +- added patch for bmo #87969 +* Tue Jul 05 2005 - stark@suse.de +- fixed regression from security update (#95069, bmo #298478) +* Mon Jun 27 2005 - stark@suse.de +- don't use system-prefs by default on NLD +- removed basic lockdown stuff for SUSE Linux + (it's not needed and caused problems: bnc #75418) +- fixed NLD lockdown patch (bnc #75418) +- don't write prefs back to gconf for now +* Wed Jun 22 2005 - stark@suse.de +- new NLD lockdown patch which is syncing user prefs to gconf +- update to 1.0.5pre security-release +* Thu Jun 09 2005 - stark@suse.de +- new revision of NLD lockdown patch +- fixed remote usage behaviour in start script (bnc #41903) +- got more bugfixes from the branch +* Thu Jun 02 2005 - stark@suse.de +- fixed neededforbuild +* Wed Jun 01 2005 - stark@suse.de +- fixed IDN for 64bit platforms (bmo #236425, bnc #46268) +* Fri May 20 2005 - stark@suse.de +- fixed keybinding for KP separator (bnc #84147) +- pulled security related patch from upstream branch +- update plastikfox theme to version 1.6 +* Thu May 12 2005 - stark@suse.de +- update to final 1.0.4 release +* Tue May 10 2005 - stark@suse.de +- update to 1.0.4 security release +- removed s390(x) patches (upstream) +- made two more files %%verify (81692) +- updated NLD lockdown patch (81304) +* Thu Apr 28 2005 - stark@suse.de +- use static NSPR libs from new location +* Sat Apr 23 2005 - stark@suse.de +- activate usage of system NSPR for distributions after 9.3 +- add patch to be able to use systen NSPR at all +* Fri Apr 22 2005 - ro@suse.de +- use mozilla-gcc4.patch +* Thu Apr 21 2005 - stark@suse.de +- don't execute gconf magic within build environment +* Sat Apr 16 2005 - stark@suse.de +- update to final 1.0.3 release +* Fri Apr 15 2005 - ro@suse.de +- fix problem in postinstall script +* Thu Apr 14 2005 - stark@suse.de +- included fixed lockdown patch for NLD +- linked proxies within Firefox with gnome settings (NLD) +- added gconfd restart procedure to install script + (only needed if gconf changes are done) (#76852) +* Sat Apr 02 2005 - stark@suse.de +- update to security pre-release 1.0.3 (#75692) + * Manual plug-in install, javascript vulnerability (bmo #288556) + * Access memory vulnerability (bmo #288688) +* Fri Apr 01 2005 - stark@suse.de +- added advanced lockdown features for ZLM integration (NLD-only) +* Tue Mar 22 2005 - stark@suse.de +- update to final 1.0.2 +- use new theme handling on NLD +- added default-plugin-less-annoying from mozilla +- use GTK2 for Flash +- use system NSPR on SUSE releases after 9.3 +- made startscript PIS aware +- set g-application-name correctly (bmo #281979) +- added man-page +- use GTK system colors +- modify useragent string and add vendor id +- activate smooth-scrolling by default (#74310) +* Tue Mar 22 2005 - stark@suse.de +- don't register beagle automatically (#74062) +- added default bookmarks for SUSE LINUX +* Mon Mar 21 2005 - max@suse.de +- Fixed a typo in the shell code that handles inclusion of the + Acrobat Reader plugin (#70861). +* Thu Mar 17 2005 - stark@suse.de +- updates from upcoming 1.0.2 +- added again logic to use Adobe Reader 7 (#70861) +- fixed crash in ICO decoding (#67142, bmo #245631) +- preinstall beagle extension (#72920) +- bugfixes in trigger scripts +- fixed industrial theming for Gnome (#72918) +* Sat Mar 12 2005 - stark@suse.de +- fixed more security related bugs + (bmo #284551, #284627, #285595) +* Wed Mar 09 2005 - stark@suse.de +- update also GNOME desktop file (#71810) +- added firefox-gnome.png to filelist +- use correct Firefox icon +* Mon Mar 07 2005 - stark@suse.de +- disable inclusion of acrobat plugin again (#70861) +- don't use gconfd in registration phase (#66381) +* Mon Mar 07 2005 - adrian@suse.de +- use standard icon again for the default desktop file and + add a Gnome-only desktop file for the Gnome icon +- add plastikfox chrome theme to fix button order within KDE +- add patch for automatic theme selection for KDE and Gnome +- do register extensions in rebuild-databases.sh instead of %%install, + to fix needed timestamps +* Fri Mar 04 2005 - stark@suse.de +- extend add-plugins to recognize Java 1.5 (#66909) +- changed comment in desktop-file (#66867) +* Tue Feb 22 2005 - stark@suse.de +- make --display parameter working in all cases (bnc #66043) +- revised postscript patch +- final 1.0.1 codebase +* Mon Feb 21 2005 - stark@suse.de +- added patch to create Postscript level 2 (instead of 3) + (special thanks to Jungshik Shin) +- disabled freetype explicitly to be able to use the above patch + (freetype wasn't used anymore since some time anyway) +* Fri Feb 18 2005 - stark@suse.de +- got more patches from branch to get another IDN fix and to + fix bug #51019 +- enabled IDN again +* Wed Feb 16 2005 - stark@suse.de +- bumped version number to 1.0.1 +* Tue Feb 15 2005 - stark@suse.de +- got updates from 1.0.1 branch +* Thu Feb 10 2005 - stark@suse.de +- additional fireflashing fix (#50635, bmo #280664) +- some more security related fixes + (bmo #268483, #273498, #277322) +- fire up GTK2 filepicker if GNOME is running +* Tue Feb 08 2005 - stark@suse.de +- some prefs are ignored (bmo #261934) +- disabled default IDN (#50566) +- fixed some more bugzilla.mozilla.org bugs: + [#276482], #280056, #280603 +* Sun Feb 06 2005 - stark@suse.de +- use same desktop categories for Professional and NLD +- added some lockdown stuff for printing and page saving + (bmo #280488) +* Wed Feb 02 2005 - stark@suse.de +- modified gconf.diff to honor ignore_hosts (bmo #280742) +- added a JS crasher fix (bmo #268535) +- added more fixes (bmo #255441, #273024, #275405, #275634) +* Fri Jan 28 2005 - stark@suse.de +- added gplflash inclusion +- improved JRE inclusion +- reactivated usage of Acrobat Reader plugin + (ready for acroread 7) +* Sat Jan 22 2005 - stark@suse.de +- added some backported bugfixes +* Sat Dec 18 2004 - stark@suse.de +- updated industrial theme to 1.0.9 +- use slightly changed icon for menu-entry (bnc #275) +- use original desktop file for NLD again +* Thu Dec 16 2004 - stark@suse.de +- newer patch for GNOME associations (bnc #362) +- fix overwriting of files with GTK picker (Ximian #65068) +- readded the industrial default theme patch for NLD +* Wed Dec 15 2004 - stark@suse.de +- activate GTK filepicker for NLD again +- fix for GNOME helper applications with parameters +- make GNOME associations the default on NLD +* Sat Dec 04 2004 - stark@suse.de +- fixed build on s390/s390x +- added patch to be able to install-global without running X + (bmo #265859) +* Thu Nov 18 2004 - stark@suse.de +- update industrial theme to 1.0.8 (still not activated) +- added patch to make home-directory the default download dir + (on NLD is still used Desktop) +* Thu Nov 11 2004 - stark@suse.de +- made initial window height smaller again +* Tue Nov 09 2004 - stark@suse.de +- update to final 1.0 release (20041109) +* Thu Nov 04 2004 - stark@suse.de +- update to 1.0rc2 +* Sat Oct 30 2004 - stark@suse.de +- added missing s390(x) patch +* Wed Oct 27 2004 - stark@suse.de +- update to 1.0rc1 codebase +- printing via XFT/fontconfig +- freetype changes to avoid API conflicts with newer freetype2 +- fixed build for s390/s390x +- removed AMD64 patch (included upstream) +- added translations sub-package +- removed "Show folder" patch for NLD (resolved upstream) +- don't use gnome-filepicker patch for NLD for now +- removed hppa buildfix (included upstream) +- removed untitled.patch (bmo #24068) resolved by (bmo #262478) +- use make -C browser/installer now to prepare installation +- don't check for default browser at startup (#47587) +- updated industrial.jar (0.99.13) (disabled) +* Fri Oct 15 2004 - stark@suse.de +- inherit locale from system +- fixed chrome registration +* Wed Oct 06 2004 - joeshaw@suse.de +- disable gconf settings as default (Ximian #67718) +* Wed Oct 06 2004 - stark@suse.de +- fixed inclusion of RealPlayer plugin again +* Tue Oct 05 2004 - stark@suse.de +- small important fix in firefox-download.patch (Ximian #65472) +* Sun Oct 03 2004 - stark@suse.de +- added security-fix from 0.10.1 (mozilla.org #259708) (#46687) +* Fri Oct 01 2004 - stark@suse.de +- final fix for downloading to Desktop folder (Ximian #65756) +- remove Postscript from printer names (Ximian #65560) +* Thu Sep 30 2004 - shprasad@suse.de +- Modified the MozillaFirefox.desktop file. + Changed the name 'Firefox' to 'Firefox Web Browser'. + Also changed it for all languages. +* Wed Sep 29 2004 - stark@suse.de +- fix inclusion of RealPlayer plugin (Ximian #65711) +* Mon Sep 27 2004 - joeshaw@suse.de +- Update the industrial default patch, for some reason it didn't + take before. +* Fri Sep 24 2004 - stark@suse.de +- fix for Ximian #65176 (mozilla.org #240068) +- revised patch for update function (Ximian #65615) +* Thu Sep 23 2004 - joeshaw@suse.de +- Uncomment the patch which tells the UI that industrial is the + default. +* Thu Sep 23 2004 - stark@suse.de +- open Nautilus on NLD for 'Show folder' in download settings + (Ximian #65472) by sragavan@novell.com +- save to Desktop folder if selected (Ximian #65756) + by sragavan@novell.com +* Wed Sep 22 2004 - stark@suse.de +- synced NLD package with 9.2 version +- GTK2 filepicker does now ask for confirmation when overwriting + files (Ximian #65068) by sagarwala@novell.com +- no direct update function (Ximian #65615) by rganesan@novell.com +- throbber linked to Novell (Ximian #66283) by rganesan@novell.com +- make industrial the default theme for NLD + (Ximian #65542) by joeshaw@suse.de +* Mon Sep 20 2004 - joeshaw@suse.de +- Add default bookmarks. Ximian #65546. +- Add the industrial theme, but it's not the default yet. +- Remove acroread from add-plugins because it's badly behaved. + Ximian #65499. +* Mon Sep 20 2004 - federico@ximian.com +- Added MozillaFirefox-toplevel-window-height.diff for + http://bugzilla.ximian.com/show_bug.cgi?id=65543 +* Sun Sep 19 2004 - stark@suse.de +- use GNOME system prefs only for NLD by default + (fixes bug #45575) +* Fri Sep 17 2004 - stark@suse.de +- joeshaw@suse.de: Update GConf patch so that proxy settings work + correctly (Ximian #64461) +- don't search Java on every path (Ximian #65383) +- added some missing fixes for official release +- added new java package name for triggers (#45257) +* Sat Sep 11 2004 - stark@suse.de +- update to official 1.0PR (0.10) +- adopted gnome-filepicker patch +- removed obsolete CUPS hack from start-script + (Ximian #65635, #65560) +* Thu Sep 09 2004 - stark@suse.de +- fixed endianess on AMD64 in JS component (#34743) +* Mon Sep 06 2004 - stark@suse.de +- fixed filelist +* Mon Sep 06 2004 - stark@suse.de +- update to 1.0PR (aka 0.10) +* Fri Sep 03 2004 - stark@suse.de +- added ppc64 patch +* Thu Sep 02 2004 - dave@suse.de +- Fixed up the .desktop installation on nld +* Wed Sep 01 2004 - shprasad@suse.de +- Doesn't ask to set Firefox as default web-browser. +* Tue Aug 31 2004 - stark@suse.de +- next new version for filepicker stuff +- deactivated native filepicker for NLD +- update to snapshot (20040831) +* Tue Aug 24 2004 - stark@suse.de +- new version of gnome-filepicker patch +- added patch for config +* Fri Aug 20 2004 - stark@suse.de +- update to snapshot (20040820) +* Thu Aug 19 2004 - stark@suse.de +- added workaround for mozilla bug #246313 + (Firefox does not start: getting "cannot open display" error) +* Wed Aug 18 2004 - stark@suse.de +- added some patches from Ximian + - use GNOME filepicker + - use more gconf settings + - set startup homepage to Novell +* Tue Aug 17 2004 - stark@suse.de +- update to pre-1.0.0 (20040817) +* Thu Aug 05 2004 - stark@suse.de +- security update to 0.9.3 + (including #43312 and others) +- handle RealPlayer 9 plugin +* Mon Aug 02 2004 - ro@suse.de +- recode desktop file to utf-8 +* Wed Jul 28 2004 - stark@suse.de +- added fix against certificate spoofing (#43312) +* Fri Jul 23 2004 - stark@suse.de +- update to 0.9.2 +- added workaround for extension registry +- removed old (incompatible) mozex extension +* Tue Jun 29 2004 - stark@suse.de +- update to 0.9.1 +- added hint to run as root first +* Tue Jun 15 2004 - stark@suse.de +- update to 0.9 +- added patch for newer freetype +* Fri Apr 02 2004 - stark@suse.de +- removing relocation of TEMP directory (#34391) +* Mon Mar 29 2004 - stark@suse.de +- update to 0.8.0+ (20040503) +- removed firefox logos and activate official branding for + milestone builds +- changed profile-dir to .firefox +- added some needed files +- enabled gnomevfs extension +* Fri Mar 26 2004 - uli@suse.de +- fixed hang during build on s390* (bug #35440) +* Wed Mar 03 2004 - stark@suse.de +- removed unused patches for GTK2 build +- more fixes for (#35179) +* Mon Mar 01 2004 - stark@suse.de +- improved start-script to interact with thunderbird (#35179) +* Thu Feb 26 2004 - stark@suse.de +- use official releasedate +- added official (trademarked) artwork +- added firefox icon to /usr/share/pixmaps +- cleaned up spec-file (there will be no GTK1 version) +* Tue Feb 24 2004 - stark@suse.de +- fixed optimization for non-x86 archs +* Tue Feb 24 2004 - stark@suse.de +- adopted file-list and build options to original distribution +- added prdtoa fix (#32963) +- added hook for static firefox build to rebuild-databases.sh +- added compiler flags for security/ (nss-opt.patch) +- included mozex (mozex.mozdev.org) +- added -Os as optimization flag +* Mon Feb 09 2004 - stark@suse.de +- renamed to MozillaFirefox +- update to final version 0.8 +* Fri Feb 06 2004 - stark@suse.de +- update to Firebird 0.8 (20040205) +- added mips build fix +- set PS printer list in MozillaFirebird.sh +- use lib64 again for biarch platforms +* Sat Jan 10 2004 - adrian@suse.de +- build as user +* Fri Aug 22 2003 - stark@suse.de +- upstream sync for 0.6.1post +* Sun Aug 10 2003 - stark@suse.de +- removed dmoz from searchplugins-filelist +* Fri Aug 08 2003 - stark@suse.de +- update to 0.6.1post (TRUNK) +- use -fno-strict-aliasing +* Thu Jul 31 2003 - stark@suse.de +- update to 0.6.1 (MOZILLA_1_4_BRANCH) +- synchronized with mozilla-source +- created file-list +* Thu Jul 10 2003 - stark@suse.de +- update to snapshot 20030709 +- fixed generation of symlink MozillaFirebird-xremote-client +* Fri Jun 20 2003 - stark@suse.de +- update to snapshot 20030622 (0.7pre) +* Mon May 19 2003 - stark@suse.de +- update to snapshot 20030518 (0.6) +* Wed May 07 2003 - stark@suse.de +- update to snapshot 20030507 +* Wed Apr 30 2003 - stark@suse.de +- initial SuSE package diff --git a/abuild.patch b/abuild.patch new file mode 100644 index 00000000..5e253444 --- /dev/null +++ b/abuild.patch @@ -0,0 +1,129 @@ +From: Wolfgang Rosenauer +Subject: Fix compiler warnings which disturb autobuild +References: + +### autobuild +... testing for serious compiler warnings +Program is using uninitialized variables. Note the difference between "is used" +and "may be used". Please investigate and fix. +Problematic file(s) and their linenumbers: + certificate.c: 541 + nsUnicodeToJamoTTF.cpp: 855 + nsObjectFrame.cpp: 1933 +### + +### autobuild +... testing for serious compiler warnings +Program returns random data in a function. Please fix. +Problematic file(s) and their linenumbers: + nsWebShell.cpp: 562 + nsOperaProfileMigrator.cpp: 831 + Program is using uninitialized variables. Note the difference between "is used" and "may be used". + Please investigate and fix. + Problematic file(s) and their linenumbers: + nsFrame.cpp: 3536 +### + +--- gfx/src/gtk/nsFontMetricsUtils.cpp.old 2005-03-24 07:27:33.000000000 +0100 ++++ gfx/src/gtk/nsFontMetricsUtils.cpp 2005-03-24 07:28:26.000000000 +0100 +@@ -75,6 +75,7 @@ NS_FontMetricsGetHints(void) + #ifdef MOZ_ENABLE_COREXFONTS + return nsFontMetricsGTK::GetHints(); + #endif ++ return 1; + } + + nsresult +@@ -95,6 +96,7 @@ NS_FontMetricsFamilyExists(nsIDeviceCont + #ifdef MOZ_ENABLE_COREXFONTS + return nsFontMetricsGTK::FamilyExists(aDevice, aName); + #endif ++ return 1; + } + + #ifdef MOZ_ENABLE_XFT +Index: intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp +=================================================================== +RCS file: /cvsroot/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp,v +retrieving revision 1.10 +diff -u -p -6 -r1.10 nsUnicodeToJamoTTF.cpp +--- intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 19 Feb 2005 07:27:54 -0000 1.10 ++++ intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 7 Jun 2005 07:21:10 -0000 +@@ -842,12 +842,13 @@ PRInt16 JamoSrchReplace (const JamoNormM + // we don't need a separate range check here because the one in + // for-loop is sufficient. + for (PRInt32 i = start; i <= end - clusterLen; i++) + { + const JamoNormMap *match; + JamoNormMap key; ++ key.liga = 0; + + // cluster array is made up of PRUint8's to save memory + // and we have to subtract aOffset from the input before looking it up. + key.seq[0] = aIn[i] - aOffset; + key.seq[1] = aIn[i + 1] - aOffset; + key.seq[2] = clusterLen == 3 ? (aIn[i + 2] - aOffset) : 0; +Index: layout/generic/nsObjectFrame.cpp +=================================================================== +RCS file: /cvsroot/mozilla/layout/generic/nsObjectFrame.cpp,v +retrieving revision 1.505 +diff -u -p -6 -r1.505 nsObjectFrame.cpp +--- layout/generic/nsObjectFrame.cpp 6 May 2005 03:14:31 -0000 1.505 ++++ layout/generic/nsObjectFrame.cpp 7 Jun 2005 07:23:27 -0000 +@@ -1850,12 +1850,13 @@ nsObjectFrame::Paint(nsPresContext* + // now we need to setup the correct location for printing + nsresult rv; + nsPluginWindow window; + nsPoint origin; + float t2p; + window.window = nsnull; ++ window.ws_info = nsnull; + + // prepare embedded mode printing struct + nsPluginPrint npprint; + npprint.mode = nsPluginMode_Embedded; + + // we need to find out if we are windowless or not +Index: docshell/base/nsWebShell.cpp +=================================================================== +RCS file: /cvsroot/mozilla/docshell/base/nsWebShell.cpp,v +retrieving revision 1.656.2.1 +diff -u -p -6 -r1.656.2.1 nsWebShell.cpp +--- docshell/base/nsWebShell.cpp 16 Sep 2005 19:11:52 -0000 1.656.2.1 ++++ docshell/base/nsWebShell.cpp 22 Sep 2005 06:30:30 -0000 +@@ -556,12 +556,13 @@ nsWebShell::OnLinkClickSync(nsIContent * + // XXX TODO Should be similar to the HTML IMG ALT attribute handling + // in NS 4.x + default: + NS_ABORT_IF_FALSE(0,"unexpected link verb"); + return NS_ERROR_UNEXPECTED; + } ++ return NS_ERROR_UNEXPECTED; + } + + NS_IMETHODIMP + nsWebShell::OnOverLink(nsIContent* aContent, + nsIURI* aURI, + const PRUnichar* aTargetSpec) +Index: layout/generic/nsFrame.cpp +=================================================================== +RCS file: /cvsroot/mozilla/layout/generic/nsFrame.cpp,v +retrieving revision 3.574.2.4 +diff -u -p -6 -r3.574.2.4 nsFrame.cpp +--- layout/generic/nsFrame.cpp 20 Sep 2005 06:32:09 -0000 3.574.2.4 ++++ layout/generic/nsFrame.cpp 22 Sep 2005 06:31:42 -0000 +@@ -3528,13 +3528,13 @@ nsresult + nsFrame::PeekOffsetParagraph(nsPresContext* aPresContext, + nsPeekOffsetStruct *aPos) + { + #ifdef DEBUG_paragraph + printf("Selecting paragraph\n"); + #endif +- nsIFrame* blockFrame; ++ nsIFrame* blockFrame = NULL; + nsCOMPtr iter (getter_AddRefs(GetBlockFrameAndLineIter(this, &blockFrame))); + if (!blockFrame || !iter) + return NS_ERROR_UNEXPECTED; + + PRInt32 thisLine; + nsresult result = iter->FindLineContaining(this, &thisLine); diff --git a/add-plugins.sh.in b/add-plugins.sh.in new file mode 100644 index 00000000..fa8b226b --- /dev/null +++ b/add-plugins.sh.in @@ -0,0 +1,70 @@ +#! /bin/sh +# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved. +# 2002-2003 SuSE Linux AG, Nuernberg, Germany +# 2005 SUSE Linux Products GmbH, Nuernberg, Germany +# + +# check if we are started as root +# only one of UID and USER must be set correctly +if test "$UID" != 0 -a "$USER" != root; then + echo "You must be root to start $0." + exit 1 +fi + +PREFIX="%PROGDIR" +MOZ_APP="%APPNAME" + +get_arch () +{ + file "$1" | sed -n 's/.*: ELF [^,]*, $[^,]*$,.*/\1/p' +} + +mozilla_arch=`get_arch $PREFIX/$MOZ_APP-bin` +mozilla_lib=`file $PREFIX/$MOZ_APP-bin | awk '{ print $3 }'` + +JAVA_CHECK_PATH="/usr/lib /usr/java" +JAVA_ORDER="mozilla ns7 ns610 [Ss]un IBM BEA" +case $mozilla_lib in + 64-bit) + LIB=lib64 + ;; + *) + LIB=lib + ;; +esac + +find_java () +{ + TMP=$(find $JAVA_CHECK_PATH -name "$1" -type f) + for i in $TMP; do + if [ "`get_arch $i`" = "$mozilla_arch" ]; then + PLUGIN="$PLUGIN $i" + fi + done + TMP="" +} + +# JAVA +if [ ! -L $PREFIX/plugins/libjavaplugin_oji.so ] || + [ ! -f $PREFIX/plugins/libjavaplugin_oji.so ] ; then # link is here and valid + PLUGIN="" + find_java *javaplugin_oji.so + find_java *javaplugin_ojigcc3.so # IBMJava + if [ "$PLUGIN" ]; then + for i in $PLUGIN; do + if [[ $i == *mozilla* ]] || [[ $i == *gcc3* ]] || [[ $i == *ns7/* ]]; then + TMP=$i + break + fi + done + fi + if [ "$TMP" ]; then + PLUGIN=$TMP + ln -sf $PLUGIN $PREFIX/plugins/libjavaplugin_oji.so + echo "-> added Java2 plugin ($PLUGIN)" + else + echo "-> Java2: no change (no suitable JRE available)" + fi +else + echo "-> Java2: no change (existing link is valid)" +fi diff --git a/bookmarks.html.nld b/bookmarks.html.nld new file mode 100644 index 00000000..99c989ab --- /dev/null +++ b/bookmarks.html.nld @@ -0,0 +1,74 @@ + + + +Bookmarks +

Bookmarks

+ +

Bookmarks Toolbar Folder +

Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar +

NOVELL: Support +
Entertainment + + The Internet Movie Database (IMDb) + Movie Reviews + Rotten Tomatoes Movie Reviews + Real Player Guide + Real Player Movie Trailers + +
News + + BBC News + CNN.com + Google News + Slashdot: News for nerds, stuff that matters + weather.com + Wired News + +
Internet Search + + Google + Open Directory Project + Yahoo! + +
Reference + + Dictionary Search + How Stuff Works + Language Translation + The Library of Congress + National Library of Medicine + Wikipedia, the free encyclopedia + +
Maps and Directions + + Map24 + MapQuest + Multimap.com + Yahoo! Maps and Driving Directions + +
Shopping + + Amazon.com + craigslist + eBay + Epinions.com + Froogle + Overstock.com + +
People and Companies + + Internet Yellow Pages + White Pages Phone Directory + Yahoo! People Search + +

NOVELL: Worldwide +

NOVELL: Novell on Linux +

NOVELL: Support +

Welcome to SUSE LINUX +

diff --git a/bookmarks.html.suse b/bookmarks.html.suse new file mode 100644 index 00000000..4683c886 --- /dev/null +++ b/bookmarks.html.suse @@ -0,0 +1,36 @@ + + + +Bookmarks +

Bookmarks

+ +

Get Bookmark Add-ons + +

Bookmarks Toolbar Folder +

Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar +

openSUSE + + openSUSE + openSUSE Download + Novell / Linux + SUSE Linux Cool Solutions + SUSE Linux Support + + + Getting Started + Latest Headlines + + +
Mozilla Firefox + + Help and Tutorials + Customize Firefox + Get Involved + About Us + +

diff --git a/cjk-postscript-fonts.dif b/cjk-postscript-fonts.dif new file mode 100644 index 00000000..7cda3c82 --- /dev/null +++ b/cjk-postscript-fonts.dif @@ -0,0 +1,28 @@ +--- modules/libpref/src/init/all.js ++++ modules/libpref/src/init/all.js +@@ -2250,8 +2250,10 @@ + pref("print.postscript.nativefont.ar", ""); + pref("print.postscript.nativefont.el", ""); + pref("print.postscript.nativefont.he", ""); +-pref("print.postscript.nativefont.ja", ""); +-pref("print.postscript.nativefont.ko", ""); ++pref("print.postscript.nativefont.ja", "UTF-8"); ++pref("print.postscript.nativefont.ja", "Ryumin-Light-UniJIS-UTF8-H"); ++pref("print.postscript.nativefont.ko", "UTF-8"); ++pref("print.postscript.nativefont.ko", "Baekmuk-Gulim-UniKS-UTF8-H"); + pref("print.postscript.nativefont.th", ""); + pref("print.postscript.nativefont.tr", ""); + pref("print.postscript.nativefont.x-baltic", ""); +@@ -2260,8 +2262,10 @@ + pref("print.postscript.nativefont.x-unicode", ""); + pref("print.postscript.nativefont.x-user-def", ""); + pref("print.postscript.nativefont.x-western", ""); +-pref("print.postscript.nativefont.zh-CN", ""); +-pref("print.postscript.nativefont.zh-TW", ""); ++pref("print.postscript.nativefont.zh-CN", "UTF-8"); ++pref("print.postscript.nativefont.zh-CN", "GB-Song-Medium-UniGB-UTF8-H"); ++pref("print.postscript.nativefont.zh-TW", "UTF-8"); ++pref("print.postscript.nativefont.zh-TW", "B5-Song-Medium-UniCNS-UTF8-H"); + pref("print.postscript.nativefont.zh-HK", ""); + + # XP_UNIX diff --git a/configure.patch b/configure.patch new file mode 100644 index 00000000..9fabf633 --- /dev/null +++ b/configure.patch @@ -0,0 +1,6180 @@ +--- configure ++++ configure +@@ -83,6 +83,8 @@ + ac_help="$ac_help + --with-qtdir=\$dir Specify Qt directory " + ac_help="$ac_help ++ --enable-startup-notification Enable startup-notification support (default: disabled) " ++ac_help="$ac_help + --enable-application=APP + Options include: + suite +@@ -133,6 +135,8 @@ + ac_help="$ac_help + --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) " + ac_help="$ac_help ++ --enable-dbus Enable dbus support (default: disabled) " ++ac_help="$ac_help + --disable-crypto Disable crypto support (Personal Security Manager)" + ac_help="$ac_help + --disable-jsd Disable JavaScript debug library" +@@ -960,7 +964,7 @@ + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:964: checking host system type" >&5 ++echo "configure:968: checking host system type" >&5 + + host_alias=$host + case "$host_alias" in +@@ -981,7 +985,7 @@ + echo "$ac_t""$host" 1>&6 + + echo $ac_n "checking target system type""... $ac_c" 1>&6 +-echo "configure:985: checking target system type" >&5 ++echo "configure:989: checking target system type" >&5 + + target_alias=$target + case "$target_alias" in +@@ -999,7 +1003,7 @@ + echo "$ac_t""$target" 1>&6 + + echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1003: checking build system type" >&5 ++echo "configure:1007: checking build system type" >&5 + + build_alias=$build + case "$build_alias" in +@@ -1067,14 +1071,15 @@ + GNOMEUI_VERSION=2.2.0 + GCONF_VERSION=1.2.1 + LIBGNOME_VERSION=2.0 ++STARTUP_NOTIFICATION_VERSION=0.8 + + MISSING_X= +-for ac_prog in gawk mawk nawk awk ++for ac_prog in mawk gawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1078: checking for $ac_word" >&5 ++echo "configure:1083: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1172,7 +1177,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1176: checking for $ac_word" >&5 ++echo "configure:1181: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1241,13 +1246,13 @@ + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 +-echo "configure:1245: checking for host c compiler" >&5 ++echo "configure:1250: checking for host c compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1251: checking for $ac_word" >&5 ++echo "configure:1256: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1282,13 +1287,13 @@ + fi + echo "$ac_t""$HOST_CC" 1>&6 + echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 +-echo "configure:1286: checking for host c++ compiler" >&5 ++echo "configure:1291: checking for host c++ compiler" >&5 + for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1292: checking for $ac_word" >&5 ++echo "configure:1297: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1337,7 +1342,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1341: checking for $ac_word" >&5 ++echo "configure:1346: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1372,7 +1377,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1376: checking for $ac_word" >&5 ++echo "configure:1381: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1407,16 +1412,16 @@ + LDFLAGS="$HOST_LDFLAGS" + + echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1411: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1416: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1431,16 +1436,16 @@ + CFLAGS="$HOST_CXXFLAGS" + + echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1435: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1440: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1469,7 +1474,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1473: checking for $ac_word" >&5 ++echo "configure:1478: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1503,7 +1508,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1507: checking for $ac_word" >&5 ++echo "configure:1512: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1533,7 +1538,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1537: checking for $ac_word" >&5 ++echo "configure:1542: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1584,7 +1589,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1588: checking for $ac_word" >&5 ++echo "configure:1593: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1616,7 +1621,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1620: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1625: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1627,12 +1632,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1631 "configure" ++#line 1636 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1658,12 +1663,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1667: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1667: checking whether we are using GNU C" >&5 ++echo "configure:1672: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1672,7 +1677,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -1691,7 +1696,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1695: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1700: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1727,7 +1732,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1731: checking for $ac_word" >&5 ++echo "configure:1736: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1763,7 +1768,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1767: checking for $ac_word" >&5 ++echo "configure:1772: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1795,7 +1800,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1799: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1804: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1806,12 +1811,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1810 "configure" ++#line 1815 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1837,12 +1842,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1841: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1846: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:1846: checking whether we are using GNU C++" >&5 ++echo "configure:1851: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1851,7 +1856,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -1870,7 +1875,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1874: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1879: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1901,57 +1906,6 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + + case "$build:$target" in + powerpc-apple-darwin8*:i?86-apple-darwin*) +@@ -1965,7 +1919,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1969: checking for $ac_word" >&5 ++echo "configure:1923: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2000,7 +1954,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2004: checking for $ac_word" >&5 ++echo "configure:1958: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2035,7 +1989,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2039: checking for $ac_word" >&5 ++echo "configure:1993: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2076,7 +2030,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2080: checking for $ac_word" >&5 ++echo "configure:2034: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2111,7 +2065,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2115: checking for $ac_word" >&5 ++echo "configure:2069: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2146,7 +2100,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2150: checking for $ac_word" >&5 ++echo "configure:2104: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2184,7 +2138,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2188: checking for $ac_word" >&5 ++echo "configure:2142: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2214,7 +2168,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2218: checking for $ac_word" >&5 ++echo "configure:2172: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2265,7 +2219,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2269: checking for $ac_word" >&5 ++echo "configure:2223: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2297,7 +2251,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2301: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2255: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2308,12 +2262,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2312 "configure" ++#line 2266 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2339,12 +2293,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2343: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2348: checking whether we are using GNU C" >&5 ++echo "configure:2302: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2353,7 +2307,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -2372,7 +2326,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2376: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2330: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2408,7 +2362,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2412: checking for $ac_word" >&5 ++echo "configure:2366: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2440,7 +2394,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2444: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2398: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2451,12 +2405,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2455 "configure" ++#line 2409 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2482,12 +2436,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2486: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:2491: checking whether we are using GNU C++" >&5 ++echo "configure:2445: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2496,7 +2450,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -2515,7 +2469,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2519: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2473: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2546,61 +2500,10 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2604: checking for $ac_word" >&5 ++echo "configure:2507: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2632,7 +2535,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2636: checking for $ac_word" >&5 ++echo "configure:2539: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2673,7 +2576,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2677: checking for $ac_word" >&5 ++echo "configure:2580: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2708,7 +2611,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2712: checking for $ac_word" >&5 ++echo "configure:2615: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2743,7 +2646,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2747: checking for $ac_word" >&5 ++echo "configure:2650: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2778,7 +2681,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2782: checking for $ac_word" >&5 ++echo "configure:2685: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2867,7 +2770,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2871: checking for $ac_word" >&5 ++echo "configure:2774: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2909,14 +2812,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2934,14 +2837,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { + unsigned *test = new unsigned(42); + ; return 0; } + EOF +-if { (eval echo configure:2945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2997,7 +2900,7 @@ + _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` + # Add flags if necessary + echo $ac_n "checking for midl flags""... $ac_c" 1>&6 +-echo "configure:3001: checking for midl flags" >&5 ++echo "configure:2904: checking for midl flags" >&5 + if test $ "$_MIDL_MAJOR_VERSION" -gt "6" $ -o $ "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" $ -o $ "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" $; then + # Starting with MIDL version 6.0.359, the MIDL compiler + # generates /Oicf /robust stubs by default, which is not +@@ -3019,9 +2922,9 @@ + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` + _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` + echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 +-echo "configure:3023: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:2926: checking for w32api version >= $W32API_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -3033,7 +2936,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + res=yes + else +@@ -3049,7 +2952,7 @@ + fi + # Check windres version + echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 +-echo "configure:3053: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:2956: checking for windres version >= $WINDRES_VERSION" >&5 + _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` + echo "$ac_t""$_WINDRES_VERSION" 1>&6 + _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` +@@ -3076,7 +2979,7 @@ + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3080: checking how to run the C preprocessor" >&5 ++echo "configure:2983: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3091,13 +2994,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3108,13 +3011,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3125,13 +3028,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3159,17 +3062,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3163: checking for $ac_hdr" >&5 ++echo "configure:3066: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3200,10 +3103,10 @@ + if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then + if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +-echo "configure:3204: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3107: checking whether $CC and cc understand -c and -o together" >&5 + else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +-echo "configure:3207: checking whether cc understands -c and -o together" >&5 ++echo "configure:3110: checking whether cc understands -c and -o together" >&5 + fi + set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +@@ -3215,16 +3118,16 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +-if { (eval echo configure:3219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' +- if { (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : +@@ -3260,7 +3163,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3264: checking how to run the C preprocessor" >&5 ++echo "configure:3167: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3275,13 +3178,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3292,13 +3195,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3309,13 +3212,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3340,7 +3243,7 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3344: checking how to run the C++ preprocessor" >&5 ++echo "configure:3247: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3353,12 +3256,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3405,7 +3308,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:3409: checking for a BSD compatible install" >&5 ++echo "configure:3312: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3458,7 +3361,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:3462: checking whether ln -s works" >&5 ++echo "configure:3365: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3483,7 +3386,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3487: checking for $ac_word" >&5 ++echo "configure:3390: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3523,7 +3426,7 @@ + fi + + echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 +-echo "configure:3527: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3430: checking for minimum required perl version >= $PERL_VERSION" >&5 + _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + echo "$ac_t""$_perl_version" 1>&6 +@@ -3533,7 +3436,7 @@ + fi + + echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 +-echo "configure:3537: checking for full perl installation" >&5 ++echo "configure:3440: checking for full perl installation" >&5 + _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + if test "$_perl_res" != 0; then +@@ -3546,7 +3449,7 @@ + # Extract the first word of "doxygen", so it can be a program name with args. + set dummy doxygen; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3550: checking for $ac_word" >&5 ++echo "configure:3453: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3582,7 +3485,7 @@ + # Extract the first word of "whoami", so it can be a program name with args. + set dummy whoami; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3586: checking for $ac_word" >&5 ++echo "configure:3489: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3618,7 +3521,7 @@ + # Extract the first word of "autoconf", so it can be a program name with args. + set dummy autoconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3622: checking for $ac_word" >&5 ++echo "configure:3525: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3654,7 +3557,7 @@ + # Extract the first word of "unzip", so it can be a program name with args. + set dummy unzip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3658: checking for $ac_word" >&5 ++echo "configure:3561: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3692,7 +3595,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3696: checking for $ac_word" >&5 ++echo "configure:3599: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3733,7 +3636,7 @@ + # Extract the first word of "makedepend", so it can be a program name with args. + set dummy makedepend; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3737: checking for $ac_word" >&5 ++echo "configure:3640: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3768,7 +3671,7 @@ + # Extract the first word of "xargs", so it can be a program name with args. + set dummy xargs; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3772: checking for $ac_word" >&5 ++echo "configure:3675: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3831,7 +3734,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3835: checking for $ac_word" >&5 ++echo "configure:3738: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3881,7 +3784,7 @@ + # Extract the first word of "sdp", so it can be a program name with args. + set dummy sdp; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3885: checking for $ac_word" >&5 ++echo "configure:3788: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3977,7 +3880,7 @@ + fi + + echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 +-echo "configure:3981: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3884: checking for valid compiler/Mac OS X SDK combination" >&5 + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -3986,7 +3889,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { return 0; } +@@ -3994,7 +3897,7 @@ + result=yes + ; return 0; } + EOF +-if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result=no + else +@@ -4019,7 +3922,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4023: checking for $ac_word" >&5 ++echo "configure:3926: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4062,7 +3965,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4066: checking for $ac_word" >&5 ++echo "configure:3969: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4130,7 +4033,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. + # --without-x overrides everything else, but does not touch the cache. + echo $ac_n "checking for X""... $ac_c" 1>&6 +-echo "configure:4134: checking for X" >&5 ++echo "configure:4037: checking for X" >&5 + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -4192,12 +4095,12 @@ + + # First, try using that file with no special directory specified. + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4266,14 +4169,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBS="$ac_save_LIBS" + # We can link X programs with no special library path. +@@ -4379,17 +4282,17 @@ + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +-echo "configure:4383: checking whether -R must be followed by a space" >&5 ++echo "configure:4286: checking whether -R must be followed by a space" >&5 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_nospace=yes + else +@@ -4405,14 +4308,14 @@ + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes + else +@@ -4444,7 +4347,7 @@ + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +-echo "configure:4448: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4351: checking for dnet_ntoa in -ldnet" >&5 + ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4452,7 +4355,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4488,7 +4391,7 @@ + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:4492: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4395: checking for dnet_ntoa in -ldnet_stub" >&5 + ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4496,7 +4399,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet_stub $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4539,12 +4442,12 @@ + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +-echo "configure:4543: checking for gethostbyname" >&5 ++echo "configure:4446: checking for gethostbyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" + else +@@ -4591,7 +4494,7 @@ + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:4595: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4498: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4599,7 +4502,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4643,12 +4546,12 @@ + # -lsocket must be given before -lnsl if both are needed. + # We assume that if connect needs -lnsl, so does gethostbyname. + echo $ac_n "checking for connect""... $ac_c" 1>&6 +-echo "configure:4647: checking for connect" >&5 ++echo "configure:4550: checking for connect" >&5 + if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" + else +@@ -4695,7 +4598,7 @@ + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:4699: checking for connect in -lsocket" >&5 ++echo "configure:4602: checking for connect in -lsocket" >&5 + ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4703,7 +4606,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4741,12 +4644,12 @@ + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +-echo "configure:4745: checking for remove" >&5 ++echo "configure:4648: checking for remove" >&5 + if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_remove=yes" + else +@@ -4793,7 +4696,7 @@ + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +-echo "configure:4797: checking for remove in -lposix" >&5 ++echo "configure:4700: checking for remove in -lposix" >&5 + ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4801,7 +4704,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lposix $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4839,12 +4742,12 @@ + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +-echo "configure:4843: checking for shmat" >&5 ++echo "configure:4746: checking for shmat" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shmat=yes" + else +@@ -4891,7 +4794,7 @@ + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +-echo "configure:4895: checking for shmat in -lipc" >&5 ++echo "configure:4798: checking for shmat in -lipc" >&5 + ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4899,7 +4802,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lipc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4946,7 +4849,7 @@ + # libraries we check for below, so use a different variable. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +-echo "configure:4950: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4853: checking for IceConnectionNumber in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4954,7 +4857,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5406,7 +5309,7 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:5410: checking whether ld has archive extraction flags" >&5 ++echo "configure:5313: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5423,14 +5326,14 @@ + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_mkshlib_force_and_unforce=$line; break + else +@@ -5465,17 +5368,17 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5469: checking for 64-bit OS" >&5 ++echo "configure:5372: checking for 64-bit OS" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -5635,9 +5538,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 +-echo "configure:5639: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5542: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -5684,17 +5587,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5688: checking for $ac_hdr" >&5 ++echo "configure:5591: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -5736,7 +5639,7 @@ + LIBS="$LIBS -lbe" + if test "$COMPILE_ENVIRONMENT"; then + echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 +-echo "configure:5740: checking for main in -lbind" >&5 ++echo "configure:5643: checking for main in -lbind" >&5 + ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5744,14 +5647,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5772,7 +5675,7 @@ + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:5776: checking for main in -lzeta" >&5 ++echo "configure:5679: checking for main in -lzeta" >&5 + ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5780,14 +5683,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lzeta $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5851,18 +5754,18 @@ + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:5855: checking for -dead_strip option to ld" >&5 ++echo "configure:5758: checking for -dead_strip option to ld" >&5 + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-dead_strip" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -6730,14 +6633,14 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -6765,7 +6668,7 @@ + CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 +-echo "configure:6769: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6672: checking for Forte compiler version >= WS6U2" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -6775,7 +6678,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -6913,7 +6816,7 @@ + ;; + *-darwin*) + echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 +-echo "configure:6917: checking for -exported_symbols_list option to ld" >&5 ++echo "configure:6820: checking for -exported_symbols_list option to ld" >&5 + if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6953,12 +6856,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:6957: checking for ANSI C header files" >&5 ++echo "configure:6860: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -6966,7 +6869,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6983,7 +6886,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7001,7 +6904,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7022,7 +6925,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -7033,7 +6936,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -7057,12 +6960,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7061: checking for working const" >&5 ++echo "configure:6964: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7132,12 +7035,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7136: checking for mode_t" >&5 ++echo "configure:7039: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7165,12 +7068,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7169: checking for off_t" >&5 ++echo "configure:7072: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7198,12 +7101,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7202: checking for pid_t" >&5 ++echo "configure:7105: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7231,12 +7134,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7235: checking for size_t" >&5 ++echo "configure:7138: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7264,12 +7167,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7268: checking for st_blksize in struct stat" >&5 ++echo "configure:7171: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7277,7 +7180,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -7298,12 +7201,12 @@ + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7302: checking for siginfo_t" >&5 ++echo "configure:7205: checking for siginfo_t" >&5 + if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7311,7 +7214,7 @@ + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -7345,12 +7248,12 @@ + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7349: checking for int16_t" >&5 ++echo "configure:7252: checking for int16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7358,7 +7261,7 @@ + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int16_t=true + else +@@ -7380,12 +7283,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7384: checking for int32_t" >&5 ++echo "configure:7287: checking for int32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7393,7 +7296,7 @@ + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else +@@ -7415,12 +7318,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7419: checking for int64_t" >&5 ++echo "configure:7322: checking for int64_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7428,7 +7331,7 @@ + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else +@@ -7450,12 +7353,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7454: checking for int64" >&5 ++echo "configure:7357: checking for int64" >&5 + if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7463,7 +7366,7 @@ + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else +@@ -7485,12 +7388,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7489: checking for uint" >&5 ++echo "configure:7392: checking for uint" >&5 + if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7498,7 +7401,7 @@ + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -7520,12 +7423,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7524: checking for uint_t" >&5 ++echo "configure:7427: checking for uint_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7533,7 +7436,7 @@ + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -7555,12 +7458,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7559: checking for uint16_t" >&5 ++echo "configure:7462: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7568,7 +7471,7 @@ + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7599,12 +7502,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7603: checking for uname.domainname" >&5 ++echo "configure:7506: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7612,7 +7515,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -7636,12 +7539,12 @@ + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:7640: checking for uname.__domainname" >&5 ++echo "configure:7543: checking for uname.__domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7649,7 +7552,7 @@ + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else +@@ -7682,7 +7585,7 @@ + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:7686: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7589: checking for usable wchar_t (2 bytes, unsigned)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7690,14 +7593,14 @@ + ac_cv_have_usable_wchar="maybe" + else + cat > conftest.$ac_ext < + int main () { + return (sizeof(wchar_t) != 2) || + (wchar_t)-1 < (wchar_t) 0 ; } + EOF +-if { (eval echo configure:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_have_usable_wchar="yes" + else +@@ -7732,7 +7635,7 @@ + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:7736: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7639: checking for compiler -fshort-wchar option" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7740,14 +7643,17 @@ + ac_cv_have_usable_wchar_option="maybe" + else + cat > conftest.$ac_ext < + int main () { + return (sizeof(wchar_t) != 2) || + (wchar_t)-1 < (wchar_t) 0 ; } + EOF +-if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_have_usable_wchar_option="yes" + else +@@ -7783,7 +7689,7 @@ + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:7787: checking for visibility(hidden) attribute" >&5 ++echo "configure:7693: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7808,7 +7714,7 @@ + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:7812: checking for visibility(default) attribute" >&5 ++echo "configure:7718: checking for visibility(default) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7833,7 +7739,7 @@ + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:7837: checking for visibility pragma support" >&5 ++echo "configure:7743: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7858,7 +7764,7 @@ + echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:7862: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7768: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7901,12 +7807,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:7905: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7811: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -7914,7 +7820,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:7918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -7939,7 +7845,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:7943: checking for opendir in -ldir" >&5 ++echo "configure:7849: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -7947,7 +7853,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -7980,7 +7886,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:7984: checking for opendir in -lx" >&5 ++echo "configure:7890: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -7988,7 +7894,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8031,17 +7937,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8035: checking for $ac_hdr" >&5 ++echo "configure:7941: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8071,17 +7977,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8075: checking for $ac_hdr" >&5 ++echo "configure:7981: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8111,17 +8017,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8115: checking for $ac_hdr" >&5 ++echo "configure:8021: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8151,17 +8057,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8155: checking for $ac_hdr" >&5 ++echo "configure:8061: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8191,17 +8097,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8195: checking for $ac_hdr" >&5 ++echo "configure:8101: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8232,17 +8138,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8236: checking for $ac_hdr" >&5 ++echo "configure:8142: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8273,17 +8179,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8277: checking for $ac_hdr" >&5 ++echo "configure:8183: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8320,17 +8226,17 @@ + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8324: checking for new" >&5 ++echo "configure:8230: checking for new" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8371,17 +8277,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8375: checking for $ac_hdr" >&5 ++echo "configure:8281: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8415,7 +8321,7 @@ + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8419: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8325: checking for gethostbyname_r in -lc_r" >&5 + ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8423,7 +8329,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8464,7 +8370,7 @@ + ;; + esac + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8468: checking for atan in -lm" >&5 ++echo "configure:8374: checking for atan in -lm" >&5 + ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8472,7 +8378,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8517,7 +8423,7 @@ + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8521: checking for dlopen in -ldl" >&5 ++echo "configure:8427: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8525,7 +8431,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8553,17 +8459,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:8557: checking for dlfcn.h" >&5 ++echo "configure:8463: checking for dlfcn.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8599,7 +8505,7 @@ + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:8603: checking for demangle in -lC_r" >&5 ++echo "configure:8509: checking for demangle in -lC_r" >&5 + ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8607,7 +8513,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8648,7 +8554,7 @@ + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:8652: checking for demangle in -lC" >&5 ++echo "configure:8558: checking for demangle in -lC" >&5 + ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8656,7 +8562,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8698,7 +8604,7 @@ + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:8702: checking for socket in -lsocket" >&5 ++echo "configure:8608: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8706,7 +8612,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8762,7 +8668,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +-echo "configure:8766: checking for XDrawLines in -lX11" >&5 ++echo "configure:8672: checking for XDrawLines in -lX11" >&5 + ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8770,7 +8676,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lX11 $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8803,7 +8709,7 @@ + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:8807: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8713: checking for XextAddDisplay in -lXext" >&5 + ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8811,7 +8717,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8846,7 +8752,7 @@ + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:8850: checking for XtFree in -lXt" >&5 ++echo "configure:8756: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8854,7 +8760,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8886,7 +8792,7 @@ + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:8890: checking for IceFlush in -lICE" >&5 ++echo "configure:8796: checking for IceFlush in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8894,7 +8800,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8926,7 +8832,7 @@ + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:8930: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:8836: checking for SmcCloseConnection in -lSM" >&5 + ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8934,7 +8840,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSM $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8966,7 +8872,7 @@ + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:8970: checking for XtFree in -lXt" >&5 ++echo "configure:8876: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8974,7 +8880,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9019,7 +8925,7 @@ + esac + + echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +-echo "configure:9023: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:8929: checking for XineramaIsActive in -lXinerama" >&5 + ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9027,7 +8933,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9060,17 +8966,17 @@ + + ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 +-echo "configure:9064: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:8970: checking for X11/extensions/Xinerama.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9093,7 +8999,7 @@ + + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9097: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9003: checking for XShmCreateImage in -lXext" >&5 + ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9101,7 +9007,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9134,17 +9040,17 @@ + + ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +-echo "configure:9138: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9044: checking for X11/extensions/XShm.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9174,7 +9080,7 @@ + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9178: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9084: checking for XieFloGeometry in -lXIE" >&5 + ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9182,7 +9088,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9215,17 +9121,17 @@ + + ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +-echo "configure:9219: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9125: checking for X11/extensions/XIElib.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9299,7 +9205,7 @@ + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9303: checking for $ac_word" >&5 ++echo "configure:9209: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9335,7 +9241,7 @@ + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9339: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9245: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes +@@ -9383,7 +9289,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -9409,7 +9315,7 @@ + } + + EOF +-if { (eval echo configure:9413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -9461,7 +9367,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:9465: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9371: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9483,7 +9389,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:9487: checking for pthread_create in -lpthread" >&5 ++echo "configure:9393: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9505,7 +9411,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:9509: checking for pthread_create in -lc_r" >&5 ++echo "configure:9415: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9527,7 +9433,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:9531: checking for pthread_create in -lc" >&5 ++echo "configure:9437: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9583,7 +9489,7 @@ + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:9587: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9493: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9606,7 +9512,7 @@ + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:9610: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9516: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9728,7 +9634,7 @@ + + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:9732: checking whether mmap() sees write()s" >&5 ++echo "configure:9638: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' +@@ -9767,11 +9673,11 @@ + result="yes" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -9796,13 +9702,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:9800: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9706: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext < + Autoconf TIOCGETP +@@ -9820,7 +9726,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA +@@ -9842,7 +9748,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:9846: checking for 8-bit clean memcmp" >&5 ++echo "configure:9752: checking for 8-bit clean memcmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9850,7 +9756,7 @@ + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_memcmp_clean=yes + else +@@ -9880,12 +9786,12 @@ + for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9884: checking for $ac_func" >&5 ++echo "configure:9790: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -9935,12 +9841,12 @@ + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9939: checking for $ac_func" >&5 ++echo "configure:9845: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -9992,12 +9898,12 @@ + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9996: checking for $ac_func" >&5 ++echo "configure:9902: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10056,19 +9962,19 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10060: checking for wcrtomb" >&5 ++echo "configure:9966: checking for wcrtomb" >&5 + if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};wcrtomb(0,'f',&ps); + ; return 0; } + EOF +-if { (eval echo configure:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -10088,19 +9994,19 @@ + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10092: checking for mbrtowc" >&5 ++echo "configure:9998: checking for mbrtowc" >&5 + if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};mbrtowc(0,0,0,&ps); + ; return 0; } + EOF +-if { (eval echo configure:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -10129,12 +10035,12 @@ + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10133: checking for res_ninit()" >&5 ++echo "configure:10039: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_res_ninit=yes + else +@@ -10176,12 +10082,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10180: checking for gnu_get_libc_version()" >&5 ++echo "configure:10086: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=yes + else +@@ -10221,7 +10127,7 @@ + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10225: checking for iconv in -lc" >&5 ++echo "configure:10131: checking for iconv in -lc" >&5 + ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10229,7 +10135,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10262,7 +10168,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10266: checking for iconv in -liconv" >&5 ++echo "configure:10172: checking for iconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10270,7 +10176,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10303,7 +10209,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10307: checking for libiconv in -liconv" >&5 ++echo "configure:10213: checking for libiconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10311,7 +10217,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10352,12 +10258,12 @@ + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10356: checking for iconv()" >&5 ++echo "configure:10262: checking for iconv()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10371,7 +10277,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else +@@ -10395,12 +10301,12 @@ + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10399: checking for iconv() with const input" >&5 ++echo "configure:10305: checking for iconv() with const input" >&5 + if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10415,7 +10321,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else +@@ -10444,19 +10350,19 @@ + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10448: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10354: checking for nl_langinfo and CODESET" >&5 + if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char* cs = nl_langinfo(CODESET); + ; return 0; } + EOF +-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else +@@ -10488,7 +10394,7 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:10492: checking for an implementation of va_copy()" >&5 ++echo "configure:10398: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10498,7 +10404,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10512,7 +10418,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_copy=yes + else +@@ -10529,7 +10435,7 @@ + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:10533: checking for an implementation of __va_copy()" >&5 ++echo "configure:10439: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10539,7 +10445,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10553,7 +10459,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv___va_copy=yes + else +@@ -10570,7 +10476,7 @@ + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:10574: checking whether va_lists can be copied by value" >&5 ++echo "configure:10480: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10580,7 +10486,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10594,7 +10500,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_val_copy=yes + else +@@ -10693,7 +10599,7 @@ + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:10697: checking for C++ exceptions flag" >&5 ++echo "configure:10603: checking for C++ exceptions flag" >&5 + + if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10728,12 +10634,12 @@ + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:10732: checking for gcc 3.0 ABI" >&5 ++echo "configure:10638: checking for gcc 3.0 ABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else +@@ -10770,12 +10676,12 @@ + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:10774: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10680: checking for C++ \"explicit\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else +@@ -10806,12 +10712,12 @@ + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:10810: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10716: checking for C++ \"typename\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else +@@ -10851,12 +10757,12 @@ + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:10855: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10761: checking for modern C++ template specialization syntax support" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < struct X { int a; }; + class Y {}; +@@ -10866,7 +10772,7 @@ + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:10870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -10888,12 +10794,12 @@ + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:10892: checking whether partial template specialization works" >&5 ++echo "configure:10798: checking whether partial template specialization works" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Foo {}; + template class Foo {}; +@@ -10901,7 +10807,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:10905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -10922,12 +10828,12 @@ + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:10926: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10832: checking whether operators must be re-defined for templates derived from templates" >&5 + if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template +@@ -10939,7 +10845,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else +@@ -10961,12 +10867,12 @@ + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:10965: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:10871: checking whether we need to cast a derived template to pass as its base class" >&5 + if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template class Derived : public Base { }; +@@ -10975,7 +10881,7 @@ + Derived bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:10979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else +@@ -10996,12 +10902,12 @@ + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11000: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:10906: checking whether the compiler can resolve const ambiguities for templates" >&5 + if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class ptrClass { +@@ -11022,7 +10928,7 @@ + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=yes + else +@@ -11044,12 +10950,12 @@ + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11048: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:10954: checking whether the C++ \"using\" keyword can change access" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else +@@ -11096,12 +11002,12 @@ + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11100: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11006: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11138,19 +11044,19 @@ + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11142: checking for \"std::\" namespace" >&5 ++echo "configure:11048: checking for \"std::\" namespace" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + return std::min(0, 1); + ; return 0; } + EOF +-if { (eval echo configure:11154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else +@@ -11171,12 +11077,12 @@ + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11175: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11081: checking whether standard template operator!=() is ambiguous" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + struct T1 {}; +@@ -11186,7 +11092,7 @@ + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else +@@ -11208,12 +11114,12 @@ + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11212: checking for C++ reinterpret_cast" >&5 ++echo "configure:11118: checking for C++ reinterpret_cast" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <(z); + ; return 0; } + EOF +-if { (eval echo configure:11225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else +@@ -11242,7 +11148,7 @@ + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11246: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11152: checking for C++ dynamic_cast to void*" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11250,8 +11156,11 @@ + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(suby)))); + } + EOF +-if { (eval echo configure:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_cpp_dynamic_cast_void_ptr=yes + else +@@ -11290,19 +11199,19 @@ + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11294: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11203: checking whether C++ requires implementation of unused virtual methods" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_cpp_unused_required=no + else +@@ -11325,12 +11234,12 @@ + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11329: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11238: checking for trouble comparing to zero near std::operator!=()" >&5 + if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + template class Foo {}; +@@ -11341,7 +11250,7 @@ + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -11373,19 +11282,19 @@ + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11377: checking for LC_MESSAGES" >&5 ++echo "configure:11286: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + int category = LC_MESSAGES; + ; return 0; } + EOF +-if { (eval echo configure:11389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -11466,7 +11375,7 @@ + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11470: checking for $ac_word" >&5 ++echo "configure:11379: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11501,7 +11410,7 @@ + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11505: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11414: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then +@@ -11603,7 +11512,7 @@ + # Extract the first word of "nss-config", so it can be a program name with args. + set dummy nss-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11607: checking for $ac_word" >&5 ++echo "configure:11516: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11638,7 +11547,7 @@ + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11642: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11551: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then +@@ -11711,7 +11620,7 @@ + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:11715: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11624: checking for jpeg_destroy_compress in -ljpeg" >&5 + ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11719,7 +11628,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ljpeg $JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11759,7 +11668,7 @@ + SYSTEM_JPEG= + else + cat > conftest.$ac_ext < + #include +@@ -11773,7 +11682,7 @@ + } + + EOF +-if { (eval echo configure:11777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_JPEG=1 + else +@@ -11814,7 +11723,7 @@ + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:11818: checking for gzread in -lz" >&5 ++echo "configure:11727: checking for gzread in -lz" >&5 + ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11822,7 +11731,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11861,7 +11770,7 @@ + SYSTEM_ZLIB= + else + cat > conftest.$ac_ext < +@@ -11882,7 +11791,7 @@ + } + + EOF +-if { (eval echo configure:11886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_ZLIB=1 + else +@@ -11925,7 +11834,7 @@ + SYSTEM_PNG= + else + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:11929: checking for png_get_valid in -lpng" >&5 ++echo "configure:11838: checking for png_get_valid in -lpng" >&5 + ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11933,7 +11842,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $PNG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11972,7 +11881,7 @@ + SYSTEM_PNG= + else + cat > conftest.$ac_ext < + #include +@@ -11986,7 +11895,7 @@ + } + + EOF +-if { (eval echo configure:11990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_PNG=1 + else +@@ -12086,8 +11995,8 @@ + MOZ_ENABLE_GTK2=1 + MOZ_ENABLE_XREMOTE=1 + MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} +- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' +- TK_LIBS='$(MOZ_GTK2_LIBS)' ++ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' ++ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' + cat >> confdefs.h <<\EOF + #define MOZ_WIDGET_GTK2 1 + EOF +@@ -12236,7 +12145,7 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. + set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12240: checking for $ac_word" >&5 ++echo "configure:12149: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12271,7 +12180,7 @@ + + min_gtk_version=$GTK_VERSION + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:12275: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12184: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -12294,7 +12203,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -12372,7 +12281,7 @@ + } + + EOF +-if { (eval echo configure:12376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -12407,7 +12316,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < +@@ -12417,7 +12326,7 @@ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:12421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" +@@ -12469,7 +12378,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12473: checking for $ac_word" >&5 ++echo "configure:12382: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12513,19 +12422,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:12517: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12426: checking for gtk+-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12524: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12433: checking MOZ_GTK2_CFLAGS" >&5 + MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +-echo "configure:12529: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12438: checking MOZ_GTK2_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" +@@ -12590,7 +12499,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12594: checking for $ac_word" >&5 ++echo "configure:12503: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12642,7 +12551,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +-echo "configure:12646: checking for main in -lqt" >&5 ++echo "configure:12555: checking for main in -lqt" >&5 + ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12650,14 +12559,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12676,7 +12585,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +-echo "configure:12680: checking for main in -lqt-mt" >&5 ++echo "configure:12589: checking for main in -lqt-mt" >&5 + ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12684,14 +12593,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt-mt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12727,9 +12636,9 @@ + LIBS="$LIBS $QT_LIBS" + + echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +-echo "configure:12731: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12640: checking Qt - version >= $QT_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -12740,7 +12649,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:12744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -12771,6 +12680,138 @@ + + + ++if test "$MOZ_ENABLE_GTK2" ++then ++ MOZ_ENABLE_STARTUP_NOTIFICATION= ++ ++ # Check whether --enable-startup-notification or --disable-startup-notification was given. ++if test "${enable_startup_notification+set}" = set; then ++ enableval="$enable_startup_notification" ++ if test "$enableval" = "yes"; then ++ MOZ_ENABLE_STARTUP_NOTIFICATION=force ++ elif test "$enableval" = "no"; then ++ MOZ_ENABLE_STARTUP_NOTIFICATION= ++ else ++ { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" ++ then ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:12710: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 ++echo "configure:12754: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 ++echo "configure:12761: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 ++ MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` ++ echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 ++echo "configure:12766: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"` `$PKG_CONFIG --libs-only-l \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"`" ++ echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 ++ else ++ MOZ_STARTUP_NOTIFICATION_CFLAGS="" ++ MOZ_STARTUP_NOTIFICATION_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ MOZ_ENABLE_STARTUP_NOTIFICATION=1 ++ else ++ ++ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force" ++ then ++ { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; exit 1; } ++ fi ++ MOZ_ENABLE_STARTUP_NOTIFICATION= ++ ++ fi ++ ++ fi ++ ++ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then ++ cat >> confdefs.h <<\EOF ++#define MOZ_ENABLE_STARTUP_NOTIFICATION 1 ++EOF ++ ++ fi ++ ++ TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" ++fi ++ ++ ++ ++ ++ + + + +@@ -13336,7 +13377,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13340: checking for $ac_word" >&5 ++echo "configure:13381: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13380,19 +13421,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for xft""... $ac_c" 1>&6 +-echo "configure:13384: checking for xft" >&5 ++echo "configure:13425: checking for xft" >&5 + + if $PKG_CONFIG --exists "xft" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13391: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13432: checking MOZ_XFT_CFLAGS" >&5 + MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` + echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 +-echo "configure:13396: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13437: checking MOZ_XFT_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" +@@ -13427,7 +13468,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13431: checking for $ac_word" >&5 ++echo "configure:13472: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13470,31 +13511,31 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 +-echo "configure:13475: checking for pango >= 1.1.0" >&5 ++ echo $ac_n "checking for pangoxft >= 1.1.0 pangox""... $ac_c" 1>&6 ++echo "configure:13516: checking for pangoxft >= 1.1.0 pangox" >&5 + +- if $PKG_CONFIG --exists "pango >= 1.1.0" ; then ++ if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + +- echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13482: checking _PANGOCHK_CFLAGS" >&5 +- _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` +- echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 ++ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 ++echo "configure:13523: checking MOZ_PANGO_CFLAGS" >&5 ++ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.1.0 pangox"` ++ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + +- echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13487: checking _PANGOCHK_LIBS" >&5 ++ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 ++echo "configure:13528: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic +- _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" +- echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 ++ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.1.0 pangox\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.1.0 pangox\"`" ++ echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 + else +- _PANGOCHK_CFLAGS="" +- _PANGOCHK_LIBS="" ++ MOZ_PANGO_CFLAGS="" ++ MOZ_PANGO_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"` +- echo $_PANGOCHK_PKG_ERRORS ++ MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.1.0 pangox"` ++ echo $MOZ_PANGO_PKG_ERRORS + fi + + +@@ -13508,7 +13549,7 @@ + if test $succeeded = yes; then + : + else +- { echo "configure: error: Library requirements (pango >= 1.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } ++ { echo "configure: error: Library requirements (pangoxft >= 1.1.0 pangox) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + + fi +@@ -13517,6 +13558,8 @@ + + + ++ ++ + # Check whether --enable-pango or --disable-pango was given. + if test "${enable_pango+set}" = set; then + enableval="$enable_pango" +@@ -13543,7 +13586,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13547: checking for $ac_word" >&5 ++echo "configure:13590: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13587,19 +13630,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6 +-echo "configure:13591: checking for pangoxft >= 1.6.0" >&5 ++echo "configure:13634: checking for pangoxft >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13598: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13641: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:13603: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13646: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`" +@@ -13627,10 +13670,110 @@ + { echo "configure: error: Library requirements (pangoxft >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:13681: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for pangocairo >= 1.10.0""... $ac_c" 1>&6 ++echo "configure:13725: checking for pangocairo >= 1.10.0" >&5 ++ ++ if $PKG_CONFIG --exists "pangocairo >= 1.10.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking PANGOCAIRO_CHK_CFLAGS""... $ac_c" 1>&6 ++echo "configure:13732: checking PANGOCAIRO_CHK_CFLAGS" >&5 ++ PANGOCAIRO_CHK_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.10.0"` ++ echo "$ac_t""$PANGOCAIRO_CHK_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking PANGOCAIRO_CHK_LIBS""... $ac_c" 1>&6 ++echo "configure:13737: checking PANGOCAIRO_CHK_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ PANGOCAIRO_CHK_LIBS="`$PKG_CONFIG --libs-only-L \"pangocairo >= 1.10.0\"` `$PKG_CONFIG --libs-only-l \"pangocairo >= 1.10.0\"`" ++ echo "$ac_t""$PANGOCAIRO_CHK_LIBS" 1>&6 ++ else ++ PANGOCAIRO_CHK_CFLAGS="" ++ PANGOCAIRO_CHK_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ PANGOCAIRO_CHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangocairo >= 1.10.0"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ ++ MOZ_PANGOCAIRO=1 ++ cat >> confdefs.h <<\EOF ++#define MOZ_PANGOCAIRO 1 ++EOF ++ ++ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" ++ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" ++ ++ else ++ : ++ fi ++ + + + + ++ + fi + + if test "$MOZ_X11" +@@ -13667,7 +13810,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +-echo "configure:13671: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13814: checking for XpGetPrinterList in -lXp" >&5 + ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -13675,7 +13818,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -13759,7 +13902,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13763: checking for $ac_word" >&5 ++echo "configure:13906: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13803,19 +13946,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:13807: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:13950: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 + + if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13814: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:13957: checking MOZ_GNOMEVFS_CFLAGS" >&5 + MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` + echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 +-echo "configure:13819: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:13962: checking MOZ_GNOMEVFS_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" +@@ -13866,7 +14009,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13870: checking for $ac_word" >&5 ++echo "configure:14013: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13910,19 +14053,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:13914: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14057: checking for gconf-2.0 >= $GCONF_VERSION" >&5 + + if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13921: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14064: checking MOZ_GCONF_CFLAGS" >&5 + MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` + echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 +-echo "configure:13926: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14069: checking MOZ_GCONF_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" +@@ -13959,6 +14102,7 @@ + + + ++ + + if test "$MOZ_ENABLE_LIBGNOME" + then +@@ -13969,7 +14113,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13973: checking for $ac_word" >&5 ++echo "configure:14117: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14013,19 +14157,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14017: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14161: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14024: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14168: checking MOZ_LIBGNOME_CFLAGS" >&5 + MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` + echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 +-echo "configure:14029: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14173: checking MOZ_LIBGNOME_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" +@@ -14103,7 +14247,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14107: checking for $ac_word" >&5 ++echo "configure:14251: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14147,19 +14291,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14151: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14295: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14158: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14302: checking MOZ_GNOMEUI_CFLAGS" >&5 + MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` + echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 +-echo "configure:14163: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14307: checking MOZ_GNOMEUI_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" +@@ -14210,6 +14354,221 @@ + + + ++if test "$MOZ_ENABLE_GTK2" ++then ++ # Check whether --enable-dbus or --disable-dbus was given. ++if test "${enable_dbus+set}" = set; then ++ enableval="$enable_dbus" ++ if test "$enableval" = "yes"; then ++ MOZ_ENABLE_DBUS=1 ++ elif test "$enableval" = "no"; then ++ MOZ_ENABLE_DBUS= ++ else ++ { echo "configure: error: Option, dbus, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++ if test "$MOZ_ENABLE_DBUS" ++ then ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:14382: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for dbus-glib-1""... $ac_c" 1>&6 ++echo "configure:14426: checking for dbus-glib-1" >&5 ++ ++ if $PKG_CONFIG --exists "dbus-glib-1" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 ++echo "configure:14433: checking MOZ_DBUS_GLIB_CFLAGS" >&5 ++ MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` ++ echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 ++echo "configure:14438: checking MOZ_DBUS_GLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"dbus-glib-1\"` `$PKG_CONFIG --libs-only-l \"dbus-glib-1\"`" ++ echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 ++ else ++ MOZ_DBUS_GLIB_CFLAGS="" ++ MOZ_DBUS_GLIB_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ MOZ_DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` ++ echo $MOZ_DBUS_GLIB_PKG_ERRORS ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ { echo "configure: error: Library requirements (dbus-glib-1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } ++ fi ++ ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:14473: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 ++echo "configure:14517: checking for gthread-2.0" >&5 ++ ++ if $PKG_CONFIG --exists "gthread-2.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 ++echo "configure:14524: checking MOZ_GTHREAD_CFLAGS" >&5 ++ MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` ++ echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 ++echo "configure:14529: checking MOZ_GTHREAD_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs-only-L \"gthread-2.0\"` `$PKG_CONFIG --libs-only-l \"gthread-2.0\"`" ++ echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 ++ else ++ MOZ_GTHREAD_CFLAGS="" ++ MOZ_GTHREAD_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ MOZ_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` ++ echo $MOZ_GTHREAD_PKG_ERRORS ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ { echo "configure: error: Library requirements (gthread-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } ++ fi ++ ++ fi ++ ++ if test "$MOZ_ENABLE_DBUS"; then ++ cat >> confdefs.h <<\EOF ++#define MOZ_ENABLE_DBUS 1 ++EOF ++ ++ fi ++fi ++ ++ ++ ++ ++ ++ ++ + if (test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_GTK2") \ + && test "$MOZ_ENABLE_COREXFONTS" \ + || test "$MOZ_ENABLE_XLIB" \ +@@ -14645,7 +15004,7 @@ + # Extract the first word of "javac", so it can be a program name with args. + set dummy javac; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14649: checking for $ac_word" >&5 ++echo "configure:15008: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14681,7 +15040,7 @@ + # Extract the first word of "jar", so it can be a program name with args. + set dummy jar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14685: checking for $ac_word" >&5 ++echo "configure:15044: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14756,6 +15115,13 @@ + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi + ++if test -z "$MOZ_ENABLE_DBUS" && test `echo "$MOZ_EXTENSIONS" | grep -c dbus` -ne 0; then ++ if test -n "$MOZ_X11"; then ++ echo "configure: warning: Cannot build dbus without required libraries. Removing dbus from MOZ_EXTENSIONS." 1>&2 ++ fi ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|dbus||'` ++fi ++ + if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then + echo "configure: warning: Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS." 1>&2 + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` +@@ -14928,7 +15294,7 @@ + gdiplus) + MOZ_SVG_RENDERER_GDIPLUS=1 + echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +-echo "configure:14932: checking for Gdiplus.h" >&5 ++echo "configure:15298: checking for Gdiplus.h" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -14938,7 +15304,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include +@@ -14947,7 +15313,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:14951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else +@@ -15027,7 +15393,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15031: checking for $ac_word" >&5 ++echo "configure:15397: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15072,7 +15438,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15076: checking for $ac_word" >&5 ++echo "configure:15442: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15141,13 +15507,13 @@ + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15145: checking for iconv" >&5 ++echo "configure:15511: checking for iconv" >&5 + for ac_prog in $HOST_ICONV "iconv" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15151: checking for $ac_word" >&5 ++echo "configure:15517: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15493,18 +15859,18 @@ + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:15497: checking for valid debug flags" >&5 ++echo "configure:15863: checking for valid debug flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15545,18 +15911,18 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:15549: checking for valid optimization flags" >&5 ++echo "configure:15915: checking for valid optimization flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15773,7 +16139,7 @@ + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:15777: checking for malloc in -lefence" >&5 ++echo "configure:16143: checking for malloc in -lefence" >&5 + ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -15781,7 +16147,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lefence $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -15893,12 +16259,12 @@ + for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:15897: checking for $ac_func" >&5 ++echo "configure:16263: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16167,12 +16533,12 @@ + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16171: checking for $ac_func" >&5 ++echo "configure:16537: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16336,7 +16702,7 @@ + # Compiler Options + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:16340: checking for gcc -pipe support" >&5 ++echo "configure:16706: checking for gcc -pipe support" >&5 + if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then + echo '#include ' > dummy-hello.c + echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c +@@ -16351,14 +16717,14 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else +@@ -16400,16 +16766,16 @@ + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" + echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:16404: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16770: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" +@@ -16430,16 +16796,16 @@ + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:16434: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16800: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -16457,16 +16823,16 @@ + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:16461: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16827: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" +@@ -16512,18 +16878,21 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" + echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +-echo "configure:16516: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16882: checking whether C++ compiler has -pedantic long long bug" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="no" + else +@@ -16553,13 +16922,16 @@ + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:16557: checking for correct temporary object destruction order" >&5 ++echo "configure:16926: checking for correct temporary object destruction order" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -16599,12 +16971,12 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:16603: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16975: checking for correct overload resolution with const and templates" >&5 + if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -16634,7 +17006,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:16638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -16926,7 +17298,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:16930: checking for $ac_word" >&5 ++echo "configure:17302: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -16970,19 +17342,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:16974: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17346: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:16981: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17353: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:16986: checking LIBIDL_LIBS" >&5 ++echo "configure:17358: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -17105,7 +17477,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17109: checking for $ac_word" >&5 ++echo "configure:17481: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17140,7 +17512,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17144: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17516: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17163,7 +17535,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17239,7 +17611,7 @@ + } + + EOF +-if { (eval echo configure:17243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17273,7 +17645,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17283,7 +17655,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17327,7 +17699,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17331: checking for $ac_word" >&5 ++echo "configure:17703: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17362,7 +17734,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17366: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17738: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17389,7 +17761,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17475,7 +17847,7 @@ + } + + EOF +-if { (eval echo configure:17479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17509,7 +17881,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -17520,7 +17892,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:17524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -17648,7 +18020,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17652: checking for $ac_word" >&5 ++echo "configure:18024: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17683,7 +18055,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17687: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18059: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17706,7 +18078,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17782,7 +18154,7 @@ + } + + EOF +-if { (eval echo configure:17786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17816,7 +18188,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17826,7 +18198,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17870,7 +18242,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17874: checking for $ac_word" >&5 ++echo "configure:18246: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17905,7 +18277,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17909: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18281: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17932,7 +18304,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18018,7 +18390,7 @@ + } + + EOF +-if { (eval echo configure:18022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18052,7 +18424,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -18063,7 +18435,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -18104,7 +18476,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18108: checking for $ac_word" >&5 ++echo "configure:18480: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18148,19 +18520,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18152: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18524: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18159: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18531: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:18164: checking LIBIDL_LIBS" >&5 ++echo "configure:18536: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -18196,7 +18568,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18200: checking for $ac_word" >&5 ++echo "configure:18572: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18233,7 +18605,7 @@ + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:18237: checking for ORBit libIDL usability" >&5 ++echo "configure:18609: checking for ORBit libIDL usability" >&5 + _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` + _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` + _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` +@@ -18250,7 +18622,7 @@ + result="maybe" + else + cat > conftest.$ac_ext < +@@ -18265,7 +18637,7 @@ + } + + EOF +-if { (eval echo configure:18269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + _LIBIDL_FOUND=1 + result="yes" +@@ -18322,7 +18694,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18326: checking for $ac_word" >&5 ++echo "configure:18698: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18366,19 +18738,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:18370: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18742: checking for glib-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18377: checking GLIB_CFLAGS" >&5 ++echo "configure:18749: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:18382: checking GLIB_LIBS" >&5 ++echo "configure:18754: checking GLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" +@@ -18462,7 +18834,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18466: checking for $ac_word" >&5 ++echo "configure:18838: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18497,7 +18869,7 @@ + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18501: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18873: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -18520,7 +18892,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18596,7 +18968,7 @@ + } + + EOF +-if { (eval echo configure:18600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18630,7 +19002,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -18640,7 +19012,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -18720,19 +19092,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:18724: checking for working alloca.h" >&5 ++echo "configure:19096: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:18736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -18753,12 +19125,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:18757: checking for alloca" >&5 ++echo "configure:19129: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -18818,12 +19190,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:18822: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19194: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&6 +-echo "configure:18852: checking for $ac_func" >&5 ++echo "configure:19224: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -18903,7 +19275,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:18907: checking stack direction for C alloca" >&5 ++echo "configure:19279: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18911,7 +19283,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -18979,17 +19351,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:18983: checking for $ac_hdr" >&5 ++echo "configure:19355: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:18993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -19080,7 +19452,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19084: checking for $ac_word" >&5 ++echo "configure:19456: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19124,19 +19496,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19128: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19500: checking for cairo >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19135: checking CAIRO_CFLAGS" >&5 ++echo "configure:19507: checking CAIRO_CFLAGS" >&5 + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +-echo "configure:19140: checking CAIRO_LIBS" >&5 ++echo "configure:19512: checking CAIRO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" +@@ -19201,7 +19573,7 @@ + # Extract the first word of "python", so it can be a program name with args. + set dummy python; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19205: checking for $ac_word" >&5 ++echo "configure:19577: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19477,14 +19849,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:19488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -19791,7 +20163,7 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $XCFLAGS" + cat > conftest.$ac_ext < +@@ -19807,7 +20179,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:19811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -20025,34 +20397,15 @@ + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-# +-# If the first sed substitution is executed (which looks for macros that +-# take arguments), then we branch to the quote section. Otherwise, +-# look for a macro that doesn't take arguments. +-cat >confdef2opt.sed <<\_ACEOF +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*([^)]*)$[ ]*$.*$,-D\1=\2,g +-t quote +-s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$,-D\1=\2,g +-t quote +-d +-: quote +-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +-s,\[,\\&,g +-s,\],\\&,g +-s,\$,$$,g +-p +-_ACEOF +-# We use echo to avoid assuming a particular line-breaking character. +-# The extra dot is to prevent the shell from consuming trailing +-# line-breaks from the sub-command output. A line-break within +-# single-quotes doesn't work because, if this script is created in a +-# platform that uses two characters for line-breaks (e.g., DOS), tr +-# would break. +-ac_LF_and_DOT=`echo; echo .` +-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +-rm -f confdef2opt.sed ++cat > conftest.defs <<\EOF ++s%#define $[A-Za-z_][A-Za-z0-9_]*$ *$.*$%-D\1=\2%g ++s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++s%\[%\\&%g ++s%\]%\\&%g ++s%\$%$$%g ++EOF ++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++rm -f conftest.defs + + MOZ_DEFINES=$DEFS + +@@ -20299,6 +20652,9 @@ + s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g + s%@HOST_MOC@%$HOST_MOC%g + s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g ++s%@MOZ_STARTUP_NOTIFICATION_CFLAGS@%$MOZ_STARTUP_NOTIFICATION_CFLAGS%g ++s%@MOZ_STARTUP_NOTIFICATION_LIBS@%$MOZ_STARTUP_NOTIFICATION_LIBS%g ++s%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g + s%@TK_CFLAGS@%$TK_CFLAGS%g + s%@TK_LIBS@%$TK_LIBS%g + s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g +@@ -20335,23 +20691,30 @@ + s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g + s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g + s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g +-s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g +-s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g +-s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g + s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g + s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g ++s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g ++s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g ++s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g + s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g ++s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g + s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g + s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g + s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g + s%@MOZ_GCONF_CFLAGS@%$MOZ_GCONF_CFLAGS%g + s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g ++s%@MOZ_ENABLE_GCONF@%$MOZ_ENABLE_GCONF%g + s%@MOZ_LIBGNOME_CFLAGS@%$MOZ_LIBGNOME_CFLAGS%g + s%@MOZ_LIBGNOME_LIBS@%$MOZ_LIBGNOME_LIBS%g + s%@MOZ_ENABLE_GNOME_COMPONENT@%$MOZ_ENABLE_GNOME_COMPONENT%g + s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g + s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g + s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g ++s%@MOZ_DBUS_GLIB_CFLAGS@%$MOZ_DBUS_GLIB_CFLAGS%g ++s%@MOZ_DBUS_GLIB_LIBS@%$MOZ_DBUS_GLIB_LIBS%g ++s%@MOZ_GTHREAD_CFLAGS@%$MOZ_GTHREAD_CFLAGS%g ++s%@MOZ_GTHREAD_LIBS@%$MOZ_GTHREAD_LIBS%g ++s%@MOZ_ENABLE_DBUS@%$MOZ_ENABLE_DBUS%g + s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g + s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g + s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g diff --git a/credits.patch b/credits.patch new file mode 100644 index 00000000..17959523 --- /dev/null +++ b/credits.patch @@ -0,0 +1,14 @@ +Index: browser/base/content/credits.xhtml +================================================================================ +--- browser/base/content/credits.xhtml ++++ browser/base/content/credits.xhtml +@@ -431,6 +431,9 @@ +

Kohei Yoshino

Boris Zbarsky

+ ++ ++

openSUSE RPM packaging

Wolfgang Rosenauer

+ + &credit.translation; + diff --git a/cups-paper.patch b/cups-paper.patch new file mode 100644 index 00000000..8a209eb6 --- /dev/null +++ b/cups-paper.patch @@ -0,0 +1,858 @@ +From: Wolfgang Rosenauer , Arne John Glenstrup +Subject: get paper sizes from CUPS +References: +https://bugzilla.novell.com/show_bug.cgi?id=65482 +https://bugzilla.mozilla.org/show_bug.cgi?id=324060 + + +================================================================================ +--- gfx/src/gtk/nsDeviceContextSpecG.cpp ++++ gfx/src/gtk/nsDeviceContextSpecG.cpp +@@ -66,6 +66,7 @@ + #ifdef USE_POSTSCRIPT + #include "nsPSPrinters.h" + #include "nsPaperPS.h" /* Paper size list */ ++#include "nsPaperFactoryPS.h" /* Paper size list factory */ + #endif /* USE_POSTSCRIPT */ + + /* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */ +@@ -1210,34 +1211,38 @@ + #ifdef SET_PRINTER_FEATURES_VIA_PREFS + printerFeatures.SetCanChangePaperSize(PR_TRUE); + #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ +- nsXPIDLCString papername; +- if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(papername)))) { +- nsPaperSizePS paper; +- +- if (paper.Find(papername)) { +- DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", +- paper.Name(), paper.Width_mm(), paper.Height_mm())); +- aPrintSettings->SetPaperSizeUnit(paper.IsMetric() ? +- (int)nsIPrintSettings::kPaperSizeMillimeters : +- (int)nsIPrintSettings::kPaperSizeInches); +- aPrintSettings->SetPaperWidth(paper.Width_mm()); +- aPrintSettings->SetPaperHeight(paper.Height_mm()); +- aPrintSettings->SetPaperName(NS_ConvertASCIItoUCS2(paper.Name()).get()); +- } +- else { +- DO_PR_DEBUG_LOG(("Unknown paper size '%s' given.\n", papername.get())); ++ { ++ nsIPaperSizePS* paper; ++ nsresult rv; ++ rv = nsPaperFactoryPS::CreatePaper ++ (fullPrinterName.get(), printerName.get(), paper); ++ if (NS_FAILED(rv)) return rv; ++ paper->FindDefault(); ++ ++ nsXPIDLCString papername; ++ if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", fullPrinterName, "print_paper_name", getter_Copies(papername)))) { ++ if (!paper->Find(papername)) { ++ DO_PR_DEBUG_LOG(("Unknown paper size '%s' given.\n", papername.get())); ++ } + } ++ DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", ++ paper->Name(), paper->Width_mm(), paper->Height_mm())); ++ aPrintSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters); ++ aPrintSettings->SetPaperWidth(paper->Width_mm()); ++ aPrintSettings->SetPaperHeight(paper->Height_mm()); ++ aPrintSettings->SetPaperName(NS_ConvertASCIItoUTF16(paper->Name()).get()); + #ifdef SET_PRINTER_FEATURES_VIA_PREFS +- paper.First(); ++ paper->First(); + int count = 0; +- while (!paper.AtEnd()) ++ while (!paper->AtEnd()) + { +- printerFeatures.SetPaperRecord(count++, paper.Name(), +- (int)paper.Width_mm(), (int)paper.Height_mm(), !paper.IsMetric()); +- paper.Next(); ++ printerFeatures.SetPaperRecord(count++, paper->Name(), ++ (int)paper->Width_mm(), (int)paper->Height_mm(), !paper->IsMetric()); ++ paper->Next(); + } + printerFeatures.SetNumPaperSizeRecords(count); + #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ ++ delete(paper); + } + + PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS == +--- gfx/src/ps/nsPrintJobPS.cpp ++++ gfx/src/ps/nsPrintJobPS.cpp +@@ -364,6 +364,10 @@ + const char *slash = strchr(printerName, '/'); + mPrinterName = slash ? slash + 1 : printerName; + mJobTitle.SetIsVoid(PR_TRUE); ++ /* Paper name */ ++ const char* paperName = nsnull; ++ aSpec->GetPaperName(&paperName); ++ mPaperName = paperName; + return NS_OK; + } + +@@ -445,6 +449,11 @@ + mNumCopies.get(), + dest->num_options, + &dest->options); ++ if (!mPaperName.IsEmpty()) ++ dest->num_options = (mCups.mCupsAddOption)("media", ++ mPaperName.get(), ++ dest->num_options, ++ &dest->options); + const char *title = mJobTitle.IsVoid() ? + "Untitled Document" : mJobTitle.get(); + result = (mCups.mCupsPrintFile)(printer.CStringAt(0)->get(), +--- gfx/src/ps/nsPrintJobPS.h ++++ gfx/src/ps/nsPrintJobPS.h +@@ -179,6 +179,7 @@ + nsCUPSShim mCups; + nsCString mPrinterName; + nsCString mNumCopies; ++ nsCString mPaperName; + nsCString mJobTitle; // IsVoid() if no title + }; + #endif /* VMS */ +--- gfx/src/psshared/Makefile.in ++++ gfx/src/psshared/Makefile.in +@@ -57,13 +57,16 @@ + + EXPORTS = nsCUPSShim.h \ + nsPaperPS.h \ ++ nsIPaperPS.h \ + nsPSPrinters.h\ + psSharedCore.h \ ++ nsPaperFactoryPS.h \ + $(NULL) + + CPPSRCS = nsCUPSShim.cpp \ + nsPaperPS.cpp \ + nsPSPrinters.cpp \ ++ nsPaperFactoryPS.cpp \ + $(NULL) + + EXTRA_DSO_LDOPTS = \ +--- gfx/src/psshared/nsCUPSShim.cpp ++++ gfx/src/psshared/nsCUPSShim.cpp +@@ -45,13 +45,18 @@ + // List of symbols to find in libcups. Must match symAddr[] defined in Init(). + // Making this an array of arrays instead of pointers allows storing the + // whole thing in read-only memory. +-static const char gSymName[][sizeof("cupsPrintFile")] = { ++static const char gSymName[][sizeof("ppdMarkDefaults")] = { + { "cupsAddOption" }, + { "cupsFreeDests" }, + { "cupsGetDest" }, + { "cupsGetDests" }, + { "cupsPrintFile" }, + { "cupsTempFd" }, ++ { "cupsGetPPD" }, ++ { "ppdOpenFile" }, ++ { "ppdClose" }, ++ { "ppdMarkDefaults" }, ++ { "ppdIsMarked" }, + }; + static const int gSymNameCt = sizeof(gSymName) / sizeof(gSymName[0]); + +@@ -71,6 +76,11 @@ + (void **)&mCupsGetDests, + (void **)&mCupsPrintFile, + (void **)&mCupsTempFd, ++ (void **)&mCupsGetPPD, ++ (void **)&mPpdOpenFile, ++ (void **)&mPpdClose, ++ (void **)&mPpdMarkDefaults, ++ (void **)&mPpdIsMarked, + }; + + for (int i = gSymNameCt; i--; ) { +--- gfx/src/psshared/nsCUPSShim.h ++++ gfx/src/psshared/nsCUPSShim.h +@@ -62,6 +62,82 @@ + cups_option_t *options; /* Options */ + } cups_dest_t; + ++typedef enum /**** Colorspaces ****/ ++{ ++ PPD_CS_CMYK = -4, /* CMYK colorspace */ ++ PPD_CS_CMY, /* CMY colorspace */ ++ PPD_CS_GRAY = 1, /* Grayscale colorspace */ ++ PPD_CS_RGB = 3, /* RGB colorspace */ ++ PPD_CS_RGBK, /* RGBK (K = gray) colorspace */ ++ PPD_CS_N /* DeviceN colorspace */ ++} ppd_cs_t; ++ ++typedef struct /**** Page Sizes ****/ ++{ ++ int marked; /* Page size selected? */ ++ char name[41]; ++ /* Media size option */ ++ float width, /* Width of media in points */ ++ length, /* Length of media in points */ ++ left, /* Left printable margin in points */ ++ bottom, /* Bottom printable margin in points */ ++ right, /* Right printable margin in points */ ++ top; /* Top printable margin in points */ ++} ppd_size_t; ++ ++typedef struct /**** Files ****/ ++{ ++ int language_level, /* Language level of device */ ++ color_device, /* 1 = color device, 0 = grayscale */ ++ variable_sizes, /* 1 = supports variable sizes, 0 = doesn't */ ++ accurate_screens, /* 1 = supports accurate screens, 0 = not */ ++ contone_only, /* 1 = continuous tone only, 0 = not */ ++ landscape, /* -90 or 90 */ ++ model_number, /* Device-specific model number */ ++ manual_copies, /* 1 = Copies done manually, 0 = hardware */ ++ throughput; /* Pages per minute */ ++ ppd_cs_t colorspace; /* Default colorspace */ ++ char *patches; /* Patch commands to be sent to printer */ ++ int num_emulations; /* Number of emulations supported */ ++ void *emulations; /* Emulations and the code to invoke them */ ++ char *jcl_begin, /* Start JCL commands */ ++ *jcl_ps, /* Enter PostScript interpreter */ ++ *jcl_end, /* End JCL commands */ ++ *lang_encoding, /* Language encoding */ ++ *lang_version, /* Language version (English, Spanish, etc.) */ ++ *modelname, /* Model name (general) */ ++ *ttrasterizer, /* Truetype rasterizer */ ++ *manufacturer, /* Manufacturer name */ ++ *product, /* Product name (from PS RIP/interpreter) */ ++ *nickname, /* Nickname (specific) */ ++ *shortnickname; /* Short version of nickname */ ++ int num_groups; /* Number of UI groups */ ++ void *groups; /* UI groups */ ++ int num_sizes; /* Number of page sizes */ ++ ppd_size_t *sizes; /* Page sizes */ ++ float custom_min[2], /* Minimum variable page size */ ++ custom_max[2], /* Maximum variable page size */ ++ custom_margins[4];/* Margins around page */ ++ int num_consts; /* Number of UI/Non-UI constraints */ ++ void *consts; /* UI/Non-UI constraints */ ++ int num_fonts; /* Number of pre-loaded fonts */ ++ char **fonts; /* Pre-loaded fonts */ ++ int num_profiles; /* Number of sRGB color profiles */ ++ void *profiles; /* sRGB color profiles */ ++ int num_filters; /* Number of filters */ ++ char **filters; /* Filter strings... */ ++ ++ /**** New in CUPS 1.1 ****/ ++ int flip_duplex; /* 1 = Flip page for back sides */ ++ ++ /**** New in CUPS 1.1.19 ****/ ++ char *protocols, /* Protocols (BCP, TBCP) string */ ++ *pcfilename; /* PCFileName string */ ++ int num_attrs, /* Number of attributes */ ++ cur_attr; /* Current attribute */ ++ void **attrs; /* Attributes */ ++} ppd_file_t; ++ + typedef cups_dest_t* (PR_CALLBACK *CupsGetDestType)(const char *printer, + const char *instance, + int num_dests, +@@ -80,6 +156,11 @@ + const char *value, + int num_options, + cups_option_t **options); ++typedef const char* (PR_CALLBACK *CupsGetPPDType) (const char* name); ++typedef ppd_file_t* (PR_CALLBACK *PPDOpenFileType) (const char* filename); ++typedef void (PR_CALLBACK *PPDCloseType) (ppd_file_t* ppd); ++typedef void (PR_CALLBACK *PPDMarkDefaultsType) (ppd_file_t* ppd); ++typedef int (PR_CALLBACK *PPDIsMarkedType) (ppd_file_t* ppd, const char* pname, const char* pname_clear); + + struct PRLibrary; + +@@ -113,6 +194,11 @@ + CupsGetDestsType mCupsGetDests; + CupsPrintFileType mCupsPrintFile; + CupsTempFdType mCupsTempFd; ++ CupsGetPPDType mCupsGetPPD; ++ PPDOpenFileType mPpdOpenFile; ++ PPDCloseType mPpdClose; ++ PPDMarkDefaultsType mPpdMarkDefaults; ++ PPDIsMarkedType mPpdIsMarked; + + private: + PRLibrary *mCupsLib; +--- gfx/src/psshared/nsIPaperPS.h ++++ gfx/src/psshared/nsIPaperPS.h +@@ -0,0 +1,102 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * Contributor(s): ++ * Arne John Glenstrup ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++ ++#ifndef _NSIPAPERPS_H_ ++#define _NSIPAPERPS_H_ ++ ++#include "prtypes.h" ++#include "psSharedCore.h" ++ ++class nsIPaperSizePS { ++ public: ++ /** --------------------------------------------------- ++ * Virtual destructor. ++ */ ++ virtual ~nsIPaperSizePS(); ++ ++ /* Allow the paper factory to create instances */ ++ friend class nsPaperFactoryPS; ++ ++ /** --------------------------------------------------- ++ * @return PR_TRUE if the cursor points past the last item. ++ */ ++ virtual PRBool AtEnd() = 0; ++ ++ /** --------------------------------------------------- ++ * Position the cursor at the beginning of the paper size list. ++ * @return VOID ++ */ ++ virtual void First() = 0; ++ ++ /** --------------------------------------------------- ++ * Advance the cursor to the next item. ++ * @return VOID ++ */ ++ virtual void Next() = 0; ++ ++ /** --------------------------------------------------- ++ * Point the cursor to the entry with the given paper name. ++ * @return PR_TRUE if pointing to a valid entry. ++ */ ++ virtual PRBool Find(const char *aName) = 0; ++ ++ /** --------------------------------------------------- ++ * Point the cursor to a default entry if available. ++ * Otherwise it's equivalent to First(). ++ * @return PR_TRUE if pointing to a valid entry. ++ */ ++ virtual PRBool FindDefault() = 0; ++ ++ /** --------------------------------------------------- ++ * @return a pointer to the name of the current paper size ++ */ ++ virtual const char *Name() = 0; ++ ++ /** --------------------------------------------------- ++ * @return the width of the page in millimeters ++ */ ++ virtual float Width_mm() = 0; ++ ++ /** --------------------------------------------------- ++ * @return the height of the page in millimeters ++ */ ++ virtual float Height_mm() = 0; ++ ++ /** --------------------------------------------------- ++ * @return PR_TRUE if the paper should be presented to ++ * the user in metric units. ++ */ ++ virtual PRBool IsMetric() { return PR_TRUE; }; ++}; ++ ++#endif /* _NSIPAPERPS_H_ */ +--- gfx/src/psshared/nsPSPrinters.h ++++ gfx/src/psshared/nsPSPrinters.h +@@ -44,6 +44,7 @@ + #include "prtypes.h" + #include "nsCUPSShim.h" + #include "psSharedCore.h" ++#include "nsCOMPtr.h" + + class nsIPrefService; + class nsIPrefBranch; +--- gfx/src/psshared/nsPaperFactoryPS.cpp ++++ gfx/src/psshared/nsPaperFactoryPS.cpp +@@ -0,0 +1,65 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Kenneth Herron . ++ * Portions created by the Initial Developer are Copyright (C) 2004 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Arne John Glenstrup ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++ ++#include "nsDebug.h" ++#include "nsPaperFactoryPS.h" ++#include "nsIPaperPS.h" ++#include "nsPaperPS.h" ++#include "nsPSPrinters.h" ++ ++nsresult ++nsPaperFactoryPS::CreatePaper(const char* fullPrinterName, ++ const char* printerName, ++ nsIPaperSizePS* &aPaper) ++{ ++ nsIPaperSizePS *newPZ; ++ ++ if (nsPSPrinterList::kTypeCUPS == nsPSPrinterList::GetPrinterType ++ (nsDependentCString(fullPrinterName))) ++ newPZ = new nsPaperSizeCUPS(fullPrinterName, printerName); ++ else ++ newPZ = new nsPaperSizePS(); ++ ++ if (!newPZ) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ aPaper = newPZ; ++ return NS_OK; ++} +--- gfx/src/psshared/nsPaperFactoryPS.h ++++ gfx/src/psshared/nsPaperFactoryPS.h +@@ -0,0 +1,64 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * Contributor(s): ++ * Arne John Glenstrup ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef nsPaperFactoryPS_h__ ++#define nsPaperFactoryPS_h__ ++ ++#include "nscore.h" ++#include "nsIPaperPS.h" ++ ++/* Factory class for the paper sizes. This class determines ++ * which paper size class should handle a request, and constructs ++ * an object of the appropriate class. ++ */ ++ ++class NS_PSSHARED nsPaperFactoryPS ++{ ++public: ++ /** ++ * Construct a paper size object for the given device context spec. ++ * On success, the paper size object is owned by the caller and should ++ * be destroyed when no longer needed. ++ * ++ * @param fullPrinterName Fully qualified name, e.g., "CUPS/myprinter" ++ * @param printerName Stripped name, e.g., "myprinter" ++ * @param aPaper If NS_OK is returned, this will be filled ++ * in with a pointer to a paper size object. ++ * @return NS_OK or a suitable error value. ++ */ ++ static nsresult CreatePaper(const char* fullPrinterName, ++ const char* printerName, ++ nsIPaperSizePS* &aPaper); ++}; ++ ++ ++#endif /* nsPaperFactoryPS_h__ */ +--- gfx/src/psshared/nsPaperPS.cpp ++++ gfx/src/psshared/nsPaperPS.cpp +@@ -22,6 +22,7 @@ + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): ++ * Arne John Glenstrup + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or +@@ -37,9 +38,25 @@ + * + * ***** END LICENSE BLOCK ***** */ + +- ++#ifdef MOZ_LOGGING ++#define FORCE_PR_LOG 1 /* Allow logging in the release build */ ++#endif /* MOZ_LOGGING */ ++#include "prlog.h" ++ + #include "nsPaperPS.h" + #include "plstr.h" ++#include "nsPSPrinters.h" ++#include ++ ++#ifdef PR_LOGGING ++static PRLogModuleInfo *PaperSizePSLM = PR_NewLogModule("PaperSizePS"); ++#endif /* PR_LOGGING */ ++/* Macro to make lines shorter */ ++#define DO_PR_DEBUG_LOG(x) PR_LOG(PaperSizePSLM, PR_LOG_DEBUG, x) ++ ++#define MM_PER_PT (25.4 / 72.0) ++#define HALF_INCH_PT 36.0 ++#define EPSILON 0.125 + + #define COUNTOF(x) (sizeof(x) / sizeof((x)[0])) + +@@ -57,7 +74,15 @@ + #undef SIZE_MM + }; + +-const unsigned int nsPaperSizePS::mCount = COUNTOF(mList); ++nsCUPSShim nsPaperSizeCUPS::mCups; ++ ++/* ~nsIPaperSizePS() is virtual, so must implement a destructor. */ ++nsIPaperSizePS::~nsIPaperSizePS () { } ++ ++nsPaperSizePS::nsPaperSizePS() { ++ mCount = COUNTOF(mList); ++ mCurrent = 0; ++} + + PRBool + nsPaperSizePS::Find(const char *aName) +@@ -70,3 +95,125 @@ + } + return PR_FALSE; + } ++ ++nsPaperSizeCUPS::nsPaperSizeCUPS(const char* fullPrinterName, ++ const char* printerName) { ++ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS('%s', '%s')\n", ++ fullPrinterName, printerName)); ++ /* Don't use CUPS before we are sure we have access to the PPD */ ++ mUsingCups = false; ++ mPPD = nsnull; ++ mCount = COUNTOF(mList); ++ mCurrent = 0; ++ if (!fullPrinterName || !printerName || ++ nsPSPrinterList::kTypeCUPS != ++ nsPSPrinterList::GetPrinterType(nsDependentCString(fullPrinterName))) ++ return; ++ if (!mCups.IsInitialized()) { mCups.Init(); } ++ if (!mCups.IsInitialized()) { ++ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS: CUPS unavailable\n")); ++ return; ++ } ++ const char* ppdFileName = mCups.mCupsGetPPD(printerName); ++ if (!ppdFileName) { ++ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS: " ++ "cannot get PPD file name for printer '%s'\n", ++ printerName)); ++ return; ++ } ++ mPPD = mCups.mPpdOpenFile(ppdFileName); ++ if (!mPPD) { ++ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS: " ++ "cannot open PPD file '%s'\n", ++ ppdFileName)); ++ return; ++ } ++ mCount = mPPD->num_sizes; ++ mUsingCups = true; ++} ++ ++nsPaperSizeCUPS::~nsPaperSizeCUPS() { ++ if (mPPD) mCups.mPpdClose(mPPD); ++} ++ ++void ++nsPaperSizeCUPS::SkipZeroSizes() { ++ if (!mUsingCups) return; ++ while (mCurrent < mCount ++ && (mPPD->sizes[mCurrent].width == 0.0f || ++ mPPD->sizes[mCurrent].length == 0.0f)) { ++ mCurrent++; ++ } ++} ++ ++PRBool ++nsPaperSizeCUPS::Find(const char* aName) { ++ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::Find ('%s') ", aName)); ++ if (!mUsingCups) return nsPaperSizePS::Find(aName); ++ for (int i = mCount; i--; ) { ++ if (!PL_strcasecmp(aName, mPPD->sizes[i].name)) { ++ DO_PR_DEBUG_LOG ++ (("found paper '%s' (%gx%gmm)\n", ++ aName, ++ round(mPPD->sizes[i].width * MM_PER_PT), ++ round(mPPD->sizes[i].length * MM_PER_PT))); ++ mCurrent = i; ++ return PR_TRUE; ++ } ++ } ++ DO_PR_DEBUG_LOG(("did not find paper '%s'\n", aName)); ++ return PR_FALSE; ++} ++ ++PRBool ++nsPaperSizeCUPS::FindDefault() { ++ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::FindDefault")); ++ if (!mUsingCups) return nsPaperSizePS::FindDefault(); ++ mCups.mPpdMarkDefaults(mPPD); ++ for (int i = mCount; i--; ) { ++ if (mCups.mPpdIsMarked(mPPD, "PageSize", mPPD->sizes[i].name )) { ++ DO_PR_DEBUG_LOG ++ (("found default paper '%s' (%gx%gmm)\n", ++ mPPD->sizes[i].name, ++ round(mPPD->sizes[i].width * MM_PER_PT), ++ round(mPPD->sizes[i].length * MM_PER_PT))); ++ mCurrent = i; ++ return PR_TRUE; ++ } ++ } ++ mCurrent = 0; ++ DO_PR_DEBUG_LOG(("no default paper found, therefore set the first\n")); ++ return PR_TRUE; ++} ++ ++const char* ++nsPaperSizeCUPS::Name() { ++ if (!mUsingCups) return nsPaperSizePS::Name(); ++ NS_PRECONDITION(!AtEnd(), "Invalid current item"); ++ return mPPD->sizes[mCurrent].name; ++} ++ ++float ++nsPaperSizeCUPS::Width_mm() { ++ if (!mUsingCups) return nsPaperSizePS::Width_mm(); ++ NS_PRECONDITION(!AtEnd(), "Invalid current item"); ++ return round(mPPD->sizes[mCurrent].width * MM_PER_PT); ++} ++ ++float ++nsPaperSizeCUPS::Height_mm() { ++ if (!mUsingCups) return nsPaperSizePS::Height_mm(); ++ NS_PRECONDITION(!AtEnd(), "Invalid current item"); ++ return round(mPPD->sizes[mCurrent].length * MM_PER_PT); ++} ++ ++PRBool ++nsPaperSizeCUPS::IsMetric() { ++ if (!mUsingCups) return nsPaperSizePS::IsMetric(); ++ NS_PRECONDITION(!AtEnd(), "Invalid current item"); ++ /* Educated guess: unless sizes are integral number */ ++ /* of half inches, present them to the user in metric. */ ++ return ++ fabs(fmod(mPPD->sizes[mCurrent].width, HALF_INCH_PT)) > EPSILON || ++ fabs(fmod(mPPD->sizes[mCurrent].length, HALF_INCH_PT)) > EPSILON; ++} +--- gfx/src/psshared/nsPaperPS.h ++++ gfx/src/psshared/nsPaperPS.h +@@ -40,9 +40,9 @@ + #ifndef _PAPERPS_H_ + #define _PAPERPS_H_ + +-#include "prtypes.h" ++#include "nsIPaperPS.h" + #include "nsDebug.h" +-#include "psSharedCore.h" ++#include "nsCUPSShim.h" + + struct nsPaperSizePS_ { + const char *name; +@@ -51,13 +51,13 @@ + PRBool isMetric; // Present to the user in metric, if possible + }; + +-class NS_PSSHARED nsPaperSizePS { ++class NS_PSSHARED nsPaperSizePS : public nsIPaperSizePS { + public: + /** --------------------------------------------------- + * Constructor + */ +- nsPaperSizePS() { mCurrent = 0; } +- ++ nsPaperSizePS(); ++ + /** --------------------------------------------------- + * @return PR_TRUE if the cursor points past the last item. + */ +@@ -85,6 +85,12 @@ + PRBool Find(const char *aName); + + /** --------------------------------------------------- ++ * Position the cursor at the beginning of the paper size list. ++ * @return PR_TRUE ++ */ ++ PRBool FindDefault() { mCurrent = 0; return PR_TRUE; } ++ ++ /** --------------------------------------------------- + * @return a pointer to the name of the current paper size + */ + const char *Name() { +@@ -117,11 +123,83 @@ + return mList[mCurrent].isMetric; + } + +- private: ++ protected: + unsigned int mCurrent; + // the class visibility should export these, but it doesn't + static NS_PSSHARED_STATIC_MEMBER_(const nsPaperSizePS_) mList[]; +- static NS_PSSHARED_STATIC_MEMBER_(const unsigned int) mCount; ++ unsigned int mCount; ++}; ++ ++class NS_PSSHARED nsPaperSizeCUPS : public nsPaperSizePS { ++ public: ++ /** --------------------------------------------------- ++ * Constructor for a specific CUPS printer. ++ * @param fullPrinterName Fully qualified name, e.g., "CUPS/myprinter" ++ * @param printerName Stripped name, e.g., "myprinter" ++ */ ++ nsPaperSizeCUPS(const char* fullPrinterName, const char* printerName); ++ ++ /** --------------------------------------------------- ++ * Destructor. ++ */ ++ ~nsPaperSizeCUPS(); ++ ++ /** --------------------------------------------------- ++ * Position the cursor at the beginning of the paper size list. ++ * @return VOID ++ */ ++ void First() { ++ nsPaperSizePS::First(); ++ SkipZeroSizes(); ++ } ++ ++ /** --------------------------------------------------- ++ * Advance the cursor to the next item. ++ * @return VOID ++ */ ++ void Next() { ++ nsPaperSizePS::Next(); ++ SkipZeroSizes(); ++ } ++ ++ /** --------------------------------------------------- ++ * Point the cursor to the entry with the given paper name. ++ * @return PR_TRUE if pointing to a valid entry. ++ */ ++ PRBool Find(const char *aName); ++ ++ /** --------------------------------------------------- ++ * Point the cursor to the CUPS default entry for paper size. ++ * @return PR_TRUE if pointing to a valid entry. ++ */ ++ PRBool FindDefault(); ++ ++ /** --------------------------------------------------- ++ * @return a pointer to the name of the current paper size ++ */ ++ const char *Name(); ++ ++ /** --------------------------------------------------- ++ * @return the width of the page in millimeters ++ */ ++ float Width_mm(); ++ ++ /** --------------------------------------------------- ++ * @return the height of the page in millimeters ++ */ ++ float Height_mm(); ++ ++ /** --------------------------------------------------- ++ * @return PR_TRUE if the paper should be presented to ++ * the user in metric units. ++ */ ++ PRBool IsMetric(); ++ ++ private: ++ void SkipZeroSizes(); ++ PRBool mUsingCups; ++ static NS_PSSHARED_STATIC_MEMBER_(nsCUPSShim) mCups; ++ ppd_file_t* mPPD; + }; + + #endif +--- gfx/src/xlib/nsDeviceContextSpecXlib.cpp ++++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp +@@ -1212,7 +1212,11 @@ + #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ + nsXPIDLCString papername; + if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(papername)))) { +- nsPaperSizePS paper; ++ nsIPaperSizePS* paper; ++ nsresult rv; ++ rv = nsPaperFactoryPS::CreatePaper ++ (fullPrinterName.get(), printerName.get(), paper); ++ if (NS_FAILED(rv)) return rv; + + if (paper.Find(papername)) { + DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", +@@ -1238,6 +1242,7 @@ + } + printerFeatures.SetNumPaperSizeRecords(count); + #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ ++ delete(paper); + } + + PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS == diff --git a/dbus.patch b/dbus.patch new file mode 100644 index 00000000..2f4f98a6 --- /dev/null +++ b/dbus.patch @@ -0,0 +1,565 @@ +Index: configure.in +================================================================================ +--- browser/installer/unix/packages-static ++++ browser/installer/unix/packages-static +@@ -341,6 +341,7 @@ + ; + bin/components/libnkgnomevfs.so + bin/components/libauth.so ++bin/components/libdbusservice.so + + ; [Additional Developer Tools] + [adt] +--- config/autoconf.mk.in ++++ config/autoconf.mk.in +@@ -458,6 +458,12 @@ + MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@ + MOZ_GTK2_LIBS = @MOZ_GTK2_LIBS@ + ++MOZ_DBUS_GLIB_CFLAGS = @MOZ_DBUS_GLIB_CFLAGS@ ++MOZ_DBUS_GLIB_LIBS = @MOZ_DBUS_GLIB_LIBS@ ++ ++MOZ_GTHREAD_CFLAGS = @MOZ_GTHREAD_CFLAGS@ ++MOZ_GTHREAD_LIBS = @MOZ_GTHREAD_LIBS@ ++ + MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@ + MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@ + +--- configure.in ++++ configure.in +@@ -4776,6 +4776,33 @@ + AC_SUBST(MOZ_GNOMEUI_LIBS) + + dnl ======================================================== ++dnl = dbus support ++dnl ======================================================== ++ ++if test "$MOZ_ENABLE_GTK2" ++then ++ MOZ_ARG_ENABLE_BOOL(dbus, ++ [ --enable-dbus Enable dbus support (default: disabled) ], ++ MOZ_ENABLE_DBUS=1, ++ MOZ_ENABLE_DBUS=) ++ ++ if test "$MOZ_ENABLE_DBUS" ++ then ++ PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1) ++ PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) ++ fi ++ ++ if test "$MOZ_ENABLE_DBUS"; then ++ AC_DEFINE(MOZ_ENABLE_DBUS) ++ fi ++fi ++AC_SUBST(MOZ_ENABLE_DBUS) ++AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) ++AC_SUBST(MOZ_DBUS_GLIB_LIBS) ++AC_SUBST(MOZ_GTHREAD_CFLAGS) ++AC_SUBST(MOZ_GTHREAD_LIBS) ++ ++dnl ======================================================== + dnl = Setting MOZ_EXTRA_X11CONVERTERS turns on additional + dnl = converters in intl/uconv that are used only by X11 gfx + dnl = implementations. By default, it's undefined so that +@@ -5128,6 +5155,13 @@ + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi + ++if test -z "$MOZ_ENABLE_DBUS" && test `echo "$MOZ_EXTENSIONS" | grep -c dbus` -ne 0; then ++ if test -n "$MOZ_X11"; then ++ AC_MSG_WARN([Cannot build dbus without required libraries. Removing dbus from MOZ_EXTENSIONS.]) ++ fi ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|dbus||'` ++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||'` +--- extensions/dbus/Makefile.in ++++ extensions/dbus/Makefile.in +@@ -0,0 +1,68 @@ ++# ###### BEGIN LICENSE BLOCK ###### ++# Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# ++# The contents of this file are subject to the Mozilla Public ++# License Version 1.1 (the "License"); you may not use this file ++# except in compliance with the License. You may obtain a copy of ++# the License at http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS ++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++# implied. See the License for the specific language governing ++# rights and limitations under the License. ++# ++# The Original Code is Novell code. ++# ++# The Initial Developer of the Original Code is Novell, Inc. ++# ++# Original Author: Robert O'Callahan (rocallahan@novell.com) ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the NPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the NPL, the GPL or the LGPL. ++# ++# ###### END LICENSE BLOCK ###### ++ ++DEPTH = ../.. ++topsrcdir = @top_srcdir@ ++srcdir = @srcdir@ ++VPATH = @srcdir@ ++ ++include $(DEPTH)/config/autoconf.mk ++ ++MODULE = dbus ++LIBRARY_NAME = dbusservice ++GRE_MODULE = 1 ++#EXPORT_LIBRARY = 1 ++IS_COMPONENT = 1 ++FORCE_SHARED_LIB = 1 ++ ++REQUIRES = xpcom \ ++ string \ ++ necko \ ++ embedcomponents \ ++ $(NULL) ++ ++EXTRA_DSO_LDOPTS = $(MOZ_DBUS_GLIB_LIBS) \ ++ $(MOZ_GTHREAD_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) ++ ++CPPSRCS = \ ++ nsDBusModule.cpp \ ++ $(NULL) ++ ++include $(topsrcdir)/config/rules.mk ++ ++CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_GTHREAD_CFLAGS) ++CXXFLAGS := $(subst -pedantic,,$(CXXFLAGS)) +--- extensions/dbus/nsDBusModule.cpp ++++ extensions/dbus/nsDBusModule.cpp +@@ -0,0 +1,414 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* vim:expandtab:shiftwidth=4:tabstop=4: ++ */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is Novell code. ++ * ++ * The Initial Developer of the Original Code is Novell, Inc. ++ * ++ * Original Author: Robert O'Callahan (rocallahan@novell.com) ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include ++ ++#define DBUS_API_SUBJECT_TO_CHANGE ++ ++#include ++#include ++#include ++#include ++ ++#include "nsIObserverService.h" ++#include "nsIObserver.h" ++#include "nsIIOService.h" ++#include "nsWeakReference.h" ++#include "nsIPrefBranch2.h" ++#include "nsIPrefService.h" ++#include "nsServiceManagerUtils.h" ++#include "nsNetCID.h" ++#include "nsCRT.h" ++#include "nsICategoryManager.h" ++#include "nsIGenericFactory.h" ++#include "nsIAppStartupNotifier.h" ++#include "nsITimer.h" ++#include "nsComponentManagerUtils.h" ++ ++#include "nsStringAPI.h" ++ ++// Define NetworkManager API constants. This avoids a dependency on ++// NetworkManager-devel. ++#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" ++#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" ++#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" ++#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange" ++typedef enum NMState ++{ ++ NM_STATE_UNKNOWN = 0, ++ NM_STATE_ASLEEP, ++ NM_STATE_CONNECTING, ++ NM_STATE_CONNECTED, ++ NM_STATE_DISCONNECTED ++} NMState; ++ ++#define NS_DBUS_CONTRACTID "@mozilla.org/dbus;1" ++#define NS_DBUS_CLASSNAME "DBus Interface" ++#define NS_DBUS_CID \ ++ { 0x85899443, \ ++ 0x2842, \ ++ 0x4cc4, \ ++ { 0x87, 0x0c, 0x7a, 0x6f, 0x22, 0xb0, 0xaa, 0x11 } \ ++ } ++ ++/** ++ * The nsDBusService component interfaces with DBUS to communicate with daemons ++ * in systems supporting DBUS. It links dynamically to the DBUS libraries so ++ * will not load on systems without those libraries ... but that's harmless. ++ * ++ * Currently the only daemon we communicate with is NetworkManager. We listen ++ * for NetworkManager state changes; we set nsIOService's offline status to ++ * FALSE when NetworkManager reports NM_STATE_CONNECTED, and to TRUE otherwise. ++ * We also solicit the current status from NetworkManager when this component ++ * gets loaded. In addition to setting IOService, we also set the ++ * "browser.offline" preference (because Firefox treats that preference as ++ * authoritative). We have to wait until prefs have been loaded before setting ++ * "browser.offline". ++ * ++ * In the future we could extend this class to talk to other daemons. ++ * ++ * Currently all communication is asynchronous. This isn't hard to implement ++ * and avoids blocking our main thread. ++ */ ++class nsDBusService : public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_NSIOBSERVER ++ ++ nsDBusService(); ++ virtual ~nsDBusService(); ++ ++ nsresult Init(); ++ ++ /** ++ * This gets called when NetworkManager sends us a StateChange signal, ++ * or when we receive a reply to our inquiry. ++ * The message contains the current NMState. ++ */ ++ void UpdateNetworkStatus(DBusMessage* message); ++ ++ /** ++ * Handle a message. ++ * @return PR_TRUE to indicate that the message has been handled ++ */ ++ PRBool HandleMessage(DBusMessage* message); ++ ++ void DoTimerCallback(nsITimer* aTimer); ++ ++private: ++ /** ++ * Try to connect to the dbus service. ++ */ ++ nsresult ConnectToDBus(); ++ /** ++ * Ask NetworkManager to send us the current status. ++ */ ++ void RequestNetworkStatus(); ++ /** ++ * Update Gecko networking settings based on information we have received. ++ */ ++ void SetGeckoNetworkStatus(); ++ /** ++ * DBUS has disconnected. Hopefull it will restart; we need to restore ++ * our connection. ++ */ ++ void HandleDBusDisconnect(); ++ ++ DBusConnection* mConnection; ++ nsCOMPtr mReconnectTimer; ++ ++ /** ++ * Set to PR_TRUE after we have received at least one status indication ++ * from NetworkManager. ++ */ ++ PRPackedBool mGotNetworkStatus; ++ /** ++ * When mGotNetworkStatus is PR_TRUE, this contains the status indicated ++ * by NetworkManager. ++ */ ++ PRPackedBool mNetworkOnline; ++ /** ++ * Set to PR_TRUE after prefs have been loaded. ++ */ ++ PRPackedBool mPrefsLoaded; ++}; ++ ++NS_IMPL_ISUPPORTS2(nsDBusService, nsIObserver, nsISupportsWeakReference) ++ ++nsDBusService::nsDBusService() { ++ mConnection = nsnull; ++ mGotNetworkStatus = PR_FALSE; ++ mPrefsLoaded = PR_FALSE; ++} ++ ++nsDBusService::~nsDBusService() { ++ if (mConnection) { ++ dbus_connection_unref(mConnection); ++ } ++ if (mReconnectTimer) { ++ mReconnectTimer->Cancel(); ++ } ++} ++ ++void nsDBusService::SetGeckoNetworkStatus() { ++ // Don't set Gecko status until after prefs have been loaded. When ++ // prefs are loaded, we'll get called again. ++ if (!mPrefsLoaded || !mGotNetworkStatus) ++ return; ++ ++ nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ if (prefs) { ++ prefs->SetBoolPref("browser.offline", !mNetworkOnline); ++ } ++ ++ nsCOMPtr ios(do_GetService(NS_IOSERVICE_CONTRACTID)); ++ if (ios) { ++ ios->SetOffline(!mNetworkOnline); ++ } ++} ++ ++void nsDBusService::UpdateNetworkStatus(DBusMessage* msg) { ++ PRInt32 result; ++ if (dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT32, &result, ++ DBUS_TYPE_INVALID)) { ++ mGotNetworkStatus = PR_TRUE; ++ mNetworkOnline = result == NM_STATE_CONNECTED; ++ SetGeckoNetworkStatus(); ++ } ++} ++ ++static void NetworkStatusNotify(DBusPendingCall *pending, ++ void* user_data) { ++ DBusMessage* msg = dbus_pending_call_steal_reply(pending); ++ if (!msg) ++ return; ++ if (dbus_message_get_type(msg) == DBUS_MESSAGE_TYPE_METHOD_RETURN) { ++ NS_STATIC_CAST(nsDBusService*, user_data)->UpdateNetworkStatus(msg); ++ } ++ dbus_message_unref(msg); ++} ++ ++void nsDBusService::RequestNetworkStatus() { ++ DBusMessage* msg = ++ dbus_message_new_method_call(NM_DBUS_SERVICE, NM_DBUS_PATH, ++ NM_DBUS_INTERFACE, "state"); ++ if (!msg) ++ return; ++ ++ DBusPendingCall* reply; ++ if (dbus_connection_send_with_reply(mConnection, msg, &reply, -1)) { ++ dbus_pending_call_set_notify(reply, NetworkStatusNotify, this, NULL); ++ dbus_pending_call_unref(reply); ++ } ++ dbus_message_unref(msg); ++} ++ ++void nsDBusService::DoTimerCallback(nsITimer *aTimer) { ++ if (aTimer == mReconnectTimer.get()) { ++ nsresult rv = ConnectToDBus(); ++ if (NS_SUCCEEDED(rv)) { ++ mReconnectTimer->Cancel(); ++ mReconnectTimer = nsnull; ++ } ++ } ++} ++ ++static void TimerCallback(nsITimer *aTimer, void *aClosure) { ++ NS_STATIC_CAST(nsDBusService*, aClosure)->DoTimerCallback(aTimer); ++} ++ ++void nsDBusService::HandleDBusDisconnect() { ++ if (mConnection) { ++ dbus_connection_unref(mConnection); ++ mConnection = nsnull; ++ } ++ ++ nsresult rv; ++ mReconnectTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); ++ if (NS_FAILED(rv)) ++ return; ++ rv = mReconnectTimer->InitWithFuncCallback(TimerCallback, this, ++ 5000, nsITimer::TYPE_REPEATING_SLACK); ++ if (NS_FAILED(rv)) { ++ mReconnectTimer = nsnull; ++ return; ++ } ++} ++ ++PRBool nsDBusService::HandleMessage(DBusMessage* message) { ++ if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, ++ "Disconnected")) { ++ HandleDBusDisconnect(); ++ return PR_FALSE; ++ } ++ ++ if (dbus_message_is_signal(message, NM_DBUS_INTERFACE, ++ NM_DBUS_SIGNAL_STATE_CHANGE)) { ++ UpdateNetworkStatus(message); ++ return PR_TRUE; ++ } ++ ++ return PR_FALSE; ++} ++ ++NS_IMETHODIMP nsDBusService::Observe(nsISupports *aSubject, ++ const char *aTopic, ++ const PRUnichar *aData) { ++ if (!aTopic) ++ return NS_OK; ++ ++ if (!nsCRT::strcmp(aTopic, NS_PREFSERVICE_READ_TOPIC_ID)) { ++ mPrefsLoaded = PR_TRUE; ++ SetGeckoNetworkStatus(); ++ } ++ return NS_OK; ++} ++ ++static DBusHandlerResult dbus_filter(DBusConnection* connection, ++ DBusMessage* message, ++ void* user_data) { ++ return NS_STATIC_CAST(nsDBusService*, user_data)->HandleMessage(message) ++ ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++} ++ ++nsresult nsDBusService::ConnectToDBus() { ++ DBusError error; ++ dbus_error_init(&error); ++ ++ mConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); ++ if (!mConnection) { ++ dbus_error_free(&error); ++ return NS_ERROR_FAILURE; ++ } ++ ++ dbus_connection_set_exit_on_disconnect(mConnection, PR_FALSE); ++ dbus_connection_setup_with_g_main(mConnection, NULL); ++ ++ if (!dbus_connection_add_filter(mConnection, dbus_filter, this, NULL)) { ++ dbus_error_free(&error); ++ return NS_ERROR_FAILURE; ++ } ++ ++ dbus_bus_add_match(mConnection, ++ "type='signal'," ++ "interface='" NM_DBUS_INTERFACE "'," ++ "sender='" NM_DBUS_SERVICE "'," ++ "path='" NM_DBUS_PATH "'", &error); ++ if (dbus_error_is_set(&error)) { ++ dbus_error_free(&error); ++ return NS_ERROR_FAILURE; ++ } ++ ++ RequestNetworkStatus(); ++ ++ dbus_error_free(&error); ++ ++ return NS_OK; ++} ++ ++nsresult nsDBusService::Init() { ++ nsresult rv; ++ nsCOMPtr observerService = ++ do_GetService("@mozilla.org/observer-service;1", &rv); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ rv = observerService->AddObserver(this, NS_PREFSERVICE_READ_TOPIC_ID, ++ PR_FALSE); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ if (!g_thread_supported ()) ++ g_thread_init (NULL); ++ dbus_g_thread_init(); ++ ++ return ConnectToDBus(); ++} ++ ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDBusService, Init) ++ ++static NS_METHOD ++RegisterDBus(nsIComponentManager *aCompMgr, ++ nsIFile *aPath, ++ const char *registryLocation, ++ const char *componentType, ++ const nsModuleComponentInfo *info) { ++ nsresult rv; ++ ++ nsCOMPtr ++ categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv)); ++ if (NS_SUCCEEDED(rv)) { ++ rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, ++ "DBus Module", ++ NS_DBUS_CONTRACTID, ++ PR_TRUE, PR_TRUE, nsnull); ++ } ++ ++ return rv; ++} ++ ++static NS_METHOD ++UnRegisterDBus(nsIComponentManager *aCompMgr, ++ nsIFile *aPath, ++ const char *registryLocation, ++ const nsModuleComponentInfo *info) { ++ nsresult rv; ++ nsCOMPtr ++ categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv)); ++ if (NS_SUCCEEDED(rv)) { ++ rv = categoryManager->DeleteCategoryEntry(APPSTARTUP_CATEGORY, ++ "DBus Module", ++ PR_TRUE); ++ } ++ return rv; ++} ++ ++static const nsModuleComponentInfo components[] = { ++ { NS_DBUS_CLASSNAME, ++ NS_DBUS_CID, ++ NS_DBUS_CONTRACTID, ++ nsDBusServiceConstructor, ++ RegisterDBus, ++ UnRegisterDBus, ++ }, ++}; ++ ++NS_IMPL_NSGETMODULE(nsDBusModule, components) diff --git a/firefox-2.0-source.tar.bz2 b/firefox-2.0-source.tar.bz2 new file mode 100644 index 00000000..5d8d38ca --- /dev/null +++ b/firefox-2.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5631f4936535866481f6ce190446b516288eb1e94bdb6d34e9b93464b203345d +size 37350148 diff --git a/firefox-appname.patch b/firefox-appname.patch new file mode 100644 index 00000000..16a41b46 --- /dev/null +++ b/firefox-appname.patch @@ -0,0 +1,26 @@ +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -173,7 +173,7 @@ + + // Whether or not the application should check at startup each time if it + // is the default browser. +-pref("browser.shell.checkDefaultBrowser", true); ++pref("browser.shell.checkDefaultBrowser", false); + + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore +--- browser/components/shell/src/nsGNOMEShellService.cpp ++++ browser/components/shell/src/nsGNOMEShellService.cpp +@@ -133,7 +133,11 @@ + rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); + NS_ENSURE_SUCCESS(rv, rv); + +- return appPath->GetNativePath(mAppPath); ++ /* This path to firefox is hardcoded for the default path setting */ ++ mAppPath.Assign ("/usr/bin/firefox"); ++ ++ //return appPath->GetNativePath(mAppPath); ++ return NS_OK; + } + + NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH) diff --git a/firefox-no-update.patch b/firefox-no-update.patch new file mode 100644 index 00000000..c4bb6d21 --- /dev/null +++ b/firefox-no-update.patch @@ -0,0 +1,106 @@ +Index: browser/app/profile/firefox.js +================================================================================ +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -77,65 +77,6 @@ + // 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/2/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_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 to download a new version that +-// is available (in seconds) default=1 day +-pref("app.update.nagTimer.download", 86400); +-// Interval: Time before prompting the user to restart to install the latest +-// download (in seconds) default=30 minutes +-pref("app.update.nagTimer.restart", 1800); +-// Interval: When all registered timers should be checked (in milliseconds) +-// default=5 seconds +-pref("app.update.timer", 600000); +- +-// 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 +--- browser/base/content/baseMenuOverlay.xul ++++ browser/base/content/baseMenuOverlay.xul +@@ -76,7 +76,7 @@ + label="&helpMenu.label;" + accesskey="&helpMenu.accesskey;"> + #endif +- ++ + +-#ifndef XP_MACOSX +- +-#endif ++ oncommand="checkForUpdates();" ++ hidden="true"/> + + + +- ++ + #ifndef XP_MACOSX +- ++ + #endif + + +@@ -458,7 +458,7 @@ + #endif + label="&bookmarkAllCmd.label;" + command="Browser:BookmarkAllTabs"/> +- + +--- browser/base/content/browser.js ++++ browser/base/content/browser.js +@@ -183,6 +183,12 @@ + var backBroadcaster = document.getElementById("Browser:Back"); + var forwardBroadcaster = document.getElementById("Browser:Forward"); + ++ if (gPrefService.getBoolPref("config.lockdown.history")) { ++ backBroadcaster.setAttribute("disabled", true); ++ forwardBroadcaster.setAttribute("disabled", true); ++ return; ++ } ++ + var webNavigation = gBrowser.webNavigation; + + // Avoid setting attributes on broadcasters if the value hasn't changed! +@@ -953,6 +959,107 @@ + BrowserSearch.init(); + } + ++function lockdownElement(ident, disable) ++{ ++ var e = document.getElementById(ident); ++ if (disable) { ++ e.setAttribute("disabled", "true"); ++ } else { ++ e.removeAttribute("disabled"); ++ } ++} ++ ++function applyLockdown(isStartup) ++{ ++ // It is important to check that Firefox code does not change the ++ // "disabled" state of these UI elements. Fortunately it mostly hides ++ // elements rather than disables them. ++ var disablePrinting = gPrefService.getBoolPref("config.lockdown.printing"); ++ var disablePrintSetup = gPrefService.getBoolPref("config.lockdown.printsetup"); ++ if (!isStartup || disablePrintSetup || disablePrintSetup) { ++ lockdownElement("menu_printSetup", disablePrinting || disablePrintSetup); ++ lockdownElement("menu_printPreview", disablePrinting || disablePrintSetup); ++ lockdownElement("cmd_print", disablePrinting); ++ } ++ ++ var disableSave = gPrefService.getBoolPref("config.lockdown.savepage"); ++ if (!isStartup || disableSave) { ++ lockdownElement("Browser:SavePage", disableSave); ++ lockdownElement("menu_saveFrame", disableSave); ++ lockdownElement("context-savepage", disableSave); ++ lockdownElement("context-savelink", disableSave); ++ lockdownElement("context-saveimage", disableSave); ++ } ++ ++ var disableBookmarks = gPrefService.getBoolPref("config.lockdown.hidebookmark"); ++ var disableBookmarkEditing = gPrefService.getBoolPref("config.lockdown.bookmark"); ++ if (!isStartup || disableBookmarks || disableBookmarkEditing) { ++ lockdownElement("viewBookmarksSidebar", disableBookmarks); ++ lockdownElement("PersonalToolbar", disableBookmarks); // XXX check ++ lockdownElement("Browser:AddBookmarkAs", disableBookmarks || disableBookmarkEditing); ++ lockdownElement("manBookmark", disableBookmarks || disableBookmarkEditing); ++ lockdownElement("context-bookmarkpage", disableBookmarks || disableBookmarkEditing); ++ lockdownElement("context-bookmarklink", disableBookmarks || disableBookmarkEditing); ++ ++ // hide the personal bookmarks toolbar if necessary ++ if (disableBookmarks) { ++ document.getElementById("PersonalToolbar").setAttribute("collapsed", "true"); ++ } ++ } ++ ++ var disableHistory = gPrefService.getBoolPref("config.lockdown.history"); ++ if (!isStartup || disableHistory) { ++ lockdownElement("viewHistorySidebar", disableHistory); ++ UpdateBackForwardButtons(); ++ var urlBar = document.getElementById("urlbar"); ++ urlBar.setAttribute("enablehistory", disableHistory ? "false" : "true"); ++ } ++ ++ var disableURLBar = gPrefService.getBoolPref("config.lockdown.urlbar"); ++ if (!isStartup || disableURLBar) { ++ lockdownElement("urlbar", disableURLBar); ++ lockdownElement("Browser:OpenLocation", disableURLBar); ++ lockdownElement("Browser:OpenFile", disableURLBar); ++ } ++ ++ var disableSearchBar = gPrefService.getBoolPref("config.lockdown.searchbar"); ++ if (!isStartup || disableSearchBar) { ++ lockdownElement("searchbar-textfield", disableSearchBar); ++ lockdownElement("searchbar-dropmarker", disableSearchBar); ++ } ++ ++ var disableToolbarEditing = gPrefService.getBoolPref("config.lockdown.toolbarediting"); ++ if (!isStartup || disableToolbarEditing) { ++ var e = document.getElementById("cmd_CustomizeToolbars"); ++ if (!e.getAttribute("inCustomization")) { ++ lockdownElement("cmd_CustomizeToolbars", disableToolbarEditing); ++ } ++ } ++ ++ // Close sidebar if we disabled the command that's currently in use ++ var sidebarBox = document.getElementById("sidebar-box"); ++ var cmd = sidebarBox.getAttribute("sidebarcommand"); ++ if (cmd) { ++ var elt = document.getElementById(cmd); ++ if (elt && elt.getAttribute("disabled") == "true") { ++ toggleSidebar(cmd, false); ++ gMustLoadSidebar = false; ++ } ++ } ++} ++ ++var lockdownObserver = { ++ observe: function(aSubject, aTopic, aPrefName) ++ { ++ try { ++ applyLockdown(false); ++ } catch (ex) { ++ dump("Failed lockdown: " + ex + "\n"); ++ } ++ } ++}; ++ ++ + function delayedStartup() + { + var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); +@@ -961,7 +1068,15 @@ + + if (!gPrefService) + gPrefService = Components.classes["@mozilla.org/preferences-service;1"] +- .getService(Components.interfaces.nsIPrefBranch); ++ .getService(Components.interfaces.nsIPrefBranchInternal); ++ try { ++ // do lockdown stuff in an exception handler so that if it fails ++ // catastrophically, the browser should still come up and function ++ applyLockdown(true); ++ gPrefService.addObserver("config.lockdown.", lockdownObserver, false); ++ } catch (ex) { ++ dump("Failed lockdown: " + ex + "\n"); ++ } + BrowserOffline.init(); + + if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) { +@@ -980,8 +1095,8 @@ + window.addEventListener("keypress", ctrlNumberTabSelection, false); + + if (gMustLoadSidebar) { +- var sidebar = document.getElementById("sidebar"); + var sidebarBox = document.getElementById("sidebar-box"); ++ var sidebar = document.getElementById("sidebar"); + sidebar.setAttribute("src", sidebarBox.getAttribute("src")); + } + +@@ -1154,6 +1269,8 @@ + os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history"); + os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked"); + ++ gPrefService.removeObserver("config.lockdown.", lockdownObserver); ++ + try { + gBrowser.removeProgressListener(window.XULBrowserWindow); + } catch (ex) { +@@ -1739,6 +1856,9 @@ + + var history = document.getElementById("hiddenHistoryTree"); + ++ if (gPrefService.getBoolPref("config.lockdown.history")) ++ return; ++ + if (history.hidden) { + history.hidden = false; + var globalHistory = Components.classes["@mozilla.org/browser/global-history;2"] +@@ -3405,6 +3525,7 @@ + + var cmd = document.getElementById("cmd_CustomizeToolbars"); + cmd.setAttribute("disabled", "true"); ++ cmd.setAttribute("inCustomization", "true"); + + #ifdef TOOLBAR_CUSTOMIZATION_SHEET + document.getElementById("customizeToolbarSheetBox").hidden = false; +@@ -3432,6 +3553,15 @@ + #endif + } + ++function BrowserRestoreCustomizationDisabledState() ++{ ++ var cmd = document.getElementById("cmd_CustomizeToolbars"); ++ if (!gPrefService.getBoolPref("config.lockdown.toolbarediting")) { ++ cmd.removeAttribute("disabled", "true"); ++ } ++ cmd.removeAttribute("inCustomization"); ++} ++ + function BrowserToolboxCustomizeDone(aToolboxChanged) + { + #ifdef TOOLBAR_CUSTOMIZATION_SHEET +@@ -3464,8 +3594,7 @@ + var menubar = document.getElementById("main-menubar"); + for (var i = 0; i < menubar.childNodes.length; ++i) + menubar.childNodes[i].setAttribute("disabled", false); +- var cmd = document.getElementById("cmd_CustomizeToolbars"); +- cmd.removeAttribute("disabled"); ++ BrowserRestoreCustomizationDisabledState(); + + // XXXmano bug 287105: wallpaper to bug 309953, + // the reload button isn't in sync with the reload command. +@@ -4225,6 +4354,9 @@ + menuItem.setAttribute("toolbarindex", i); + menuItem.setAttribute("type", "checkbox"); + menuItem.setAttribute("label", toolbarName); ++ if (toolbar.getAttribute("disabled") == "true") { ++ menuItem.setAttribute("disabled", "true"); ++ } + menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey")); + menuItem.setAttribute("checked", toolbar.getAttribute("collapsed") != "true"); + popup.insertBefore(menuItem, firstMenuItem); +@@ -4466,7 +4598,8 @@ + #endif + this.showItem( "context-setDesktopBackground", haveSetDesktopBackground && this.onLoadedImage ); + +- if ( haveSetDesktopBackground && this.onLoadedImage ) ++ var lockedSetDesktopBackground = gPrefService.getBoolPref("config.lockdown.setwallpaper"); ++ if ( haveSetDesktopBackground && this.onLoadedImage && !lockedSetDesktopBackground ) + this.setItemAttr( "context-setDesktopBackground", "disabled", this.disableSetDesktopBackground()); + + // View Image depends on whether an image was clicked on. +--- browser/components/bookmarks/content/bookmarksProperties.js ++++ browser/components/bookmarks/content/bookmarksProperties.js +@@ -138,6 +138,15 @@ + // set initial focus + nameNode.focus(); + nameNode.select(); ++ ++ // I don't know why doing this is a good idea. If bookmark editing ++ // is disabled we shouldn't let the user into the preferences ++ // dialog. ++ var prefs = Components.classes["@mozilla.org/preferences-service;1"] ++ .getService(Components.interfaces.nsIPrefBranch); ++ if (prefs.getBoolPref("config.lockdown.bookmark")) { ++ document.getElementById("url").setAttribute("disabled", "true"); ++ } + } + + +--- modules/libpref/src/init/all.js ++++ modules/libpref/src/init/all.js +@@ -1011,6 +1011,20 @@ + // if the system has enabled accessibility + pref("config.use_system_prefs.accessibility", false); + ++// 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.disable_themes",false); ++pref("config.lockdown.disable_extensions",false); ++pref("config.lockdown.searchbar",false); ++pref("config.lockdown.hidebookmark",false); ++pref("config.lockdown.setwallpaper",false); ++ + /* + * What are the entities that you want Mozilla to save using mnemonic + * names rather than numeric codes? E.g. If set, we'll output +--- toolkit/components/help/content/toolbarCustomization.js ++++ toolkit/components/help/content/toolbarCustomization.js +@@ -42,11 +42,23 @@ + { + var customizePopup = document.getElementById("cmd_CustomizeToolbars"); + customizePopup.setAttribute("disabled", "true"); ++ customizePopup.setAttribute("inEdit", "true"); + + window.openDialog("chrome://help/content/customizeToolbar.xul", "CustomizeToolbar", + "chrome,all,dependent", document.getElementById(id)); + } + ++function RestoreCustomizationDisabledState() ++{ ++ var prefs = Components.classes["@mozilla.org/preferences-service;1"] ++ .getService(Components.interfaces.nsIPrefBranchInternal); ++ var customizePopup = document.getElementById("cmd_CustomizeToolbars"); ++ if (!prefs.getBoolPref("config.lockdown.toolbarediting")) { ++ customizePopup.removeAttribute("disabled"); ++ } ++ customizePopup.removeAttribute("inEdit"); ++} ++ + # ToolboxCustomizeDone() - Resets the toolbar back to its default state. Reenables + # toolbar buttons and the "Customize Toolbar" command. + # +@@ -54,8 +66,7 @@ + function ToolboxCustomizeDone(aToolboxChanged) + { + # Update global UI elements that may have been added or removed +- var customizePopup = document.getElementById("cmd_CustomizeToolbars"); +- customizePopup.removeAttribute("disabled"); ++ RestoreCustomizationDisabledState(); + + # make sure our toolbar buttons have the correct enabled state restored to them... + if (this.UpdateToolbar != undefined) +@@ -77,8 +88,7 @@ + document.commandDispatcher.updateCommands('help-toolbar'); + + # re-enable toolbar customization command +- var customizePopup = document.getElementById("cmd_CustomizeToolbars"); +- customizePopup.removeAttribute("disabled"); ++ RestoreCustomizationDisabledState(); + + # hook for extra toolbar items + var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); +--- toolkit/components/printing/content/printdialog.js ++++ toolkit/components/printing/content/printdialog.js +@@ -51,6 +51,7 @@ + var gWebBrowserPrint = null; + var gPrintSetInterface = Components.interfaces.nsIPrintSettings; + var doDebug = false; ++var gPrefService = null; + + //--------------------------------------------------- + function initDialog() +@@ -88,11 +89,23 @@ + dialog.fpDialog = document.getElementById("fpDialog"); + + dialog.enabled = false; ++ ++ gPrefService = Components.classes["@mozilla.org/preferences-service;1"] ++ .getService(Components.interfaces.nsIPrefService).getBranch(null); ++ if (gPrefService.getBoolPref("config.lockdown.savepage")) { ++ dialog.fileRadio.setAttribute("disabled", "true"); ++ } ++ if (gPrefService.getBoolPref("config.lockdown.printing")) { ++ dialog.printButton.setAttribute("disabled", "true"); ++ } + } + + //--------------------------------------------------- + function checkInteger(element) + { ++ if (gPrefService.getBoolPref("config.lockdown.printing")) ++ return; ++ + var value = element.value; + if (value && value.length > 0) { + value = value.replace(/[^0-9]/g,""); diff --git a/firefox.1 b/firefox.1 new file mode 100644 index 00000000..d5b38a52 --- /dev/null +++ b/firefox.1 @@ -0,0 +1,125 @@ +.TH FIREFOX 1 "January 04, 2006" firefox "Linux User's Manual" +.SH NAME +firefox \- a Web browser for X11 derived from the Mozilla browser + +.SH SYNOPSIS +.B firefox +[\fIOPTIONS\fR] [\fIURL\fR] + +.B firefox-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBMozilla Firefox\fR is an open-source web browser, designed for +standards compliance, performance and portability. + +.SH USAGE +\fBfirefox\fR is a simple shell script that will set up the +environment for the actual executable, \fBfirefox-bin\fR. + +.SH OPTIONS +A summary of the options supported by \fBfirefox\fR is included below. + +.SS "GTK options" +\fB\-\-gdk-debug=\fR\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-gtk-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-gtk-module=\fR\fIMODULE\fR +Load an additional Gtk module + +.SS "X11 options" +.TP +.BI \-\-display= DISPLAY +X display to use +.TP +.B \--sync +Make X calls synchronous +.TP +.B \-\-no-xshm +Don't use X shared memory extension +.TP +.BI \-\-xim-preedit= STYLE +.TP +.BI \-\-xim-status= STYLE +.TP +.B \-\-g-fatal-warnings +Make all warnings fatal + +.SS "Firefox options" +.TP +.B \-h, \-help +Show summary of options. +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR. +.TP +.B \-v, \-version +Print \fB/usr/bin/firefox-bin\fR version. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +.TP +.B \-ProfileManager +Start with profile manager. +.TP +\fB\-UILocale\fR \fIlang-region\fR +Start with \fIlang-region\fR resources. +.TP +\fB\-contentLocale\fR \fIlang-region\fR +Start with \fIlang-region\fR resources. +.TP +\fB\-remote\fR \fIcommand\fR +Execute \fIcommand\fR in an already running Firefox process. For more info, +see: \fIhttp://www.mozilla.org/unix/remote.html\fR +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP +\fB\-new-window\fR \fIurl\fR +Open URL in a new window if Firefox is already running. +.TP +\fB\-new-tab\fR \fIurl\fR +Open URL in a new tab if Firefox is already running. +.TP +\fB\-preferences\fR +Open Firefox preferences menu. +.TP + +.SH FILES +\fI/usr/bin/firefox\fR - shell script wrapping +\fBfirefox\fR +.br +\fI/usr/lib/firefox/firefox-bin\fR - \fBfirefox\fR +executable + +.SH VERSION +1.5 + +.SH BUGS +To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR + +.SH "SEE ALSO" +.BR mozilla(1) + +.SH AUTHORS +.TP +.B The Mozilla Organization +.I http://www.mozilla.org/about.html diff --git a/firefox.schemas b/firefox.schemas new file mode 100644 index 00000000..e0e1edba --- /dev/null +++ b/firefox.schemas @@ -0,0 +1,287 @@ + + + + /schemas/apps/firefox/lockdown/disable_history + /apps/firefox/lockdown/disable_history + firefox + bool + false + + To disable the History. + To disable the histroy. + + + + /schemas/apps/firefox/lockdown/disable_toolbar_editing + /apps/firefox/lockdown/disable_toolbar_editing + firefox + bool + false + + Disable toolbar editing. + Disable ToolBar Editing. + + + + + /schemas/apps/firefox/lockdown/disable_themes + /apps/firefox/lockdown/disable_themes + firefox + bool + false + + Disable installing themes + Disable installing theme + + + + + /schemas/apps/firefox/lockdown/disable_extensions + /apps/firefox/lockdown/disable_extensions + firefox + bool + false + + Disable installing extensions + Disable installing extensions + + + + + /schemas/apps/firefox/web/disable_popups + /apps/firefox/web/disable_popups + firefox + bool + false + + Allow Popups. + Allow Popups. + + + + + /schemas/apps/firefox/web/java_enabled + /apps/firefox/web/java_enabled + firefox + bool + true + + Enable java. + Enable java. + + + + + /schemas/apps/firefox/web/javascript_enabled + /apps/firefox/web/javascript_enabled + firefox + bool + true + + Enable javascript. + Enable javascript. + + + + + /schemas/apps/firefox/lockdown/disable_url_bar + /apps/firefox/lockdown/disable_url_bar + firefox + bool + false + + Disable URL bar. + Disable URL bar. + + + + + /schemas/apps/firefox/lockdown/disable_searchbar + /apps/firefox/lockdown/disable_searchbar + firefox + bool + false + + Disable search bar. + Disable search bar. + + + + + /schemas/apps/firefox/web/disable_cookies + /apps/firefox/web/disable_cookies + firefox + bool + false + + Disable Cookies. + Disable Cookies. + + + + + /schemas/apps/firefox/web/disable_save_password + /apps/firefox/web/disable_save_password + firefox + bool + false + + Disable Save Password. + Disable Save Password. + + + + + /schemas/apps/firefox/web/cache_size + /apps/firefox/web/cache_size + firefox + int + 50000 + + Cache Size. + Cache Size. + + + + + /schemas/apps/firefox/general/homepage_url + /apps/firefox/general/homepage_url + firefox + string + www.novell.com/linux + + Home Page URL. + Home Page URL. + + + + + /schemas/apps/firefox/web/download_defaultfolder + /apps/firefox/web/download_defaultfolder + firefox + string + Desktop + + Default downloadfolder location. + This is the default download folder location. + + + + + /schemas/apps/firefox/lockdown/disable_unsafe_protocol + /apps/firefox/lockdown/disable_unsafe_protocol + firefox + bool + false + + Disable Unsafe Protocol. + Disable Unsafe Protocol. + + + + + /schemas/apps/firefox/lockdown/disable_bookmark_editing + /apps/firefox/lockdown/disable_bookmark_editing + firefox + bool + false + + disable_bookmark_editing. + disable_bookmark_editing. + + + + + /schemas/apps/firefox/lockdown/hide_bookmark + /apps/firefox/lockdown/hide_bookmark + firefox + bool + false + + Hide Bookmarks + Hide Bookmarks. + + + + + /schemas/apps/firefox/lockdown/disable_javascript_chrome + /apps/firefox/lockdown/disable_javascript_chrome + firefox + bool + false + + Disable Javascript Chrome. + Disable Javascript Chrome. + + + + + /schemas/apps/firefox/web/cookie_accept + /apps/firefox/web/cookie_accept + firefox + int + 0 + + Setting Cookies. + Setting Cookies. + + + + + /schemas/apps/firefox/web/images_load + /apps/firefox/web/images_load + firefox + int + 0 + + Setting Loadimages. + Setting Loadimages. + + + + + + /schemas/apps/firefox/lockdown/additional_safe_protocols + /apps/firefox/lockdown/additional_safe_protocols + firefox + string + + + Additional Safe Protocols. + Additional Safe Protocols. + + + + + + /schemas/apps/firefox/general/trusted_URIs + /apps/firefox/general/trusted_URIs + firefox + list + string + [] + + List of URIs for which Kerberos/NTLM is enabled + A comma-separated list of URI keys, of the form + [scheme "://"] [host [":" port]], for which login should be allowed + via SPNEGO Kerberos or NTLM authentication. + + + + + /schemas/apps/firefox/general/delegated_URIs + /apps/firefox/general/delegated_URIs + firefox + list + string + [] + + List of URIs for which Kerberos/NTLM delegation is enabled + A comma-separated list of URI keys, of the form + [scheme "://"] [host [":" port]], for which delegation should be allowed + using SPNEGO Kerberos or NTLM authentication. + + + + + diff --git a/firefox48.png b/firefox48.png new file mode 100644 index 00000000..b806fcbe --- /dev/null +++ b/firefox48.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bab5478fce79ea10ad689b7678118c90c87649f46e232e432337db783d054006 +size 5211 diff --git a/gcc-undefined-ops.patch b/gcc-undefined-ops.patch new file mode 100644 index 00000000..4bc7884e --- /dev/null +++ b/gcc-undefined-ops.patch @@ -0,0 +1,90 @@ +--- layout/base/nsCSSRendering.cpp.orig 2006-10-25 23:59:19.000000000 +0200 ++++ layout/base/nsCSSRendering.cpp 2006-10-26 00:00:04.000000000 +0200 +@@ -1000,14 +1000,14 @@ + FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height-adjust,isInvert); + FillOrInvertRect(aContext,dashRect.x,(borderOutside.YMost()-(dashRect.height-adjust)),dashRect.width, dashRect.height-adjust,isInvert); + currRect.y += (dashRect.height-adjust); +- temp = temp-= (dashRect.height-adjust); ++ temp -= (dashRect.height-adjust); + } else { + adjust = (temp%dashRect.width)/2; // adjust a tad longer + // draw in the left and right + FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height+adjust,isInvert); + FillOrInvertRect(aContext, dashRect.x,(borderOutside.YMost()-(dashRect.height+adjust)),dashRect.width, dashRect.height+adjust,isInvert); + currRect.y += (dashRect.height+adjust); +- temp = temp-= (dashRect.height+adjust); ++ temp -= (dashRect.height+adjust); + } + + if( temp > ywidth) +@@ -1066,14 +1066,14 @@ + FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); + FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width-adjust)),dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); + currRect.x += (dashRect.width-adjust); +- temp = temp-= (dashRect.width-adjust); ++ temp -= (dashRect.width-adjust); + } else { + adjust = (temp%dashRect.width)/2; + // draw in the left and right + FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width+adjust,dashRect.height,isInvert); + FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width+adjust)),dashRect.y,dashRect.width+adjust,dashRect.height,isInvert); + currRect.x += (dashRect.width+adjust); +- temp = temp-= (dashRect.width+adjust); ++ temp -= (dashRect.width+adjust); + } + + +--- layout/xul/base/src/nsBox.cpp.orig 2006-10-26 00:00:26.000000000 +0200 ++++ layout/xul/base/src/nsBox.cpp 2006-10-26 00:01:30.000000000 +0200 +@@ -863,7 +863,7 @@ + while (box) { + nsRect* overflowArea = box->GetOverflowAreaProperty(); + nsRect bounds = overflowArea ? *overflowArea + box->GetPosition() : +- bounds = box->GetRect(); ++ box->GetRect(); + rect.UnionRect(rect, bounds); + + box->GetNextBox(&box); +--- intl/unicharutil/src/nsEntityConverter.cpp.orig 2005-04-02 20:44:00.000000000 +0200 ++++ intl/unicharutil/src/nsEntityConverter.cpp 2006-10-26 00:07:24.000000000 +0200 +@@ -236,7 +236,8 @@ + if (IS_HIGH_SURROGATE(inString[i]) && + i + 2 < len && + IS_LOW_SURROGATE(inString[i + 1])) { +- key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10); ++ key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[i + 1]), 10); ++ ++i; + } + else { + key.AppendInt(inString[i],10); +--- content/events/src/nsEventStateManager.cpp.orig 2006-08-06 00:19:17.000000000 +0200 ++++ content/events/src/nsEventStateManager.cpp 2006-10-26 00:11:16.000000000 +0200 +@@ -4301,7 +4301,7 @@ + do_QueryInterface(GetDocumentOuterWindow(mDocument)); + if (newWindow) { + nsIFocusController *newFocusController = +- newFocusController = newWindow->GetRootFocusController(); ++ newWindow->GetRootFocusController(); + nsCOMPtr oldWindow = + do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument)); + if (oldWindow) { +--- netwerk/cache/src/nsDiskCacheMap.h.orig 2006-02-04 23:01:22.000000000 +0100 ++++ netwerk/cache/src/nsDiskCacheMap.h 2006-10-26 00:15:09.000000000 +0200 +@@ -168,7 +168,7 @@ + + // set blockCount + NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count"); +- blockCount = --blockCount; ++ --blockCount; + mDataLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; + + mDataLocation |= eLocationInitializedMask; +@@ -236,7 +236,7 @@ + + // set blockCount + NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count"); +- blockCount = --blockCount; ++ --blockCount; + mMetaLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; + + mMetaLocation |= eLocationInitializedMask; diff --git a/gconf-backend.patch b/gconf-backend.patch new file mode 100644 index 00000000..3a87d709 --- /dev/null +++ b/gconf-backend.patch @@ -0,0 +1,3267 @@ +Index: extensions/pref/system-pref/src/nsSystemPref.h +================================================================================ +--- browser/installer/unix/packages-static ++++ browser/installer/unix/packages-static +@@ -210,6 +210,7 @@ + bin/components/nsUpdateService.js + bin/components/extensions.xpt + bin/components/update.xpt ++bin/components/libsystem-pref-gconf.so + bin/components/nsBookmarkTransactionManager.js + bin/components/nsSessionStartup.js + bin/components/nsSessionStore.js +--- config/autoconf.mk.in ++++ config/autoconf.mk.in +@@ -226,6 +226,7 @@ + MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@ + MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@ + ++MOZ_ENABLE_GCONF = @MOZ_ENABLE_GCONF@ + MOZ_GCONF_CFLAGS = @MOZ_GCONF_CFLAGS@ + MOZ_GCONF_LIBS = @MOZ_GCONF_LIBS@ + +--- configure.in ++++ configure.in +@@ -4709,6 +4709,7 @@ + ]) + fi + ++ AC_SUBST(MOZ_ENABLE_GCONF) + AC_SUBST(MOZ_GCONF_CFLAGS) + AC_SUBST(MOZ_GCONF_LIBS) + +--- extensions/pref/system-pref/src/Makefile.in ++++ extensions/pref/system-pref/src/Makefile.in +@@ -47,14 +47,13 @@ + include $(DEPTH)/config/autoconf.mk + + MODULE = system-pref +-LIBRARY_NAME = system-pref_s ++LIBRARY_NAME = system-pref + ifneq ($(OS_ARCH),WINNT) + SHORT_LIBNAME = syspref + endif + +-# We want to force the creation of a static lib. +-FORCE_STATIC_LIB = 1 + MOZILLA_INTERNAL_API = 1 ++GRE_MODULE = 1 + + REQUIRES = xpcom \ + string \ +@@ -62,27 +61,25 @@ + pref \ + $(NULL) + +-ifdef MOZ_ENABLE_GTK2 ++ifdef MOZ_ENABLE_GCONF + DIRS = gconf + endif + +-EXTRA_DSO_LDOPTS = \ +- -L$(DIST)/bin \ +- $(MOZ_COMPONENT_LIBS) \ +- $(NULL) +- + CPPSRCS = \ + nsSystemPref.cpp \ ++ nsSystemPrefFactory.cpp \ + $(NULL) + ++EXTRA_DSO_LDOPTS = \ ++ $(MOZ_COMPONENT_LIBS) \ ++ $(NULL) ++ + EXPORTS = \ +- nsSystemPrefLog.h \ ++ nsISystemPrefService.h \ + $(NULL) + +-include $(topsrcdir)/config/rules.mk ++EXPORT_LIBRARY = 1 ++IS_COMPONENT = 1 ++MODULE_NAME = nsSystemPrefModule + +-ifdef MOZ_ENABLE_GTK2 +-INCLUDES += \ +- -I$(srcdir)/gconf \ +- $(NULL) +-endif ++include $(topsrcdir)/config/rules.mk +--- extensions/pref/system-pref/src/gconf/Makefile.in ++++ extensions/pref/system-pref/src/gconf/Makefile.in +@@ -46,44 +46,36 @@ + + include $(DEPTH)/config/autoconf.mk + +-MODULE = system-pref +-LIBRARY_NAME = system-pref ++MODULE = system-pref-gconf ++LIBRARY_NAME = system-pref-gconf + GRE_MODULE = 1 + MOZILLA_INTERNAL_API = 1 + ++PACKAGE_FILE = gconf.pkg ++ + REQUIRES = pref \ ++ system-pref \ + string \ + xpcom \ + embedcomponents \ ++ necko \ + $(NULL) + + CPPSRCS = \ + nsSystemPrefService.cpp \ +- nsSystemPrefFactory.cpp \ + $(NULL) + +-SHARED_LIBRARY_LIBS = $(DIST)/lib/libsystem-pref_s.a +- + EXTRA_DSO_LDOPTS = \ +- -L$(DIST)/bin \ + $(MOZ_COMPONENT_LIBS) \ +- $(MOZ_GTK2_LIBS) \ ++ $(MOZ_GTK2_LIBS) \ ++ $(MOZ_GCONF_LIBS) \ + $(NULL) + +-EXPORT_LIBRARY = 1 ++#EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 +-MODULE_NAME = nsSystemPrefModule +- +-EXPORTS = \ +- nsSystemPrefService.h \ +- $(NULL) ++FORCE_SHARED_LIB = 1 + + include $(topsrcdir)/config/rules.mk + +-CFLAGS += $(MOZ_GTK2_CFLAGS) +-CXXFLAGS += $(MOZ_GTK2_CFLAGS) +- +-LOCAL_INCLUDES = -I$(srcdir)/.. +- +-export:: +- $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . ++CFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GCONF_CFLAGS) ++CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GCONF_CFLAGS) +--- extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp ++++ extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp +@@ -23,7 +23,7 @@ + * + * Original Author: Bolian Yin (bolian.yin@sun.com) + * +- * Contributor(s): ++ * Contributor(s): Robert O'Callahan/Novell (rocallahan@novell.com) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or +@@ -41,6 +41,7 @@ + + #include + #include ++#include + + #include "plstr.h" + #include "nsCOMPtr.h" +@@ -48,837 +49,1259 @@ + #include "nsIServiceManager.h" + #include "nsIObserver.h" + #include "nsWeakReference.h" +- ++#include "nsIPrefBranch2.h" ++#include "nsISystemPrefService.h" ++#include "nsDataHashtable.h" ++#include "nsHashKeys.h" ++#include "nsICategoryManager.h" ++#include "nsIGenericFactory.h" + #include "nsString.h" +-#include "nsSystemPrefLog.h" +-#include "nsSystemPrefService.h" +- +-/************************************************************************* +- * The strange thing here is that we load the gconf library manually and +- * search the function pointers we need. If that process fails, no gconf +- * support is available in mozilla. The aim is to make mozilla independent +- * on gconf, in both compile time and run time. +- ************************************************************************/ +- +-//gconf types +-extern "C" { +- +- typedef enum { +- GCONF_VALUE_INVALID, +- GCONF_VALUE_STRING, +- GCONF_VALUE_INT, +- GCONF_VALUE_FLOAT, +- GCONF_VALUE_BOOL, +- GCONF_VALUE_SCHEMA, +- +- GCONF_VALUE_LIST, +- GCONF_VALUE_PAIR +- +- }GConfValueType; +- +- typedef struct { +- GConfValueType type; +- }GConfValue; +- +- typedef void * (*GConfClientGetDefaultType) (void); +- typedef PRBool (*GConfClientGetBoolType) (void *client, const gchar *key, +- GError **err); +- typedef gchar* (*GConfClientGetStringType) (void *client, const gchar *key, +- GError **err); +- typedef PRInt32 (*GConfClientGetIntType) (void *client, const gchar *key, +- GError **err); +- typedef void (*GConfClientNotifyFuncType) (void* client, guint cnxn_id, +- void *entry, +- gpointer user_data); +- typedef guint (*GConfClientNotifyAddType) (void* client, +- const gchar* namespace_section, +- GConfClientNotifyFuncType func, +- gpointer user_data, +- GFreeFunc destroy_notify, +- GError** err); +- typedef void (*GConfClientNotifyRemoveType) (void *client, +- guint cnxn); +- typedef void (*GConfClientAddDirType) (void *client, +- const gchar *dir, +- guint8 preload, +- GError **err); +- typedef void (*GConfClientRemoveDirType) (void *client, +- const gchar *dir, +- GError **err); +- +- typedef const char* (*GConfEntryGetKeyType) (const void *entry); +- typedef GConfValue* (*GConfEntryGetValueType) (const void *entry); +- +- typedef const char* (*GConfValueGetStringType) (const GConfValue *value); +- typedef PRInt32 (*GConfValueGetIntType) (const GConfValue *value); +- typedef PRBool (*GConfValueGetBoolType) (const GConfValue *value); ++#include "nsIPermissionManager.h" + +- +- static void gconf_key_listener (void* client, guint cnxn_id, +- void *entry, gpointer user_data); +-} ++#define NS_SYSTEMPREF_SERVICE_CID \ ++ { /* {3724e748-b088-4bf8-9298-aad426b66293} */ \ ++ 0x3724e748, \ ++ 0xb088, \ ++ 0x4bf8, \ ++ { 0x92, 0x98, 0xaa, 0xd4, 0x26, 0xb6, 0x62, 0x93 } \ ++ } ++ ++#define NS_SYSTEMPREF_SERVICE_CLASSNAME "System Preferences Platform Service" ++ ++/** ++ * We can link directly to the gconf library. If it's not available, ++ * this component just won't load and no system prefs will be offered. ++ */ ++ ++#define NUM_ELEM(a) (sizeof(a)/sizeof(a[0])) ++ ++class nsSystemPrefService; ++ ++/** ++ * List the preferences that have a simple mapping between Moz and gconf. ++ * These preferences have the same meaning and their values are ++ * automatically converted. ++ */ ++struct SimplePrefMapping { ++ const char *mozPrefName; ++ const char *gconfPrefName; ++ /** ++ * If this is PR_FALSE, then we never allow Mozilla to change ++ * this setting. The Mozilla pref will always be locked. ++ * If this is PR_TRUE then Mozilla will be allowed to change ++ * the setting --- but only if it is writable in gconf. ++ */ ++ PRBool allowWritesFromMozilla; ++}; ++typedef nsresult (* ComplexGConfPrefChanged)(nsSystemPrefService* aPrefService, ++ GConfClient* aClient); ++typedef nsresult (* ComplexMozPrefChanged)(nsSystemPrefService* aPrefService, ++ GConfClient* aClient); ++struct ComplexGConfPrefMapping { ++ const char* gconfPrefName; ++ ComplexGConfPrefChanged callback; ++}; + +-struct GConfCallbackData +-{ +- GConfProxy *proxy; +- void * userData; +- PRUint32 atom; +- PRUint32 notifyId; ++struct ComplexMozPrefMapping { ++ const char* mozPrefName; ++ ComplexMozPrefChanged callback; + }; +-////////////////////////////////////////////////////////////////////// +-// GConPrxoy is a thin wrapper for easy use of gconf funcs. It loads the +-// gconf library and initializes the func pointers for later use. +-////////////////////////////////////////////////////////////////////// +-class GConfProxy ++ ++class nsSystemPrefService : public nsISystemPrefService + { + public: +- GConfProxy(nsSystemPrefService* aSysPrefService); +- ~GConfProxy(); +- PRBool Init(); +- +- nsresult GetBoolPref(const char *aMozKey, PRBool *retval); +- nsresult GetCharPref(const char *aMozKey, char **retval); +- nsresult GetIntPref(const char *aMozKey, PRInt32 *retval); ++ NS_DECL_ISUPPORTS + +- nsresult NotifyAdd (PRUint32 aAtom, void *aUserData); +- nsresult NotifyRemove (PRUint32 aAtom, const void *aUserData); ++ nsresult Init(); + +- nsresult GetAtomForMozKey(const char *aMozKey, PRUint32 *aAtom) { +- return GetAtom(aMozKey, 0, aAtom); +- } +- const char *GetMozKey(PRUint32 aAtom) { +- return GetKey(aAtom, 0); ++ virtual nsresult LoadSystemPreferences(nsISystemPref* aPrefs); ++ virtual nsresult NotifyMozillaPrefChanged(const char* aPrefName); ++ virtual nsresult NotifyUnloadSystemPreferences(); ++ ++ nsSystemPrefService(); ++ virtual ~nsSystemPrefService(); ++ ++ nsISystemPref* GetPrefs() { return mPref; } ++ SimplePrefMapping* GetSimpleCallbackData(PRUint32 aKey) { ++ SimplePrefMapping* result = nsnull; ++ mGConfSimpleCallbacks.Get(aKey, &result); ++ return result; ++ } ++ ComplexGConfPrefMapping* GetComplexCallbackData(PRUint32 aKey) { ++ ComplexGConfPrefMapping* result = nsnull; ++ mGConfComplexCallbacks.Get(aKey, &result); ++ return result; + } + +- void OnNotify(void *aClient, void * aEntry, PRUint32 aNotifyId, +- GConfCallbackData *aData); +- + private: +- void *mGConfClient; +- PRLibrary *mGConfLib; +- PRBool mInitialized; +- nsSystemPrefService *mSysPrefService; +- +- //listeners +- nsAutoVoidArray *mObservers; +- +- void InitFuncPtrs(); +- //gconf public func ptrs +- +- //gconf client funcs +- GConfClientGetDefaultType GConfClientGetDefault; +- GConfClientGetBoolType GConfClientGetBool; +- GConfClientGetStringType GConfClientGetString; +- GConfClientGetIntType GConfClientGetInt; +- GConfClientNotifyAddType GConfClientNotifyAdd; +- GConfClientNotifyRemoveType GConfClientNotifyRemove; +- GConfClientAddDirType GConfClientAddDir; +- GConfClientRemoveDirType GConfClientRemoveDir; +- +- //gconf entry funcs +- GConfEntryGetValueType GConfEntryGetValue; +- GConfEntryGetKeyType GConfEntryGetKey; +- +- //gconf value funcs +- GConfValueGetBoolType GConfValueGetBool; +- GConfValueGetStringType GConfValueGetString; +- GConfValueGetIntType GConfValueGetInt; +- +- //pref name translating stuff +- nsresult GetAtom(const char *aKey, PRUint8 aNameType, PRUint32 *aAtom); +- nsresult GetAtomForGConfKey(const char *aGConfKey, PRUint32 *aAtom) \ +- {return GetAtom(aGConfKey, 1, aAtom);} +- const char *GetKey(PRUint32 aAtom, PRUint8 aNameType); +- const char *GetGConfKey(PRUint32 aAtom) \ +- {return GetKey(aAtom, 1); } +- inline const char *MozKey2GConfKey(const char *aMozKey); +- +- //const strings +- static const char sPrefGConfKey[]; +- static const char sDefaultLibName1[]; +- static const char sDefaultLibName2[]; ++ nsISystemPref* mPref; ++ nsDataHashtable mGConfSimpleCallbacks; ++ nsDataHashtable mGConfComplexCallbacks; ++ // This is set to PR_FALSE temporarily to stop listening to gconf ++ // change notifications (while we change gconf values) ++ PRPackedBool mListenToGConf; + }; + +-struct SysPrefCallbackData { +- nsISupports *observer; +- PRBool bIsWeakRef; +- PRUint32 prefAtom; +-}; +- +-PRBool PR_CALLBACK +-sysPrefDeleteObserver(void *aElement, void *aData) { +- SysPrefCallbackData *pElement = +- NS_STATIC_CAST(SysPrefCallbackData *, aElement); +- NS_RELEASE(pElement->observer); +- nsMemory::Free(pElement); +- return PR_TRUE; +-} +- +-NS_IMPL_ISUPPORTS2(nsSystemPrefService, nsIPrefBranch, nsIPrefBranch2) +- +-/* public */ + nsSystemPrefService::nsSystemPrefService() +- :mInitialized(PR_FALSE), +- mGConf(nsnull), +- mObservers(nsnull) ++ : mPref(nsnull), mListenToGConf(PR_TRUE) + { ++ mGConfSimpleCallbacks.Init(); ++ mGConfComplexCallbacks.Init(); + } + + nsSystemPrefService::~nsSystemPrefService() + { +- mInitialized = PR_FALSE; +- +- if (mGConf) +- delete mGConf; +- if (mObservers) { +- (void)mObservers->EnumerateForwards(sysPrefDeleteObserver, nsnull); +- delete mObservers; +- } ++ NotifyUnloadSystemPreferences(); + } + + nsresult + nsSystemPrefService::Init() + { +- if (!gSysPrefLog) { +- gSysPrefLog = PR_NewLogModule("Syspref"); +- if (!gSysPrefLog) return NS_ERROR_OUT_OF_MEMORY; +- } +- +- SYSPREF_LOG(("Init SystemPref Service\n")); +- if (mInitialized) +- return NS_ERROR_FAILURE; +- +- if (!mGConf) { +- mGConf = new GConfProxy(this); +- if (!mGConf->Init()) { +- delete mGConf; +- mGConf = nsnull; +- return NS_ERROR_FAILURE; +- } +- } +- +- mInitialized = PR_TRUE; + return NS_OK; + } + +-/* readonly attribute string root; */ +-NS_IMETHODIMP nsSystemPrefService::GetRoot(char * *aRoot) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++NS_IMPL_ISUPPORTS1(nsSystemPrefService, nsISystemPrefService) + +-/* long getPrefType (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::GetPrefType(const char *aPrefName, PRInt32 *_retval) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; ++static GConfClient* GetGConf() { ++ return gconf_client_get_default(); + } + +-/* boolean getBoolPref (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::GetBoolPref(const char *aPrefName, PRBool *_retval) ++static PRBool VerifyMatchingTypes(nsISystemPref* aPrefs, ++ const char* aMozPref, GConfValue* aVal) + { +- return mInitialized ? +- mGConf->GetBoolPref(aPrefName, _retval) : NS_ERROR_FAILURE; +-} ++ nsCOMPtr prefBranch = aPrefs->GetPrefUserBranch(); ++ PRInt32 type; ++ nsresult rv = prefBranch->GetPrefType(aMozPref, &type); ++ if (NS_FAILED(rv)) { ++ // pref probably doesn't exist. Let gconf set it. ++ return PR_TRUE; ++ } + +-/* void setBoolPref (in string aPrefName, in long aValue); */ +-NS_IMETHODIMP nsSystemPrefService::SetBoolPref(const char *aPrefName, PRInt32 aValue) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; ++ PRBool ok; ++ switch (aVal->type) { ++ case GCONF_VALUE_STRING: ++ ok = type == nsIPrefBranch2::PREF_STRING; ++ break; ++ case GCONF_VALUE_INT: ++ ok = type == nsIPrefBranch2::PREF_INT; ++ break; ++ case GCONF_VALUE_BOOL: ++ ok = type == nsIPrefBranch2::PREF_BOOL; ++ break; ++ default: ++ NS_ERROR("Unhandled gconf preference type"); ++ return PR_FALSE; ++ } ++ ++ NS_ASSERTION(ok, "Mismatched gconf/Mozilla pref types"); ++ return ok; + } + +-/* string getCharPref (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::GetCharPref(const char *aPrefName, char **_retval) +-{ +- return mInitialized ? +- mGConf->GetCharPref(aPrefName, _retval) : NS_ERROR_FAILURE; +-} ++/** ++ * Map a gconf pref value into the corresponding Mozilla pref. ++ */ ++static nsresult ApplySimpleMapping(SimplePrefMapping* aMap, ++ nsISystemPref* aPrefs, ++ GConfClient* aClient) ++{ ++ GConfValue* val = gconf_client_get(aClient, aMap->gconfPrefName, nsnull); ++ if (!val) { ++ // No gconf key, so there's really nothing to do ++ return NS_OK; ++ } + +-/* void setCharPref (in string aPrefName, in string aValue); */ +-NS_IMETHODIMP nsSystemPrefService::SetCharPref(const char *aPrefName, const char *aValue) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++ VerifyMatchingTypes(aPrefs, aMap->mozPrefName, val); + +-/* long getIntPref (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::GetIntPref(const char *aPrefName, PRInt32 *_retval) +-{ +- return mInitialized ? +- mGConf->GetIntPref(aPrefName, _retval) : NS_ERROR_FAILURE; +-} ++ PRBool locked = !aMap->allowWritesFromMozilla || ++ !gconf_client_key_is_writable(aClient, aMap->gconfPrefName, nsnull); ++ nsresult rv; ++ switch (val->type) { ++ case GCONF_VALUE_STRING: { ++ const char* str = gconf_value_get_string(val); ++ rv = aPrefs->SetOverridingMozillaStringPref(aMap->mozPrefName, str, locked); ++ // XXX do we need to free 'str' here? ++ break; ++ } ++ case GCONF_VALUE_INT: ++ rv = aPrefs->SetOverridingMozillaIntPref(aMap->mozPrefName, ++ gconf_value_get_int(val), locked); ++ break; ++ case GCONF_VALUE_BOOL: ++ rv = aPrefs->SetOverridingMozillaBoolPref(aMap->mozPrefName, ++ gconf_value_get_bool(val), locked); ++ break; ++ default: ++ NS_ERROR("Unusable gconf value type"); ++ rv = NS_ERROR_FAILURE; ++ break; ++ } ++ ++ gconf_value_free(val); ++ return rv; ++} ++ ++/** ++ * Map a Mozilla pref into the corresponding gconf pref, if ++ * that's allowed. ++ */ ++static nsresult ReverseApplySimpleMapping(SimplePrefMapping* aMap, ++ nsISystemPref* aPrefs, ++ GConfClient* aClient) ++{ ++ // Verify that the gconf key has the right type, if it exists ++ GConfValue* val = gconf_client_get(aClient, aMap->gconfPrefName, nsnull); ++ if (val) { ++ VerifyMatchingTypes(aPrefs, aMap->mozPrefName, val); ++ gconf_value_free(val); ++ } ++ ++ PRBool writable = aMap->allowWritesFromMozilla && ++ gconf_client_key_is_writable(aClient, aMap->gconfPrefName, nsnull); ++ if (!writable) { ++ NS_ERROR("Gconf key is not writable"); ++ return NS_ERROR_FAILURE; ++ } + +-/* void setIntPref (in string aPrefName, in long aValue); */ +-NS_IMETHODIMP nsSystemPrefService::SetIntPref(const char *aPrefName, PRInt32 aValue) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++ nsCOMPtr prefBranch = aPrefs->GetPrefUserBranch(); ++ PRInt32 type; ++ nsresult rv = prefBranch->GetPrefType(aMap->mozPrefName, &type); ++ if (NS_FAILED(rv)) { ++ NS_ERROR("Writing back a pref that doesn't exist?"); ++ return rv; ++ } + +-/* void getComplexValue (in string aPrefName, in nsIIDRef aType, [iid_is (aType), retval] out nsQIResult aValue); */ +-NS_IMETHODIMP nsSystemPrefService::GetComplexValue(const char *aPrefName, const nsIID & aType, void * *aValue) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++ switch (type) { ++ case nsIPrefBranch2::PREF_STRING: ++ { ++ char* result; ++ rv = prefBranch->GetCharPref(aMap->mozPrefName, &result); ++ if (NS_FAILED(rv)) ++ return rv; + +-/* void setComplexValue (in string aPrefName, in nsIIDRef aType, in nsISupports aValue); */ +-NS_IMETHODIMP nsSystemPrefService::SetComplexValue(const char *aPrefName, const nsIID & aType, nsISupports *aValue) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++ gconf_client_set_string(aClient, aMap->gconfPrefName, result, nsnull); ++ nsMemory::Free(result); ++ } ++ break; ++ case nsIPrefBranch2::PREF_INT: ++ { ++ PRInt32 result; ++ rv = prefBranch->GetIntPref(aMap->mozPrefName, &result); ++ if (NS_FAILED(rv)) ++ return rv; + +-/* void clearUserPref (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::ClearUserPref(const char *aPrefName) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++ gconf_client_set_int(aClient, aMap->gconfPrefName, result, nsnull); ++ } ++ break; ++ case nsIPrefBranch2::PREF_BOOL: ++ { ++ PRBool result; ++ rv = prefBranch->GetBoolPref(aMap->mozPrefName, &result); ++ if (NS_FAILED(rv)) ++ return rv; + +-/* void lockPref (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::LockPref(const char *aPrefName) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++ gconf_client_set_bool(aClient, aMap->gconfPrefName, result, nsnull); ++ } ++ break; ++ default: ++ NS_ERROR("Unhandled gconf preference type"); ++ return NS_ERROR_FAILURE; ++ } + +-/* boolean prefHasUserValue (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::PrefHasUserValue(const char *aPrefName, PRBool *_retval) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; ++ return NS_OK; + } + +-/* boolean prefIsLocked (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::PrefIsLocked(const char *aPrefName, PRBool *_retval) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; +-} ++/* BEGIN preference mapping definition area ++ * ++ * There are a few rules that our preference maps have to obey: ++ * ++ * 1) Each mapping defines a relationship R between a set of GConf preferences and ++ * a set of Mozilla preferences that must *always* be true. Thus, when a Mozilla ++ * pref changes or a gconf pref changes, we may need to change something on the ++ * other side to preserve R. If a GConf preference is read-only, then we may ++ * need to lock one or more Mozilla preferences to avoid a situation where the ++ * Mozilla preference changes and we can't update the GConf preference to ++ * ensure R continues to hold. ++ * ++ * 2) If an unlocked Mozilla preference is changed, then we can only ++ * preserve R by changing GConf preferences; we are not allowed to ++ * change Mozilla preferences. ++ * ++ * 3) If a GConf preference is changed, then we can only preserve R by ++ * changing Moozilla preferences; we are nt allowed to change GConf ++ * preferences. ++ * ++ * For "simple" mappings, the relationship R is just of the form ++ * "GConf preference 'A' is equal to Mozilla preference 'B'". R is ++ * preserved by setting A to B when B changes, and by setting B to A ++ * when A changes. If A is read-only then we lock B (or we may just ++ * decide to lock B for other reasons). Thus rules 1-3 are satisfied. ++ * ++ * For "complex" mappings we have more complicated ++ * relationships. These are documented below. ++ */ ++ ++static SimplePrefMapping sSimplePrefMappings[] = { ++ // GNOME proxy settings; allow these to be set through the Firefox UI ++ {"network.proxy.http", "/system/http_proxy/host", PR_TRUE}, ++ {"network.proxy.http_port", "/system/http_proxy/port", PR_TRUE}, ++ {"network.proxy.ftp", "/system/proxy/ftp_host", PR_TRUE}, ++ {"network.proxy.ftp_port", "/system/proxy/ftp_port", PR_TRUE}, ++ {"network.proxy.ssl", "/system/proxy/secure_host", PR_TRUE}, ++ {"network.proxy.ssl_port", "/system/proxy/secure_port", PR_TRUE}, ++ {"network.proxy.socks", "/system/proxy/socks_host", PR_TRUE}, ++ {"network.proxy.socks_port", "/system/proxy/socks_port", PR_TRUE}, ++ {"network.proxy.autoconfig_url", "/system/proxy/autoconfig_url", PR_TRUE}, ++ ++ // GNOME accessibility setting; never allow this to be set by Firefox ++ {"config.use_system_prefs.accessibility", ++ "/desktop/gnome/interface/accessibility", PR_FALSE}, ++ ++ // GConf Firefox preferences; allow these to be set through the Firefox UI ++ {"security.enable_java", "/apps/firefox/web/java_enabled", PR_TRUE}, ++ {"javascript.enabled", "/apps/firefox/web/javascript_enabled", PR_TRUE}, ++ {"browser.startup.homepage", "/apps/firefox/general/homepage_url", PR_TRUE}, ++ {"browser.cache.disk.capacity", "/apps/firefox/web/cache_size", PR_TRUE}, ++ {"network.cookie.lifetimePolicy", "/apps/firefox/web/cookie_accept", PR_TRUE}, ++ ++ // UI lockdown settings; never allow these to be set by Firefox. There is no ++ // Firefox UI for these but they could otherwise be set via about:config. ++ {"config.lockdown.printing", "/desktop/gnome/lockdown/disable_printing", PR_FALSE}, ++ {"config.lockdown.printsetup", "/desktop/gnome/lockdown/disable_print_setup", PR_FALSE}, ++ {"config.lockdown.savepage", "/desktop/gnome/lockdown/disable_save_to_disk", PR_FALSE}, ++ {"config.lockdown.history", "/apps/firefox/lockdown/disable_history", PR_FALSE}, ++ {"config.lockdown.toolbarediting", "/apps/firefox/lockdown/disable_toolbar_editing", PR_FALSE}, ++ {"config.lockdown.urlbar", "/apps/firefox/lockdown/disable_url_bar", PR_FALSE}, ++ {"config.lockdown.bookmark", "/apps/firefox/lockdown/disable_bookmark_editing", PR_FALSE}, ++ {"config.lockdown.disable_themes", "/apps/firefox/lockdown/disable_themes", PR_FALSE}, ++ {"config.lockdown.disable_extensions", "/apps/firefox/lockdown/disable_extensions", PR_FALSE}, ++ {"config.lockdown.searchbar", "/apps/firefox/lockdown/disable_searchbar", PR_FALSE}, ++ {"config.lockdown.hidebookmark", "/apps/firefox/lockdown/hide_bookmark", PR_FALSE}, ++}; + +-/* void unlockPref (in string aPrefName); */ +-NS_IMETHODIMP nsSystemPrefService::UnlockPref(const char *aPrefName) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; ++static nsresult ApplyListPref(nsSystemPrefService* aPrefService, ++ GConfClient* aClient, ++ const char* aGConfKey, const char* aMozKey, ++ char aSeparator) ++{ ++ GSList* list = gconf_client_get_list(aClient, aGConfKey, ++ GCONF_VALUE_STRING, nsnull); ++ nsCAutoString str; ++ for (GSList* l = list; l; l = l->next) { ++ str.Append((const char*)l->data); ++ if (l->next) { ++ str.Append(aSeparator); ++ } ++ } ++ PRBool lock = !gconf_client_key_is_writable(aClient, aGConfKey, nsnull); ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaStringPref(aMozKey, str.get(), lock); ++ // XXX does this free the strings? Should it? ++ g_slist_free(list); ++ return rv; ++} ++static nsresult ReverseApplyListPref(nsSystemPrefService* aPrefService, ++ GConfClient* aClient, ++ const char* aGConfKey, const char* aMozKey, ++ char aSeparator) ++{ ++ char* data = nsnull; ++ nsCOMPtr prefs = ++ aPrefService->GetPrefs()->GetPrefUserBranch(); ++ prefs->GetCharPref(aMozKey, &data); ++ if (!data) ++ return NS_ERROR_FAILURE; ++ nsresult rv = NS_OK; ++ GSList* list = nsnull; ++ PRInt32 i = 0; ++ while (data[i]) { ++ const char* nextComma = strchr(data+i, ','); ++ PRInt32 tokLen = nextComma ? nextComma - (data+i) : strlen(data+i); ++ char* tok = strndup(data+i, tokLen); ++ if (!tok) ++ break; ++ GSList* newList = g_slist_append(list, tok); ++ if (!newList) { ++ rv = NS_ERROR_OUT_OF_MEMORY; ++ break; ++ } ++ list = newList; ++ if (!nextComma) ++ break; ++ i = nextComma + 1 - data; ++ } ++ nsMemory::Free(data); ++ if (NS_SUCCEEDED(rv)) { ++ gconf_client_set_list(aClient, aGConfKey, GCONF_VALUE_STRING, list, nsnull); ++ } ++ for (GSList* l = list; l; l = l->next) { ++ free(l->data); ++ } ++ g_slist_free(list); ++ return rv; + } + +-/* void deleteBranch (in string aStartingAt); */ +-NS_IMETHODIMP nsSystemPrefService::DeleteBranch(const char *aStartingAt) ++/** ++ * The relationship R is ++ * "network.negotiate-auth.trusted-uris" is the comma-separated concatenation ++ * of the elements of the list "/apps/firefox/general/trusted_URIs" ++ */ ++static const char GConfKey_TrustedURIs[] = "/apps/firefox/general/trusted_URIs"; ++static const char MozKey_TrustedURIs[] = "network.negotiate-auth.trusted-uris"; ++static nsresult ApplyTrustedURIs(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ return ApplyListPref(aPrefService, aClient, ++ GConfKey_TrustedURIs, MozKey_TrustedURIs, ','); ++} ++static nsresult ReverseApplyTrustedURIs(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ return ReverseApplyListPref(aPrefService, aClient, ++ GConfKey_TrustedURIs, MozKey_TrustedURIs, ','); ++} ++ ++/** ++ * The relationship R is ++ * "network.negotiate-auth.delegation-uris" is the comma-separated concatenation ++ * of the elements of the list "/apps/firefox/general/delegation_URIs" ++ */ ++static const char GConfKey_DelegationURIs[] = "/apps/firefox/general/delegation_URIs"; ++static const char MozKey_DelegationURIs[] = "network.negotiate-auth.delegation-uris"; ++static nsresult ApplyDelegationURIs(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ return ApplyListPref(aPrefService, aClient, ++ GConfKey_DelegationURIs, MozKey_DelegationURIs, ','); ++} ++static nsresult ReverseApplyDelegationURIs(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ return ReverseApplyListPref(aPrefService, aClient, ++ GConfKey_DelegationURIs, MozKey_DelegationURIs, ','); ++} ++ ++/** ++ * The relationship R is ++ * "network.proxy.no_proxies_on" is the comma-separated concatenation ++ * of the elements of the list "/system/http_proxy/ignore_hosts" ++ */ ++static const char GConfKey_IgnoreHosts[] = "/system/http_proxy/ignore_hosts"; ++static const char MozKey_IgnoreHosts[] = "network.proxy.no_proxies_on"; ++static nsresult ApplyIgnoreHosts(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ return ApplyListPref(aPrefService, aClient, ++ GConfKey_IgnoreHosts, MozKey_IgnoreHosts, ','); ++} ++static nsresult ReverseApplyIgnoreHosts(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ return ReverseApplyListPref(aPrefService, aClient, ++ GConfKey_IgnoreHosts, MozKey_IgnoreHosts, ','); ++} ++ ++/** ++ * The relationship R is ++ * ("/system/proxy/mode" is 'manual' if and only if "network.proxy.type" is eProxyConfig_Manual (1)) ++ * AND ("/system/proxy/mode" is 'auto' if and only if "network.proxy.type" is eProxyConfig_PAC (2)) ++ * ++ * [This means 'none' matches any value of "network.proxy.type" other than 1 or 2.] ++ */ ++static const char GConfKey_ProxyMode[] = "/system/proxy/mode"; ++static const char MozKey_ProxyMode[] = "network.proxy.type"; ++static nsresult ApplyProxyMode(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) + { +- return NS_ERROR_NOT_IMPLEMENTED; ++ char* str = gconf_client_get_string(aClient, GConfKey_ProxyMode, nsnull); ++ if (!str) ++ return NS_ERROR_FAILURE; ++ PRInt32 val = -1; ++ nsCOMPtr prefs = ++ aPrefService->GetPrefs()->GetPrefUserBranch(); ++ prefs->GetIntPref(MozKey_ProxyMode, &val); ++ if (val < 0) ++ return NS_ERROR_FAILURE; ++ if (!strcmp(str, "manual")) { ++ val = 1; ++ } else if (!strcmp(str, "auto")) { ++ val = 2; ++ } else if (strcmp(str, "none")) { ++ // invalid value for this gconf pref; do nothing ++ g_free(str); ++ return NS_OK; ++ } else { ++ if (val == 1 || val == 2) { ++ // We need to make it something that 'none' maps to ++ val = 0; ++ } ++ } ++ g_free(str); ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_ProxyMode, nsnull); ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaIntPref(MozKey_ProxyMode, val, lock); ++ return rv; ++} ++static nsresult ReverseApplyProxyMode(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRInt32 val = -1; ++ nsCOMPtr prefs = ++ aPrefService->GetPrefs()->GetPrefUserBranch(); ++ prefs->GetIntPref(MozKey_ProxyMode, &val); ++ if (val < 0) ++ return NS_ERROR_FAILURE; ++ const char* str; ++ switch (val) { ++ case 1: str = "manual"; break; ++ case 2: str = "auto"; break; ++ default: str = "none"; break; ++ } ++ gconf_client_set_string(aClient, GConfKey_ProxyMode, str, nsnull); ++ return NS_OK; + } + +-/* void getChildList (in string aStartingAt, out unsigned long aCount, [array, size_is (aCount), retval] out string aChildArray); */ +-NS_IMETHODIMP nsSystemPrefService::GetChildList(const char *aStartingAt, PRUint32 *aCount, char ***aChildArray) ++/** ++ * The relationship R is ++ * If "/apps/firefox/web/download_defaultfolder" is the empty string, then ++ * "browser.download.useDownloadDir" is false; ++ * otherwise "browser.download.useDownloadDir" is true and "browser.download.folderList" ++ * is (0 if "/apps/firefox/web/download_defaultfolder" is "Desktop"; ++ * 1 if "/apps/firefox/web/download_defaultfolder" is "My Downloads"; ++ * 3 if "/apps/firefox/web/download_defaultfolder" is "Home"; ++ * otherwise 2 and "browser.download.dir" = "/apps/firefox/web/download_defaultfolder") ++ */ ++static const char GConfKey_DownloadFolder[] = "/apps/firefox/web/download_defaultfolder"; ++static const char MozKey_UseDownloadDir[] = "browser.download.useDownloadDir"; ++static const char MozKey_DownloadDirType[] = "browser.download.folderList"; ++static const char MozKey_DownloadDirExplicit[] = "browser.download.dir"; ++static nsresult ApplyDownloadFolder(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) + { +- return NS_ERROR_NOT_IMPLEMENTED; ++ char* str = gconf_client_get_string(aClient, GConfKey_DownloadFolder, nsnull); ++ if (!str) ++ return NS_ERROR_FAILURE; ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_DownloadFolder, nsnull); ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_UseDownloadDir, *str != 0, lock); ++ if (NS_FAILED(rv)) { ++ g_free(str); ++ return rv; ++ } ++ PRInt32 dirType = 0; ++ if (!strcmp(str, "Desktop")) { ++ dirType = 0; ++ } else if (!strcmp(str, "My Downloads")) { ++ dirType = 1; ++ } else if (!strcmp(str, "Home")) { ++ dirType = 3; ++ } else { ++ dirType = 2; ++ } ++ // Always set all three Mozilla preferences. This is simpler and avoids ++ // problems; e.g., if the gconf value changes from "/home/rocallahan" to "Desktop" ++ // we might leave MozKey_DownloadDirType accidentally locked. ++ rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaIntPref(MozKey_DownloadDirType, dirType, lock); ++ if (NS_SUCCEEDED(rv)) { ++ rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaStringPref(MozKey_DownloadDirExplicit, str, lock); ++ } ++ g_free(str); ++ return rv; + } + +-/* void resetBranch (in string aStartingAt); */ +-NS_IMETHODIMP nsSystemPrefService::ResetBranch(const char *aStartingAt) +-{ +- return NS_ERROR_NOT_IMPLEMENTED; ++static nsresult ReverseApplyDownloadFolder(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRBool useDownloadDir = PR_FALSE; ++ const char* result; ++ char* explicitStr = nsnull; ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ prefs->GetBoolPref(MozKey_UseDownloadDir, &useDownloadDir); ++ if (!useDownloadDir) { ++ result = ""; ++ } else { ++ PRInt32 type = -1; ++ prefs->GetIntPref(MozKey_DownloadDirType, &type); ++ if (type < 0) ++ return NS_ERROR_FAILURE; ++ switch (type) { ++ case 0: result = "Desktop"; break; ++ case 1: result = "My Downloads"; break; ++ case 2: ++ prefs->GetCharPref(MozKey_DownloadDirExplicit, &explicitStr); ++ result = explicitStr; ++ break; ++ case 3: result = "Home"; break; ++ default: ++ NS_ERROR("Unknown download dir type"); ++ return NS_ERROR_FAILURE; ++ } ++ } ++ if (!result) ++ return NS_ERROR_FAILURE; ++ gconf_client_set_string(aClient, GConfKey_DownloadFolder, ++ result, nsnull); ++ nsMemory::Free(explicitStr); ++ return NS_OK; + } + +-/* void addObserver (in string aDomain, in nsIObserver aObserver, in boolean aHoldWeak); */ +-NS_IMETHODIMP nsSystemPrefService::AddObserver(const char *aDomain, nsIObserver *aObserver, PRBool aHoldWeak) +-{ +- nsresult rv; +- +- NS_ENSURE_ARG_POINTER(aDomain); +- NS_ENSURE_ARG_POINTER(aObserver); +- +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); +- +- PRUint32 prefAtom; +- // make sure the pref name is supported +- rv = mGConf->GetAtomForMozKey(aDomain, &prefAtom); +- NS_ENSURE_SUCCESS(rv, rv); +- +- if (!mObservers) { +- mObservers = new nsAutoVoidArray(); +- if (mObservers == nsnull) +- return NS_ERROR_OUT_OF_MEMORY; +- } +- +- SysPrefCallbackData *pCallbackData = (SysPrefCallbackData *) +- nsMemory::Alloc(sizeof(SysPrefCallbackData)); +- if (pCallbackData == nsnull) +- return NS_ERROR_OUT_OF_MEMORY; +- +- pCallbackData->bIsWeakRef = aHoldWeak; +- pCallbackData->prefAtom = prefAtom; +- // hold a weak reference to the observer if so requested +- nsCOMPtr observerRef; +- if (aHoldWeak) { +- nsCOMPtr weakRefFactory = +- do_QueryInterface(aObserver); +- if (!weakRefFactory) { +- // the caller didn't give us a object that supports weak reference. +- // ... tell them +- nsMemory::Free(pCallbackData); +- return NS_ERROR_INVALID_ARG; +- } +- nsCOMPtr tmp = do_GetWeakReference(weakRefFactory); +- observerRef = tmp; ++/** ++ * The relationship R is ++ * "/apps/firefox/web/disable_cookies" is true if and only if ++ * "network.cookie.cookieBehavior" is 2 ('dontUse') ++ */ ++static const char GConfKey_DisableCookies[] = "/apps/firefox/web/disable_cookies"; ++static const char MozKey_CookieBehavior[] = "network.cookie.cookieBehavior"; ++static const char MozKey_CookieExceptions[] = "network.cookie.honorExceptions"; ++static const char MozKey_CookieViewExceptions[] = "pref.privacy.disable_button.cookie_exceptions"; ++static nsresult ApplyDisableCookies(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ gboolean disable = gconf_client_get_bool(aClient, GConfKey_DisableCookies, nsnull); ++ PRInt32 behavior = -1; ++ nsCOMPtr prefs = ++ aPrefService->GetPrefs()->GetPrefUserBranch(); ++ prefs->GetIntPref(MozKey_CookieBehavior, &behavior); ++ if (behavior < 0) ++ return NS_ERROR_FAILURE; ++ if (disable) { ++ behavior = 2; + } else { +- observerRef = aObserver; ++ if (behavior == 2) { ++ behavior = 0; ++ } + } ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_DisableCookies, nsnull); ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_CookieExceptions, !lock, lock); ++ if (NS_FAILED(rv)) ++ return rv; ++ rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_CookieViewExceptions, lock, lock); ++ if (NS_FAILED(rv)) ++ return rv; ++ return aPrefService->GetPrefs()-> ++ SetOverridingMozillaIntPref(MozKey_CookieBehavior, behavior, lock); ++} ++static nsresult ReverseApplyDisableCookies(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRInt32 behavior = -1; ++ nsCOMPtr prefs = ++ aPrefService->GetPrefs()->GetPrefUserBranch(); ++ prefs->GetIntPref(MozKey_CookieBehavior, &behavior); ++ if (behavior < 0) ++ return NS_ERROR_FAILURE; ++ gconf_client_set_bool(aClient, GConfKey_DisableCookies, behavior == 2, nsnull); ++ return NS_OK; ++} + +- rv = mGConf->NotifyAdd(prefAtom, pCallbackData); +- if (NS_FAILED(rv)) { +- nsMemory::Free(pCallbackData); +- return rv; ++static char const* windowOpenFeatures[] = { ++ "dom.disable_window_open_feature.close", ++ "dom.disable_window_open_feature.directories", ++ "dom.disable_window_open_feature.location", ++ "dom.disable_window_open_feature.menubar", ++ "dom.disable_window_open_feature.minimizable", ++ "dom.disable_window_open_feature.personalbar", ++ "dom.disable_window_open_feature.resizable", ++ "dom.disable_window_open_feature.scrollbars", ++ "dom.disable_window_open_feature.status", ++ "dom.disable_window_open_feature.titlebar", ++ "dom.disable_window_open_feature.toolbar" ++}; ++/** ++ * The relationship R is ++ * "/apps/firefox/lockdown/disable_javascript_chrome" is true if and only if ++ * all of windowOpenFeatures are true ++ */ ++static const char GConfKey_DisableJSChrome[] = ++ "/apps/firefox/lockdown/disable_javascript_chrome"; ++static nsresult ApplyWindowOpen(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ gboolean disable = gconf_client_get_bool(aClient, GConfKey_DisableJSChrome, nsnull); ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_DisableJSChrome, nsnull); ++ PRBool curValues[NUM_ELEM(windowOpenFeatures)]; ++ PRUint32 i; ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRBool allDisabled = PR_TRUE; ++ for (i = 0; i < NUM_ELEM(windowOpenFeatures); ++i) { ++ nsresult rv = prefs->GetBoolPref(windowOpenFeatures[i], &curValues[i]); ++ if (NS_FAILED(rv)) ++ return rv; ++ if (!curValues[i]) { ++ allDisabled = PR_FALSE; ++ } ++ } ++ for (i = 0; i < NUM_ELEM(windowOpenFeatures); ++i) { ++ PRBool newVal = curValues[i]; ++ if (disable) { ++ newVal = PR_TRUE; ++ } else if (allDisabled) { ++ // If all disable-window-open-feature prefs are currently ++ // PR_TRUE, then we need to set at least one of them to ++ // PR_FALSE. Set all of them to PR_FALSE. ++ newVal = PR_FALSE; ++ } // If at least one disable-window-open-feature pref is ++ // currently PR_FALSE, then we don't need to change anything ++ // when the gconf pref says don't disable ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(windowOpenFeatures[i], newVal, lock); ++ if (NS_FAILED(rv)) ++ return rv; + } +- +- pCallbackData->observer = observerRef; +- NS_ADDREF(pCallbackData->observer); +- +- mObservers->AppendElement(pCallbackData); + return NS_OK; + } + +-/* void removeObserver (in string aDomain, in nsIObserver aObserver); */ +-NS_IMETHODIMP nsSystemPrefService::RemoveObserver(const char *aDomain, nsIObserver *aObserver) ++static nsresult ReverseApplyWindowOpen(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) + { +- nsresult rv; +- +- NS_ENSURE_ARG_POINTER(aDomain); +- NS_ENSURE_ARG_POINTER(aObserver); +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); +- +- if (!mObservers) +- return NS_OK; +- +- PRUint32 prefAtom; +- // make sure the pref name is supported +- rv = mGConf->GetAtomForMozKey(aDomain, &prefAtom); +- NS_ENSURE_SUCCESS(rv, rv); +- +- // need to find the index of observer, so we can remove it +- PRIntn count = mObservers->Count(); +- if (count <= 0) +- return NS_OK; +- +- PRIntn i; +- SysPrefCallbackData *pCallbackData; +- for (i = 0; i < count; ++i) { +- pCallbackData = (SysPrefCallbackData *)mObservers->ElementAt(i); +- if (pCallbackData) { +- nsCOMPtr observerRef; +- if (pCallbackData->bIsWeakRef) { +- nsCOMPtr weakRefFactory = +- do_QueryInterface(aObserver); +- if (weakRefFactory) { +- nsCOMPtr tmp = +- do_GetWeakReference(aObserver); +- observerRef = tmp; +- } +- } +- if (!observerRef) +- observerRef = aObserver; +- +- if (pCallbackData->observer == observerRef && +- pCallbackData->prefAtom == prefAtom) { +- rv = mGConf->NotifyRemove(prefAtom, pCallbackData); +- if (NS_SUCCEEDED(rv)) { +- mObservers->RemoveElementAt(i); +- NS_RELEASE(pCallbackData->observer); +- nsMemory::Free(pCallbackData); +- } +- return rv; +- } ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRBool allDisabled = PR_TRUE; ++ PRBool curValues[NUM_ELEM(windowOpenFeatures)]; ++ for (PRUint32 i = 0; i < NUM_ELEM(windowOpenFeatures); ++i) { ++ nsresult rv = prefs->GetBoolPref(windowOpenFeatures[i], &curValues[i]); ++ if (NS_FAILED(rv)) ++ return rv; ++ if (!curValues[i]) { ++ allDisabled = PR_FALSE; + } + } ++ gconf_client_set_bool(aClient, GConfKey_DisableJSChrome, allDisabled, nsnull); + return NS_OK; + } + +-void +-nsSystemPrefService::OnPrefChange(PRUint32 aPrefAtom, void *aData) +-{ +- if (!mInitialized) +- return; +- +- SysPrefCallbackData *pData = (SysPrefCallbackData *)aData; +- if (pData->prefAtom != aPrefAtom) +- return; +- +- nsCOMPtr observer; +- if (pData->bIsWeakRef) { +- nsCOMPtr weakRef = +- do_QueryInterface(pData->observer); +- if(weakRef) +- observer = do_QueryReferent(weakRef); +- if (!observer) { +- // this weak referenced observer went away, remove it from the list +- nsresult rv = mGConf->NotifyRemove(aPrefAtom, pData); +- if (NS_SUCCEEDED(rv)) { +- mObservers->RemoveElement(pData); +- NS_RELEASE(pData->observer); +- nsMemory::Free(pData); +- } +- return; ++/** ++ * The relationship R is ++ * If "/apps/firefox/lockdown/disable_unsafe_protocol" is true then ++ * -- "network.protocol-handler.blocked-default" is true ++ * -- "network.protocol-handler.blocked.XYZ" is false if and only if ++ * XYZ is a builtin non-disablable protocol or in ++ * "/apps/firefox/lockdown/additional_safe_protocols" ++ * AND if "/apps/firefox/lockdown/disable_unsafe_protocol" is false then ++ * -- "network.protocol-handler.blocked-default" is false ++ * -- if "network.protocol-handler.blocked.XYZ" exists then it is false ++ */ ++static const char GConfKey_DisableUnsafeProtocols[] = ++ "/apps/firefox/lockdown/disable_unsafe_protocol"; ++static const char GConfKey_AdditionalSafeProtocols[] = ++ "/apps/firefox/lockdown/additional_safe_protocols"; ++static const char MozKey_BlockedDefault[] = ++ "network.protocol-handler.blocked-default"; ++static const char MozKey_BlockedPrefix[] = ++ "network.protocol-handler.blocked."; ++static const char* nonDisablableBuiltinProtocols[] = ++ { "about", "data", "jar", "keyword", "resource", "viewsource", ++ "chrome", "moz-icon", "javascript", "file" }; ++static PRBool FindString(const char** aList, PRInt32 aCount, ++ const char* aStr) ++{ ++ for (PRInt32 i = 0; i < aCount; ++i) { ++ if (!strcmp(aStr, aList[i])) ++ return PR_TRUE; ++ } ++ return PR_FALSE; ++} ++typedef nsDataHashtable StringSet; ++/** Collect the set of protocol names that we want to set preferences for */ ++static nsresult AddAllProtocols(nsSystemPrefService* aPrefService, ++ const char* aSafeProtocols, ++ StringSet* aProtocolSet, ++ StringSet* aSafeSet) ++{ ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRUint32 childCount; ++ char **childArray = nsnull; ++ nsresult rv = prefs->GetChildList(MozKey_BlockedPrefix, &childCount, &childArray); ++ if (NS_FAILED(rv)) ++ return rv; ++ PRUint32 i; ++ for (i = 0; i < childCount; ++i) { ++ nsDependentCString tmp(childArray[i] + NUM_ELEM(MozKey_BlockedPrefix)-1); ++ aProtocolSet->Put(tmp, 1); // copies ++ } ++ for (i = 0; i < NUM_ELEM(nonDisablableBuiltinProtocols); ++i) { ++ nsDependentCString tmp(nonDisablableBuiltinProtocols[i]); ++ aProtocolSet->Put(tmp, 1); ++ } ++ i = 0; ++ while (aSafeProtocols[i]) { ++ const char* nextComma = strchr(aSafeProtocols+i, ','); ++ PRUint32 tokLen = nextComma ? nextComma - (aSafeProtocols+i) ++ : strlen(aSafeProtocols+i); ++ nsCAutoString tok(aSafeProtocols+i, tokLen); ++ aProtocolSet->Put(tok, 1); ++ aSafeSet->Put(tok, 1); ++ if (nextComma) { ++ i = nextComma - aSafeProtocols + 1; ++ } else { ++ break; + } + } +- else +- observer = do_QueryInterface(pData->observer); +- +- if (observer) +- observer->Observe(NS_STATIC_CAST(nsIPrefBranch *, this), +- NS_SYSTEMPREF_PREFCHANGE_TOPIC_ID, +- NS_ConvertUTF8toUCS2(mGConf->GetMozKey(aPrefAtom)). +- get()); ++ NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(childCount, childArray); ++ return NS_OK; + } + +-/************************************************************* +- * GConfProxy +- * +- ************************************************************/ +- +-struct GConfFuncListType { +- const char *FuncName; +- PRFuncPtr FuncPtr; +-}; +- +-struct PrefNamePair { +- const char *mozPrefName; +- const char *gconfPrefName; +-}; +- +-const char +-GConfProxy::sPrefGConfKey[] = "accessibility.unix.gconf2.shared-library"; +-const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so.4"; +-const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so"; +- +-#define GCONF_FUNCS_POINTER_BEGIN \ +- static GConfFuncListType sGConfFuncList[] = { +-#define GCONF_FUNCS_POINTER_ADD(func_name) \ +- {func_name, nsnull}, +-#define GCONF_FUNCS_POINTER_END \ +- {nsnull, nsnull}, }; +- +-GCONF_FUNCS_POINTER_BEGIN +- GCONF_FUNCS_POINTER_ADD("gconf_client_get_default") // 0 +- GCONF_FUNCS_POINTER_ADD("gconf_client_get_bool") // 1 +- GCONF_FUNCS_POINTER_ADD("gconf_client_get_string") //2 +- GCONF_FUNCS_POINTER_ADD("gconf_client_get_int") //3 +- GCONF_FUNCS_POINTER_ADD("gconf_client_notify_add") //4 +- GCONF_FUNCS_POINTER_ADD("gconf_client_notify_remove") //5 +- GCONF_FUNCS_POINTER_ADD("gconf_client_add_dir") //6 +- GCONF_FUNCS_POINTER_ADD("gconf_client_remove_dir") //7 +- GCONF_FUNCS_POINTER_ADD("gconf_entry_get_value") //8 +- GCONF_FUNCS_POINTER_ADD("gconf_entry_get_key") //9 +- GCONF_FUNCS_POINTER_ADD("gconf_value_get_bool") //10 +- GCONF_FUNCS_POINTER_ADD("gconf_value_get_string") //11 +- GCONF_FUNCS_POINTER_ADD("gconf_value_get_int") //12 +-GCONF_FUNCS_POINTER_END +- +-///////////////////////////////////////////////////////////////////////////// +-// the list is the mapping table, between mozilla prefs and gconf prefs +-// It is expected to include all the pref pairs that are related in mozilla +-// and gconf. +-// +-// Note: the prefs listed here are not neccessarily be read from gconf, they +-// are the prefs that could be read from gconf. Mozilla has another +-// list (see sSysPrefList in nsSystemPref.cpp) that decide which prefs +-// are really read. +-////////////////////////////////////////////////////////////////////////////// +- +-static const PrefNamePair sPrefNameMapping[] = { +-#include "gconf_pref_list.inc" +- {nsnull, nsnull}, ++struct ProtocolPrefClosure { ++ StringSet safeProtocolSet; ++ nsIPrefBranch2* prefs; ++ nsISystemPref* prefSetter; ++ PRPackedBool disableUnsafe; ++ PRPackedBool lock; + }; + +-PRBool PR_CALLBACK +-gconfDeleteObserver(void *aElement, void *aData) { +- nsMemory::Free(aElement); +- return PR_TRUE; ++static PLDHashOperator PR_CALLBACK SetProtocolPref(const nsACString& aKey, ++ int aItem, ++ void* aClosure) ++{ ++ ProtocolPrefClosure* closure = NS_STATIC_CAST(ProtocolPrefClosure*, aClosure); ++ const nsCString& protocol = PromiseFlatCString(aKey); ++ PRBool blockProtocol = PR_FALSE; ++ if (closure->disableUnsafe && ++ !FindString(nonDisablableBuiltinProtocols, ++ NUM_ELEM(nonDisablableBuiltinProtocols), protocol.get()) && ++ !closure->safeProtocolSet.Get(aKey, nsnull)) { ++ blockProtocol = PR_TRUE; ++ } ++ ++ nsCAutoString prefName; ++ prefName.Append(MozKey_BlockedPrefix); ++ prefName.Append(protocol); ++ closure->prefSetter->SetOverridingMozillaBoolPref(prefName.get(), blockProtocol, ++ closure->lock); ++ return PL_DHASH_NEXT; ++} ++static nsresult ApplyUnsafeProtocols(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_DisableUnsafeProtocols, nsnull) ++ || !gconf_client_key_is_writable(aClient, GConfKey_AdditionalSafeProtocols, nsnull); ++ gboolean disable = gconf_client_get_bool(aClient, GConfKey_DisableUnsafeProtocols, nsnull); ++ char* protocols = gconf_client_get_string(aClient, GConfKey_AdditionalSafeProtocols, nsnull); ++ if (!protocols) ++ return NS_ERROR_FAILURE; ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_BlockedDefault, disable, lock); ++ StringSet protocolSet; ++ ProtocolPrefClosure closure; ++ protocolSet.Init(); ++ closure.safeProtocolSet.Init(); ++ if (NS_SUCCEEDED(rv)) { ++ rv = AddAllProtocols(aPrefService, protocols, &protocolSet, ++ &closure.safeProtocolSet); ++ } ++ if (NS_SUCCEEDED(rv)) { ++ closure.disableUnsafe = disable; ++ closure.lock = lock; ++ closure.prefSetter = aPrefService->GetPrefs(); ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ closure.prefs = prefs; ++ protocolSet.EnumerateRead(SetProtocolPref, &closure); ++ } ++ g_free(protocols); ++ return rv; ++} ++ ++static nsresult ReverseApplyUnsafeProtocols(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRBool blockedDefault; ++ nsresult rv = prefs->GetBoolPref(MozKey_BlockedDefault, &blockedDefault); ++ if (NS_FAILED(rv)) ++ return rv; ++ nsCAutoString enabledProtocols; ++ PRUint32 childCount; ++ char **childArray = nsnull; ++ rv = prefs->GetChildList(MozKey_BlockedPrefix, &childCount, &childArray); ++ if (NS_FAILED(rv)) ++ return rv; ++ for (PRUint32 i = 0; i < childCount; ++i) { ++ PRBool val = PR_FALSE; ++ prefs->GetBoolPref(childArray[i], &val); ++ if (val) { ++ if (enabledProtocols.Length() > 0) { ++ enabledProtocols.Append(','); ++ } ++ enabledProtocols.Append(childArray[i] + NUM_ELEM(MozKey_BlockedPrefix)-1); ++ } ++ } ++ NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(childCount, childArray); ++ gconf_client_set_bool(aClient, GConfKey_DisableUnsafeProtocols, blockedDefault, nsnull); ++ gconf_client_set_string(aClient, GConfKey_AdditionalSafeProtocols, ++ enabledProtocols.get(), nsnull); ++ return NS_OK; + } + +-GConfProxy::GConfProxy(nsSystemPrefService *aSysPrefService): +- mGConfClient(nsnull), +- mGConfLib(nsnull), +- mInitialized(PR_FALSE), +- mSysPrefService(aSysPrefService), +- mObservers(nsnull) +-{ ++/** ++ * Set config.lockdown.setwallpaper if and only if ++ * /desktop/gnome/background/picture_filename is write-only. Always ++ * lock it. ++ */ ++static const char MozKey_LockdownWallpaper[] = "config.lockdown.setwallpaper"; ++static const char GConfKey_WallpaperSetting[] = ++ "/desktop/gnome/background/picture_filename"; ++static nsresult ApplyWallpaper(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRBool canSetWallpaper = ++ gconf_client_key_is_writable(aClient, GConfKey_WallpaperSetting, nsnull); ++ return aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_LockdownWallpaper, ++ !canSetWallpaper, PR_TRUE); ++} ++// No ReverseApplyWallpaper because this Mozilla pref can never be ++// modified ++ ++/** ++ * The relationship R is ++ * "signon.rememberSignons" is true if and only if "/apps/firefox/web/disable_save_password" ++ * is false. ++ */ ++static const char MozKey_RememberSignons[] = "signon.rememberSignons"; ++static const char GConfKey_DisableSavePassword[] = "/apps/firefox/web/disable_save_password"; ++static nsresult ApplyDisableSavePassword(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_DisableSavePassword, nsnull); ++ gboolean disable = gconf_client_get_bool(aClient, GConfKey_DisableSavePassword, nsnull); ++ return aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_RememberSignons, !disable, lock); ++} ++ ++static nsresult ReverseApplyDisableSavePassword(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRBool remember; ++ nsresult rv = prefs->GetBoolPref(MozKey_RememberSignons, &remember); ++ if (NS_FAILED(rv)) ++ return rv; ++ gconf_client_set_bool(aClient, GConfKey_DisableSavePassword, !remember, nsnull); ++ return NS_OK; + } + +-GConfProxy::~GConfProxy() +-{ +- if (mGConfClient) +- g_object_unref(G_OBJECT(mGConfClient)); +- +- if (mObservers) { +- (void)mObservers->EnumerateForwards(gconfDeleteObserver, nsnull); +- delete mObservers; ++/** ++ * The relationship R is ++ * "permissions.default.image" is 1 (nsIPermissionManager::ALLOW_ACTION) if and only if ++ * "/apps/firefox/web/images_load" is 0, AND ++ * "permissions.default.image" is 2 (nsIPermissionManager::DENY_ACTION) if and only if ++ * "/apps/firefox/web/images_load" is 2, AND ++ * "permissions.default.image" is 3 if and only if "/apps/firefox/web/images_load" is 1 ++ * ++ * Also, we set pref.advanced.images.disable_button.view_image iff ++ * /apps/firefox/web/images_load is read-only ++ * And we set permissions.default.honorExceptions iff ++ * /apps/firefox/web/images_load is not read-only ++ */ ++static const char MozKey_ImagePermissions[] = "permissions.default.image"; ++static const char MozKey_ImageExceptions[] = "permissions.honorExceptions.image"; ++static const char MozKey_ImageViewExceptions[] = "pref.advanced.images.disable_button.view_image"; ++static const char GConfKey_LoadImages[] = "/apps/firefox/web/images_load"; ++static nsresult ApplyLoadImages(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_LoadImages, nsnull); ++ // 0 == accept, 1 == no-foreign, 2 == reject ++ gint setting = gconf_client_get_int(aClient, GConfKey_LoadImages, nsnull); ++ PRInt32 pref; ++ switch (setting) { ++ case 0: pref = nsIPermissionManager::ALLOW_ACTION; break; ++ case 2: pref = nsIPermissionManager::DENY_ACTION; break; ++ case 1: pref = 3; break; ++ default: return NS_ERROR_FAILURE; + } ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_ImageExceptions, !lock, lock); ++ if (NS_FAILED(rv)) ++ return rv; ++ rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_ImageViewExceptions, lock, lock); ++ if (NS_FAILED(rv)) ++ return rv; ++ return aPrefService->GetPrefs()-> ++ SetOverridingMozillaIntPref(MozKey_ImagePermissions, pref, lock); + } + +-PRBool +-GConfProxy::Init() ++static nsresult ReverseApplyLoadImages(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) + { +- SYSPREF_LOG(("GConfProxy:: Init GConfProxy\n")); +- if (!mSysPrefService) +- return PR_FALSE; +- if (mInitialized) +- return PR_TRUE; +- +- nsCOMPtr pref = do_GetService(NS_PREF_CONTRACTID); +- if (!pref) +- return PR_FALSE; +- +- nsXPIDLCString gconfLibName; +- nsresult rv; +- +- //check if gconf-2 library is given in prefs +- rv = pref->GetCharPref(sPrefGConfKey, getter_Copies(gconfLibName)); +- if (NS_SUCCEEDED(rv)) { +- //use the library name in the preference +- SYSPREF_LOG(("GConf library in prefs is %s\n", gconfLibName.get())); +- mGConfLib = PR_LoadLibrary(gconfLibName.get()); +- } +- else { +- SYSPREF_LOG(("GConf library not specified in prefs, try the default: " +- "%s and %s\n", sDefaultLibName1, sDefaultLibName2)); +- mGConfLib = PR_LoadLibrary(sDefaultLibName1); +- if (!mGConfLib) +- mGConfLib = PR_LoadLibrary(sDefaultLibName2); +- } +- +- if (!mGConfLib) { +- SYSPREF_LOG(("Fail to load GConf library\n")); +- return PR_FALSE; ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRInt32 pref; ++ nsresult rv = prefs->GetIntPref(MozKey_ImagePermissions, &pref); ++ if (NS_FAILED(rv)) ++ return rv; ++ gint setting; ++ switch (pref) { ++ case nsIPermissionManager::ALLOW_ACTION: setting = 0; break; ++ case nsIPermissionManager::DENY_ACTION: setting = 2; break; ++ case 3: setting = 1; break; ++ default: return NS_ERROR_FAILURE; + } ++ gconf_client_set_int(aClient, GConfKey_LoadImages, setting, nsnull); ++ return NS_OK; ++} + +- //check every func we need in the gconf library +- GConfFuncListType *funcList; +- PRFuncPtr func; +- for (funcList = sGConfFuncList; funcList->FuncName; ++funcList) { +- func = PR_FindFunctionSymbol(mGConfLib, funcList->FuncName); +- if (!func) { +- SYSPREF_LOG(("Check GConf Func Error: %s", funcList->FuncName)); +- goto init_failed_unload; ++/** ++ * The relationship R is ++ * "/apps/firefox/web/disable_popups" is true if and only if ++ * "dom.disable_open_during_load" is true ++ * AND if "/apps/firefox/web/disable_popups" is true then ++ * "privacy.popups.showBrowserMessage" is false. ++ */ ++static const char MozKey_DisablePopups[] = "dom.disable_open_during_load"; ++static const char MozKey_DisableBrowserPopupMessage[] = "privacy.popups.showBrowserMessage"; ++static const char GConfKey_DisablePopups[] = "/apps/firefox/web/disable_popups"; ++static nsresult ApplyDisablePopups(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) ++{ ++ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_DisablePopups, nsnull); ++ gboolean disable = gconf_client_get_bool(aClient, GConfKey_DisablePopups, nsnull); ++ nsresult rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_DisablePopups, disable, lock); ++ if (NS_SUCCEEDED(rv)) { ++ if (disable) { ++ rv = aPrefService->GetPrefs()-> ++ SetOverridingMozillaBoolPref(MozKey_DisableBrowserPopupMessage, PR_TRUE, lock); ++ } else { ++ rv = aPrefService->GetPrefs()-> ++ StopOverridingMozillaPref(MozKey_DisableBrowserPopupMessage); + } +- funcList->FuncPtr = func; + } +- +- InitFuncPtrs(); +- +- mGConfClient = GConfClientGetDefault(); +- +- // Don't unload past this point, since GConf's initialization of ORBit +- // causes atexit handlers to be registered. +- +- if (!mGConfClient) { +- SYSPREF_LOG(("Fail to Get default gconf client\n")); +- goto init_failed; +- } +- mInitialized = PR_TRUE; +- return PR_TRUE; +- +- init_failed_unload: +- PR_UnloadLibrary(mGConfLib); +- init_failed: +- mGConfLib = nsnull; +- return PR_FALSE; ++ return rv; + } + +-nsresult +-GConfProxy::GetBoolPref(const char *aMozKey, PRBool *retval) ++static nsresult ReverseApplyDisablePopups(nsSystemPrefService* aPrefService, ++ GConfClient* aClient) + { +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); +- *retval = GConfClientGetBool(mGConfClient, MozKey2GConfKey(aMozKey), NULL); ++ nsCOMPtr prefs = aPrefService->GetPrefs()->GetPrefUserBranch(); ++ PRBool disabled; ++ nsresult rv = prefs->GetBoolPref(MozKey_DisablePopups, &disabled); ++ if (NS_FAILED(rv)) ++ return rv; ++ gconf_client_set_bool(aClient, GConfKey_DisablePopups, disabled, nsnull); + return NS_OK; + } + +-nsresult +-GConfProxy::GetCharPref(const char *aMozKey, char **retval) +-{ +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); ++static ComplexGConfPrefMapping sComplexGConfPrefMappings[] = { ++ {GConfKey_TrustedURIs, ApplyTrustedURIs}, ++ {GConfKey_DelegationURIs, ApplyDelegationURIs}, ++ {GConfKey_IgnoreHosts, ApplyIgnoreHosts}, ++ {GConfKey_ProxyMode, ApplyProxyMode}, ++ {GConfKey_DownloadFolder, ApplyDownloadFolder}, ++ {GConfKey_DisableCookies, ApplyDisableCookies}, ++ {GConfKey_DisableJSChrome, ApplyWindowOpen}, ++ {GConfKey_DisableUnsafeProtocols, ApplyUnsafeProtocols}, ++ {GConfKey_AdditionalSafeProtocols, ApplyUnsafeProtocols}, ++ {GConfKey_WallpaperSetting, ApplyWallpaper}, ++ {GConfKey_DisableSavePassword, ApplyDisableSavePassword}, ++ {GConfKey_LoadImages, ApplyLoadImages}, ++ {GConfKey_DisablePopups, ApplyDisablePopups} ++}; ++static ComplexMozPrefMapping sComplexMozPrefMappings[] = { ++ {MozKey_TrustedURIs, ReverseApplyTrustedURIs}, ++ {MozKey_DelegationURIs, ReverseApplyDelegationURIs}, ++ {MozKey_IgnoreHosts, ReverseApplyIgnoreHosts}, ++ {MozKey_ProxyMode, ReverseApplyProxyMode}, ++ {MozKey_UseDownloadDir, ReverseApplyDownloadFolder}, ++ {MozKey_DownloadDirType, ReverseApplyDownloadFolder}, ++ {MozKey_DownloadDirExplicit, ReverseApplyDownloadFolder}, ++ {MozKey_CookieBehavior, ReverseApplyDisableCookies}, ++ {MozKey_RememberSignons, ReverseApplyDisableSavePassword}, ++ {MozKey_ImagePermissions, ReverseApplyLoadImages}, ++ {MozKey_DisablePopups, ReverseApplyDisablePopups} ++}; ++// The unsafe protocol preferences are handled specially because ++// they affect an unknown number of Mozilla preferences ++// Window opener permissions are also handled specially so we don't have to ++// repeat the windowOpenFeatures list. ++ ++/* END preference mapping definition area */ ++ ++static PR_CALLBACK void GConfSimpleNotification(GConfClient* client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ nsSystemPrefService* service = NS_STATIC_CAST(nsSystemPrefService*, user_data); ++ SimplePrefMapping* map = NS_STATIC_CAST(SimplePrefMapping*, ++ service->GetSimpleCallbackData(cnxn_id)); ++ NS_ASSERTION(map, "Can't find mapping for callback"); ++ if (!map) ++ return; + +- gchar *str = GConfClientGetString(mGConfClient, +- MozKey2GConfKey(aMozKey), NULL); +- if (str) { +- *retval = PL_strdup(str); +- g_free(str); +- } +- return NS_OK; ++ ApplySimpleMapping(map, service->GetPrefs(), client); + } + +-nsresult +-GConfProxy::GetIntPref(const char *aMozKey, PRInt32 *retval) +-{ +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); +- if (strcmp (aMozKey, "network.proxy.type") == 0) { +- gchar *str; +- +- str = GConfClientGetString(mGConfClient, +- MozKey2GConfKey (aMozKey), NULL); +- +- if (str) { +- if (strcmp (str, "manual") == 0) +- *retval = 1; +- else if (strcmp (str, "auto") == 0) +- *retval = 2; +- else +- *retval = 0; +- +- g_free (str); +- } else +- *retval = 0; +- } else { +- *retval = GConfClientGetInt(mGConfClient, +- MozKey2GConfKey(aMozKey), NULL); +- } ++static PR_CALLBACK void GConfComplexNotification(GConfClient* client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ nsSystemPrefService* service = NS_STATIC_CAST(nsSystemPrefService*, user_data); ++ ComplexGConfPrefMapping* map = NS_STATIC_CAST(ComplexGConfPrefMapping*, ++ service->GetComplexCallbackData(cnxn_id)); ++ NS_ASSERTION(map, "Can't find mapping for callback"); ++ if (!map) ++ return; + +- return NS_OK; ++ map->callback(service, GetGConf()); + } + +-nsresult +-GConfProxy::NotifyAdd (PRUint32 aAtom, void *aUserData) ++nsresult nsSystemPrefService::LoadSystemPreferences(nsISystemPref* aPrefs) + { +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); +- +- const char *gconfKey = GetGConfKey(aAtom); +- if (!gconfKey) +- return NS_ERROR_FAILURE; ++ mPref = aPrefs; + +- if (!mObservers) { +- mObservers = new nsAutoVoidArray(); +- if (mObservers == nsnull) +- return NS_ERROR_OUT_OF_MEMORY; ++ GConfClient* client = GetGConf(); ++ PRUint32 i; ++ nsCOMPtr userPrefs = aPrefs->GetPrefUserBranch(); ++ ++ // Update gconf settings with any Mozilla settings that have ++ // changed from the default. Do it before we register our ++ // gconf notifications. ++ for (i = 0; i < NUM_ELEM(sSimplePrefMappings); ++i) { ++ gconf_client_add_dir(client, sSimplePrefMappings[i].gconfPrefName, ++ GCONF_CLIENT_PRELOAD_NONE, nsnull); ++ ++ PRBool hasUserPref = PR_FALSE; ++ nsresult rv = ++ userPrefs->PrefHasUserValue(sSimplePrefMappings[i].mozPrefName, ++ &hasUserPref); ++ if (NS_FAILED(rv)) ++ return rv; ++ if (hasUserPref && sSimplePrefMappings[i].allowWritesFromMozilla && ++ gconf_client_key_is_writable(client, ++ sSimplePrefMappings[i].gconfPrefName, ++ nsnull)) { ++ rv = ReverseApplySimpleMapping(&sSimplePrefMappings[i], ++ aPrefs, client); ++ if (NS_FAILED(rv)) ++ return rv; ++ } ++ } ++ for (i = 0; i < NUM_ELEM(sComplexGConfPrefMappings); ++i) { ++ gconf_client_add_dir(client, sComplexGConfPrefMappings[i].gconfPrefName, ++ GCONF_CLIENT_PRELOAD_NONE, nsnull); ++ } ++ ComplexMozPrefChanged lastMozCallback = nsnull; ++ for (i = 0; i < NUM_ELEM(sComplexMozPrefMappings); ++i) { ++ PRBool hasUserPref = PR_FALSE; ++ nsresult rv = ++ userPrefs->PrefHasUserValue(sComplexMozPrefMappings[i].mozPrefName, ++ &hasUserPref); ++ if (NS_FAILED(rv)) ++ return rv; ++ if (hasUserPref) { ++ ComplexMozPrefChanged cb = sComplexMozPrefMappings[i].callback; ++ if (cb != lastMozCallback) { ++ cb(this, client); ++ lastMozCallback = cb; ++ } ++ } + } + +- GConfCallbackData *pData = (GConfCallbackData *) +- nsMemory::Alloc(sizeof(GConfCallbackData)); +- NS_ENSURE_TRUE(pData, NS_ERROR_OUT_OF_MEMORY); +- +- pData->proxy = this; +- pData->userData = aUserData; +- pData->atom = aAtom; +- mObservers->AppendElement(pData); +- +- GConfClientAddDir(mGConfClient, gconfKey, +- 0, // GCONF_CLIENT_PRELOAD_NONE, don't preload anything +- NULL); +- +- pData->notifyId = GConfClientNotifyAdd(mGConfClient, gconfKey, +- gconf_key_listener, pData, +- NULL, NULL); ++ // Register simple mappings and callbacks ++ for (i = 0; i < NUM_ELEM(sSimplePrefMappings); ++i) { ++ guint cx = gconf_client_notify_add(client, ++ sSimplePrefMappings[i].gconfPrefName, ++ GConfSimpleNotification, this, ++ nsnull, nsnull); ++ mGConfSimpleCallbacks.Put(cx, &sSimplePrefMappings[i]); ++ nsresult rv = ApplySimpleMapping(&sSimplePrefMappings[i], aPrefs, client); ++ if (NS_FAILED(rv)) ++ return rv; ++ } ++ ++ ComplexGConfPrefChanged lastCallback = nsnull; ++ for (i = 0; i < NUM_ELEM(sComplexGConfPrefMappings); ++i) { ++ guint cx = gconf_client_notify_add(client, ++ sComplexGConfPrefMappings[i].gconfPrefName, ++ GConfComplexNotification, this, ++ nsnull, nsnull); ++ mGConfComplexCallbacks.Put(cx, &sComplexGConfPrefMappings[i]); ++ ComplexGConfPrefChanged cb = sComplexGConfPrefMappings[i].callback; ++ if (cb != lastCallback) { ++ cb(this, client); ++ lastCallback = cb; ++ } ++ } ++ ++ ApplyUnsafeProtocols(this, client); ++ + return NS_OK; + } + +-nsresult +-GConfProxy::NotifyRemove (PRUint32 aAtom, const void *aUserData) ++nsresult nsSystemPrefService::NotifyMozillaPrefChanged(const char* aPrefName) + { +- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE); ++ PRUint32 i; ++ GConfClient* client = GetGConf(); + +- PRIntn count = mObservers->Count(); +- if (count <= 0) +- return NS_OK; +- +- PRIntn i; +- GConfCallbackData *pData; +- for (i = 0; i < count; ++i) { +- pData = (GConfCallbackData *)mObservers->ElementAt(i); +- if (pData && pData->atom == aAtom && pData->userData == aUserData) { +- GConfClientNotifyRemove(mGConfClient, pData->notifyId); +- GConfClientRemoveDir(mGConfClient, +- GetGConfKey(pData->atom), NULL); +- mObservers->RemoveElementAt(i); +- nsMemory::Free(pData); +- break; ++ for (i = 0; i < NUM_ELEM(sSimplePrefMappings); ++i) { ++ if (!strcmp(aPrefName, sSimplePrefMappings[i].mozPrefName)) { ++ ReverseApplySimpleMapping(&sSimplePrefMappings[i], ++ mPref, client); + } + } +- return NS_OK; +-} + +-void +-GConfProxy::InitFuncPtrs() +-{ +- //gconf client funcs +- GConfClientGetDefault = +- (GConfClientGetDefaultType) sGConfFuncList[0].FuncPtr; +- GConfClientGetBool = +- (GConfClientGetBoolType) sGConfFuncList[1].FuncPtr; +- GConfClientGetString = +- (GConfClientGetStringType) sGConfFuncList[2].FuncPtr; +- GConfClientGetInt = +- (GConfClientGetIntType) sGConfFuncList[3].FuncPtr; +- GConfClientNotifyAdd = +- (GConfClientNotifyAddType) sGConfFuncList[4].FuncPtr; +- GConfClientNotifyRemove = +- (GConfClientNotifyRemoveType) sGConfFuncList[5].FuncPtr; +- GConfClientAddDir = +- (GConfClientAddDirType) sGConfFuncList[6].FuncPtr; +- GConfClientRemoveDir = +- (GConfClientRemoveDirType) sGConfFuncList[7].FuncPtr; +- +- //gconf entry funcs +- GConfEntryGetValue = (GConfEntryGetValueType) sGConfFuncList[8].FuncPtr; +- GConfEntryGetKey = (GConfEntryGetKeyType) sGConfFuncList[9].FuncPtr; +- +- //gconf value funcs +- GConfValueGetBool = (GConfValueGetBoolType) sGConfFuncList[10].FuncPtr; +- GConfValueGetString = (GConfValueGetStringType) sGConfFuncList[11].FuncPtr; +- GConfValueGetInt = (GConfValueGetIntType) sGConfFuncList[12].FuncPtr; +-} +- +-void +-GConfProxy::OnNotify(void *aClient, void * aEntry, PRUint32 aNotifyId, +- GConfCallbackData *aData) +-{ +- if (!mInitialized || !aEntry || (mGConfClient != aClient) || !aData) +- return; ++ for (i = 0; i < NUM_ELEM(sComplexMozPrefMappings); ++i) { ++ if (!strcmp(aPrefName, sComplexMozPrefMappings[i].mozPrefName)) { ++ sComplexMozPrefMappings[i].callback(this, client); ++ } ++ } + +- if (GConfEntryGetValue(aEntry) == NULL) +- return; ++ for (i = 0; i < NUM_ELEM(windowOpenFeatures); ++i) { ++ if (!strcmp(aPrefName, windowOpenFeatures[i])) { ++ ReverseApplyWindowOpen(this, client); ++ } ++ } + +- PRUint32 prefAtom; +- nsresult rv = GetAtomForGConfKey(GConfEntryGetKey(aEntry), &prefAtom); +- if (NS_FAILED(rv)) +- return; ++ ReverseApplyUnsafeProtocols(this, client); + +- mSysPrefService->OnPrefChange(prefAtom, aData->userData); ++ return NS_OK; + } + +-nsresult +-GConfProxy::GetAtom(const char *aKey, PRUint8 aNameType, PRUint32 *aAtom) ++static PLDHashOperator PR_CALLBACK UnregisterSimple(const PRUint32& aKey, ++ SimplePrefMapping* aData, ++ void* aClosure) + { +- if (!aKey) +- return NS_ERROR_FAILURE; +- PRUint32 prefSize = sizeof(sPrefNameMapping) / sizeof(sPrefNameMapping[0]); +- for (PRUint32 index = 0; index < prefSize; ++index) { +- if (!strcmp((aNameType == 0) ? sPrefNameMapping[index].mozPrefName : +- sPrefNameMapping[index].gconfPrefName, aKey)) { +- *aAtom = index; +- return NS_OK; +- } +- } +- return NS_ERROR_FAILURE; ++ GConfClient* client = GetGConf(); ++ gconf_client_notify_remove(client, aKey); ++ gconf_client_remove_dir(client, aData->gconfPrefName, nsnull); ++ return PL_DHASH_NEXT; + } + +-const char * +-GConfProxy::GetKey(PRUint32 aAtom, PRUint8 aNameType) ++static PLDHashOperator PR_CALLBACK UnregisterComplex(const PRUint32& aKey, ++ ComplexGConfPrefMapping* aData, ++ void* aClosure) + { +- PRUint32 mapSize = sizeof(sPrefNameMapping) / sizeof(sPrefNameMapping[0]); +- if (aAtom >= 0 && aAtom < mapSize) +- return (aNameType == 0) ? sPrefNameMapping[aAtom].mozPrefName : +- sPrefNameMapping[aAtom].gconfPrefName; +- return NULL; ++ GConfClient* client = GetGConf(); ++ gconf_client_notify_remove(client, aKey); ++ gconf_client_remove_dir(client, aData->gconfPrefName, nsnull); ++ return PL_DHASH_NEXT; + } + +-inline const char * +-GConfProxy::MozKey2GConfKey(const char *aMozKey) ++nsresult nsSystemPrefService::NotifyUnloadSystemPreferences() + { +- PRUint32 atom; +- nsresult rv = GetAtomForMozKey(aMozKey, &atom); +- if (NS_SUCCEEDED(rv)) +- return GetGConfKey(atom); +- return NULL; +-} ++ // Unregister callbacks ++ mGConfSimpleCallbacks.EnumerateRead(UnregisterSimple, this); ++ mGConfSimpleCallbacks.Clear(); ++ mGConfComplexCallbacks.EnumerateRead(UnregisterComplex, this); ++ mGConfComplexCallbacks.Clear(); + +-/* static */ +-void gconf_key_listener (void* client, guint cnxn_id, +- void *entry, gpointer user_data) +-{ +- SYSPREF_LOG(("...SYSPREF_LOG...key listener get called \n")); +- if (!user_data) +- return; +- GConfCallbackData *pData = NS_REINTERPRET_CAST(GConfCallbackData *, +- user_data); +- pData->proxy->OnNotify(client, entry, cnxn_id, pData); ++ return NS_OK; + } ++ ++// Factory stuff ++ ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemPrefService, Init) ++ ++static const nsModuleComponentInfo components[] = { ++ { NS_SYSTEMPREF_SERVICE_CLASSNAME, ++ NS_SYSTEMPREF_SERVICE_CID, ++ NS_SYSTEMPREF_SERVICE_CONTRACTID, ++ nsSystemPrefServiceConstructor, ++ }, ++}; ++ ++NS_IMPL_NSGETMODULE(nsSystemPrefServiceModule, components) +--- extensions/pref/system-pref/src/nsISystemPrefService.h ++++ extensions/pref/system-pref/src/nsISystemPrefService.h +@@ -0,0 +1,107 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* vim:expandtab:shiftwidth=4:tabstop=4: ++ */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Novell ++ * Portions created by Novell are Copyright (C) 2005 Novell, ++ * All Rights Reserved. ++ * ++ * Original Author: Robert O'Callahan (rocallahan@novell.com) ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef nsISystemPrefService_h__ ++#define nsISystemPrefService_h__ ++ ++#include "nsCOMPtr.h" ++#include "nsIPrefBranchInternal.h" ++ ++#define NS_SYSTEMPREF_SERVICE_CONTRACTID "@mozilla.org/system-preferences-service;1" ++ ++#define NS_ISYSTEMPREFSERVICE_IID \ ++{ 0x006e1cfd, 0xd66a, 0x40b9, \ ++ { 0x84, 0xa1, 0x84, 0xf3, 0xe6, 0xa2, 0xca, 0xbc } } ++ ++class nsISystemPref { ++public: ++ /** ++ * Call one of these three methods to override a Mozilla ++ * preference with a system value. You can call it multiple ++ * times to change the value of a given preference to track ++ * the underlying system value. ++ * ++ * If aLocked is true then we set the default preference and ++ * lock it so the user value is ignored. If aLocked is false ++ * then we unlock the Mozilla preference and set the Mozilla ++ * user value. ++ */ ++ virtual nsresult SetOverridingMozillaBoolPref(const char* aPrefName, ++ PRBool aValue, PRBool aLocked, ++ PRBool aPresent = PR_TRUE) = 0; ++ virtual nsresult SetOverridingMozillaIntPref(const char* aPrefName, ++ PRInt32 aValue, PRBool aLocked, ++ PRBool aPresent = PR_TRUE) = 0; ++ virtual nsresult SetOverridingMozillaStringPref(const char* aPrefName, ++ const char* aValue, PRBool aLocked, ++ PRBool aPresent = PR_TRUE) = 0; ++ virtual nsresult StopOverridingMozillaPref(const char* aPrefName) = 0; ++ virtual already_AddRefed GetPrefUserBranch() = 0; ++ virtual already_AddRefed GetPrefDefaultBranch() = 0; ++}; ++ ++class nsISystemPrefService : public nsISupports { ++public: ++ NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISYSTEMPREFSERVICE_IID) ++ ++ /** ++ * Load the system prefs from the store into their corresponding ++ * Mozilla prefs, calling SetOverridingMozillaPref on each ++ * such pref. ++ */ ++ virtual nsresult LoadSystemPreferences(nsISystemPref* aPrefs) = 0; ++ ++ /** ++ * Notify that a Mozilla user pref that is being overridden by the ++ * store has changed. The new value of the Mozilla pref should be ++ * written back to the store. ++ */ ++ virtual nsresult NotifyMozillaPrefChanged(const char* aPrefName) = 0; ++ ++ /** ++ * Notify that we're about to stop using the system prefs. After ++ * this, nsSystemPref will automatically stop overriding all ++ * Mozilla prefs that are being overridden. ++ */ ++ virtual nsresult NotifyUnloadSystemPreferences() = 0; ++}; ++ ++#endif +--- extensions/pref/system-pref/src/nsSystemPref.cpp ++++ extensions/pref/system-pref/src/nsSystemPref.cpp +@@ -24,6 +24,7 @@ + * Original Author: Bolian Yin (bolian.yin@sun.com) + * + * Contributor(s): ++ * Robert O'Callahan (rocallahan@novell.com) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or +@@ -41,66 +42,60 @@ + + #include "nsSystemPref.h" + #include "nsIObserverService.h" ++#include "nsIAppStartupNotifier.h" ++#include "nsIPrefService.h" ++#include "nsIPrefBranch.h" ++#include "nsICategoryManager.h" ++#include "nsIServiceManager.h" + + #include "nsSystemPrefLog.h" +-#include "nsSystemPrefService.h" + #include "nsString.h" + +-const char sSysPrefString[] = "config.use_system_prefs"; +-union MozPrefValue { +- char * stringVal; +- PRInt32 intVal; +- PRBool boolVal; +-}; ++#include + + struct SysPrefItem { +- const char *prefName; // mozilla pref string name +- MozPrefValue defaultValue; // store the mozilla default value +- PRBool isLocked; // store the mozilla lock status ++ // Saved values on both branches ++ PRInt32 savedUserValueScalar; ++ char* savedUserValueString; ++ PRInt32 savedDefaultValueScalar; ++ char* savedDefaultValueString; ++ // When this is true, then the value was locked originally ++ PRPackedBool savedLocked; ++ // When this is true, then there was a user value ++ PRPackedBool savedUserPresent; ++ PRPackedBool ignore; ++ + SysPrefItem() { +- prefName = nsnull; +- defaultValue.intVal = 0; +- defaultValue.stringVal = nsnull; +- defaultValue.boolVal = PR_FALSE; +- isLocked = PR_FALSE; ++ savedUserValueScalar = 0; ++ savedUserValueString = nsnull; ++ savedDefaultValueScalar = 0; ++ savedDefaultValueString = nsnull; ++ savedUserPresent = PR_FALSE; ++ savedLocked = PR_FALSE; ++ ignore = PR_FALSE; + } +- void SetPrefName(const char *aPrefName) { +- prefName = aPrefName; ++ ++ virtual ~SysPrefItem() { ++ nsMemory::Free(savedUserValueString); ++ nsMemory::Free(savedDefaultValueString); + } + }; + +-// all prefs that mozilla need to read from host system if they are available +-static const char *sSysPrefList[] = { +- "network.proxy.http", +- "network.proxy.http_port", +- "network.proxy.ftp", +- "network.proxy.ftp_port", +- "network.proxy.ssl", +- "network.proxy.ssl_port", +- "network.proxy.socks", +- "network.proxy.socks_port", +- "network.proxy.no_proxies_on", +- "network.proxy.autoconfig_url", +- "network.proxy.type", +- "config.use_system_prefs.accessibility", +-}; ++static const char sSysPrefString[] = "config.use_system_prefs"; + + PRLogModuleInfo *gSysPrefLog = NULL; + + NS_IMPL_ISUPPORTS2(nsSystemPref, nsIObserver, nsISupportsWeakReference) + +-nsSystemPref::nsSystemPref(): +- mSysPrefService(nsnull), +- mEnabled(PR_FALSE), +- mSysPrefs(nsnull) ++nsSystemPref::nsSystemPref() : mIgnorePrefSetting(PR_FALSE) + { ++ mSavedPrefs.Init(); ++ mCachedUserPrefBranch = nsnull; ++ mCachedDefaultPrefBranch = nsnull; + } + + nsSystemPref::~nsSystemPref() + { +- mSysPrefService = nsnull; +- mEnabled = PR_FALSE; +- delete [] mSysPrefs; + } + + /////////////////////////////////////////////////////////////////////////////// +@@ -131,6 +126,54 @@ + return(rv); + } + ++already_AddRefed ++nsSystemPref::GetPrefUserBranch() ++{ ++ if (mCachedUserPrefBranch) { ++ NS_ADDREF(mCachedUserPrefBranch); ++ return mCachedUserPrefBranch; ++ } ++ ++ nsresult rv; ++ nsCOMPtr prefService = ++ do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); ++ if (NS_FAILED(rv)) ++ return nsnull; ++ nsCOMPtr prefBranch; ++ rv = prefService->GetBranch(nsnull, getter_AddRefs(prefBranch)); ++ if (NS_FAILED(rv)) ++ return nsnull; ++ nsCOMPtr pb2(do_QueryInterface(prefBranch)); ++ if (!pb2) ++ return nsnull; ++ ++ nsIPrefBranch2* result = nsnull; ++ pb2.swap(result); ++ return result; ++} ++ ++already_AddRefed ++nsSystemPref::GetPrefDefaultBranch() ++{ ++ if (mCachedDefaultPrefBranch) { ++ NS_ADDREF(mCachedDefaultPrefBranch); ++ return mCachedDefaultPrefBranch; ++ } ++ ++ nsresult rv; ++ nsCOMPtr prefService = ++ do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); ++ if (NS_FAILED(rv)) ++ return nsnull; ++ nsCOMPtr prefBranch; ++ rv = prefService->GetDefaultBranch(nsnull, getter_AddRefs(prefBranch)); ++ if (NS_FAILED(rv)) ++ return nsnull; ++ nsIPrefBranch* pb = nsnull; ++ prefBranch.swap(pb); ++ return pb; ++} ++ + /////////////////////////////////////////////////////////////////////////////// + // nsSystemPref::Observe + // Observe notifications from mozilla pref system and system prefs (if enabled) +@@ -145,330 +188,446 @@ + if (!aTopic) + return NS_OK; + +- // if we are notified by pref service +- // check the system pref settings +- if (!nsCRT::strcmp(aTopic, NS_PREFSERVICE_READ_TOPIC_ID)) { +- SYSPREF_LOG(("Observed: %s\n", aTopic)); +- +- nsCOMPtr prefBranch = +- do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); +- if (NS_FAILED(rv)) +- return rv; ++ nsCOMPtr userBranch = GetPrefUserBranch(); ++ nsCOMPtr defaultBranch = GetPrefDefaultBranch(); + +- rv = prefBranch->GetBoolPref(sSysPrefString, &mEnabled); ++ // Check the default branch first. If system prefs are enabled ++ // by default, then don't check the user prefs; we don't want ++ // to allow users to change the default. ++ PRBool defaultEnabled; ++ rv = defaultBranch->GetBoolPref(sSysPrefString, &defaultEnabled); ++ if (NS_FAILED(rv)) { ++ SYSPREF_LOG(("...Failed to Get %s\n", sSysPrefString)); ++ return rv; ++ } ++ PRBool enabled = defaultEnabled; ++ if (!enabled) { ++ rv = userBranch->GetBoolPref(sSysPrefString, &enabled); + if (NS_FAILED(rv)) { +- SYSPREF_LOG(("...FAil to Get %s\n", sSysPrefString)); ++ SYSPREF_LOG(("...Failed to Get %s\n", sSysPrefString)); + return rv; + } ++ } + +- // if there is no system pref service, assume nothing happen to us +- mSysPrefService = do_GetService(NS_SYSTEMPREF_SERVICE_CONTRACTID, &rv); +- if (NS_FAILED(rv) || !mSysPrefService) { +- SYSPREF_LOG(("...No System Pref Service\n")); +- return NS_OK; +- } ++ if (!nsCRT::strcmp(aTopic, NS_PREFSERVICE_READ_TOPIC_ID)) { ++ // The prefs have just loaded. This is the first thing that ++ // happens to us. ++ SYSPREF_LOG(("Observed: %s\n", aTopic)); + +- // listen on its changes +- rv = prefBranch->AddObserver(sSysPrefString, this, PR_TRUE); ++ // listen on changes to use_system_pref. It's OK to ++ // hold a strong reference because we don't keep a reference ++ // to the pref branch. ++ rv = userBranch->AddObserver(sSysPrefString, this, PR_TRUE); + if (NS_FAILED(rv)) { +- SYSPREF_LOG(("...FAil to add observer for %s\n", sSysPrefString)); ++ SYSPREF_LOG(("...Failed to add observer for %s\n", sSysPrefString)); + return rv; + } + +- if (!mEnabled) { +- SYSPREF_LOG(("%s is disabled\n", sSysPrefString)); ++ NS_ASSERTION(!mSysPrefService, "Should not be already enabled"); ++ if (!enabled) { ++ // Don't load the system pref service if the preference is ++ // not set. + return NS_OK; + } +- SYSPREF_LOG(("%s is enabled\n", sSysPrefString)); +- rv = UseSystemPrefs(); + +- } +- // sSysPrefString value was changed, update ... +- else if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) && +- NS_ConvertUTF8toUCS2(sSysPrefString).Equals(aData)) { +- SYSPREF_LOG(("++++++ Notify: topic=%s data=%s\n", +- aTopic, NS_ConvertUCS2toUTF8(aData).get())); ++ SYSPREF_LOG(("%s is enabled\n", sSysPrefString)); + +- nsCOMPtr prefBranch = +- do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); ++ rv = LoadSystemPrefs(); + if (NS_FAILED(rv)) + return rv; + +- PRBool enabled = mEnabled; +- rv = prefBranch->GetBoolPref(sSysPrefString, &mEnabled); +- if (enabled != mEnabled) { +- if (mEnabled) +- //read prefs from system +- rv = UseSystemPrefs(); +- else +- //roll back to mozilla prefs +- rv = UseMozillaPrefs(); ++ // Lock config.use_system_prefs so the user can't undo ++ // it. But only do this if it was set by in the default prefs; ++ // if it was not set by default, then locking it would actually ++ // unset the value! And the user should be allowed to turn off ++ // something they set themselves. ++ if (NS_SUCCEEDED(rv) && defaultEnabled) { ++ userBranch->LockPref(sSysPrefString); + } + } + +- // if the system pref notify us that some pref has been changed by user +- // outside mozilla. We need to read it again. +- else if (!nsCRT::strcmp(aTopic, NS_SYSTEMPREF_PREFCHANGE_TOPIC_ID) && +- aData) { +- NS_ASSERTION(mEnabled == PR_TRUE, "Should not listen when disabled"); +- SYSPREF_LOG(("====== System Pref Notify topic=%s data=%s\n", +- aTopic, (char*)aData)); +- rv = ReadSystemPref(NS_LossyConvertUCS2toASCII(aData).get()); +- return NS_OK; +- } else if (!nsCRT::strcmp(aTopic,"profile-before-change")) { +- //roll back to mozilla prefs +- if (mEnabled) +- UseMozillaPrefs(); +- mEnabled = PR_FALSE; +- mSysPrefService = nsnull; +- delete [] mSysPrefs; +- mSysPrefs = nsnull; +- } else +- SYSPREF_LOG(("Not needed topic Received %s\n", aTopic)); +- return rv; +-} ++ if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) && ++ nsDependentString(aData).EqualsASCII(sSysPrefString)) { ++ // sSysPrefString value was changed, update... ++ SYSPREF_LOG(("++++++ Notify: topic=%s data=%s\n", ++ aTopic, NS_ConvertUCS2toUTF8(aData).get())); ++ if (mSysPrefService && !enabled) ++ return RestoreMozillaPrefs(); ++ if (!mSysPrefService && enabled) { ++ // Don't lock it. If the user enabled use_system_prefs, ++ // they should be allowed to unlock it. ++ return LoadSystemPrefs(); ++ } + +-/* private */ ++ // didn't change? ++ return NS_OK; ++ } + +-//////////////////////////////////////////////////////////////// +-// nsSystemPref::UseSystemPrefs +-// Read all the prefs in the table from system, listen for their +-// changes in system pref service. +-//////////////////////////////////////////////////////////////// +-nsresult +-nsSystemPref::UseSystemPrefs() +-{ +- SYSPREF_LOG(("\n====Now Use system prefs==\n")); +- nsresult rv = NS_OK; +- if (!mSysPrefService) { +- return NS_ERROR_FAILURE; ++ if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { ++ // some other pref changed, tell the backend if there is one ++ if (mSysPrefService && !mIgnorePrefSetting) { ++ NS_LossyConvertUTF16toASCII tmp(aData); ++#ifdef DEBUG ++ PRBool isLocked; ++ userBranch->PrefIsLocked(tmp.get(), &isLocked); ++ NS_ASSERTION(!isLocked, "Locked pref is changing?"); ++#endif ++ SysPrefItem* item; ++ if (!mSavedPrefs.Get(tmp, &item)) { ++ NS_ERROR("Notified about pref change that we didn't ask about?"); ++ } else { ++ if (!item->ignore) { ++ mSysPrefService->NotifyMozillaPrefChanged(tmp.get()); ++ } ++ } ++ } ++ return NS_OK; + } + +- PRIntn sysPrefCount= sizeof(sSysPrefList) / sizeof(sSysPrefList[0]); ++ if (!nsCRT::strcmp(aTopic,"profile-before-change")) ++ return RestoreMozillaPrefs(); + +- if (!mSysPrefs) { +- mSysPrefs = new SysPrefItem[sysPrefCount]; +- if (!mSysPrefs) +- return NS_ERROR_OUT_OF_MEMORY; +- for (PRIntn index = 0; index < sysPrefCount; ++index) +- mSysPrefs[index].SetPrefName(sSysPrefList[index]); +- } ++ SYSPREF_LOG(("Not needed topic Received %s\n", aTopic)); + +- for (PRIntn index = 0; index < sysPrefCount; ++index) { +- // save mozilla prefs +- SaveMozDefaultPref(mSysPrefs[index].prefName, +- &mSysPrefs[index].defaultValue, +- &mSysPrefs[index].isLocked); +- +- // get the system prefs +- ReadSystemPref(mSysPrefs[index].prefName); +- SYSPREF_LOG(("Add Listener on %s\n", mSysPrefs[index].prefName)); +- mSysPrefService->AddObserver(mSysPrefs[index].prefName, +- this, PR_TRUE); +- } + return rv; + } + +-////////////////////////////////////////////////////////////////////// +-// nsSystemPref::ReadSystemPref +-// Read a pref value from system pref service, and lock it in mozilla. +-////////////////////////////////////////////////////////////////////// + nsresult +-nsSystemPref::ReadSystemPref(const char *aPrefName) ++nsSystemPref::SetOverridingMozillaBoolPref(const char* aPrefName, ++ PRBool aValue, PRBool aLock, PRBool aPresent) + { +- if (!mSysPrefService) +- return NS_ERROR_FAILURE; +- nsresult rv; +- +- nsCOMPtr prefBranch +- (do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); +- if (NS_FAILED(rv)) +- return rv; +- +- SYSPREF_LOG(("about to read aPrefName %s\n", aPrefName)); ++ return OverridePref(aPrefName, nsIPrefBranch::PREF_BOOL, ++ (void*)aValue, aLock, aPresent); ++} + +- prefBranch->UnlockPref(aPrefName); ++nsresult ++nsSystemPref::SetOverridingMozillaIntPref(const char* aPrefName, ++ PRInt32 aValue, PRBool aLock, PRBool aPresent) ++{ ++ return OverridePref(aPrefName, nsIPrefBranch::PREF_INT, ++ (void*)aValue, aLock, aPresent); ++} + +- PRInt32 prefType = nsIPrefBranch::PREF_INVALID; +- nsXPIDLCString strValue; +- PRInt32 intValue = 0; +- PRBool boolValue = PR_FALSE; ++nsresult ++nsSystemPref::SetOverridingMozillaStringPref(const char* aPrefName, ++ const char* aValue, PRBool aLock, PRBool aPresent) ++{ ++ return OverridePref(aPrefName, nsIPrefBranch::PREF_STRING, ++ (void*)aValue, aLock, aPresent); ++} + +- rv = prefBranch->GetPrefType(aPrefName, &prefType); +- if (NS_FAILED(rv)) +- return rv; +- switch (prefType) { ++static nsresult RestorePrefValue(PRInt32 aPrefType, ++ const char* aPrefName, ++ SysPrefItem* aItem, ++ nsIPrefBranch* aUser, ++ nsIPrefBranch* aDefault) ++{ ++ switch (aPrefType) { + case nsIPrefBranch::PREF_STRING: +- mSysPrefService->GetCharPref(aPrefName, getter_Copies(strValue)); +- SYSPREF_LOG(("system value is %s\n", strValue.get())); +- +- prefBranch->SetCharPref(aPrefName, strValue.get()); ++ aDefault->SetCharPref(aPrefName, ++ aItem->savedDefaultValueString); ++ if (aItem->savedUserPresent) { ++ aUser->SetCharPref(aPrefName, aItem->savedUserValueString); ++ } + break; + case nsIPrefBranch::PREF_INT: +- mSysPrefService->GetIntPref(aPrefName, &intValue); +- SYSPREF_LOG(("system value is %d\n", intValue)); +- +- prefBranch->SetIntPref(aPrefName, intValue); ++ aDefault->SetIntPref(aPrefName, aItem->savedDefaultValueScalar); ++ if (aItem->savedUserPresent) { ++ aUser->SetIntPref(aPrefName, aItem->savedUserValueScalar); ++ } + break; + case nsIPrefBranch::PREF_BOOL: +- mSysPrefService->GetBoolPref(aPrefName, &boolValue); +- SYSPREF_LOG(("system value is %s\n", boolValue ? "TRUE" : "FALSE")); +- +- prefBranch->SetBoolPref(aPrefName, boolValue); ++ aDefault->SetBoolPref(aPrefName, aItem->savedDefaultValueScalar); ++ if (aItem->savedUserPresent) { ++ aUser->SetBoolPref(aPrefName, aItem->savedUserValueScalar); ++ } + break; + default: +- SYSPREF_LOG(("Fail to system value for it\n")); ++ NS_ERROR("Unknown preference type"); + return NS_ERROR_FAILURE; + } +- prefBranch->LockPref(aPrefName); ++ ++ if (!aItem->savedUserPresent) { ++ aUser->DeleteBranch(aPrefName); ++ } ++ + return NS_OK; + } + +-////////////////////////////////////////////////////////////////////// +-// nsSystemPref::UseMozillaPrefs +-// Restore mozilla default prefs, remove system pref listeners +-///////////////////////////////////////////////////////////////////// +-nsresult +-nsSystemPref::UseMozillaPrefs() ++static PLDHashOperator PR_CALLBACK RestorePref(const nsACString& aKey, ++ SysPrefItem* aItem, ++ void* aClosure) + { +- nsresult rv = NS_OK; +- SYSPREF_LOG(("\n====Now rollback to Mozilla prefs==\n")); ++ nsSystemPref* prefs = NS_STATIC_CAST(nsSystemPref*, aClosure); ++ nsCOMPtr userBranch = prefs->GetPrefUserBranch(); ++ const nsCString& prefName = PromiseFlatCString(aKey); ++ ++ PRInt32 prefType = nsIPrefBranch::PREF_INVALID; ++ nsresult rv = userBranch->GetPrefType(prefName.get(), &prefType); ++ if (NS_FAILED(rv)) ++ return PL_DHASH_NEXT; ++ PRBool isLocked; ++ userBranch->PrefIsLocked(prefName.get(), &isLocked); ++ if (NS_FAILED(rv)) ++ return PL_DHASH_NEXT; + +- // if we did not use system prefs, do nothing +- if (!mSysPrefService) +- return NS_OK; ++ // Remove our observer before we change the value ++ userBranch->RemoveObserver(prefName.get(), prefs); ++ // Remember to ignore this item. Because some prefs start with "config.use_system_prefs", ++ // which we always observe, even after we remove the observer, changes to the pref will ++ // still be observed by us. We must ignore them. ++ aItem->ignore = PR_TRUE; + +- PRIntn sysPrefCount= sizeof(sSysPrefList) / sizeof(sSysPrefList[0]); +- for (PRIntn index = 0; index < sysPrefCount; ++index) { +- // restore mozilla default value and free string memory if needed +- RestoreMozDefaultPref(mSysPrefs[index].prefName, +- &mSysPrefs[index].defaultValue, +- mSysPrefs[index].isLocked); +- SYSPREF_LOG(("stop listening on %s\n", mSysPrefs[index].prefName)); +- mSysPrefService->RemoveObserver(mSysPrefs[index].prefName, +- this); ++ // Unlock the pref so we can set it ++ if (isLocked) { ++ userBranch->UnlockPref(prefName.get()); + } +- return rv; ++ ++ nsCOMPtr defaultBranch = prefs->GetPrefDefaultBranch(); ++ ++ RestorePrefValue(prefType, prefName.get(), aItem, ++ userBranch, defaultBranch); ++ ++ if (aItem->savedLocked) { ++ userBranch->LockPref(prefName.get()); ++ } ++ ++ return PL_DHASH_NEXT; + } + +-//////////////////////////////////////////////////////////////////////////// +-// nsSystemPref::RestoreMozDefaultPref +-// Save the saved mozilla default value. +-// It is also responsible for allocate the string memory when needed, because +-// this method know what type of value is stored. +-///////////////////////////////////////////////////////////////////////////// + nsresult +-nsSystemPref::SaveMozDefaultPref(const char *aPrefName, +- MozPrefValue *aPrefValue, +- PRBool *aLocked) +-{ +- NS_ENSURE_ARG_POINTER(aPrefName); +- NS_ENSURE_ARG_POINTER(aPrefValue); +- NS_ENSURE_ARG_POINTER(aLocked); +- +- nsresult rv; ++nsSystemPref::StopOverridingMozillaPref(const char* aPrefName) ++{ ++ SysPrefItem* item; ++ nsDependentCString prefNameStr(aPrefName); ++ if (!mSavedPrefs.Get(prefNameStr, &item)) ++ return NS_OK; + +- nsCOMPtr prefBranch = +- do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); +- if (NS_FAILED(rv)) +- return rv; ++ RestorePref(prefNameStr, item, this); ++ mSavedPrefs.Remove(prefNameStr); ++ delete item; ++ return NS_OK; ++} + +- SYSPREF_LOG(("Save Mozilla value for %s\n", aPrefName)); ++/* private */ + ++nsresult ++nsSystemPref::OverridePref(const char* aPrefName, PRInt32 aType, ++ void* aValue, PRBool aLock, PRBool aPresent) ++{ ++ nsCOMPtr userBranch = GetPrefUserBranch(); ++ nsCOMPtr defaultBranch = GetPrefDefaultBranch(); + PRInt32 prefType = nsIPrefBranch::PREF_INVALID; +- nsXPIDLCString strValue; +- +- rv = prefBranch->GetPrefType(aPrefName, &prefType); ++ nsresult rv = userBranch->GetPrefType(aPrefName, &prefType); + if (NS_FAILED(rv)) + return rv; +- switch (prefType) { +- case nsIPrefBranch::PREF_STRING: +- prefBranch->GetCharPref(aPrefName, +- getter_Copies(strValue)); +- SYSPREF_LOG(("Mozilla value is %s", strValue.get())); +- +- if (aPrefValue->stringVal) +- PL_strfree(aPrefValue->stringVal); +- aPrefValue->stringVal = PL_strdup(strValue.get()); +- break; +- case nsIPrefBranch::PREF_INT: +- prefBranch->GetIntPref(aPrefName, &aPrefValue->intVal); +- SYSPREF_LOG(("Mozilla value is %d\n", aPrefValue->intVal)); + +- break; +- case nsIPrefBranch::PREF_BOOL: +- prefBranch->GetBoolPref(aPrefName, &aPrefValue->boolVal); +- SYSPREF_LOG(("Mozilla value is %s\n", +- aPrefValue->boolVal ? "TRUE" : "FALSE")); ++ PRBool isLocked; ++ rv = userBranch->PrefIsLocked(aPrefName, &isLocked); ++ if (NS_FAILED(rv)) ++ return rv; ++ PRBool hasUserValue; ++ rv = userBranch->PrefHasUserValue(aPrefName, &hasUserValue); ++ if (NS_FAILED(rv)) ++ return rv; + +- break; +- default: +- SYSPREF_LOG(("Fail to Read Mozilla value for it\n")); +- return NS_ERROR_FAILURE; ++ if (prefType == 0) { ++ // Preference does not exist. Allow the system prefs to ++ // set it. ++ } else { ++ NS_ASSERTION(aType == prefType, ++ "System pref engine passed incorrect type for Mozilla pref"); ++ if (aType != prefType) ++ return NS_ERROR_FAILURE; ++ } ++ ++ if (prefType != 0) { ++ nsDependentCString prefNameStr(aPrefName); ++ SysPrefItem* item = nsnull; ++ if (!mSavedPrefs.Get(prefNameStr, &item)) { ++ // Need to save the existing value away ++ item = new SysPrefItem(); ++ if (!item) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ item->savedLocked = isLocked; ++ item->savedUserPresent = hasUserValue; ++ ++ switch (prefType) { ++ case nsIPrefBranch::PREF_STRING: ++ if (hasUserValue) { ++ userBranch->GetCharPref(aPrefName, &item->savedUserValueString); ++ } ++ defaultBranch->GetCharPref(aPrefName, &item->savedDefaultValueString); ++ break; ++ case nsIPrefBranch::PREF_INT: ++ if (hasUserValue) { ++ userBranch->GetIntPref(aPrefName, &item->savedUserValueScalar); ++ } ++ defaultBranch->GetIntPref(aPrefName, &item->savedDefaultValueScalar); ++ break; ++ case nsIPrefBranch::PREF_BOOL: ++ if (hasUserValue) { ++ userBranch->GetBoolPref(aPrefName, &item->savedUserValueScalar); ++ } ++ defaultBranch->GetBoolPref(aPrefName, &item->savedDefaultValueScalar); ++ break; ++ default: ++ NS_ERROR("Unknown preference type"); ++ delete item; ++ return NS_ERROR_FAILURE; ++ } ++ ++ mSavedPrefs.Put(prefNameStr, item); ++ ++ // Watch the user value in case it changes on the Mozilla side ++ // If 'aLock' is true then it shouldn't change and we don't ++ // need the observer, but don't bother optimizing for that. ++ userBranch->AddObserver(aPrefName, this, PR_TRUE); ++ } else { ++ if (isLocked != aLock) { ++ // restore pref value on user and default branches ++ RestorePrefValue(prefType, aPrefName, item, ++ userBranch, defaultBranch); ++ } ++ } + } +- rv = prefBranch->PrefIsLocked(aPrefName, aLocked); +- SYSPREF_LOG((" (%s).\n", aLocked ? "Locked" : "NOT Locked")); +- return rv; +-} + +-//////////////////////////////////////////////////////////////////////////// +-// nsSystemPref::RestoreMozDefaultPref +-// Restore the saved mozilla default value to pref service. +-// It is also responsible for free the string memory when needed, because +-// this method know what type of value is stored. +-///////////////////////////////////////////////////////////////////////////// +-nsresult +-nsSystemPref::RestoreMozDefaultPref(const char *aPrefName, +- MozPrefValue *aPrefValue, +- PRBool aLocked) +-{ +- NS_ENSURE_ARG_POINTER(aPrefName); ++ // We need to ignore pref changes due to our own calls here ++ mIgnorePrefSetting = PR_TRUE; + +- nsresult rv; ++ // Unlock it if it's locked, so we can set it ++ if (isLocked) { ++ rv = userBranch->UnlockPref(aPrefName); ++ if (NS_FAILED(rv)) ++ return rv; ++ } + +- nsCOMPtr prefBranch = +- do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); ++ // Set the pref on the default branch if we're locking it, because ++ // only the default branch gets used when the pref is locked. ++ // Set the pref on the user branch if we're not locking it, because ++ // that's where the user change will go. ++ nsIPrefBranch* settingBranch = ++ aLock ? defaultBranch.get() : NS_STATIC_CAST(nsIPrefBranch*, userBranch.get()); ++ ++ if (!aPresent) { ++ rv = settingBranch->DeleteBranch(aPrefName); ++ } else { ++ switch (aType) { ++ case nsIPrefBranch::PREF_STRING: ++ rv = settingBranch->SetCharPref(aPrefName, (const char*)aValue); ++ break; ++ case nsIPrefBranch::PREF_INT: ++ rv = settingBranch->SetIntPref(aPrefName, (PRInt32)(NS_PTR_TO_INT32(aValue))); ++ break; ++ case nsIPrefBranch::PREF_BOOL: ++ rv = settingBranch->SetBoolPref(aPrefName, (PRBool)(NS_PTR_TO_INT32(aValue))); ++ break; ++ default: ++ NS_ERROR("Unknown preference type"); ++ mIgnorePrefSetting = PR_FALSE; ++ return NS_ERROR_FAILURE; ++ } ++ } + if (NS_FAILED(rv)) + return rv; ++ if (aLock) { ++ rv = userBranch->LockPref(aPrefName); ++ } + +- SYSPREF_LOG(("Restore Mozilla value for %s\n", aPrefName)); ++ mIgnorePrefSetting = PR_FALSE; ++ return rv; ++} + +- PRInt32 prefType = nsIPrefBranch::PREF_INVALID; +- rv = prefBranch->GetPrefType(aPrefName, &prefType); ++nsresult ++nsSystemPref::FixupLockdownPrefs() ++{ ++ nsCOMPtr userPrefs = GetPrefUserBranch(); ++ nsCOMPtr defaultPrefs = GetPrefUserBranch(); ++ PRUint32 childCount; ++ char **childArray = nsnull; ++ nsresult rv = userPrefs->GetChildList("config.lockdown.", ++ &childCount, &childArray); + if (NS_FAILED(rv)) + return rv; ++ for (PRUint32 i = 0; i < childCount; ++i) { ++ PRInt32 type; ++ rv = defaultPrefs->GetPrefType(childArray[i], &type); ++ if (NS_FAILED(rv)) ++ return rv; ++ NS_ASSERTION(type == nsIPrefBranch2::PREF_BOOL, ++ "All config.lockdown.* prefs should be boolean"); ++ if (type == nsIPrefBranch2::PREF_BOOL) { ++ rv = defaultPrefs->SetBoolPref(childArray[i], PR_FALSE); ++ if (NS_FAILED(rv)) ++ return rv; ++ } ++ } ++ NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(childCount, childArray); ++ return NS_OK; ++} + +- // unlock, if it is locked +- prefBranch->UnlockPref(aPrefName); ++nsresult ++nsSystemPref::LoadSystemPrefs() ++{ ++ SYSPREF_LOG(("\n====Now Use system prefs==\n")); ++ NS_ASSERTION(!mSysPrefService, ++ "Shouldn't have the pref service here"); ++ nsresult rv; ++ mSysPrefService = do_GetService(NS_SYSTEMPREF_SERVICE_CONTRACTID, &rv); ++ if (NS_FAILED(rv) || !mSysPrefService) { ++ FixupLockdownPrefs(); ++ SYSPREF_LOG(("...No System Pref Service\n")); ++ return NS_OK; ++ } + +- switch (prefType) { +- case nsIPrefBranch::PREF_STRING: +- prefBranch->SetCharPref(aPrefName, +- aPrefValue->stringVal); +- SYSPREF_LOG(("Mozilla value is %s\n", aPrefValue->stringVal)); ++ // Cache the pref-branch while we load up the system prefs. ++ NS_ASSERTION(!mCachedUserPrefBranch, ++ "Shouldn't have a cache here"); ++ nsCOMPtr userBranch = GetPrefUserBranch(); ++ nsCOMPtr defaultBranch = GetPrefDefaultBranch(); ++ mCachedDefaultPrefBranch = defaultBranch; ++ mCachedUserPrefBranch = userBranch; ++ rv = mSysPrefService->LoadSystemPreferences(this); ++ mCachedDefaultPrefBranch = nsnull; ++ mCachedUserPrefBranch = nsnull; ++ ++ if (NS_FAILED(rv)) { ++ // Restore all modified preferences to their original values ++ mSavedPrefs.EnumerateRead(RestorePref, this); ++ mSavedPrefs.Clear(); ++ mSysPrefService = nsnull; ++ } ++ ++ return rv; ++} + +- PL_strfree(aPrefValue->stringVal); +- aPrefValue->stringVal = nsnull; ++nsresult ++nsSystemPref::RestoreMozillaPrefs() ++{ ++ SYSPREF_LOG(("\n====Now rollback to Mozilla prefs==\n")); + +- break; +- case nsIPrefBranch::PREF_INT: +- prefBranch->SetIntPref(aPrefName, aPrefValue->intVal); +- SYSPREF_LOG(("Mozilla value is %d\n", aPrefValue->intVal)); ++ NS_ASSERTION(mSysPrefService, ++ "Should have the pref service here"); ++ if (!mSysPrefService) ++ return NS_ERROR_FAILURE; + +- break; +- case nsIPrefBranch::PREF_BOOL: +- prefBranch->SetBoolPref(aPrefName, aPrefValue->boolVal); +- SYSPREF_LOG(("Mozilla value is %s\n", +- aPrefValue->boolVal ? "TRUE" : "FALSE")); ++ nsCOMPtr userBranch = GetPrefUserBranch(); ++ nsCOMPtr defaultBranch = GetPrefDefaultBranch(); ++ mCachedDefaultPrefBranch = defaultBranch; ++ mCachedUserPrefBranch = userBranch; ++ ++ mSysPrefService->NotifyUnloadSystemPreferences(); ++ // Restore all modified preferences to their original values ++ mSavedPrefs.EnumerateRead(RestorePref, this); ++ mSavedPrefs.Clear(); ++ ++ mCachedDefaultPrefBranch = nsnull; ++ mCachedUserPrefBranch = nsnull; ++ ++ mSysPrefService = nsnull; + +- break; +- default: +- SYSPREF_LOG(("Fail to Restore Mozilla value for it\n")); +- return NS_ERROR_FAILURE; +- } ++ FixupLockdownPrefs(); + +- // restore its old lock status +- if (aLocked) +- prefBranch->LockPref(aPrefName); + return NS_OK; + } +--- extensions/pref/system-pref/src/nsSystemPref.h ++++ extensions/pref/system-pref/src/nsSystemPref.h +@@ -23,7 +23,7 @@ + * + * Original Author: Bolian Yin (bolian.yin@sun.com) + * +- * Contributor(s): ++ * Contributor(s): Robert O'Callahan/Novell (rocallahan@novell.com) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or +@@ -45,16 +45,14 @@ + #include "nsCOMPtr.h" + #include "nsXPCOM.h" + #include "nsCRT.h" +-#include "nsIAppStartupNotifier.h" +-#include "nsICategoryManager.h" +-#include "nsIServiceManager.h" + #include "nsWeakReference.h" +-#include "nsIPrefService.h" +-#include "nsIPrefBranch2.h" ++#include "nsClassHashtable.h" ++#include "nsHashKeys.h" ++#include "nsMemory.h" + +-#include ++#include "nsISystemPrefService.h" ++#include "nsIObserver.h" + +-union MozPrefValue; + struct SysPrefItem; + + ////////////////////////////////////////////////////////////////////////// +@@ -62,18 +60,34 @@ + // nsSystemPref, as an extension of mozilla pref service, reads some mozilla + // prefs from host system when the feature is enabled ("config.system-pref"). + // +-// nsSystemPref listens on NS_PREFSERVICE_READ_TOPIC_ID. When notified, +-// nsSystemPref will start the nsSystemPrefService (platform specific) to +-// read all the interested prefs (listed in sSysPrefList table) from system +-// and lock these prefs from user's modification. +-// +-// This feature will make mozilla integrated better into host platforms. If +-// users want to change the prefs read from system, the system provided pref +-// editor (i.e. gconf-editor in gnome) should be used. ++// nsSystemPref listens on NS_PREFSERVICE_READ_TOPIC_ID. When ++// notified, nsSystemPref will start the nsSystemPrefService (platform ++// specific) and tell it to override Mozilla prefs with its own ++// settings. ++// ++// When overriding a Mozilla preference the prefservice can request the ++// pref be locked or unlocked. If the pref is locked then we set the default ++// value and lock it in Mozilla so the user value is ignored and the user cannot ++// change the value. If the pref is unlocked then we set the user value ++// and unlock it in Mozilla so the user can change it. If the user changes it, ++// then the prefservice is notified so it can copy the value back to its ++// underlying store. ++// ++// We detect changes to Mozilla prefs by observing pref changes in the ++// user branch. ++// ++// For testing purposes, if the user toggles on ++// config.use_system_prefs then we save the current preferences before ++// overriding them from gconf, and if the user toggles off ++// config.use_system_prefs *in the same session* then we restore the ++// preferences. If the user exits without turning off use_system_prefs ++// then the saved values are lost and the new values are permanent. ++// + ////////////////////////////////////////////////////////////////////////// + + class nsSystemPref : public nsIObserver, +- public nsSupportsWeakReference ++ public nsSupportsWeakReference, ++ public nsISystemPref + { + public: + NS_DECL_ISUPPORTS +@@ -83,23 +97,39 @@ + virtual ~nsSystemPref(); + nsresult Init(void); + ++ // nsISystemPref ++ virtual nsresult SetOverridingMozillaBoolPref(const char* aPrefName, ++ PRBool aValue, PRBool aLocked, ++ PRBool aPresent = PR_TRUE); ++ virtual nsresult SetOverridingMozillaIntPref(const char* aPrefName, ++ PRInt32 aValue, PRBool aLocked, ++ PRBool aPresent = PR_TRUE); ++ virtual nsresult SetOverridingMozillaStringPref(const char* aPrefName, ++ const char* aValue, PRBool aLocked, ++ PRBool aPresent = PR_TRUE); ++ virtual nsresult StopOverridingMozillaPref(const char* aPrefName); ++ virtual already_AddRefed GetPrefUserBranch(); ++ virtual already_AddRefed GetPrefDefaultBranch(); ++ + private: +- // funcs used to load system prefs and save mozilla default prefs +- nsresult UseSystemPrefs(); +- nsresult ReadSystemPref(const char *aPrefName); +- nsresult SaveMozDefaultPref(const char *aPrefName, +- MozPrefValue *aPrefVal, +- PRBool *aLocked); +- +- // funcs used to load mozilla default prefs +- nsresult UseMozillaPrefs(); +- nsresult RestoreMozDefaultPref(const char *aPrefName, +- MozPrefValue *aPrefVal, +- PRBool aLocked); +- +- nsCOMPtr mSysPrefService; +- PRBool mEnabled; // system pref is enabled or not +- SysPrefItem *mSysPrefs; ++ // If we don't load the system prefs for any reason, then ++ // set all config.lockdown.* preferences to PR_FALSE so that ++ // residual lockdown settings are removed. ++ nsresult FixupLockdownPrefs(); ++ ++ nsresult LoadSystemPrefs(); ++ ++ nsresult RestoreMozillaPrefs(); ++ ++ nsresult OverridePref(const char* aPrefName, PRInt32 aType, ++ void* aValue, PRBool aLock, PRBool aPresent); ++ ++ nsCOMPtr mSysPrefService; ++ nsClassHashtable mSavedPrefs; ++ // weak pointers to cached prefbranches ++ nsIPrefBranch2* mCachedUserPrefBranch; ++ nsIPrefBranch* mCachedDefaultPrefBranch; ++ PRPackedBool mIgnorePrefSetting; + }; + + #define NS_SYSTEMPREF_CID \ +--- extensions/pref/system-pref/src/nsSystemPrefFactory.cpp ++++ extensions/pref/system-pref/src/nsSystemPrefFactory.cpp +@@ -42,10 +42,10 @@ + #include "nsICategoryManager.h" + #include "nsIGenericFactory.h" + #include "nsSystemPref.h" +-#include "nsSystemPrefService.h" ++#include "nsIServiceManager.h" ++#include "nsIAppStartupNotifier.h" + + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemPref, Init) +-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemPrefService, Init) + + // Registering nsSystemPref module as part of the app-startup category to get + // it instantiated. +@@ -96,11 +96,6 @@ + RegisterSystemPref, + UnRegisterSystemPref, + }, +- { NS_SYSTEMPREF_SERVICE_CLASSNAME, +- NS_SYSTEMPREF_SERVICE_CID, +- NS_SYSTEMPREF_SERVICE_CONTRACTID, +- nsSystemPrefServiceConstructor, +- }, + }; + + NS_IMPL_NSGETMODULE(nsSystemPrefModule, components) diff --git a/gecko-lockdown.patch b/gecko-lockdown.patch new file mode 100644 index 00000000..f3fa03f5 --- /dev/null +++ b/gecko-lockdown.patch @@ -0,0 +1,330 @@ +Index: extensions/cookie/nsCookiePermission.cpp +================================================================================ +--- extensions/cookie/nsCookiePermission.cpp ++++ extensions/cookie/nsCookiePermission.cpp +@@ -83,6 +83,7 @@ + // obsolete pref names for migration + static const char kCookiesLifetimeEnabled[] = "network.cookie.lifetime.enabled"; + static const char kCookiesLifetimeBehavior[] = "network.cookie.lifetime.behavior"; ++static const char kCookiesHonorExceptions[] = "network.cookie.honorExceptions"; + static const char kCookiesAskPermission[] = "network.cookie.warnAboutCookies"; + + static const char kPermissionType[] = "cookie"; +@@ -126,6 +127,7 @@ + prefBranch->AddObserver(kCookiesLifetimePolicy, this, PR_FALSE); + prefBranch->AddObserver(kCookiesLifetimeDays, this, PR_FALSE); + prefBranch->AddObserver(kCookiesAlwaysAcceptSession, this, PR_FALSE); ++ prefBranch->AddObserver(kCookiesHonorExceptions, this, PR_FALSE); + #ifdef MOZ_MAIL_NEWS + prefBranch->AddObserver(kCookiesDisabledForMailNews, this, PR_FALSE); + #endif +@@ -182,6 +184,10 @@ + if (PREF_CHANGED(kCookiesAlwaysAcceptSession) && + NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesAlwaysAcceptSession, &val))) + mCookiesAlwaysAcceptSession = val; ++ ++ if (PREF_CHANGED(kCookiesHonorExceptions) && ++ NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesHonorExceptions, &val))) ++ mCookiesHonorExceptions = val; + + #ifdef MOZ_MAIL_NEWS + if (PREF_CHANGED(kCookiesDisabledForMailNews) && +@@ -249,6 +255,11 @@ + #endif // MOZ_MAIL_NEWS + + // finally, check with permission manager... ++ if (!mCookiesHonorExceptions) { ++ *aResult = ACCESS_DEFAULT; ++ return NS_OK; ++ } ++ + nsresult rv = mPermMgr->TestPermission(aURI, kPermissionType, (PRUint32 *) aResult); + if (NS_SUCCEEDED(rv)) { + switch (*aResult) { +--- extensions/cookie/nsCookiePermission.h ++++ extensions/cookie/nsCookiePermission.h +@@ -58,10 +58,11 @@ + nsCookiePermission() + : mCookiesLifetimeSec(LL_MAXINT) + , mCookiesLifetimePolicy(0) // ACCEPT_NORMALLY +- , mCookiesAlwaysAcceptSession(PR_FALSE) ++ , mCookiesAlwaysAcceptSession(PR_FALSE), + #ifdef MOZ_MAIL_NEWS +- , mCookiesDisabledForMailNews(PR_TRUE) ++ , mCookiesDisabledForMailNews(PR_TRUE), + #endif ++ mCookiesHonorExceptions(PR_TRUE) + {} + virtual ~nsCookiePermission() {} + +@@ -77,7 +78,7 @@ + #ifdef MOZ_MAIL_NEWS + PRPackedBool mCookiesDisabledForMailNews; + #endif +- ++ PRPackedBool mCookiesHonorExceptions; + }; + + // {CE002B28-92B7-4701-8621-CC925866FB87} +--- extensions/permissions/nsContentBlocker.cpp ++++ extensions/permissions/nsContentBlocker.cpp +@@ -74,6 +74,7 @@ + nsContentBlocker::nsContentBlocker() + { + memset(mBehaviorPref, BEHAVIOR_ACCEPT, NUMBER_OF_TYPES); ++ memset(mHonorExceptions, PR_TRUE, NUMBER_OF_TYPES); + } + + nsresult +@@ -90,6 +91,11 @@ + rv = prefService->GetBranch("permissions.default.", getter_AddRefs(prefBranch)); + NS_ENSURE_SUCCESS(rv, rv); + ++ nsCOMPtr honorExceptionsPrefBranch; ++ rv = prefService->GetBranch("permissions.honorExceptions.", ++ getter_AddRefs(honorExceptionsPrefBranch)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ + // Migrate old image blocker pref + nsCOMPtr oldPrefBranch; + oldPrefBranch = do_QueryInterface(prefService); +@@ -119,8 +125,15 @@ + mPrefBranchInternal = do_QueryInterface(prefBranch, &rv); + NS_ENSURE_SUCCESS(rv, rv); + ++ mHonorExceptionsPrefBranchInternal = ++ do_QueryInterface(honorExceptionsPrefBranch, &rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ + rv = mPrefBranchInternal->AddObserver("", this, PR_TRUE); +- PrefChanged(prefBranch, nsnull); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ rv = mHonorExceptionsPrefBranchInternal->AddObserver("", this, PR_TRUE); ++ PrefChanged(nsnull); + + return rv; + } +@@ -129,19 +142,22 @@ + #define LIMIT(x, low, high, default) ((x) >= (low) && (x) <= (high) ? (x) : (default)) + + void +-nsContentBlocker::PrefChanged(nsIPrefBranch *aPrefBranch, +- const char *aPref) ++nsContentBlocker::PrefChanged(const char *aPref) + { +- PRInt32 val; +- +-#define PREF_CHANGED(_P) (!aPref || !strcmp(aPref, _P)) +- +- for(PRUint32 i = 0; i < NUMBER_OF_TYPES; ++i) { +- if (PREF_CHANGED(kTypeString[i]) && +- NS_SUCCEEDED(aPrefBranch->GetIntPref(kTypeString[i], &val))) +- mBehaviorPref[i] = LIMIT(val, 1, 3, 1); ++ for (PRUint32 i = 0; i < NUMBER_OF_TYPES; ++i) { ++ if (!aPref || !strcmp(kTypeString[i], aPref)) { ++ PRInt32 val; ++ PRBool b; ++ if (mPrefBranchInternal && ++ NS_SUCCEEDED(mPrefBranchInternal->GetIntPref(kTypeString[i], &val))) { ++ mBehaviorPref[i] = LIMIT(val, 1, 3, 1); ++ } ++ if (mHonorExceptionsPrefBranchInternal && ++ NS_SUCCEEDED(mHonorExceptionsPrefBranchInternal->GetBoolPref(kTypeString[i], &b))) { ++ mHonorExceptions[i] = b; ++ } ++ } + } +- + } + + // nsIContentPolicy Implementation +@@ -234,11 +250,13 @@ + // default prefs. + // Don't forget the aContentType ranges from 1..8, while the + // array is indexed 0..7 +- PRUint32 permission; +- nsresult rv = mPermissionManager->TestPermission(aCurrentURI, +- kTypeString[aContentType - 1], +- &permission); +- NS_ENSURE_SUCCESS(rv, rv); ++ PRUint32 permission = 0; ++ if (mHonorExceptions[aContentType - 1]) { ++ nsresult rv = mPermissionManager->TestPermission(aCurrentURI, ++ kTypeString[aContentType - 1], ++ &permission); ++ NS_ENSURE_SUCCESS(rv, rv); ++ } + + // If there is nothing on the list, use the default. + if (!permission) { +@@ -264,7 +282,7 @@ + return NS_OK; + + PRBool trustedSource = PR_FALSE; +- rv = aFirstURI->SchemeIs("chrome", &trustedSource); ++ nsresult rv = aFirstURI->SchemeIs("chrome", &trustedSource); + NS_ENSURE_SUCCESS(rv,rv); + if (!trustedSource) { + rv = aFirstURI->SchemeIs("resource", &trustedSource); +@@ -329,8 +347,6 @@ + { + NS_ASSERTION(!strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic), + "unexpected topic - we only deal with pref changes!"); +- +- if (mPrefBranchInternal) +- PrefChanged(mPrefBranchInternal, NS_LossyConvertUTF16toASCII(aData).get()); ++ PrefChanged(NS_LossyConvertUTF16toASCII(aData).get()); + return NS_OK; + } +--- extensions/permissions/nsContentBlocker.h ++++ extensions/permissions/nsContentBlocker.h +@@ -66,7 +66,7 @@ + private: + ~nsContentBlocker() {} + +- void PrefChanged(nsIPrefBranch *, const char *); ++ void PrefChanged(const char *); + nsresult TestPermission(nsIURI *aCurrentURI, + nsIURI *aFirstURI, + PRInt32 aContentType, +@@ -75,7 +75,9 @@ + + nsCOMPtr mPermissionManager; + nsCOMPtr mPrefBranchInternal; ++ nsCOMPtr mHonorExceptionsPrefBranchInternal; + PRUint8 mBehaviorPref[NUMBER_OF_TYPES]; ++ PRPackedBool mHonorExceptions[NUMBER_OF_TYPES]; + }; + + #define NS_CONTENTBLOCKER_CID \ +--- modules/libpref/src/init/all.js ++++ modules/libpref/src/init/all.js +@@ -716,6 +716,7 @@ + pref("network.hosts.nntp_server", "news.mozilla.org"); + + pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign ++pref("permissions.honorExceptions.image", true); + pref("network.image.warnAboutImages", false); + pref("network.proxy.type", 0); + pref("network.proxy.ftp", ""); +@@ -734,6 +735,7 @@ + pref("network.proxy.failover_timeout", 1800); // 30 minutes + pref("network.online", true); //online/offline + pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-p3p ++pref("network.cookie.honorExceptions", true); + pref("network.cookie.disableCookieForMailNews", true); // disable all cookies for mail + pref("network.cookie.lifetimePolicy", 0); // accept normally, 1-askBeforeAccepting, 2-acceptForSession,3-acceptForNDays + pref("network.cookie.alwaysAcceptSessionCookies", false); +--- netwerk/base/src/nsIOService.cpp ++++ netwerk/base/src/nsIOService.cpp +@@ -371,6 +371,16 @@ + nsCOMPtr prefBranch; + GetPrefBranch(getter_AddRefs(prefBranch)); + if (prefBranch) { ++ nsCAutoString protocolBlockedPref("network.protocol-handler.blocked."); ++ protocolBlockedPref += scheme; ++ PRBool blockedProtocol = PR_FALSE; ++ rv = prefBranch->GetBoolPref(protocolBlockedPref.get(), &blockedProtocol); ++ if (NS_FAILED(rv)) { ++ rv = prefBranch->GetBoolPref("network.protocol-handler.blocked-default", &blockedProtocol); ++ } ++ if (NS_SUCCEEDED(rv) && blockedProtocol) ++ return NS_ERROR_UNKNOWN_PROTOCOL; ++ + nsCAutoString externalProtocolPref("network.protocol-handler.external."); + externalProtocolPref += scheme; + rv = prefBranch->GetBoolPref(externalProtocolPref.get(), &externalProtocol); +--- widget/src/gtk2/nsWindow.cpp ++++ widget/src/gtk2/nsWindow.cpp +@@ -64,6 +64,7 @@ + #include "nsIPrefBranch.h" + #include "nsIServiceManager.h" + #include "nsGfxCIID.h" ++#include "nsIPrefService.h" + + #ifdef ACCESSIBILITY + #include "nsPIAccessNode.h" +@@ -73,7 +74,6 @@ + #include "stdlib.h" + static PRBool sAccessibilityChecked = PR_FALSE; + static PRBool sAccessibilityEnabled = PR_FALSE; +-static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1"; + static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; + static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility"; + #endif +@@ -2644,18 +2644,18 @@ + sAccessibilityEnabled = atoi(envValue); + LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue)); + } +- //check gconf-2 setting ++ //check preference setting + else { +- nsCOMPtr sysPrefService = +- do_GetService(sSysPrefService, &rv); +- if (NS_SUCCEEDED(rv) && sysPrefService) { +- +- // do the work to get gconf setting. +- // will be done soon later. +- sysPrefService->GetBoolPref(sAccessibilityKey, ++ nsCOMPtr prefService = ++ do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); ++ if (NS_SUCCEEDED(rv) && prefService) { ++ nsCOMPtr prefBranch; ++ rv = prefService->GetBranch(nsnull, getter_AddRefs(prefBranch)); ++ if (NS_SUCCEEDED(rv) && prefBranch) { ++ prefBranch->GetBoolPref(sAccessibilityKey, + &sAccessibilityEnabled); ++ } + } +- + } + } + if (sAccessibilityEnabled) { +--- xpinstall/src/nsXPInstallManager.cpp ++++ xpinstall/src/nsXPInstallManager.cpp +@@ -285,6 +285,7 @@ + //----------------------------------------------------- + // Get permission to install + //----------------------------------------------------- ++ nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); + + #ifdef ENABLE_SKIN_SIMPLE_INSTALLATION_UI + if ( mChromeType == CHROME_SKIN ) +@@ -294,7 +295,11 @@ + + // skins get a simpler/friendlier dialog + // XXX currently not embeddable +- OKtoInstall = ConfirmChromeInstall( mParentWindow, packageList ); ++ PRBool themesDisabled = PR_FALSE; ++ if (pref) ++ pref->GetBoolPref("config.lockdown.disable_themes", &themesDisabled); ++ OKtoInstall = !themesDisabled && ++ ConfirmChromeInstall( mParentWindow, packageList ); + } + else + { +@@ -304,12 +304,17 @@ nsXPInstallManager::InitManagerInternal( + else + { + #endif +- rv = dlgSvc->ConfirmInstall( mParentWindow, +- packageList, +- numStrings, +- &OKtoInstall ); +- if (NS_FAILED(rv)) +- OKtoInstall = PR_FALSE; ++ PRBool extensionsDisabled = PR_FALSE; ++ if (pref) ++ pref->GetBoolPref("config.lockdown.disable_extensions", &extensionsDisabled); ++ if (!extensionsDisabled) { ++ rv = dlgSvc->ConfirmInstall( mParentWindow, ++ packageList, ++ numStrings, ++ &OKtoInstall ); ++ if (NS_FAILED(rv)) ++ OKtoInstall = PR_FALSE; ++ } + #ifdef ENABLE_SKIN_SIMPLE_INSTALLATION_UI + } + #endif diff --git a/gnome-vfs-default.patch b/gnome-vfs-default.patch new file mode 100644 index 00000000..4a9a2579 --- /dev/null +++ b/gnome-vfs-default.patch @@ -0,0 +1,47 @@ +Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp +=================================================================== +RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v +retrieving revision 1.58 +diff -d -u -p -r1.58 nsOSHelperAppService.cpp +--- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 ++++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 21 Jul 2005 03:07:40 -0000 +@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const + + LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get())); + ++#ifdef MOZ_WIDGET_GTK2 ++ // Look in GNOME registry first since it is the preferred method in GNOME, ++ // should trump the mailcap entry ++ LOG(("Looking in GNOME registry\n")); ++ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); ++ if (gnomeInfo) { ++ LOG(("Got MIMEInfo from GNOME registry\n")); ++ return gnomeInfo; ++ } ++#endif ++ + // extract the major and minor types + NS_ConvertASCIItoUTF16 mimeType(aMIMEType); + nsAString::const_iterator start_iter, end_iter, +@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const + mozillaFlags, + PR_TRUE); + +- +- if (handler.IsEmpty() && extensions.IsEmpty() && +- mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { +- // No useful data yet +- +-#ifdef MOZ_WIDGET_GTK2 +- LOG(("Looking in GNOME registry\n")); +- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); +- if (gnomeInfo) { +- LOG(("Got MIMEInfo from GNOME registry\n")); +- return gnomeInfo; +- } +-#endif +- } +- + if (handler.IsEmpty() && mailcap_description.IsEmpty()) { + DoLookUpHandlerAndDescription(majorType, + minorType, diff --git a/gnome-vfs.patch b/gnome-vfs.patch new file mode 100644 index 00000000..ea75187a --- /dev/null +++ b/gnome-vfs.patch @@ -0,0 +1,393 @@ +Index: uriloader/exthandler/Makefile.in +================================================================================ +--- uriloader/exthandler/Makefile.in ++++ uriloader/exthandler/Makefile.in +@@ -103,7 +103,7 @@ + LOCAL_INCLUDES = -I$(srcdir) + + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +-OSHELPER += nsGNOMERegistry.cpp ++OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp + endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),beos) +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp +@@ -42,7 +42,7 @@ + #include "nsString.h" + #include "nsIComponentManager.h" + #include "nsILocalFile.h" +-#include "nsMIMEInfoImpl.h" ++#include "nsMIMEInfoUnix.h" + #include "nsAutoPtr.h" + + #include +@@ -56,12 +56,12 @@ + typedef struct _GnomeProgram GnomeProgram; + typedef struct _GnomeModuleInfo GnomeModuleInfo; + +-typedef struct { ++struct GnomeVFSMimeApplication { + char *id; + char *name; + char *command; + /* there is more here, but we don't need it */ +-} GnomeVFSMimeApplication; ++}; + + typedef GConfClient * (*_gconf_client_get_default_fn)(); + typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, +@@ -264,7 +264,7 @@ + } + + +-/* static */ already_AddRefed ++/* static */ already_AddRefed + nsGNOMERegistry::GetFromExtension(const char *aFileExt) + { + if (!gconfLib) +@@ -286,7 +286,7 @@ + return GetFromType(mimeType); + } + +-/* static */ already_AddRefed ++/* static */ already_AddRefed + nsGNOMERegistry::GetFromType(const char *aMIMEType) + { + if (!gconfLib) +@@ -296,9 +296,11 @@ + if (!handlerApp) + return nsnull; + +- nsRefPtr mimeInfo = new nsMIMEInfoImpl(aMIMEType); ++ nsRefPtr mimeInfo = new nsMIMEInfoUnix(aMIMEType); + NS_ENSURE_TRUE(mimeInfo, nsnull); + ++ mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); ++ + // Get the list of extensions and append then to the mimeInfo. + GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); + for (GList *extension = extensions; extension; extension = extension->next) +@@ -320,11 +322,21 @@ + return nsnull; + } + +- gchar *commandPath = g_find_program_in_path(nativeCommand); ++ gchar **argv; ++ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); ++ if (!res) { ++ NS_ERROR("Could not convert helper app command to filesystem encoding"); ++ _gnome_vfs_mime_application_free(handlerApp); ++ return nsnull; ++ } ++ ++ gchar *commandPath = g_find_program_in_path(argv[0]); + + g_free(nativeCommand); ++ g_strfreev(argv); + + if (!commandPath) { ++ NS_WARNING("could not find command in path"); + _gnome_vfs_mime_application_free(handlerApp); + return nsnull; + } +@@ -342,7 +354,7 @@ + + _gnome_vfs_mime_application_free(handlerApp); + +- nsMIMEInfoBase* retval; ++ nsMIMEInfoUnix* retval; + NS_ADDREF((retval = mimeInfo)); + return retval; + } +--- uriloader/exthandler/unix/nsGNOMERegistry.h ++++ uriloader/exthandler/unix/nsGNOMERegistry.h +@@ -35,10 +35,13 @@ + * + * ***** END LICENSE BLOCK ***** */ + ++#ifndef nsGNOMERegistry_h__ ++#define nsGNOMERegistry_h__ ++ + #include "nsIURI.h" + #include "nsCOMPtr.h" + +-class nsMIMEInfoBase; ++class nsMIMEInfoUnix; + + class nsGNOMERegistry + { +@@ -52,7 +55,9 @@ + static void GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc); + +- static already_AddRefed GetFromExtension(const char *aFileExt); ++ static already_AddRefed GetFromExtension(const char *aFileExt); + +- static already_AddRefed GetFromType(const char *aMIMEType); ++ static already_AddRefed GetFromType(const char *aMIMEType); + }; ++ ++#endif // nsGNOMERegistry_h__ +--- uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ++++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +@@ -0,0 +1,196 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org Code. ++ * ++ * The Initial Developer of the Original Code is ++ * Red Hat, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Christopher Aillon (Original author) ++ * ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsMIMEInfoUnix.h" ++#include "prlink.h" ++#include "prmem.h" ++#include ++#include ++ ++static PRLibrary *gnomeLib; ++static PRLibrary *vfsLib; ++ ++typedef struct _GnomeProgram GnomeProgram; ++typedef struct _GnomeModuleInfo GnomeModuleInfo; ++ ++typedef enum { ++ GNOME_VFS_OK // there's more but we don't care about them. ++} GnomeVFSResult; ++ ++typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) ++ (GnomeVFSMimeApplication *app, ++ GList *uris); ++typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); ++typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); ++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, ++ const GnomeModuleInfo *, int, ++ char **, const char *, ...); ++typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); ++typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); ++typedef GnomeProgram * (*_gnome_program_get_fn)(); ++typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); ++ ++#define DECL_FUNC_PTR(func) static _##func##_fn _##func ++ ++DECL_FUNC_PTR(gnome_vfs_mime_application_launch); ++DECL_FUNC_PTR(gnome_vfs_mime_application_free); ++DECL_FUNC_PTR(gnome_vfs_mime_application_copy); ++DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); ++DECL_FUNC_PTR(gnome_program_init); ++DECL_FUNC_PTR(gnome_program_get); ++DECL_FUNC_PTR(libgnome_module_info_get); ++DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); ++ ++static PRLibrary * ++LoadVersionedLibrary(const char* libName, const char* libVersion) ++{ ++ char *platformLibName = PR_GetLibraryName(nsnull, libName); ++ nsCAutoString versionLibName(platformLibName); ++ versionLibName.Append(libVersion); ++ PR_Free(platformLibName); ++ return PR_LoadLibrary(versionLibName.get()); ++} ++ ++static void ++Cleanup() ++{ ++ // Unload all libraries ++ if (gnomeLib) ++ PR_UnloadLibrary(gnomeLib); ++ if (vfsLib) ++ PR_UnloadLibrary(vfsLib); ++ ++ gnomeLib = vfsLib = nsnull; ++} ++ ++static void ++InitGnomeVFS() ++{ ++ static PRBool initialized = PR_FALSE; ++ ++ if (initialized) ++ return; ++ ++ #define ENSURE_LIB(lib) \ ++ PR_BEGIN_MACRO \ ++ if (!lib) { \ ++ Cleanup(); \ ++ return; \ ++ } \ ++ PR_END_MACRO ++ ++ #define GET_LIB_FUNCTION(lib, func, failure) \ ++ PR_BEGIN_MACRO \ ++ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ ++ if (!_##func) { \ ++ failure; \ ++ } \ ++ PR_END_MACRO ++ ++ // Attempt to open libgnome ++ gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); ++ ENSURE_LIB(gnomeLib); ++ ++ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); ++ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); ++ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); ++ ++ // Attempt to open libgnomevfs ++ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); ++ ENSURE_LIB(vfsLib); ++ ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); ++ ++ // Initialize GNOME, if it's not already initialized. It's not ++ // necessary to tell GNOME about our actual command line arguments. ++ ++ if (!_gnome_program_get()) { ++ char *argv[1] = { "gecko" }; ++ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), ++ 1, argv, NULL); ++ } ++ ++ // Note: after GNOME has been initialized, do not ever unload these ++ // libraries. They register atexit handlers, so if they are unloaded, we'll ++ // crash on exit. ++} ++ ++void ++nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) ++{ ++ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { ++ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); ++ ++ mPreferredAction = nsIMIMEInfo::useSystemDefault; ++ ++ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); ++ if (name) ++ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); ++ } ++} ++ ++nsMIMEInfoUnix::~nsMIMEInfoUnix() ++{ ++ if (mDefaultVFSApplication) ++ _gnome_vfs_mime_application_free(mDefaultVFSApplication); ++} ++ ++nsresult ++nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) ++{ ++ NS_ENSURE_ARG_POINTER(aFile); ++ ++ InitGnomeVFS(); ++ ++ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { ++ nsCAutoString nativePath; ++ aFile->GetNativePath(nativePath); ++ ++ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); ++ ++ GList *uris = NULL; ++ uris = g_list_append(uris, uri); ++ ++ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); ++ ++ g_free(uri); ++ g_list_free(uris); ++ ++ if (result != GNOME_VFS_OK) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++ } ++ ++ if (!mDefaultApplication) ++ return NS_ERROR_FILE_NOT_FOUND; ++ ++ return LaunchWithIProcess(mDefaultApplication, aFile); ++} +--- uriloader/exthandler/unix/nsMIMEInfoUnix.h ++++ uriloader/exthandler/unix/nsMIMEInfoUnix.h +@@ -0,0 +1,50 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org Code. ++ * ++ * The Initial Developer of the Original Code is ++ * Red Hat, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Christopher Aillon (Original author) ++ * ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef nsMimeInfoUnix_h__ ++#define nsMimeInfoUnix_h__ ++ ++#include "nsMIMEInfoImpl.h" ++ ++struct GnomeVFSMimeApplication; ++ ++class nsMIMEInfoUnix : public nsMIMEInfoImpl ++{ ++public: ++ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} ++ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {}; ++ ++ virtual ~nsMIMEInfoUnix(); ++ ++ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); ++ ++protected: ++ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); ++ ++ GnomeVFSMimeApplication *mDefaultVFSApplication; ++}; ++ ++#endif // nsMimeInfoUnix_h__ +--- uriloader/exthandler/unix/nsOSHelperAppService.cpp ++++ uriloader/exthandler/unix/nsOSHelperAppService.cpp +@@ -44,6 +44,7 @@ + #include "nsOSHelperAppService.h" + #ifdef MOZ_WIDGET_GTK2 + #include "nsGNOMERegistry.h" ++#include "nsMIMEInfoUnix.h" + #endif + #include "nsISupports.h" + #include "nsString.h" diff --git a/greasemonkey.patch b/greasemonkey.patch new file mode 100644 index 00000000..3c97d131 --- /dev/null +++ b/greasemonkey.patch @@ -0,0 +1,28 @@ +Index: docshell/base/nsDocShell.cpp +================================================================================ +--- docshell/base/nsDocShell.cpp ++++ docshell/base/nsDocShell.cpp +@@ -5758,6 +5758,9 @@ + if (onLocationChangeNeeded) { + FireOnLocationChange(this, request, mCurrentURI); + } ++ ++ FireOnStateChange(this, request, ++ STATE_TRANSFERRING|STATE_IS_NETWORK|STATE_IS_DOCUMENT, NS_OK); + + return NS_OK; + } +--- xpfe/browser/src/nsBrowserStatusFilter.cpp ++++ xpfe/browser/src/nsBrowserStatusFilter.cpp +@@ -152,8 +152,10 @@ + if (aStateFlags & STATE_IS_REQUEST) { + if (!mUseRealProgressFlag && mTotalRequests) + return OnProgressChange(nsnull, nsnull, 0, 0, mFinishedRequests, mTotalRequests); ++ } else if (aStateFlags & STATE_IS_DOCUMENT) { ++ return mListener->OnStateChange(aWebProgress, aRequest, aStateFlags, ++ aStatus); + } +- + // no need to forward this state change + return NS_OK; + } else { diff --git a/l10n.tar.bz2 b/l10n.tar.bz2 new file mode 100644 index 00000000..d89a0bcc --- /dev/null +++ b/l10n.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b6d85090c1d464c570fb198e12d59f27081f0db6f295c7a71d28281e11e4781 +size 11407982 diff --git a/locale.patch b/locale.patch new file mode 100644 index 00000000..8463f035 --- /dev/null +++ b/locale.patch @@ -0,0 +1,11 @@ +--- modules/libpref/src/init/all.js.orig 2004-10-15 14:50:11.740865580 +0200 ++++ modules/libpref/src/init/all.js 2004-10-15 14:50:34.371625152 +0200 +@@ -653,7 +653,7 @@ + pref("intl.charset.detector", "chrome://navigator/locale/navigator.properties"); + pref("intl.charset.default", "chrome://navigator-platform/locale/navigator.properties"); + pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff --git a/make-perl.patch b/make-perl.patch new file mode 100644 index 00000000..3c91bff5 --- /dev/null +++ b/make-perl.patch @@ -0,0 +1,17 @@ +Index: toolkit/mozapps/installer/packager.mk +================================================================================ +--- toolkit/mozapps/installer/packager.mk ++++ toolkit/mozapps/installer/packager.mk +@@ -304,9 +304,9 @@ + @mkdir $(DIST)/$(MOZ_PKG_APPNAME) + ifdef MOZ_PKG_MANIFEST + $(RM) -rf $(DIST)/xpt +- $(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \ +- Packager::Copy("$(DIST)", "$(DIST)/$(MOZ_PKG_APPNAME)", \ +- "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1);' ++ $(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager;' \ ++ -e 'Packager::Copy("$(DIST)", "$(DIST)/$(MOZ_PKG_APPNAME)", ' \ ++ -e '"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1);' + $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v + else # !MOZ_PKG_MANIFEST + ifeq ($(MOZ_PKG_FORMAT),DMG) diff --git a/misc.dif b/misc.dif new file mode 100644 index 00000000..be6fda91 --- /dev/null +++ b/misc.dif @@ -0,0 +1,20 @@ +--- gfx/src/x11shared/nsFT2FontCatalog.cpp ++++ gfx/src/x11shared/nsFT2FontCatalog.cpp +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -92,9 +93,6 @@ + // Called to get the TrueType font summary from the disk font catalog. + // + +-// Solaris is missing a prototype for ctime +-extern "C" {char *ctime(const time_t *timep);} +- + #include + #include FT_GLYPH_H + #include FT_FREETYPE_H diff --git a/mozilla.sh.in b/mozilla.sh.in new file mode 100644 index 00000000..d769c95f --- /dev/null +++ b/mozilla.sh.in @@ -0,0 +1,165 @@ +#!/bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# Wolfgang Rosenauer +# + +## +## Usage: +## +## $ mozilla +## +## This script is meant to run a mozilla program from the mozilla +## rpm installation. +## +## The script will setup all the environment voodoo needed to make +## mozilla work. + +cmdname=`basename $0` + +## +## Variables +## +MOZ_DIST_BIN="%PREFIX" +MOZ_DIST_LIB="%PROGDIR" +MOZ_APPNAME="%APPNAME" +MOZ_PROFILE="%PROFILE" +MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME-bin" + +mozilla_lib=`file $MOZ_PROGRAM | awk '{ print $3 }'` +case $mozilla_lib in + 64-bit) + LIB=lib64 + ;; + *) + LIB=lib + ;; +esac +BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins +if [ ! -d $BROWSER_PLUGIN_DIR ]; then + BROWSER_PLUGIN_DIR=/opt/netscape/plugins +fi + +# Force use of GTK+ 2.0 for Flash player to get better performance +# (no impact when using mozilla gtk1 build +# +export FLASH_GTK_LIBRARY=libgtk-x11-2.0.so.0 + +# ignore composite extension +export XLIB_SKIP_ARGB_VISUALS=1 + +# Pango support +if [ -z "$MOZ_ENABLE_PANGO" -a -z "$MOZ_DISABLE_PANGO" ]; then + case "${LC_ALL-${LC_CTYPE-${LANG-en_US}}}" in + bn*|gu*|hi*|km*|kn*|ml*|mr*|pa*|ta*|te*) # list of languages which need pango + ;; + *) + export MOZ_DISABLE_PANGO=1 # disable by default + ;; + esac +fi + +## +## Set MOZILLA_FIVE_HOME +## +MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" +export MOZILLA_FIVE_HOME + +## +## Set LD_LIBRARY_PATH +## +if [ "$LD_LIBRARY_PATH" ] +then + LD_LIBRARY_PATH=$MOZ_DIST_LIB/plugins:$MOZ_DIST_LIB:$LD_LIBRARY_PATH +else + LD_LIBRARY_PATH=$MOZ_DIST_LIB/plugins:$MOZ_DIST_LIB +fi +export LD_LIBRARY_PATH + +## Make sure that we set the plugin path for backwards compatibility +## Set MOZ_PLUGIN_PATH to $HOME/.mozilla/plugins if not set +## +if [ -z "$MOZ_PLUGIN_PATH" ]; then + export MOZ_PLUGIN_PATH=$MOZILLA_FIVE_HOME/plugins:$BROWSER_PLUGIN_DIR + if [ "$HOME" ] ; then + export MOZ_PLUGIN_PATH=$HOME/$MOZ_PROFILE/plugins:$MOZ_PLUGIN_PATH + fi +else + # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH + echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null + _retval=$? + if [ ${_retval} -ne 0 ]; then + export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR + fi +fi + +moz_pis_startstop_scripts() +{ + MOZ_USER_DIR="$MOZ_PROFILE" + # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" + # These variables and there meaning are specified in + # mozilla/xpfe/bootstrap/init.d/README + MOZ_PIS_API=2 + MOZ_PIS_MOZBINDIR="$MOZ_DIST_LIB" + MOZ_PIS_SESSION_PID="$$" + MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" + export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR + + case "${1}" in + "start") + for curr_pis in "$MOZ_DIST_LIB/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do + if [ -x "${curr_pis}" ] ; then + case "${curr_pis}" in + *.sh) . "${curr_pis}" ;; + *) "${curr_pis}" "start" ;; + esac + fi + done + ;; + "stop") + for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "$MOZ_DIST_LIB/init.d"/K* ; do + if [ -x "${curr_pis}" ] ; then + case "${curr_pis}" in + *.sh) . "${curr_pis}" ;; + *) "${curr_pis}" "stop" ;; + esac + fi + done + ;; + *) + echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." + exit 1 + ;; + esac +} + +## Start addon scripts +moz_pis_startstop_scripts "start" + +if [ -d /proc/asound ]; then + LD_PRELOAD=/usr/$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} $MOZ_PROGRAM $@ +else + $MOZ_PROGRAM $@ +fi + +## Stop addon scripts +moz_pis_startstop_scripts "stop" + +exit 0 diff --git a/nspr-prdtoa.patch b/nspr-prdtoa.patch new file mode 100644 index 00000000..e49314cd --- /dev/null +++ b/nspr-prdtoa.patch @@ -0,0 +1,17 @@ +--- nsprpub/pr/src/misc/Makefile.in.foo Wed Jun 11 15:42:57 2003 ++++ nsprpub/pr/src/misc/Makefile.in Wed Jun 11 15:42:49 2003 +@@ -82,6 +82,14 @@ + + include $(topsrcdir)/config/rules.mk + ++NONOPT_CFLAGS=$(filter-out -O%, $(CFLAGS)) ++ ++ifeq ($(OS_ARCH),Linux) ++$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c ++ @$(MAKE_OBJDIR) ++ $(CC) -o $@ -c $(NONOPT_CFLAGS) -ffloat-store $< ++endif ++ + # + # Generate prerr.h, prerr.c, and prerr.properties from prerr.et. + # diff --git a/nss-opt.patch b/nss-opt.patch new file mode 100644 index 00000000..d633808c --- /dev/null +++ b/nss-opt.patch @@ -0,0 +1,22 @@ +From: Wolfgang Rosenauer +Subject: NSS doesn't inherit CFLAGS +References: https://bugzilla.mozilla.org/show_bug.cgi?id=101249 +Description: +CFLAGS are not taken from mozilla build + +Index: security/manager/Makefile.in +================================================================================ +--- security/manager/Makefile.in ++++ security/manager/Makefile.in +@@ -154,7 +154,10 @@ + ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT)) + DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT) + endif +-ifndef MOZ_DEBUG ++ifdef MOZ_DEBUG ++DEFAULT_GMAKE_FLAGS += OPTIMIZER="$(MOZ_DEBUG_FLAGS)" ++else ++DEFAULT_GMAKE_FLAGS += OPTIMIZER="$(MOZ_OPTIMIZE_FLAGS)" + DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 + endif + ifdef GNU_CC diff --git a/pango-cairo.patch b/pango-cairo.patch new file mode 100644 index 00000000..eaac5efe --- /dev/null +++ b/pango-cairo.patch @@ -0,0 +1,134 @@ +Index: config/autoconf.mk.in +=================================================================== +RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v +retrieving revision 3.363.2.1 +diff -u -p -6 -r3.363.2.1 autoconf.mk.in +--- config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1 ++++ config/autoconf.mk.in 27 Aug 2005 19:57:29 -0000 +@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@ + MOZ_XFT_LIBS = @MOZ_XFT_LIBS@ + MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@ + + MOZ_ENABLE_PANGO = @MOZ_ENABLE_PANGO@ + MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ + MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ ++MOZ_PANGOCAIRO = @MOZ_PANGOCAIRO@ + + MOZ_EXTRA_X11CONVERTERS = @MOZ_EXTRA_X11CONVERTERS@ + + MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@ + MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@ + +Index: gfx/src/gtk/mozilla-decoder.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v +retrieving revision 1.3 +diff -u -p -6 -r1.3 mozilla-decoder.cpp +--- gfx/src/gtk/mozilla-decoder.cpp 7 Nov 2004 23:59:23 -0000 1.3 ++++ gfx/src/gtk/mozilla-decoder.cpp 27 Aug 2005 19:57:49 -0000 +@@ -37,13 +37,17 @@ + * ***** END LICENSE BLOCK ***** */ + + #define PANGO_ENABLE_BACKEND + #define PANGO_ENABLE_ENGINE + + #include "mozilla-decoder.h" ++#ifdef MOZ_PANGOCAIRO ++#include ++#else + #include ++#endif + #include + #include + #include + + #include "nsString.h" + #include "nsIPersistentProperties2.h" +@@ -205,13 +209,17 @@ mozilla_decoders_init(void) + } + else { + printf("unknown suffix used for mapping\n"); + } + } + ++#ifdef MOZ_PANGOCAIRO ++ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), ++#else + pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), ++#endif + mozilla_find_decoder, + NULL, + NULL); + + initialized = PR_TRUE; + +Index: configure.in +=================================================================== +RCS file: /cvsroot/mozilla/configure.in,v +retrieving revision 1.1503.2.6 +diff -u -p -6 -r1.1503.2.6 configure.in +--- configure.in 25 Aug 2005 19:05:34 -0000 1.1503.2.6 ++++ configure.in 29 Aug 2005 08:03:32 -0000 +@@ -3707,14 +3707,14 @@ gtk) + ;; + + gtk2) + MOZ_ENABLE_GTK2=1 + MOZ_ENABLE_XREMOTE=1 + MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} +- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' +- TK_LIBS='$(MOZ_GTK2_LIBS)' ++ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' ++ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' + AC_DEFINE(MOZ_WIDGET_GTK2) + ;; + + xlib) + MOZ_ENABLE_XLIB=1 + if test "$_HAVE_FREETYPE2"; then +@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_ + fi + + if test "$MOZ_ENABLE_XFT" + then + AC_DEFINE(MOZ_ENABLE_XFT) + PKG_CHECK_MODULES(MOZ_XFT, xft) +- PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) ++ PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox) + fi + + AC_SUBST(MOZ_ENABLE_XFT) + AC_SUBST(MOZ_XFT_CFLAGS) + AC_SUBST(MOZ_XFT_LIBS) ++AC_SUBST(MOZ_PANGO_CFLAGS) ++AC_SUBST(MOZ_PANGO_LIBS) + + dnl ======================================================== + dnl = pango font rendering + dnl ======================================================== + MOZ_ARG_ENABLE_BOOL(pango, + [ --enable-pango Enable Pango font rendering support], + MOZ_ENABLE_PANGO=1, + MOZ_ENABLE_PANGO=) + + if test "$MOZ_ENABLE_PANGO" + then + AC_DEFINE(MOZ_ENABLE_PANGO) + PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0) ++ PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0, ++ [ ++ MOZ_PANGOCAIRO=1 ++ AC_DEFINE(MOZ_PANGOCAIRO) ++ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" ++ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" ++ ], ++ [:]) + + AC_SUBST(MOZ_ENABLE_PANGO) ++ AC_SUBST(MOZ_PANGOCAIRO) + AC_SUBST(MOZ_PANGO_CFLAGS) + AC_SUBST(MOZ_PANGO_LIBS) + fi + + dnl ======================================================== + dnl = x11 core font support (default and ability to enable depend on toolkit) diff --git a/plastikfox-theme.tar.bz2 b/plastikfox-theme.tar.bz2 new file mode 100644 index 00000000..366f94fa --- /dev/null +++ b/plastikfox-theme.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a227d241e6e9f588871e23af27097c099cddfd345387f843c847ca4f9222f9ea +size 608690 diff --git a/postscript.patch b/postscript.patch new file mode 100644 index 00000000..9163c2b2 --- /dev/null +++ b/postscript.patch @@ -0,0 +1,29 @@ +From: Wolfgang Rosenauer +Subject: make pagesize postscript DSC conform +References: +http://www.cups.org/str.php?L1542 +https://bugzilla.mozilla.org/show_bug.cgi?id=334485 + +Index: gfx/src/ps/nsPostScriptObj.cpp +================================================================================ +--- gfx/src/ps/nsPostScriptObj.cpp ++++ gfx/src/ps/nsPostScriptObj.cpp +@@ -466,6 +466,7 @@ + + // Tell the printer what size paper it should use + fprintf(f, ++ "%%%%BeginFeature: *PageSize %s\n" + "/setpagedevice where\n" // Test for the feature + "{ pop 2 dict\n" + " dup /PageSize [ %s %s ] put\n" // Paper dimensions +@@ -473,7 +474,9 @@ + " dup /PageSize 3 put\n" // Select the nearest page size to fit + " put\n" + " setpagedevice\n" // Install settings +- "} if\n", ++ "} if\n" ++ "%%%%EndFeature\n", ++ mPrintSetup->paper_name, + fpCString(NSTwipsToFloatPoints(paper_width)).get(), + fpCString(NSTwipsToFloatPoints(paper_height)).get()); + diff --git a/proxy-dev.patch b/proxy-dev.patch new file mode 100644 index 00000000..5131030e --- /dev/null +++ b/proxy-dev.patch @@ -0,0 +1,168 @@ +From: Robert O'Callahan +Subject: proxy.pac: host resolution error +References: +https://bugzilla.novell.com/show_bug.cgi?id=196506 +https://bugzilla.mozilla.org/show_bug.cgi?id=347307 + +Index: netwerk/base/src/nsProxyAutoConfig.js +================================================================================ +--- netwerk/base/src/nsProxyAutoConfig.js ++++ netwerk/base/src/nsProxyAutoConfig.js +@@ -50,7 +50,7 @@ + + const nsISupports = Components.interfaces.nsISupports; + const nsIProxyAutoConfig = Components.interfaces.nsIProxyAutoConfig; +-const nsIDNSService = Components.interfaces.nsIDNSService; ++const nsPIDNSService = Components.interfaces.nsPIDNSService; + + // implementor of nsIProxyAutoConfig + function nsProxyAutoConfig() {}; +@@ -114,7 +114,7 @@ + // wrapper for getting local IP address called by PAC file + function myIpAddress() { + try { +- return dns.resolve(dns.myHostName, 0).getNextAddrAsString(); ++ return dns.getNetworkAddrAsString(); + } catch (e) { + return '127.0.0.1'; + } +@@ -176,7 +176,7 @@ + } + + var pac = new nsProxyAutoConfig() ; +-var dns = Components.classes[kDNS_CONTRACTID].getService(nsIDNSService); ++var dns = Components.classes[kDNS_CONTRACTID].getService(nsPIDNSService); + + var pacUtils = + "function dnsDomainIs(host, domain) {\n" + +--- netwerk/dns/public/nsPIDNSService.idl ++++ netwerk/dns/public/nsPIDNSService.idl +@@ -58,4 +58,11 @@ + * this method. + */ + void shutdown(); ++ ++ /** ++ * Returns the IP address of the machine that is most suitable for ++ * identifying the machine's network. Favour VPN addresses above ++ * wired/wireless addresses above 127.x.x.x addresses. ++ */ ++ ACString getNetworkAddrAsString(); + }; +--- netwerk/dns/src/nsDNSService2.cpp ++++ netwerk/dns/src/nsDNSService2.cpp +@@ -56,6 +56,11 @@ + #include "prio.h" + #include "plstr.h" + ++#include ++#include ++#include ++#include ++ + static const char kPrefDnsCacheEntries[] = "network.dnsCacheEntries"; + static const char kPrefDnsCacheExpiration[] = "network.dnsCacheExpiration"; + static const char kPrefEnableIDN[] = "network.enableIDN"; +@@ -135,6 +140,18 @@ + return NS_OK; + } + ++static nsresult ++AddrToString(PRNetAddr* aAddr, nsACString& aResult) ++{ ++ char buf[64]; ++ if (PR_NetAddrToString(aAddr, buf, sizeof(buf)) == PR_SUCCESS) { ++ aResult.Assign(buf); ++ return NS_OK; ++ } ++ NS_ERROR("PR_NetAddrToString failed unexpectedly"); ++ return NS_ERROR_FAILURE; // conversion failed for some reason ++} ++ + NS_IMETHODIMP + nsDNSRecord::GetNextAddrAsString(nsACString &result) + { +@@ -142,13 +159,7 @@ + nsresult rv = GetNextAddr(0, &addr); + if (NS_FAILED(rv)) return rv; + +- char buf[64]; +- if (PR_NetAddrToString(&addr, buf, sizeof(buf)) == PR_SUCCESS) { +- result.Assign(buf); +- return NS_OK; +- } +- NS_ERROR("PR_NetAddrToString failed unexpectedly"); +- return NS_ERROR_FAILURE; // conversion failed for some reason ++ return AddrToString(&addr, result); + } + + NS_IMETHODIMP +@@ -580,3 +591,68 @@ + + return af; + } ++ ++static PRInt32 ++GetScoreForInterface(struct ifaddrs* aInterface) ++{ ++ // Interface must be up ++ if (!(aInterface->ifa_flags & IFF_UP)) ++ return 0; ++ // Interface must be configured ++ if (!(aInterface->ifa_flags & IFF_RUNNING)) ++ return 0; ++ ++ // Only look at IP interfaces ++ sa_family_t type = aInterface->ifa_addr->sa_family; ++ if (type != AF_INET && type != AF_INET6) ++ return 0; ++ ++ // Loopback interfaces get the lowest score ++ if (aInterface->ifa_flags & IFF_LOOPBACK) ++ return 1; ++ ++ if (strchr(aInterface->ifa_name, ':')) { ++ // guess that it's probably a VPN address ++ return 3; ++ } ++ ++ // Regular interface ++ return 2; ++} ++ ++nsresult ++SockaddrToString(struct sockaddr* aAddr, nsACString& aResult) ++{ ++ PRNetAddr* addr = NS_REINTERPRET_CAST(PRNetAddr*, aAddr); ++ return AddrToString(addr, aResult); ++} ++ ++NS_IMETHODIMP ++nsDNSService::GetNetworkAddrAsString(nsACString& aResult) ++{ ++ aResult.AssignLiteral("127.0.0.1"); ++ ++ struct ifaddrs* addrs; ++ if (getifaddrs(&addrs) < 0) ++ return NS_OK; ++ ++ struct ifaddrs* bestAddr = nsnull; ++ PRInt32 bestScore = 0; ++ struct ifaddrs* addr; ++ for (addr = addrs; addr; addr = addr->ifa_next) { ++ PRInt32 score = GetScoreForInterface(addr); ++ if (score > 0 && (!bestAddr || score > bestScore)) { ++ bestAddr = addr; ++ bestScore = score; ++ } ++ } ++ ++ if (!bestAddr) { ++ freeifaddrs(addrs); ++ return NS_OK; ++ } ++ ++ nsresult rv = SockaddrToString(bestAddr->ifa_addr, aResult); ++ freeifaddrs(addrs); ++ return rv; ++} diff --git a/ready b/ready new file mode 100644 index 00000000..473a0f4c diff --git a/rpath.patch b/rpath.patch new file mode 100644 index 00000000..39a01e2b --- /dev/null +++ b/rpath.patch @@ -0,0 +1,21 @@ +Index: browser/app/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/browser/app/Makefile.in,v +retrieving revision 1.52.2.2.2.19.2.1 +diff -u -p -6 -r1.52.2.2.2.19.2.1 Makefile.in +--- browser/app/Makefile.in 8 Apr 2005 23:29:22 -0000 1.52.2.2.2.19.2.1 ++++ browser/app/Makefile.in 18 Aug 2005 10:20:26 -0000 +@@ -72,12 +72,13 @@ TK_LIBS := -framework Cocoa $(TK_LIBS) + endif + + LIBS = \ + $(STATIC_COMPONENTS_LINKER_PATH) \ + $(EXTRA_DSO_LIBS) \ + $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \ ++ $(RPATH) \ + $(MOZ_JS_LIBS) \ + $(XPCOM_LIBS) \ + $(NSPR_LIBS) \ + $(TK_LIBS) \ + $(NULL) + diff --git a/search-addons.tar.bz2 b/search-addons.tar.bz2 new file mode 100644 index 00000000..1510b132 --- /dev/null +++ b/search-addons.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf5066695cf24ea4f0dc28a86f4e5e7fc69112b5761caecb81c3dd276cba29c2 +size 2809 diff --git a/skin-selection.patch b/skin-selection.patch new file mode 100644 index 00000000..c6accfcb --- /dev/null +++ b/skin-selection.patch @@ -0,0 +1,51 @@ +From: Wolfgang Rosenauer +Subject: choose default theme at first startup according to the Desktop Env +References: + + +Index: browser/app/profile/firefox.js +================================================================================ +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -102,7 +102,7 @@ + pref("keyword.URL", "chrome://browser-region/locale/region.properties"); + + pref("general.useragent.locale", "@AB_CD@"); +-pref("general.skins.selectedSkin", "classic/1.0"); ++//pref("general.skins.selectedSkin", "classic/1.0"); + pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@"); + + pref("general.smoothScroll", false); +--- modules/libpref/src/nsPrefService.cpp ++++ modules/libpref/src/nsPrefService.cpp +@@ -36,6 +36,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + ++#include + #include "nsPrefService.h" + #include "nsAppDirectoryServiceDefs.h" + #include "nsDirectoryServiceDefs.h" +@@ -207,11 +208,22 @@ + NS_IMETHODIMP nsPrefService::ReadUserPrefs(nsIFile *aFile) + { + nsresult rv; ++ PRBool rv2; + + if (nsnull == aFile) { + rv = UseDefaultPrefFile(); + UseUserPrefFile(); + ++ rv2 = PREF_HasUserPref("general.skins.selectedSkin"); ++ if (!rv2) { ++ if (getenv("KDE_FULL_SESSION")) ++ PREF_SetCharPref("general.skins.selectedSkin", "plastikfox"); ++ else if (getenv("DESKTOP_SESSION") && !strcmp("gnome", getenv("DESKTOP_SESSION"))) ++ PREF_SetCharPref("general.skins.selectedSkin", "tango"); ++ else ++ PREF_SetCharPref("general.skins.selectedSkin", "classic/1.0"); ++ } ++ + NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID); + + } else { diff --git a/startup.patch b/startup.patch new file mode 100644 index 00000000..b6248276 --- /dev/null +++ b/startup.patch @@ -0,0 +1,1075 @@ +From: Robert O'Callahan +Subject: implement startup-notification +References: +https://bugzilla.novell.com/show_bug.cgi?id=115417 +https://bugzilla.mozilla.org/show_bug.cgi?id=223492 + +Index: configure.in +================================================================================ +--- config/autoconf.mk.in ++++ config/autoconf.mk.in +@@ -223,6 +223,10 @@ + MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ + MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@ + ++MOZ_ENABLE_STARTUP_NOTIFICATION = @MOZ_ENABLE_STARTUP_NOTIFICATION@ ++MOZ_STARTUP_NOTIFICATION_CFLAGS = @MOZ_STARTUP_NOTIFICATION_CFLAGS@ ++MOZ_STARTUP_NOTIFICATION_LIBS = @MOZ_STARTUP_NOTIFICATION_LIBS@ ++ + MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@ + MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@ + +--- configure.in ++++ configure.in +@@ -125,6 +125,7 @@ + GNOMEUI_VERSION=2.2.0 + GCONF_VERSION=1.2.1 + LIBGNOME_VERSION=2.0 ++STARTUP_NOTIFICATION_VERSION=0.8 + + dnl Set various checks + dnl ======================================================== +@@ -4088,6 +4089,42 @@ + + AC_SUBST(MOZ_DEFAULT_TOOLKIT) + ++dnl ======================================================== ++dnl = startup-notification support module ++dnl ======================================================== ++ ++if test "$MOZ_ENABLE_GTK2" ++then ++ MOZ_ENABLE_STARTUP_NOTIFICATION= ++ ++ MOZ_ARG_ENABLE_BOOL(startup-notification, ++ [ --enable-startup-notification Enable startup-notification support (default: disabled) ], ++ MOZ_ENABLE_STARTUP_NOTIFICATION=force, ++ MOZ_ENABLE_STARTUP_NOTIFICATION=) ++ ++ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" ++ then ++ PKG_CHECK_MODULES(MOZ_STARTUP_NOTIFICATION, ++ libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION, ++ [MOZ_ENABLE_STARTUP_NOTIFICATION=1], [ ++ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force" ++ then ++ AC_MSG_ERROR([* * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION]) ++ fi ++ MOZ_ENABLE_STARTUP_NOTIFICATION= ++ ]) ++ fi ++ ++ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then ++ AC_DEFINE(MOZ_ENABLE_STARTUP_NOTIFICATION) ++ fi ++ ++ TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" ++fi ++AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION) ++AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS) ++AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS) ++ + AC_SUBST(GTK_CONFIG) + AC_SUBST(TK_CFLAGS) + AC_SUBST(TK_LIBS) +--- toolkit/components/remote/Makefile.in ++++ toolkit/components/remote/Makefile.in +@@ -56,8 +56,9 @@ + string \ + appcomps \ + toolkitcomps \ +- appcomps \ ++ appshell \ + xulapp \ ++ layout \ + widget \ + gfx \ + dom \ +--- toolkit/components/remote/nsGTKRemoteService.cpp ++++ toolkit/components/remote/nsGTKRemoteService.cpp +@@ -50,7 +50,7 @@ + + #include "nsIBaseWindow.h" + #include "nsIDocShell.h" +-#include "nsIDOMWindow.h" ++#include "nsPIDOMWindow.h" + #include "nsIGenericFactory.h" + #include "nsILocalFile.h" + #include "nsIObserverService.h" +@@ -58,6 +58,8 @@ + #include "nsIServiceManager.h" + #include "nsIWeakReference.h" + #include "nsIWidget.h" ++#include "nsIAppShellService.h" ++#include "nsAppShellCID.h" + + #include "nsCOMPtr.h" + #include "nsString.h" +@@ -72,6 +74,10 @@ + #include "nsISuiteRemoteService.h" + #endif + ++#ifdef MOZ_WIDGET_GTK2 ++#include "nsGTKToolkit.h" ++#endif ++ + #define MOZILLA_VERSION_PROP "_MOZILLA_VERSION" + #define MOZILLA_LOCK_PROP "_MOZILLA_LOCK" + #define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND" +@@ -155,20 +161,44 @@ + return PL_DHASH_NEXT; + } + +-NS_IMETHODIMP +-nsGTKRemoteService::RegisterWindow(nsIDOMWindow* aWindow) ++static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow) + { + // get the native window for this instance + nsCOMPtr scriptObject + (do_QueryInterface(aWindow)); +- NS_ENSURE_TRUE(scriptObject, NS_ERROR_FAILURE); ++ NS_ENSURE_TRUE(scriptObject, nsnull); + + nsCOMPtr baseWindow + (do_QueryInterface(scriptObject->GetDocShell())); +- NS_ENSURE_TRUE(baseWindow, NS_ERROR_FAILURE); ++ NS_ENSURE_TRUE(baseWindow, nsnull); + + nsCOMPtr mainWidget; + baseWindow->GetMainWidget(getter_AddRefs(mainWidget)); ++ return mainWidget; ++} ++ ++static nsGTKToolkit* GetGTKToolkit() ++{ ++ nsCOMPtr svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID); ++ if (!svc) ++ return nsnull; ++ nsCOMPtr window; ++ svc->GetHiddenDOMWindow(getter_AddRefs(window)); ++ if (!window) ++ return nsnull; ++ nsIWidget* widget = GetMainWidget(window); ++ if (!widget) ++ return nsnull; ++ nsIToolkit* toolkit = widget->GetToolkit(); ++ if (!toolkit) ++ return nsnull; ++ return NS_STATIC_CAST(nsGTKToolkit*, toolkit); ++} ++ ++NS_IMETHODIMP ++nsGTKRemoteService::RegisterWindow(nsIDOMWindow* aWindow) ++{ ++ nsIWidget* mainWidget = GetMainWidget(aWindow); + NS_ENSURE_TRUE(mainWidget, NS_ERROR_FAILURE); + + // walk up the widget tree and find the toplevel window in the +@@ -260,7 +290,7 @@ + + #ifndef MOZ_XUL_APP + const char* +-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow) ++nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, PRUint32 aTimestamp) + { + nsresult rv; + +@@ -283,8 +313,60 @@ + } + + #else //MOZ_XUL_APP ++ ++// Set desktop startup ID to the passed ID, if there is one, so that any created ++// windows get created with the right window manager metadata, and any windows ++// that get new tabs and are activated also get the right WM metadata. ++// If there is no desktop startup ID, then use the X event's timestamp ++// for _NET_ACTIVE_WINDOW when the window gets focused or shown. ++static void ++SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, ++ PRUint32 aTimestamp) { ++#ifdef MOZ_WIDGET_GTK2 ++ nsGTKToolkit* toolkit = GetGTKToolkit(); ++ if (!toolkit) ++ return; ++ if (!aDesktopStartupID.IsEmpty()) { ++ toolkit->SetDesktopStartupID(aDesktopStartupID); ++ } else { ++ toolkit->SetFocusTimestamp(aTimestamp); ++ } ++#endif ++} ++ ++static PRBool ++FindExtensionParameterInCommand(const char* aParameterName, ++ const nsACString& aCommand, ++ char aSeparator, ++ nsACString* aValue) ++{ ++ nsCAutoString searchFor; ++ searchFor.Append(aSeparator); ++ searchFor.Append(aParameterName); ++ searchFor.Append('='); ++ ++ nsACString::const_iterator start, end; ++ aCommand.BeginReading(start); ++ aCommand.EndReading(end); ++ if (!FindInReadable(searchFor, start, end)) ++ return PR_FALSE; ++ ++ nsACString::const_iterator charStart, charEnd; ++ charStart = end; ++ aCommand.EndReading(charEnd); ++ nsACString::const_iterator idStart = charStart, idEnd; ++ if (FindCharInReadable(aSeparator, charStart, charEnd)) { ++ idEnd = charStart; ++ } else { ++ idEnd = charEnd; ++ } ++ *aValue = nsDependentCSubstring(idStart, idEnd); ++ return PR_TRUE; ++} ++ + const char* +-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow) ++nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, ++ PRUint32 aTimestamp) + { + nsresult rv; + +@@ -314,6 +396,12 @@ + #endif + + if (!command.EqualsLiteral("ping")) { ++ nsCAutoString desktopStartupID; ++ nsDependentCString cmd(aCommand); ++ FindExtensionParameterInCommand("DESKTOP_STARTUP_ID", ++ cmd, '\n', ++ &desktopStartupID); ++ + char* argv[3] = {"dummyappname", "-remote", aCommand}; + rv = cmdline->Init(3, argv, nsnull, nsICommandLine::STATE_REMOTE_EXPLICIT); + if (NS_FAILED(rv)) +@@ -322,6 +410,8 @@ + if (aWindow) + cmdline->SetWindowContext(aWindow); + ++ SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp); ++ + rv = cmdline->Run(); + if (NS_ERROR_ABORT == rv) + return "500 command not parseable"; +@@ -333,7 +423,8 @@ + } + + const char* +-nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow) ++nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow, ++ PRUint32 aTimestamp) + { + nsresult rv; + +@@ -364,6 +455,8 @@ + if (NS_FAILED(rv)) + return "509 internal error"; + ++ nsCAutoString desktopStartupID; ++ + char **argv = (char**) malloc(sizeof(char*) * argc); + if (!argv) return "509 internal error"; + +@@ -372,6 +465,12 @@ + for (int i = 0; i < argc; ++i) { + argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]); + ++ if (i == 0) { ++ nsDependentCString cmd(argv[0]); ++ FindExtensionParameterInCommand("DESKTOP_STARTUP_ID", ++ cmd, ' ', ++ &desktopStartupID); ++ } + #ifdef DEBUG_bsmedberg + printf(" argv[%i]:\t%s\n", i, argv[i]); + #endif +@@ -386,7 +485,10 @@ + if (aWindow) + cmdline->SetWindowContext(aWindow); + ++ SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp); ++ + rv = cmdline->Run(); ++ + if (NS_ERROR_ABORT == rv) + return "500 command not parseable"; + +@@ -486,7 +588,7 @@ + return FALSE; + + // cool, we got the property data. +- const char *response = HandleCommand(data, window); ++ const char *response = HandleCommand(data, window, pevent->time); + + // put the property onto the window as the response + XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window), +@@ -531,7 +633,7 @@ + return FALSE; + + // cool, we got the property data. +- const char *response = HandleCommandLine(data, window); ++ const char *response = HandleCommandLine(data, window, pevent->time); + + // put the property onto the window as the response + XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window), +--- toolkit/components/remote/nsGTKRemoteService.h ++++ toolkit/components/remote/nsGTKRemoteService.h +@@ -80,10 +80,12 @@ + nsIWeakReference* aData, + void* aClosure); + +- static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow); ++ static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow, ++ PRUint32 aTimestamp); + + #ifdef MOZ_XUL_APP +- static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow); ++ static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow, ++ PRUint32 aTimestamp); + #endif + + static gboolean HandlePropertyChange(GtkWidget *widget, +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -344,6 +344,10 @@ + EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) + endif + ++ifdef MOZ_ENABLE_STARTUP_NOTIFICATION ++EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS) ++endif ++ + ifdef MOZ_ENABLE_XPRINT + EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS) + endif +--- toolkit/xre/Makefile.in ++++ toolkit/xre/Makefile.in +@@ -69,6 +69,7 @@ + shellservice \ + string \ + uriloader \ ++ layout \ + widget \ + windowwatcher \ + xpcom \ +--- toolkit/xre/nsAppRunner.cpp ++++ toolkit/xre/nsAppRunner.cpp +@@ -96,6 +96,7 @@ + #include "nsIWindowWatcher.h" + #include "nsIXULAppInfo.h" + #include "nsIXULRuntime.h" ++#include "nsIScriptGlobalObject.h" + + #include "nsCRT.h" + #include "nsCOMPtr.h" +@@ -112,6 +113,12 @@ + #include "nsXULAppAPI.h" + #include "nsXREDirProvider.h" + #include "nsToolkitCompsCID.h" ++#include "nsPIDOMWindow.h" ++#include "nsIDOMWindowInternal.h" ++#include "nsIBaseWindow.h" ++#include "nsIWidget.h" ++#include "nsIDocShell.h" ++#include "nsAppShellCID.h" + + #include "nsINIParser.h" + +@@ -249,6 +256,9 @@ + #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) + #include + #endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 ++#if defined(MOZ_WIDGET_GTK2) ++#include "nsGTKToolkit.h" ++#endif + + #if defined(MOZ_WIDGET_QT) + #include +@@ -916,7 +926,7 @@ + // use int here instead of a PR type since it will be returned + // from main - just to keep types consistent + static int +-HandleRemoteArgument(const char* remote) ++HandleRemoteArgument(const char* remote, const char* aDesktopStartupID) + { + nsresult rv; + ArgResult ar; +@@ -957,7 +967,7 @@ + nsXPIDLCString response; + PRBool success = PR_FALSE; + rv = client.SendCommand(program.get(), username, profile, remote, +- getter_Copies(response), &success); ++ aDesktopStartupID, getter_Copies(response), &success); + // did the command fail? + if (NS_FAILED(rv)) { + PR_fprintf(PR_STDERR, "Error: Failed to send command: %s\n", +@@ -974,7 +984,7 @@ + } + + static PRBool +-RemoteCommandLine() ++RemoteCommandLine(const char* aDesktopStartupID) + { + nsresult rv; + ArgResult ar; +@@ -1006,7 +1016,7 @@ + nsXPIDLCString response; + PRBool success = PR_FALSE; + rv = client.SendCommandLine(program.get(), username, nsnull, +- gArgc, gArgv, ++ gArgc, gArgv, aDesktopStartupID, + getter_Copies(response), &success); + // did the command fail? + if (NS_FAILED(rv) || !success) +@@ -1865,6 +1875,41 @@ + #ifdef MOZ_WIDGET_GTK2 + #include "prlink.h" + typedef void (*_g_set_application_name_fn)(const gchar *application_name); ++ ++static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow) ++{ ++ // get the native window for this instance ++ nsCOMPtr scriptObject ++ (do_QueryInterface(aWindow)); ++ NS_ENSURE_TRUE(scriptObject, nsnull); ++ ++ nsCOMPtr baseWindow ++ (do_QueryInterface(scriptObject->GetDocShell())); ++ NS_ENSURE_TRUE(baseWindow, nsnull); ++ ++ nsCOMPtr mainWidget; ++ baseWindow->GetMainWidget(getter_AddRefs(mainWidget)); ++ return mainWidget; ++} ++ ++static nsGTKToolkit* GetGTKToolkit() ++{ ++ nsCOMPtr svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID); ++ if (!svc) ++ return nsnull; ++ nsCOMPtr window; ++ svc->GetHiddenDOMWindow(getter_AddRefs(window)); ++ if (!window) ++ return nsnull; ++ nsIWidget* widget = GetMainWidget(window); ++ if (!widget) ++ return nsnull; ++ nsIToolkit* toolkit = widget->GetToolkit(); ++ if (!toolkit) ++ return nsnull; ++ return NS_STATIC_CAST(nsGTKToolkit*, toolkit); ++} ++ + #endif + + int +@@ -2033,6 +2078,19 @@ + return 0; + } + ++#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE) ++ // Stash DESKTOP_STARTUP_ID becaus gtk_init will clear it. ++#define HAVE_DESKTOP_STARTUP_ID ++ char* desktopStartupID = PR_GetEnv("DESKTOP_STARTUP_ID"); ++ if (desktopStartupID) { ++ if (desktopStartupID[0] == 0) { ++ desktopStartupID = nsnull; ++ } else { ++ desktopStartupID = strdup(desktopStartupID); ++ } ++ } ++#endif ++ + #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) + // setup for private colormap. Ideally we'd like to do this + // in nsAppShell::Create, but we need to get in before gtk +@@ -2058,6 +2116,7 @@ + if (glib2) { + PR_UnloadLibrary(glib2); + } ++ gtk_window_set_auto_startup_notification(PR_FALSE); + #endif + + gtk_widget_set_default_visual(gdk_rgb_get_visual()); +@@ -2122,12 +2181,12 @@ + return 1; + } + if (ar) { +- return HandleRemoteArgument(xremotearg); ++ return HandleRemoteArgument(xremotearg, desktopStartupID); + } + + if (!PR_GetEnv("MOZ_NO_REMOTE")) { + // Try to remote the entire command line. If this fails, start up normally. +- if (RemoteCommandLine()) ++ if (RemoteCommandLine(desktopStartupID)) + return 0; + } + #endif +@@ -2329,6 +2388,13 @@ + NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); + NS_ENSURE_SUCCESS(rv, 1); + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ nsRefPtr toolkit = GetGTKToolkit(); ++ if (toolkit && desktopStartupID) { ++ toolkit->SetDesktopStartupID(nsDependentCString(desktopStartupID)); ++ } ++#endif ++ + // Extension Compatibility Checking and Startup + if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { + nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); +@@ -2505,9 +2571,28 @@ + } + #endif + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2) ++ nsGTKToolkit* toolkit = GetGTKToolkit(); ++ if (toolkit) { ++ nsCAutoString currentDesktopStartupID; ++ toolkit->GetDesktopStartupID(¤tDesktopStartupID); ++ if (!currentDesktopStartupID.IsEmpty()) { ++ nsCAutoString desktopStartupEnv; ++ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); ++ desktopStartupEnv.Append(currentDesktopStartupID); ++ // Leak it with extreme prejudice! ++ PR_SetEnv(ToNewCString(desktopStartupEnv)); ++ } ++ } ++#endif ++ + rv = LaunchChild(nativeApp, appInitiatedRestart); + return rv == NS_ERROR_LAUNCHED_CHILD_PROCESS ? 0 : 1; + } + ++#ifdef HAVE_DESKTOP_STARTUP_ID ++ free(desktopStartupID); ++#endif ++ + return NS_FAILED(rv) ? 1 : 0; + } +--- widget/src/gtk2/Makefile.in ++++ widget/src/gtk2/Makefile.in +@@ -97,6 +97,7 @@ + $(MOZ_COMPONENT_LIBS) \ + -lgkgfx \ + -lgtkxtbin \ ++ $(MOZ_STARTUP_NOTIFICATION_LIBS) \ + $(XLDFLAGS) \ + $(XLIBS) \ + $(MOZ_GTK2_LIBS) +@@ -107,14 +108,15 @@ + + EXPORTS = \ + nsIGdkPixbufImage.h \ ++ nsGTKToolkit.h \ + mozdrawingarea.h \ + mozcontainer.h \ + $(NULL) + + include $(topsrcdir)/config/rules.mk + +-CFLAGS += $(MOZ_GTK2_CFLAGS) +-CXXFLAGS += $(MOZ_GTK2_CFLAGS) ++CFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS) ++CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS) + + DEFINES += -DUSE_XIM + +--- widget/src/gtk2/nsGTKToolkit.h ++++ widget/src/gtk2/nsGTKToolkit.h +@@ -0,0 +1,87 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* vim:expandtab:shiftwidth=4:tabstop=4: ++ */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef GTKTOOLKIT_H ++#define GTKTOOLKIT_H ++ ++#include "nsIToolkit.h" ++#include "nsString.h" ++#include ++ ++/** ++ * Wrapper around the thread running the message pump. ++ * The toolkit abstraction is necessary because the message pump must ++ * execute within the same thread that created the widget under Win32. ++ */ ++ ++class nsGTKToolkit : public nsIToolkit ++{ ++public: ++ nsGTKToolkit(); ++ virtual ~nsGTKToolkit(); ++ ++ NS_DECL_ISUPPORTS ++ ++ NS_IMETHOD Init(PRThread *aThread); ++ ++ void CreateSharedGC(void); ++ GdkGC *GetSharedGC(void); ++ ++ /** ++ * Get/set our value of DESKTOP_STARTUP_ID. When non-empty, this is applied ++ * to the next toplevel window to be shown or focused (and then immediately ++ * cleared). ++ */ ++ void SetDesktopStartupID(const nsACString& aID) { mDesktopStartupID = aID; } ++ void GetDesktopStartupID(nsACString* aID) { *aID = mDesktopStartupID; } ++ ++ /** ++ * Get/set the timestamp value to be used, if non-zero, to focus the ++ * next top-level window to be shown or focused (upon which it is cleared). ++ */ ++ void SetFocusTimestamp(PRUint32 aTimestamp) { mFocusTimestamp = aTimestamp; } ++ PRUint32 GetFocusTimestamp() { return mFocusTimestamp; } ++ ++private: ++ GdkGC *mSharedGC; ++ nsCString mDesktopStartupID; ++ PRUint32 mFocusTimestamp; ++}; ++ ++#endif // GTKTOOLKIT_H +--- widget/src/gtk2/nsToolkit.cpp ++++ widget/src/gtk2/nsToolkit.cpp +@@ -38,7 +38,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "nscore.h" // needed for 'nsnull' +-#include "nsToolkit.h" ++#include "nsGTKToolkit.h" + + // + // Static thread local storage index of the Toolkit +@@ -51,9 +51,10 @@ + // constructor + // + //------------------------------------------------------------------------- +-nsToolkit::nsToolkit() ++nsGTKToolkit::nsGTKToolkit() + { + mSharedGC = nsnull; ++ mFocusTimestamp = 0; + } + + //------------------------------------------------------------------------- +@@ -61,7 +62,7 @@ + // destructor + // + //------------------------------------------------------------------------- +-nsToolkit::~nsToolkit() ++nsGTKToolkit::~nsGTKToolkit() + { + if (mSharedGC) { + gdk_gc_unref(mSharedGC); +@@ -77,9 +78,9 @@ + // + //------------------------------------------------------------------------- + +-NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit) ++NS_IMPL_ISUPPORTS1(nsGTKToolkit, nsIToolkit) + +-void nsToolkit::CreateSharedGC(void) ++void nsGTKToolkit::CreateSharedGC(void) + { + GdkPixmap *pixmap; + +@@ -91,7 +92,7 @@ + gdk_pixmap_unref(pixmap); + } + +-GdkGC *nsToolkit::GetSharedGC(void) ++GdkGC *nsGTKToolkit::GetSharedGC(void) + { + return gdk_gc_ref(mSharedGC); + } +@@ -100,7 +101,7 @@ + // + // + //------------------------------------------------------------------------- +-NS_IMETHODIMP nsToolkit::Init(PRThread *aThread) ++NS_IMETHODIMP nsGTKToolkit::Init(PRThread *aThread) + { + CreateSharedGC(); + +@@ -135,7 +136,7 @@ + // Create a new toolkit for this thread... + // + if (!toolkit) { +- toolkit = new nsToolkit(); ++ toolkit = new nsGTKToolkit(); + + if (!toolkit) { + rv = NS_ERROR_OUT_OF_MEMORY; +--- widget/src/gtk2/nsWindow.cpp ++++ widget/src/gtk2/nsWindow.cpp +@@ -40,7 +40,7 @@ + #include "prlink.h" + + #include "nsWindow.h" +-#include "nsToolkit.h" ++#include "nsGTKToolkit.h" + #include "nsIRenderingContext.h" + #include "nsIRegion.h" + #include "nsIRollupListener.h" +@@ -58,6 +58,11 @@ + #include + #include + ++#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION ++#define SN_API_NOT_YET_FROZEN ++#include ++#endif ++ + #include "gtk2xtbin.h" + + #include "nsIPrefService.h" +@@ -655,6 +660,70 @@ + return NS_ERROR_NOT_IMPLEMENTED; + } + ++typedef void (* SetUserTimeFunc)(GdkWindow* aWindow, guint32 aTimestamp); ++ ++static void ++SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow) ++{ ++ nsCOMPtr toolkit; ++ NS_GetCurrentToolkit(getter_AddRefs(toolkit)); ++ if (!toolkit) ++ return; ++ ++ nsGTKToolkit* GTKToolkit = NS_STATIC_CAST(nsGTKToolkit*, ++ NS_STATIC_CAST(nsIToolkit*, toolkit)); ++ nsCAutoString desktopStartupID; ++ GTKToolkit->GetDesktopStartupID(&desktopStartupID); ++ if (desktopStartupID.IsEmpty()) { ++ PRUint32 timestamp = GTKToolkit->GetFocusTimestamp(); ++ if (timestamp) { ++ gdk_window_focus(aWindow->window, timestamp); ++ GTKToolkit->SetFocusTimestamp(0); ++ } ++ return; ++ } ++ ++#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION ++ GdkDrawable* drawable = GDK_DRAWABLE(aWindow->window); ++ GtkWindow* win = GTK_WINDOW(aWindow); ++ if (!win) { ++ NS_WARNING("Passed in widget was not a GdkWindow!"); ++ return; ++ } ++ GdkScreen* screen = gtk_window_get_screen(win); ++ SnDisplay* snd = ++ sn_display_new(gdk_x11_drawable_get_xdisplay(drawable), nsnull, nsnull); ++ if (!snd) ++ return; ++ SnLauncheeContext* ctx = ++ sn_launchee_context_new(snd, gdk_screen_get_number(screen), ++ desktopStartupID.get()); ++ if (!ctx) { ++ sn_display_unref(snd); ++ return; ++ } ++ ++ if (sn_launchee_context_get_id_has_timestamp(ctx)) { ++ PRLibrary* gtkLibrary; ++ SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc) ++ PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary); ++ if (setUserTimeFunc) { ++ setUserTimeFunc(aWindow->window, sn_launchee_context_get_timestamp(ctx)); ++ PR_UnloadLibrary(gtkLibrary); ++ } ++ } ++ ++ sn_launchee_context_setup_window(ctx, gdk_x11_drawable_get_xid(drawable)); ++ ++ sn_launchee_context_complete(ctx); ++ ++ sn_launchee_context_unref(ctx); ++ sn_display_unref(snd); ++#endif ++ ++ GTKToolkit->SetDesktopStartupID(EmptyCString()); ++} ++ + NS_IMETHODIMP + nsWindow::SetFocus(PRBool aRaise) + { +@@ -675,10 +744,15 @@ + // set properly. + GtkWidget *toplevelWidget = gtk_widget_get_toplevel(owningWidget); + ++ if (toplevelWidget && aRaise) { ++ SetUserTimeAndStartupIDForActivatedWindow(toplevelWidget); ++ } ++ + if (gRaiseWindows && aRaise && toplevelWidget && + !GTK_WIDGET_HAS_FOCUS(owningWidget) && +- !GTK_WIDGET_HAS_FOCUS(toplevelWidget)) ++ !GTK_WIDGET_HAS_FOCUS(toplevelWidget)) { + GetAttention(-1); ++ } + + nsWindow *owningWindow = get_window_for_gtk_widget(owningWidget); + if (!owningWindow) +@@ -1147,7 +1221,7 @@ + + case NS_NATIVE_GRAPHIC: { + NS_ASSERTION(nsnull != mToolkit, "NULL toolkit, unable to get a GC"); +- return (void *)NS_STATIC_CAST(nsToolkit *, mToolkit)->GetSharedGC(); ++ return (void *)NS_STATIC_CAST(nsGTKToolkit *, mToolkit)->GetSharedGC(); + break; + } + +@@ -2755,7 +2829,7 @@ + // is shown. + // XXX that may or may not be true for GTK+ 2.x + if (mTransparencyBitmap) { +- ApplyTransparencyBitmap(); ++ ApplyTransparencyBitmap(); + } + + // unset our flag now that our window has been shown +@@ -2765,6 +2839,11 @@ + moz_drawingarea_set_visibility(mDrawingarea, aAction); + gtk_widget_show(GTK_WIDGET(mContainer)); + gtk_widget_show(mShell); ++ ++ // Set up usertime/startupID metadata for the created window. ++ if (mWindowType != eWindowType_invisible) { ++ SetUserTimeAndStartupIDForActivatedWindow(mShell); ++ } + } + else if (mContainer) { + moz_drawingarea_set_visibility(mDrawingarea, TRUE); +--- widget/src/xremoteclient/XRemoteClient.cpp ++++ widget/src/xremoteclient/XRemoteClient.cpp +@@ -173,6 +173,7 @@ + nsresult + XRemoteClient::SendCommand (const char *aProgram, const char *aUsername, + const char *aProfile, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aWindowFound) + { + PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand")); +@@ -198,7 +199,7 @@ + + if (NS_SUCCEEDED(rv)) { + // send our command +- rv = DoSendCommand(w, aCommand, aResponse, &destroyed); ++ rv = DoSendCommand(w, aCommand, aDesktopStartupID, aResponse, &destroyed); + + // if the window was destroyed, don't bother trying to free the + // lock. +@@ -217,6 +218,7 @@ + XRemoteClient::SendCommandLine (const char *aProgram, const char *aUsername, + const char *aProfile, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aWindowFound) + { + PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine")); +@@ -242,7 +244,7 @@ + + if (NS_SUCCEEDED(rv)) { + // send our command +- rv = DoSendCommandLine(w, argc, argv, aResponse, &destroyed); ++ rv = DoSendCommandLine(w, argc, argv, aDesktopStartupID, aResponse, &destroyed); + + // if the window was destroyed, don't bother trying to free the + // lock. +@@ -643,6 +645,7 @@ + + nsresult + XRemoteClient::DoSendCommand(Window aWindow, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aDestroyed) + { + *aDestroyed = PR_FALSE; +@@ -651,9 +654,28 @@ + ("(writing " MOZILLA_COMMAND_PROP " \"%s\" to 0x%x)\n", + aCommand, (unsigned int) aWindow)); + ++ // We add the DESKTOP_STARTUP_ID setting as an extra line of ++ // the command string. Firefox ignores all lines but the first. ++ static char desktopStartupPrefix[] = "\nDESKTOP_STARTUP_ID="; ++ ++ PRInt32 len = strlen(aCommand); ++ if (aDesktopStartupID) { ++ len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID); ++ } ++ char* buffer = (char*)malloc(len + 1); ++ if (!buffer) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ strcpy(buffer, aCommand); ++ if (aDesktopStartupID) { ++ strcat(buffer, desktopStartupPrefix); ++ strcat(buffer, aDesktopStartupID); ++ } ++ + XChangeProperty (mDisplay, aWindow, mMozCommandAtom, XA_STRING, 8, +- PropModeReplace, (unsigned char *)aCommand, +- strlen(aCommand)); ++ PropModeReplace, (unsigned char *)buffer, len); ++ ++ free(buffer); + + if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandAtom)) + return NS_ERROR_FAILURE; +@@ -663,7 +685,7 @@ + + /* like strcpy, but return the char after the final null */ + static char* +-estrcpy(char* s, char* d) ++estrcpy(const char* s, char* d) + { + while (*s) + *d++ = *s++; +@@ -674,6 +696,7 @@ + + nsresult + XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aDestroyed) + { + int i; +@@ -690,9 +713,16 @@ + // [argc][offsetargv0][offsetargv1...]\0\0argv[1]...\0 + // (offset is from the beginning of the buffer) + ++ static char desktopStartupPrefix[] = " DESKTOP_STARTUP_ID="; ++ + PRInt32 argvlen = strlen(cwdbuf); +- for (i = 0; i < argc; ++i) +- argvlen += strlen(argv[i]); ++ for (i = 0; i < argc; ++i) { ++ PRInt32 len = strlen(argv[i]); ++ if (i == 0 && aDesktopStartupID) { ++ len += strlen(desktopStartupPrefix) + strlen(aDesktopStartupID); ++ } ++ argvlen += len; ++ } + + PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 + + sizeof(PRInt32) * (argc + 1)); +@@ -708,6 +738,10 @@ + for (int i = 0; i < argc; ++i) { + buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer)); + bufend = estrcpy(argv[i], bufend); ++ if (i == 0 && aDesktopStartupID) { ++ bufend = estrcpy(desktopStartupPrefix, bufend - 1); ++ bufend = estrcpy(aDesktopStartupID, bufend - 1); ++ } + } + + #ifdef DEBUG_bsmedberg +--- widget/src/xremoteclient/XRemoteClient.h ++++ widget/src/xremoteclient/XRemoteClient.h +@@ -48,10 +48,12 @@ + virtual nsresult Init(); + virtual nsresult SendCommand(const char *aProgram, const char *aUsername, + const char *aProfile, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded); + virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername, + const char *aProfile, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded); + void Shutdown(); + +@@ -67,10 +69,12 @@ + PRBool aSupportsCommandLine); + nsresult DoSendCommand (Window aWindow, + const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, + PRBool *aDestroyed); + nsresult DoSendCommandLine(Window aWindow, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, + PRBool *aDestroyed); + PRBool WaitForResponse (Window aWindow, char **aResponse, +--- widget/src/xremoteclient/mozilla-xremote-client.cpp ++++ widget/src/xremoteclient/mozilla-xremote-client.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #ifdef MOZ_WIDGET_PHOTON + #include "PhRemoteClient.h" + #else +@@ -99,7 +100,7 @@ + // send the command - it doesn't get any easier than this + PRBool success = PR_FALSE; + char *error = 0; +- rv = client.SendCommand(browser, username, profile, command, ++ rv = client.SendCommand(browser, username, profile, command, nsnull, + &error, &success); + + // failed to send command +--- widget/src/xremoteclient/nsRemoteClient.h ++++ widget/src/xremoteclient/nsRemoteClient.h +@@ -85,6 +85,7 @@ + */ + virtual nsresult SendCommand(const char *aProgram, const char *aUsername, + const char *aProfile, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded) = 0; + + /** +@@ -97,6 +98,7 @@ + virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername, + const char *aProfile, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded) = 0; + }; + diff --git a/system-extensions.patch b/system-extensions.patch new file mode 100644 index 00000000..99f33fe0 --- /dev/null +++ b/system-extensions.patch @@ -0,0 +1,58 @@ +Index: toolkit/mozapps/extensions/src/nsExtensionManager.js.in +================================================================================ +--- toolkit/mozapps/extensions/src/nsExtensionManager.js.in ++++ toolkit/mozapps/extensions/src/nsExtensionManager.js.in +@@ -119,6 +119,7 @@ + + const KEY_APP_PROFILE = "app-profile"; + const KEY_APP_GLOBAL = "app-global"; ++const KEY_APP_SYSTEM = "app-system"; + + const CATEGORY_INSTALL_LOCATIONS = "extension-install-locations"; + +@@ -2676,6 +2677,16 @@ + priority); + InstallLocations.put(profileLocation); + ++ // Register App-System Install Location ++ try { ++ var appSystemExtensions = getDirNoCreate("DrvD", ["usr","lib","browser-extensions","firefox"]); ++ var priority = nsIInstallLocation.PRIORITY_APP_PROFILE - 1; ++ var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM, ++ appSystemExtensions, true, ++ priority); ++ InstallLocations.put(systemLocation); ++ } catch (e) {} ++ + #ifdef XP_WIN + // Register HKEY_LOCAL_MACHINE Install Location + InstallLocations.put( +@@ -3852,7 +3863,7 @@ + + // Prepare themes for installation + // Only enumerate directories in the app-profile and app-global locations. +- var locations = [KEY_APP_PROFILE, KEY_APP_GLOBAL]; ++ var locations = [KEY_APP_PROFILE, KEY_APP_GLOBAL, KEY_APP_SYSTEM]; + for (var i = 0; i < locations.length; ++i) { + var location = InstallLocations.get(locations[i]); + if (!location.canAccess) +@@ -3918,7 +3929,8 @@ + var items = PendingOperations.getOperations(OP_NEEDS_INSTALL); + for (i = items.length - 1; i >= 0; --i) { + if (items[i].locationKey == KEY_APP_PROFILE || +- items[i].locationKey == KEY_APP_GLOBAL) ++ items[i].locationKey == KEY_APP_GLOBAL || ++ items[i].locationKey == KEY_APP_SYSTEM) + itemsToCheck.push(items[i].id); + } + this._finishOperations(); +@@ -4903,7 +4915,8 @@ + } + } + else if (installLocation.name == KEY_APP_PROFILE || +- installLocation.name == KEY_APP_GLOBAL) { ++ installLocation.name == KEY_APP_GLOBAL || ++ installLocation.name == KEY_APP_SYSTEM) { + // Check for a pointer file and remove it if it exists + var pointerFile = installLocation.location.clone(); + pointerFile.append(id); diff --git a/system-proxies.patch b/system-proxies.patch new file mode 100644 index 00000000..a11c897d --- /dev/null +++ b/system-proxies.patch @@ -0,0 +1,894 @@ +Index: netwerk/base/public/nsISystemProxySettings.idl +================================================================================ +--- allmakefiles.sh ++++ allmakefiles.sh +@@ -984,6 +984,7 @@ + toolkit/components/downloads/src/Makefile + toolkit/components/filepicker/Makefile + toolkit/components/gnome/Makefile ++toolkit/components/unixproxy/Makefile + toolkit/components/help/Makefile + toolkit/components/history/Makefile + toolkit/components/history/public/Makefile +--- browser/components/preferences/connection.xul ++++ browser/components/preferences/connection.xul +@@ -38,7 +38,12 @@ + # + # ***** END LICENSE BLOCK ***** + +- ++ ++ %connectionDTD; ++ ++ %mainDTD; ++]> + + + +@@ -99,6 +104,7 @@ + + ++ + + + +--- browser/installer/unix/packages-static ++++ browser/installer/unix/packages-static +@@ -51,6 +51,7 @@ + bin/xpicleanup + + ; [Components] ++bin/components/libunixproxy.so + bin/components/accessibility.xpt + bin/components/accessibility-atk.xpt + bin/components/appshell.xpt +--- netwerk/base/public/Makefile.in ++++ netwerk/base/public/Makefile.in +@@ -98,6 +98,7 @@ + nsIStreamTransportService.idl \ + nsIStreamLoader.idl \ + nsISyncStreamListener.idl \ ++ nsISystemProxySettings.idl \ + nsIUnicharStreamLoader.idl \ + nsIStandardURL.idl \ + nsIURLParser.idl \ +--- netwerk/base/public/nsISystemProxySettings.idl ++++ netwerk/base/public/nsISystemProxySettings.idl +@@ -0,0 +1,65 @@ ++/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is Novell code. ++ * ++ * The Initial Developer of the Original Code is Novell. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Robert O'Callahan (rocallahan@novell.com) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISupports.idl" ++#include "nsIURI.idl" ++ ++%{C++ ++#define NS_SYSTEMPROXYSETTINGS_CONTRACTID "@mozilla.org/system-proxy-settings;1" ++%} ++ ++/** ++ * This interface allows the proxy code to use platform-specific proxy ++ * settings when the proxy preference is set to "automatic discovery". If it can ++ * load a service with the above contract ID, it will use it to determine the ++ * PAC file name. If no PAC file is specified then the service itself will behave ++ * like a PAC file. ++ */ ++[scriptable, uuid(a9f3ae38-b769-4e0b-9317-578388e326c9)] ++interface nsISystemProxySettings : nsISupports ++{ ++ /** ++ * If non-empty, use this PAC file. If empty, call getProxyForURI instead. ++ */ ++ readonly attribute AUTF8String PACURI; ++ ++ /** ++ * See nsIProxyAutoConfig::getProxyForURI; this function behaves exactly ++ * the same way. ++ */ ++ ACString getProxyForURI(in nsIURI aURI); ++}; +--- netwerk/base/src/nsPACMan.h ++++ netwerk/base/src/nsPACMan.h +@@ -128,6 +128,14 @@ + */ + PRBool IsLoading() { return mLoader != nsnull; } + ++ /** ++ * Returns true if the given URI matches the URI of our PAC file. ++ */ ++ PRBool IsPACURI(nsIURI *uri) { ++ PRBool result; ++ return mPACURI && NS_SUCCEEDED(mPACURI->Equals(uri, &result)) && result; ++ } ++ + private: + NS_DECL_NSISTREAMLOADEROBSERVER + NS_DECL_NSIINTERFACEREQUESTOR +@@ -163,14 +171,6 @@ + void OnLoadFailure(); + + /** +- * Returns true if the given URI matches the URI of our PAC file. +- */ +- PRBool IsPACURI(nsIURI *uri) { +- PRBool result; +- return mPACURI && NS_SUCCEEDED(mPACURI->Equals(uri, &result)) && result; +- } +- +- /** + * Event fu for calling StartLoading asynchronously. + */ + PR_STATIC_CALLBACK(void *) LoadEvent_Handle(PLEvent *); +--- netwerk/base/src/nsProtocolProxyService.cpp ++++ netwerk/base/src/nsProtocolProxyService.cpp +@@ -411,6 +411,12 @@ + mProxyConfig = NS_STATIC_CAST(ProxyConfig, type); + reloadPAC = PR_TRUE; + } ++ ++ if (mProxyConfig == eProxyConfig_System) { ++ mSystemProxySettings = do_GetService(NS_SYSTEMPROXYSETTINGS_CONTRACTID); ++ } else { ++ mSystemProxySettings = nsnull; ++ } + } + + if (!pref || !strcmp(pref, "network.proxy.http")) +@@ -466,8 +472,10 @@ + LoadHostFilters(tempString.get()); + } + +- // We're done if not using PAC or WPAD +- if (mProxyConfig != eProxyConfig_PAC && mProxyConfig != eProxyConfig_WPAD) ++ // We're done if not using something that could give us a PAC URL ++ // (PAC, WPAD or System) ++ if (mProxyConfig != eProxyConfig_PAC && mProxyConfig != eProxyConfig_WPAD && ++ mProxyConfig != eProxyConfig_System) + return; + + // OK, we need to reload the PAC file if: +@@ -482,17 +490,21 @@ + if (mProxyConfig == eProxyConfig_PAC) { + prefBranch->GetCharPref("network.proxy.autoconfig_url", + getter_Copies(tempString)); +- } +- else if (mProxyConfig == eProxyConfig_WPAD) { ++ } else { + // We diverge from the WPAD spec here in that we don't walk the + // hosts's FQDN, stripping components until we hit a TLD. Doing so + // is dangerous in the face of an incomplete list of TLDs, and TLDs + // get added over time. We could consider doing only a single + // substitution of the first component, if that proves to help + // compatibility. +- tempString.AssignLiteral("http://wpad/wpad.dat"); ++ if (mSystemProxySettings) ++ mSystemProxySettings->GetPACURI(tempString); ++ else ++ tempString.AssignLiteral("http://wpad/wpad.dat"); ++ } ++ if (!tempString.IsEmpty()) { ++ ConfigureFromPAC(tempString); + } +- ConfigureFromPAC(tempString); + } + } + +@@ -901,13 +913,16 @@ + return NS_ERROR_OUT_OF_MEMORY; + } + +- mFailedProxies.Clear(); +- + nsCOMPtr pacURI; + nsresult rv = NS_NewURI(getter_AddRefs(pacURI), spec); + if (NS_FAILED(rv)) + return rv; + ++ if (mPACMan->IsPACURI(pacURI)) ++ return NS_OK; ++ ++ mFailedProxies.Clear(); ++ + return mPACMan->LoadPACFromURI(pacURI); + } + +@@ -917,8 +932,10 @@ + nsresult aStatus, + nsIProxyInfo **aResult) + { +- // We only support failover when a PAC file is configured. +- if (mProxyConfig != eProxyConfig_PAC && mProxyConfig != eProxyConfig_WPAD) ++ // We only support failover when a PAC file is configured, either ++ // directly or via system settings ++ if (mProxyConfig != eProxyConfig_PAC && mProxyConfig != eProxyConfig_WPAD && ++ mProxyConfig != eProxyConfig_System) + return NS_ERROR_NOT_AVAILABLE; + + // Verify that |aProxy| is one of our nsProxyInfo objects. +@@ -1214,15 +1231,37 @@ + if (!(info.flags & nsIProtocolHandler::ALLOWS_PROXY)) + return NS_OK; // Can't proxy this (filters may not override) + ++ if (mSystemProxySettings) { ++ nsCAutoString PACURI; ++ if (NS_SUCCEEDED(mSystemProxySettings->GetPACURI(PACURI)) && ++ !PACURI.IsEmpty()) { ++ // Switch to new PAC file if that setting has changed. If the setting ++ // hasn't changed, ConfigureFromPAC will exit early. ++ nsresult rv = ConfigureFromPAC(PACURI); ++ if (NS_FAILED(rv)) ++ return rv; ++ } else { ++ nsCAutoString proxy; ++ nsresult rv = mSystemProxySettings->GetProxyForURI(uri, proxy); ++ if (NS_SUCCEEDED(rv)) { ++ ProcessPACString(proxy, result); ++ return NS_OK; ++ } ++ // no proxy, stop search ++ return NS_OK; ++ } ++ } ++ + // if proxies are enabled and this host:port combo is supposed to use a + // proxy, check for a proxy. + if (mProxyConfig == eProxyConfig_Direct || + (mProxyConfig == eProxyConfig_Manual && + !CanUseProxy(uri, info.defaultPort))) + return NS_OK; +- ++ + // Proxy auto config magic... +- if (mProxyConfig == eProxyConfig_PAC || mProxyConfig == eProxyConfig_WPAD) { ++ if (mProxyConfig == eProxyConfig_PAC || mProxyConfig == eProxyConfig_WPAD || ++ mProxyConfig == eProxyConfig_System) { + // Do not query PAC now. + *usePAC = PR_TRUE; + return NS_OK; +--- netwerk/base/src/nsProtocolProxyService.h ++++ netwerk/base/src/nsProtocolProxyService.h +@@ -48,6 +48,7 @@ + #include "nsPIProtocolProxyService.h" + #include "nsIProtocolProxyFilter.h" + #include "nsIProxyAutoConfig.h" ++#include "nsISystemProxySettings.h" + #include "nsIProxyInfo.h" + #include "nsIObserver.h" + #include "nsDataHashtable.h" +@@ -310,6 +311,7 @@ + eProxyConfig_PAC, + eProxyConfig_Direct4x, + eProxyConfig_WPAD, ++ eProxyConfig_System, // use system proxy settings if available, otherwise WPAD + eProxyConfig_Last + }; + +@@ -371,6 +373,7 @@ + PRBool mSOCKSProxyRemoteDNS; + + nsRefPtr mPACMan; // non-null if we are using PAC ++ nsCOMPtr mSystemProxySettings; + + PRTime mSessionStart; + nsFailedProxyTable mFailedProxies; +--- toolkit/components/gnome/nsGConfService.cpp ++++ toolkit/components/gnome/nsGConfService.cpp +@@ -39,6 +39,8 @@ + #include "nsGConfService.h" + #include "nsCRT.h" + #include "nsString.h" ++#include "nsSupportsPrimitives.h" ++#include "nsArray.h" + + #include + +@@ -125,6 +127,37 @@ + } + + NS_IMETHODIMP ++nsGConfService::GetStringList(const nsACString &aKey, nsIArray** aResult) ++{ ++ nsCOMPtr items; ++ NS_NewArray(getter_AddRefs(items)); ++ if (!items) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ GError* error = nsnull; ++ GSList* list = gconf_client_get_list(mClient, PromiseFlatCString(aKey).get(), ++ GCONF_VALUE_STRING, &error); ++ if (error) { ++ g_error_free(error); ++ return NS_ERROR_FAILURE; ++ } ++ ++ for (GSList* l = list; l; l = l->next) { ++ nsSupportsCStringImpl* obj = new nsSupportsCStringImpl(); ++ if (!obj) { ++ g_slist_free(list); ++ return NS_ERROR_OUT_OF_MEMORY; ++ } ++ obj->SetData(nsDependentCString((const char*)l->data)); ++ items->AppendElement(obj, PR_FALSE); ++ } ++ ++ g_slist_free(list); ++ NS_ADDREF(*aResult = items); ++ return NS_OK; ++} ++ ++NS_IMETHODIMP + nsGConfService::SetBool(const nsACString &aKey, PRBool aValue) + { + PRBool res = gconf_client_set_bool(mClient, PromiseFlatCString(aKey).get(), +--- toolkit/components/gnome/nsIGConfService.idl ++++ toolkit/components/gnome/nsIGConfService.idl +@@ -37,6 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "nsISupports.idl" ++#include "nsIArray.idl" + + [scriptable, uuid(01ac7b2e-c07c-465f-b35c-542eaef420a9)] + interface nsIGConfService : nsISupports +@@ -46,6 +47,7 @@ + AUTF8String getString(in AUTF8String key); + long getInt(in AUTF8String key); + float getFloat(in AUTF8String key); ++ nsIArray getStringList(in AUTF8String key); + + void setBool(in AUTF8String key, in boolean value); + void setString(in AUTF8String key, in AUTF8String value); +--- toolkit/components/unixproxy/nsUnixSystemProxySettings.cpp ++++ toolkit/components/unixproxy/nsUnixSystemProxySettings.cpp +@@ -0,0 +1,425 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Robert O'Callahan (rocallahan@novell.com) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISystemProxySettings.h" ++#include "nsIGenericFactory.h" ++#include "nsIServiceManager.h" ++#include "nsIGConfService.h" ++#include "nsIURI.h" ++#include "nsReadableUtils.h" ++#include "nsArray.h" ++#include "prnetdb.h" ++#include "prenv.h" ++#include "nsPrintfCString.h" ++#include "nsNetUtil.h" ++#include "nsISupportsPrimitives.h" ++ ++class nsUnixSystemProxySettings : public nsISystemProxySettings { ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_NSISYSTEMPROXYSETTINGS ++ ++ nsUnixSystemProxySettings() {} ++ nsresult Init(); ++ ++private: ++ ~nsUnixSystemProxySettings() {} ++ ++ nsCOMPtr mGConf; ++}; ++ ++NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) ++ ++nsresult ++nsUnixSystemProxySettings::Init() ++{ ++ // If this is a GNOME session, load gconf and try to use its preferences. ++ // If gconf is not available (which would be stupid) we'll proceed as if this ++ // was not a GNOME session, using *_PROXY environment variables. ++ const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); ++ if (sessionType && !strcmp(sessionType, "gnome")) { ++ mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); ++ } ++ return NS_OK; ++} ++ ++static PRBool ++IsProxyMode(nsIGConfService* aGConf, const char* aMode) ++{ ++ nsCAutoString mode; ++ return NS_SUCCEEDED(aGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) && ++ mode.EqualsASCII(aMode); ++} ++ ++nsresult ++nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) ++{ ++ if (!mGConf || !IsProxyMode(mGConf, "auto")) ++ return NS_ERROR_FAILURE; ++ return mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/autoconfig_url"), ++ aResult); ++} ++ ++static PRBool ++IsInNoProxyList(const nsACString& aHost, PRInt32 aPort, const char* noProxyVal) ++{ ++ NS_ASSERTION(aPort >= 0, "Negative port?"); ++ ++ nsCAutoString noProxy(noProxyVal); ++ if (noProxy.EqualsLiteral("*")) ++ return PR_TRUE; ++ ++ noProxy.StripWhitespace(); ++ ++ nsReadingIterator pos; ++ nsReadingIterator end; ++ noProxy.BeginReading(pos); ++ noProxy.EndReading(end); ++ while (pos != end) { ++ nsReadingIterator last = pos; ++ nsReadingIterator nextPos; ++ if (FindCharInReadable(',', last, end)) { ++ nextPos = last; ++ ++nextPos; ++ } else { ++ last = end; ++ nextPos = end; ++ } ++ ++ nsReadingIterator colon = pos; ++ PRInt32 port = -1; ++ if (FindCharInReadable(':', colon, last)) { ++ ++colon; ++ nsDependentCSubstring portStr(colon, last); ++ nsCAutoString portStr2(portStr); ++ PRInt32 err; ++ port = portStr2.ToInteger(&err); ++ if (err != 0) { ++ port = -2; // don't match any port, so we ignore this pattern ++ } ++ --colon; ++ } else { ++ colon = last; ++ } ++ ++ if (port == -1 || port == aPort) { ++ nsDependentCSubstring hostStr(pos, colon); ++ if (StringEndsWith(aHost, hostStr, nsCaseInsensitiveCStringComparator())) ++ return PR_TRUE; ++ } ++ ++ pos = nextPos; ++ } ++ ++ return PR_FALSE; ++} ++ ++static void SetProxyResult(const char* aType, const nsACString& aHost, ++ PRInt32 aPort, nsACString& aResult) ++{ ++ aResult.AppendASCII(aType); ++ aResult.Append(' '); ++ aResult.Append(aHost); ++ aResult.Append(':'); ++ aResult.Append(nsPrintfCString("%d", aPort)); ++} ++ ++static nsresult ++GetProxyForURIFromEnvironment(const nsACString& aScheme, ++ const nsACString& aHost, ++ PRInt32 aPort, ++ nsACString& aResult) ++{ ++ nsCAutoString envVar; ++ envVar.Append(aScheme); ++ envVar.AppendLiteral("_proxy"); ++ const char* proxyVal = PR_GetEnv(envVar.get()); ++ if (!proxyVal) { ++ proxyVal = PR_GetEnv("all_proxy"); ++ if (!proxyVal) { ++ // Return failure so that the caller can detect the failure and ++ // fall back to other proxy detection (e.g., WPAD) ++ return NS_ERROR_FAILURE; ++ } ++ } ++ ++ const char* noProxyVal = PR_GetEnv("no_proxy"); ++ if (noProxyVal && IsInNoProxyList(aHost, aPort, noProxyVal)) { ++ aResult.AppendLiteral("DIRECT"); ++ return NS_OK; ++ } ++ ++ // Use our URI parser to crack the proxy URI ++ nsCOMPtr proxyURI; ++ nsresult rv = NS_NewURI(getter_AddRefs(proxyURI), proxyVal); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ // Is there a way to specify "socks://" or something in these environment ++ // variables? I can't find any documentation. ++ PRBool isHTTP; ++ rv = proxyURI->SchemeIs("http", &isHTTP); ++ if (NS_FAILED(rv)) ++ return rv; ++ if (!isHTTP) ++ return NS_ERROR_FAILURE; ++ ++ nsCAutoString proxyHost; ++ rv = proxyURI->GetHost(proxyHost); ++ if (NS_FAILED(rv)) ++ return rv; ++ PRInt32 proxyPort; ++ rv = proxyURI->GetPort(&proxyPort); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ SetProxyResult("PROXY", proxyHost, proxyPort, aResult); ++ return NS_OK; ++} ++ ++static nsresult ++SetProxyResultFromGConf(nsIGConfService* aGConf, const char* aKeyBase, ++ const char* aType, nsACString& aResult) ++{ ++ nsCAutoString hostKey; ++ hostKey.AppendASCII(aKeyBase); ++ hostKey.AppendLiteral("host"); ++ nsCAutoString host; ++ nsresult rv = aGConf->GetString(hostKey, host); ++ if (NS_FAILED(rv)) ++ return rv; ++ if (host.IsEmpty()) ++ return NS_ERROR_FAILURE; ++ ++ nsCAutoString portKey; ++ portKey.AppendASCII(aKeyBase); ++ portKey.AppendLiteral("port"); ++ PRInt32 port; ++ rv = aGConf->GetInt(portKey, &port); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ SetProxyResult(aType, host, port, aResult); ++ return NS_OK; ++} ++ ++/* copied from nsProtocolProxyService.cpp --- we should share this! */ ++static void ++proxy_MaskIPv6Addr(PRIPv6Addr &addr, PRUint16 mask_len) ++{ ++ if (mask_len == 128) ++ return; ++ ++ if (mask_len > 96) { ++ addr.pr_s6_addr32[3] = PR_htonl( ++ PR_ntohl(addr.pr_s6_addr32[3]) & (~0L << (128 - mask_len))); ++ } ++ else if (mask_len > 64) { ++ addr.pr_s6_addr32[3] = 0; ++ addr.pr_s6_addr32[2] = PR_htonl( ++ PR_ntohl(addr.pr_s6_addr32[2]) & (~0L << (96 - mask_len))); ++ } ++ else if (mask_len > 32) { ++ addr.pr_s6_addr32[3] = 0; ++ addr.pr_s6_addr32[2] = 0; ++ addr.pr_s6_addr32[1] = PR_htonl( ++ PR_ntohl(addr.pr_s6_addr32[1]) & (~0L << (64 - mask_len))); ++ } ++ else { ++ addr.pr_s6_addr32[3] = 0; ++ addr.pr_s6_addr32[2] = 0; ++ addr.pr_s6_addr32[1] = 0; ++ addr.pr_s6_addr32[0] = PR_htonl( ++ PR_ntohl(addr.pr_s6_addr32[0]) & (~0L << (32 - mask_len))); ++ } ++} ++ ++static PRBool ConvertToIPV6Addr(const nsACString& aName, ++ PRIPv6Addr* aAddr) ++{ ++ PRNetAddr addr; ++ if (PR_StringToNetAddr(PromiseFlatCString(aName).get(), &addr) != PR_SUCCESS) ++ return PR_FALSE; ++ ++ PRIPv6Addr ipv6; ++ // convert parsed address to IPv6 ++ if (addr.raw.family == PR_AF_INET) { ++ // convert to IPv4-mapped address ++ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &ipv6); ++ } else if (addr.raw.family == PR_AF_INET6) { ++ // copy the address ++ memcpy(&ipv6, &addr.ipv6.ip, sizeof(PRIPv6Addr)); ++ } else { ++ return PR_FALSE; ++ } ++ ++ return PR_TRUE; ++} ++ ++static PRBool GConfIgnoreHost(const nsACString& aIgnore, ++ const nsACString& aHost) ++{ ++ if (aIgnore.Equals(aHost, nsCaseInsensitiveCStringComparator())) ++ return PR_TRUE; ++ ++ if (StringBeginsWith(aIgnore, NS_LITERAL_CSTRING("*")) && ++ StringEndsWith(aHost, nsDependentCSubstring(aIgnore, 1), ++ nsCaseInsensitiveCStringComparator())) ++ return PR_TRUE; ++ ++ PRInt32 mask = 128; ++ nsReadingIterator start; ++ nsReadingIterator slash; ++ nsReadingIterator end; ++ aIgnore.BeginReading(start); ++ aIgnore.BeginReading(slash); ++ aIgnore.EndReading(end); ++ if (FindCharInReadable('/', slash, end)) { ++ ++slash; ++ nsDependentCSubstring maskStr(slash, end); ++ nsCAutoString maskStr2(maskStr); ++ PRInt32 err; ++ mask = maskStr2.ToInteger(&err); ++ if (err != 0) { ++ mask = 128; ++ } ++ --slash; ++ } else { ++ slash = end; ++ } ++ ++ PRIPv6Addr ignoreAddr, hostAddr; ++ if (!ConvertToIPV6Addr(aIgnore, &ignoreAddr) || ++ !ConvertToIPV6Addr(aHost, &hostAddr)) ++ return PR_FALSE; ++ ++ proxy_MaskIPv6Addr(ignoreAddr, mask); ++ proxy_MaskIPv6Addr(hostAddr, mask); ++ ++ return memcmp(&ignoreAddr, &hostAddr, sizeof(PRIPv6Addr)) == 0; ++} ++ ++static nsresult ++GetProxyForURIFromGConf(nsIGConfService* aGConf, ++ const nsACString& aScheme, ++ const nsACString& aHost, ++ PRInt32 aPort, ++ nsACString& aResult) ++{ ++ if (!IsProxyMode(aGConf, "manual")) { ++ aResult.AppendLiteral("DIRECT"); ++ return NS_OK; ++ } ++ ++ nsCOMPtr ignoreList; ++ if (NS_SUCCEEDED(aGConf->GetStringList(NS_LITERAL_CSTRING("/system/http_proxy/ignore_hosts"), ++ getter_AddRefs(ignoreList))) && ignoreList) { ++ PRUint32 len = 0; ++ ignoreList->GetLength(&len); ++ for (PRUint32 i = 0; i < len; ++i) { ++ nsCOMPtr str = do_QueryElementAt(ignoreList, i); ++ if (str) { ++ nsCAutoString s; ++ if (NS_SUCCEEDED(str->GetData(s)) && !s.IsEmpty()) { ++ if (GConfIgnoreHost(s, aHost)) { ++ aResult.AppendLiteral("DIRECT"); ++ return NS_OK; ++ } ++ } ++ } ++ } ++ } ++ ++ nsresult rv = SetProxyResultFromGConf(aGConf, "/system/proxy/socks_", "SOCKS", aResult); ++ if (NS_SUCCEEDED(rv)) ++ return rv; ++ ++ if (aScheme.LowerCaseEqualsLiteral("http")) { ++ rv = SetProxyResultFromGConf(aGConf, "/system/http_proxy/", "PROXY", aResult); ++ } else if (aScheme.LowerCaseEqualsLiteral("https")) { ++ rv = SetProxyResultFromGConf(aGConf, "/system/proxy/secure_", "PROXY", aResult); ++ } else if (aScheme.LowerCaseEqualsLiteral("ftp")) { ++ rv = SetProxyResultFromGConf(aGConf, "/system/proxy/ftp_", "PROXY", aResult); ++ } else { ++ rv = NS_ERROR_FAILURE; ++ } ++ ++ if (NS_FAILED(rv)) { ++ aResult.AppendLiteral("DIRECT"); ++ } ++ return NS_OK; ++} ++ ++nsresult ++nsUnixSystemProxySettings::GetProxyForURI(nsIURI* aURI, nsACString& aResult) ++{ ++ nsCAutoString scheme; ++ nsresult rv = aURI->GetScheme(scheme); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ nsCAutoString host; ++ rv = aURI->GetHost(host); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ PRInt32 port; ++ rv = aURI->GetPort(&port); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ if (!mGConf) ++ return GetProxyForURIFromEnvironment(scheme, host, port, aResult); ++ ++ return GetProxyForURIFromGConf(mGConf, scheme, host, port, aResult); ++} ++ ++#define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ ++ { 0x0fa3158c, 0xd5a7, 0x43de, \ ++ {0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } } ++ ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixSystemProxySettings, Init) ++ ++static const nsModuleComponentInfo components[] = { ++ { "Unix System Proxy Settings Service", ++ NS_UNIXSYSTEMPROXYSERVICE_CID, ++ NS_SYSTEMPROXYSETTINGS_CONTRACTID, ++ nsUnixSystemProxySettingsConstructor } ++}; ++ ++NS_IMPL_NSGETMODULE(unixproxy, components) +Index: Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/Makefile.in,v +retrieving revision 1.299.2.18 +diff -u -p -6 -r1.299.2.18 Makefile.in +--- Makefile.in 14 Sep 2006 18:07:02 -0000 1.299.2.18 ++++ Makefile.in 27 Nov 2006 19:04:14 -0000 +@@ -282,12 +282,13 @@ tier_50_dirs += directory/xpcom + endif + + ifndef MINIMO + ifdef MOZ_XUL_APP + ifdef MOZ_ENABLE_GTK2 + tier_50_dirs += toolkit/components/gnome ++tier_50_dirs += toolkit/components/unixproxy + endif + endif + endif + + ifdef MOZ_LEAKY + tier_50_dirs += tools/leaky +--- toolkit/components/unixproxy/Makefile.in.orig 2006-11-27 21:25:50.000000000 +0100 ++++ toolkit/components/unixproxy/Makefile.in 2006-11-27 21:26:18.000000000 +0100 +@@ -0,0 +1,67 @@ ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is the Mozilla GNOME integration code. ++# ++# The Initial Developer of the Original Code is ++# IBM Corporation. ++# Portions created by the Initial Developer are Copyright (C) 2004 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# Brian Ryner ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++DEPTH = ../../.. ++topsrcdir = @top_srcdir@ ++srcdir = @srcdir@ ++VPATH = @srcdir@ ++ ++include $(DEPTH)/config/autoconf.mk ++ ++MODULE = unixproxy ++MOZILLA_INTERNAL_API = 1 ++ ++REQUIRES = \ ++ xpcom \ ++ string \ ++ necko \ ++ mozgnome \ ++ $(NULL) ++ ++CPPSRCS = \ ++ nsUnixSystemProxySettings.cpp \ ++ $(NULL) ++ ++LIBRARY_NAME = unixproxy ++IS_COMPONENT = 1 ++FORCE_SHARED_LIB = 1 ++ ++EXTRA_DSO_LDOPTS += \ ++ $(MOZ_COMPONENT_LIBS) \ ++ $(NULL) ++ ++include $(topsrcdir)/config/rules.mk diff --git a/tab-close.patch b/tab-close.patch new file mode 100644 index 00000000..723a8cde --- /dev/null +++ b/tab-close.patch @@ -0,0 +1,13 @@ +Index: browser/themes/winstripe/browser/browser.css +================================================================================ +--- browser/themes/winstripe/browser/browser.css ++++ browser/themes/winstripe/browser/browser.css +@@ -1172,7 +1172,7 @@ + list-style-image: url("chrome://global/skin/icons/close.png"); + -moz-appearance: none; + -moz-image-region: rect(0px, 16px, 16px, 0px); +- padding: 4px 2px; ++ padding: 0px 0px; + border: none !important; + } + diff --git a/tango-theme.tar.bz2 b/tango-theme.tar.bz2 new file mode 100644 index 00000000..d8e19000 --- /dev/null +++ b/tango-theme.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36f5e5df7f49358c4fe9c5f69ff77d1a1efdf06d3f364e8e39c00ce771b3a2a9 +size 674974 diff --git a/visibility.patch b/visibility.patch new file mode 100644 index 00000000..2051a02d --- /dev/null +++ b/visibility.patch @@ -0,0 +1,31 @@ +From: Wolfgang Rosenauer +Subject: disable visibility feature +References: +https://bugzilla.novell.com/show_bug.cgi?id=83908 +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297 + +because of a gcc bug it's not possible to build with that +feature at the moment + +Index: configure +=================================================================== +RCS file: /cvsroot/mozilla/configure,v +retrieving revision 1.1443 +diff -u -p -6 -r1.1443 configure +--- configure 2 Jun 2005 04:00:20 -0000 1.1443 ++++ configure 6 Jun 2005 07:34:06 -0000 +@@ -7303,13 +7303,13 @@ else + int foo_default = 1; + EOF + ac_cv_visibility_pragma=no + if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then + if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then + if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then +- ac_cv_visibility_pragma=yes ++ ac_cv_visibility_pragma=no + fi + fi + fi + rm -f conftest.cs + + fi

Bookmarks

Bookmarks Toolbar Folder

Entertainment

News

Internet Search

Reference

Maps and Directions

Shopping

People and Companies

Bookmarks

Bookmarks Toolbar Folder

openSUSE

Mozilla Firefox

openSUSE RPM packaging