--- firefox-2.0.0.12+2nobinonly+2.orig/firefox-2.0.0.12+nobinonly-source.tar.bz2.cdbs-config_list +++ firefox-2.0.0.12+2nobinonly+2/firefox-2.0.0.12+nobinonly-source.tar.bz2.cdbs-config_list @@ -0,0 +1,74 @@ +mozilla/build/autoconf/config.guess +mozilla/build/autoconf/config.sub +mozilla/browser/installer/unix/config.it +mozilla/browser/installer/windows/config.it +mozilla/nsprpub/build/autoconf/config.guess +mozilla/nsprpub/build/autoconf/config.sub +mozilla/nsprpub/config/config.mk +mozilla/security/nss/cmd/crmf-cgi/config.mk +mozilla/security/nss/cmd/crmftest/config.mk +mozilla/security/nss/cmd/lib/config.mk +mozilla/security/nss/cmd/zlib/config.mk +mozilla/security/nss/lib/asn1/config.mk +mozilla/security/nss/lib/base/config.mk +mozilla/security/nss/lib/certdb/config.mk +mozilla/security/nss/lib/certhigh/config.mk +mozilla/security/nss/lib/ckfw/builtins/config.mk +mozilla/security/nss/lib/ckfw/config.mk +mozilla/security/nss/lib/ckfw/capi/config.mk +mozilla/security/nss/lib/ckfw/dbm/config.mk +mozilla/security/nss/lib/crmf/config.mk +mozilla/security/nss/lib/cryptohi/config.mk +mozilla/security/nss/lib/dev/config.mk +mozilla/security/nss/lib/freebl/config.mk +mozilla/security/nss/lib/jar/config.mk +mozilla/security/nss/lib/nss/config.mk +mozilla/security/nss/lib/pk11wrap/config.mk +mozilla/security/nss/lib/pkcs12/config.mk +mozilla/security/nss/lib/pkcs7/config.mk +mozilla/security/nss/lib/pki/config.mk +mozilla/security/nss/lib/pki1/config.mk +mozilla/security/nss/lib/smime/config.mk +mozilla/security/nss/lib/softoken/config.mk +mozilla/security/nss/lib/ssl/config.mk +mozilla/security/nss/lib/util/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/ssl/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/config.mk +mozilla/security/nss/tests/pkcs11/netscape/trivial/config.h.in +mozilla/security/coreconf/config.mk +mozilla/directory/c-sdk/config/autoconf/config.guess +mozilla/directory/c-sdk/config/autoconf/config.sub +mozilla/directory/c-sdk/config/config.mk +mozilla/db/sqlite3/src/config.h +mozilla/toolkit/components/viewconfig/content/config.js +mozilla/toolkit/components/viewconfig/content/config.xul +mozilla/toolkit/locales/en-US/chrome/global/config.dtd +mozilla/toolkit/locales/en-US/chrome/global/config.properties +mozilla/toolkit/themes/pinstripe/global/config.css +mozilla/toolkit/themes/winstripe/global/config.css +mozilla/tools/leaky/config.h +mozilla/extensions/cck/browser/resources/content/cckwizard/config.xul +mozilla/extensions/irc/xul/content/config.css +mozilla/extensions/irc/xul/content/config.js +mozilla/extensions/irc/xul/content/config.xul +mozilla/extensions/irc/xul/locale/en-US/config.dtd +mozilla/extensions/xmlterm/config/config.mk +mozilla/config/config.mk +mozilla/js/src/config.mk +mozilla/xpinstall/packager/build/win/gre/config.it +mozilla/xpinstall/packager/build/win/mfcembed/config.it +mozilla/xpinstall/packager/build/win/mozilla/config.it +mozilla/xpinstall/packager/os2/config.it +mozilla/xpinstall/packager/unix/config.it +mozilla/xpinstall/packager/win_gre/config.it +mozilla/xpinstall/packager/win_mfcembed/config.it +mozilla/xpinstall/packager/windows/config.it +mozilla/xpinstall/wizard/unix/src2/config.ini +mozilla/themes/classic/global/config.css +mozilla/themes/modern/global/config.css +mozilla/xpfe/global/resources/content/config.js +mozilla/xpfe/global/resources/content/config.xul +mozilla/xpfe/global/resources/locale/en-US/config.dtd +mozilla/xpfe/global/resources/locale/en-US/config.properties --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.ubuntu-prefs.js +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.ubuntu-prefs.js @@ -0,0 +1,4 @@ + +// only define lock file +pref("general.config.filename", "firefox-2.cfg"); + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/apport/firefox-2.py +++ firefox-2.0.0.12+2nobinonly+2/debian/apport/firefox-2.py @@ -0,0 +1,137 @@ +'''firefox apport hook draft + +/usr/share/apport/package-hooks/firefox-2.py + +Appends to apport's firefox default report: the files pluginreg.dat and +profiles.ini, and also a summary of all the extensions loaded on each firefox +profile (the summary is the extension's name, it's version, and the id) +obtained by parsing each extension's install.rdf file. + +Copyright (c) 2007: Hilario J. Montoliu + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +import os +import ConfigParser +import glob +import cStringIO +from xml.dom import minidom + +def extensions_ini_parser(extensions_ini_file): + '''parses profile's extensions.ini file and returns a tuple: + ((global extensions, local extensions), (global theme, local theme))''' + parser = ConfigParser.ConfigParser() + parser.read(extensions_ini_file) + ext_ini_d = {} + for section in parser.sections(): + section_global, section_local, my_ext = [], [], '' + for extension in parser.options(section): + my_ext = parser.get(section, extension) + if '/usr/lib/firefox/extensions' in my_ext: + section_global.append((my_ext)) + else: + section_local.append((my_ext)) + ext_ini_d[section] = (section_global, section_local) + return (ext_ini_d['ExtensionDirs'], ext_ini_d['ThemeDirs']) + +def install_ini_parser(extension_path): + '''parses each extension's install.rdf and returns string: + extension name, its version and the id.''' + rdf_file = os.path.join(extension_path, 'install.rdf') + refs_dict = {'em:version': '', 'em:id': '', 'em:name': ''} + parse_err = '%s (Not Parsed)\n' % extension_path + dom_doc = minidom.parse(rdf_file) + for key in refs_dict.keys(): + this_key = '' + try: + document_ref = dom_doc.getElementsByTagName('RDF:Description')[0].attributes + this_key = document_ref[key].value + except: + try: + document_ref = dom_doc.getElementsByTagName('Description')[0].attributes + this_key = document_ref[key].value + except: + try: + this_key = dom_doc.getElementsByTagName(key)[0].childNodes[0].data + except: + return parse_err + try: # avoid problems with encodings. + print >> cStringIO.StringIO(), this_key + refs_dict[key] = this_key + except UnicodeEncodeError: + refs_dict[key] = repr(this_key) + return '''%(em:name)s (version: %(em:version)s) -\tid: %(em:id)s''' % refs_dict + +def extension_summary_helper(extension_list, section_name, alt_output = 1): + '''does some output proccessing for extensionSummary''' + str = '' + if len(extension_list) > 0: + str += ''' %s:\n''' % section_name + for extension in extension_list: + str += ''' %s\n''' % install_ini_parser(extension) + else: + if alt_output == 1: # if 0, don't output anything + str += ''' No %s in this Profile.\n''' % section_name + str += '''\n''' + return str + +def add_info(report): + config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox') + + # append pluginreg.dat file: + pluginreg_dat = os.path.join(config_dir,'pluginreg.dat') + if os.path.exists(pluginreg_dat): + report['pluginreg.dat'] = open(pluginreg_dat).read() + + # append profiles.ini file & parse it: + profiles_ini = os.path.join(config_dir,'profiles.ini') + if os.path.exists(profiles_ini): + report['profiles.ini'] = open(profiles_ini).read() + # parse profiles.ini: + profiles_d = {} # { profile_name : [ profile_path, is_default ] } + profile_parser = ConfigParser.ConfigParser() + profile_parser.read(profiles_ini) + for section in profile_parser.sections(): + if profile_parser.has_option(section, 'Name') and profile_parser.has_option(section, 'Path'): + if profile_parser.has_option(section, 'Default'): + is_default = profile_parser.get(section, 'Default') + else: + is_default = 0 + profiles_d[profile_parser.get(section, 'Name')] = (os.path.join(config_dir, profile_parser.get(section, 'Path')), is_default) + + # summarize the extensions loaded on each profile (either global and local): + extensions_dict, themes_dict, extension_summary = {}, {}, '' + for profile_name in profiles_d.keys(): + profile_path, is_default = profiles_d[profile_name] + extensions_ini = os.path.join(profile_path, 'extensions.ini') + if os.path.exists(extensions_ini): + # attach each profile's extensions.ini too (not enabled). + #report['extensions.ini (profile: %s)' % profile_name ] = open(extensions_ini).read() + (extensions_dict['global_extensions'], extensions_dict['local_extensions']),\ + (themes_dict['global_theme'], themes_dict['local_theme']) = extensions_ini_parser(extensions_ini) + + if is_default == '1': is_default_str = ''' (The Default):''' + else: is_default_str = ''':''' + extension_summary += '''Profile "%s"%s\n\n''' % (profile_name, is_default_str) + extension_summary += extension_summary_helper(extensions_dict['global_extensions'], 'Global Extensions') + extension_summary += extension_summary_helper(extensions_dict['local_extensions'], 'Local Extensions') + extension_summary += extension_summary_helper(themes_dict['global_theme'], 'Global Theme', 0) + extension_summary += extension_summary_helper(themes_dict['local_theme'], 'Local Theme', 0) + buffer = cStringIO.StringIO() # it's needed for propper apport attachments + print >> buffer, extension_summary + buffer.seek(0) + report['ExtensionSummary'] = buffer.read() + # debug (comment on production) + # return report + +#### debug #### +# (uncomment the 'return report' at add_report()) +if __name__ == "__main__": + D = {} + report = add_info(D) + for key in report.keys(): print '''%s:\n''' % key, report[key] --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-dom-inspector.dirs +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-dom-inspector.dirs @@ -0,0 +1 @@ +usr/lib/firefox/extensions --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.postinst +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.postinst @@ -0,0 +1,34 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then + update-alternatives --install /usr/bin/x-www-browser \ + x-www-browser /usr/bin/firefox-2 30 \ + --slave /usr/share/man/man1/x-www-browser.1.gz \ + x-www-browser.1.gz /usr/share/man/man1/firefox-2.1.gz + touch /usr/lib/firefox/.autoreg +fi + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database +fi + +#DEBHELPER# + +echo "Please restart any running Firefoxes, or you will experience problems." + +unud=/var/lib/update-notifier/user.d + +if pgrep firefox-2-bin >/dev/null 2>&1 && test -d $unud; then + cp -f /usr/share/firefox-2/firefox-2-restart-required.update-notifier \ + "$unud/firefox-2-restart-required" +fi + +crd=/usr/lib/firefox-2/components/compreg.dat +if test -f $crd; then + cat >&2 <<'END' +Warning: something created compreg.dat! +Your system was affected by this bug: https://launchpad.net/bugs/30791 +compreg.dat has now been removed again, which should fix the symptoms. +END + rm $crd +fi --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-gnome-support.prerm +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-gnome-support.prerm @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --remove gnome-www-browser /usr/bin/firefox-2 + touch /usr/lib/firefox/.autoreg +fi + +#DEBHELPER# --- firefox-2.0.0.12+2nobinonly+2.orig/debian/wikipedia.gif.uu +++ firefox-2.0.0.12+2nobinonly+2/debian/wikipedia.gif.uu @@ -0,0 +1,9 @@ +begin 664 wikipedia.gif +M1TE&.#EA$``0`/0```0"!!D8&2@H*#PZ/$A'2%=85VEJ:7I[>H2#A)B8F*FH +MJ;FZN +M:#HN!;$\"G$TSU$TC5$\B/`^!$'#@4@\'`9C(V!P/!(!!<,@0HX*`<:C$40H +M1(LO.(`0)0"[(^(G(A!HC0%!U#B4$(!OW/ firefox links + - update debian/firefox-2-dev.links + - update debian/firefox-2.links + * provide compatibility links for several .pc files: firefox-gtkmozembed.pc, + firefox-js.pc, firefox-plugin.pc, firefox-xpcom.pc + - update debian/firefox-2-dev.links + + -- Alexander Sack Mon, 25 Feb 2008 10:57:06 +0100 + +firefox (2.0.0.12+2nobinonly+2-0ubuntu2) hardy; urgency=low + + * update patch to support NSS for firefox 3 beta 3 + - add debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch + - update debian/patches/series + * improve readability of control file by unfolding Build-Depends to + multiple-lines + - update debian/control + + -- Alexander Sack Mon, 11 Feb 2008 15:05:16 +0100 + +firefox (2.0.0.12+2nobinonly+2-0ubuntu1) hardy; urgency=low + + [ Alexander Sack ] + * New stability upstream release (v2.0.0.12) + * MFSA 2008-01 aka CVE-2008-0412: Crashes with evidence of memory corruption + v1.8.1.12 (Browser crashes) + * MFSA 2008-01 aka CVE-2008-0413: Crashes with evidence of memory corruption + v1.8.1.12 (javascript crashes) + * MFSA 2008-02 aka CVE-2008-0414: Multiple file input focus stealing + vulnerabilities: 1. Focus shifting bugs and 2. Selective keystroke + blocking bugs + * MFSA 2008-03 aka CVE-2008-0415: Privilege escalation, XSS, Remote Code + Execution (JavaScript privilege escalation bugs) + * MFSA 2008-04 aka CVE-2008-0416: Multiple XSS vulnerabilities from + character encoding + * MFSA 2008-05 aka CVE-2008-0417: Stored password corruption + * MFSA 2008-06 aka CVE-2008-0418: Directory traversal via chrome: URI + * MFSA 2008-07 aka CVE-2008-0419: Web browsing history and forward + navigation + stealing + * MFSA 2008-08 aka CVE-2008-0420: Possible information disclosure in BMP + decoder + * MFSA 2008-09 aka CVE-2008-0591: File action dialog tampering + * MFSA 2008-10 aka CVE-2008-0592: Mishandling of locally-saved plain text + files + * MFSA 2008-11 aka CVE-2008-0593: URL token stealing via stylesheet redirect + * MFSA 2008-12 aka CVE-2008-0594: Web forgery overwrite with div overlay + * updated diverged patches + - debian/patches/ubuntu-look-and-feel-patch.patch + - debian/patches/configure-autoconf2-13-reconfigure.patch + - debian/patches/series + * remove patches applied upstream + - debian/patches/bz391028_att284556.patch + + -- Alexander Sack Mon, 11 Feb 2008 00:28:46 +0100 + +firefox (2.0.0.10+2nobinonly-0ubuntu2) hardy; urgency=low + + New security/stability upstream release (v2.0.0.10): + * include follow up patch to fix 2.0.0.10 regression (bz391028): + - add debian/patches/bz391028_att284556.patch + - update debian/patches/series + * include patch for cairo Xlib build failure (bz344818): + - add bz344818_att264996.patch + - update debian/patches/series + - update debian/patches/configure-autoconf2-13-reconfigure.patch + + -- Alexander Sack Wed, 28 Nov 2007 17:14:46 +0100 + +firefox (2.0.0.10+2nobinonly-0ubuntu1.7.10.1) gutsy-security; urgency=low + + * New security/stability upstream release (v2.0.0.10) + * MFSA 2007-37 aka CVE-2007-5947 + * MFSA 2007-38 aka CVE-2007-5959 + * MFSA 2007-39 aka CVE-2007-5960 + + * debian/patches/bz384304_lp117575_linkrecursion_fix_in_startscript.patch, + series: drop patch applied upstream. + * debian/patches/configure-autoconf2-13-reconfigure.patch: rerun + autconf2.13 to resolve upstream merge conflicts. + + -- Alexander Sack Sun, 25 Nov 2007 19:39:25 +0100 + +firefox (2.0.0.8+2nobinonly-0ubuntu3) hardy; urgency=low + + * debian/control: fix package description to not include "development + version disclaimer (LP: #150791). + + -- Alexander Sack Sun, 28 Oct 2007 18:22:42 +0100 + +firefox (2.0.0.8+2nobinonly-0ubuntu2) hardy; urgency=low + + * debian/rules: define LIB_DIR to set mozillla-five-home appropriately + (LP: #157126). + + -- Alexander Sack Sat, 27 Oct 2007 23:45:41 +0200 + +firefox (2.0.0.8+2nobinonly-0ubuntu1) gutsy-security; urgency=low + + New security/stability upstream release (v2.0.0.8): + * MFSA 2007-29 aka CVE-2007-5339 (browser), CVE-2007-5340 (javascript) + * MFSA 2007-30 aka CVE-2007-1095 + * MFSA 2007-31 aka CVE-2007-2292 + * MFSA 2007-32 aka CVE-2007-3511, CVE-2006-2894 + * MFSA 2007-33 aka CVE-2007-5334 + * MFSA 2007-34 aka CVE-2007-5337 + * MFSA 2007-35 aka CVE-2007-5338 + * MFSA 2007-36 aka CVE-2007-4841 (windows only) + + Packaging changes: + * debian/patches/bz389801-theme-crash-with-GtkOptionMenu-indicator_size-and-indicator_spacing.patch, + series: drop patch - applied upstream. + * debian/patches/build-system-garbage.patch: drop allmakefiles.sh hunk - + applied upstream. + * debian/patches/configure-autoconf2-13-reconfigure.patch: rerun + autoconf2.13 + + -- Alexander Sack Fri, 19 Oct 2007 13:04:01 +0200 + +firefox (2.0.0.6+2nobinonly-0ubuntu1) gutsy; urgency=low + + * Reupload source tarball without binaries (LP: #121734) - sanitized using + debian/remove.binonly.sh + * debian/remove.binonly.sh: add script to strip original tarball from + binary only cruft. + * debian/debsearch.src: debsearch plugin now searches for gutsy packages + (LP: #150503). + + -- Alexander Sack Mon, 08 Oct 2007 13:04:06 +0200 + +firefox (2.0.0.6+2-0ubuntu4) gutsy; urgency=low + + * patch shaping: rename patches and include there bugzilla id + where available; document bzXXX-dont-reset-user-prefs-on-upgrade and + force-no-pragma-visibility-for-gcc-4.2_4.3 patches. + * debian/patches/bz389801-theme-crash-with-GtkOptionMenu-indicator_size-and-indicator_spacing.patch: + prefetch latest patch from bugzilla 389801 to fix top-crasher + (LP: #129007). + * debian/firefox-gnome-support.install: properly install gnome support files + previously missing in firefox-gnome-support package (LP: #131743). + + -- Alexander Sack Wed, 19 Sep 2007 18:16:37 +0200 + +firefox (2.0.0.6+2-0ubuntu3) gutsy; urgency=low + + * debian/rules, debian/control: use don't build lpia with gcc-4.1/g++-4.1 anymore, but + use gcc-4.2/g++-4.2 for all archs now. + * debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3, debian/patches/series: + add patch to siable pragma visibility strategy to hide symbols. stick to + -fvisibility=hidden. + * debian/patches/configure-autoconf2-13-reconfigure.patch: rerun autoconf2.13 to make + new force-no-pragma-visibility-for-gcc-4.2_4.3 effective. + * remove unused patches from debian/patches directory: + - debian/patches/bz364093-thebes-system-cairo-fix + - debian/patches/ftbfs-with-branding-dir + - debian/patches/no-have-stdint-h-ftbfs.patch + - debian/patches/submakefiles-fix + - debian/patches/test + - debian/patches/trunk-fsh + + -- Alexander Sack Mon, 27 Aug 2007 13:28:05 +0200 + +firefox (2.0.0.6+2-0ubuntu2) gutsy; urgency=low + + * use gXX 4.1 on lpia for now: + - debian/control: build-depend on gcc-4.1 and g++-4.1 on lpia + architectures + - debian/rules: use CXX=g++-4.1 and CC=gcc-4.1 on lpia if those + variables are not user defined + + -- Alexander Sack Fri, 10 Aug 2007 16:37:32 +0200 + +firefox (2.0.0.6+2-0ubuntu1) gutsy; urgency=low + + New security/stability upstream release (v2.0.0.6) + + * MFSA 2007-26 aka CVE-2007-3844 + * MFSA 2007-27 aka CVE-2007-3845 + + ++ + + LP: #126110 - [gutsy] menu item translations lost + + * resurrect feisty .desktop file + * reapply sv translations + + ++ + + LP: #123045 - Launcher icon missing, red "X" displayed instead + + * debian/changelog: document 'fix firefox-nspr.pc/firefox-nss.pc to + use system provided libs' checkin. + * debian/changelog: bump version for next release, but keep NOTRELEASED + + ++ + + Fix firefox-nspr.pc/firefox-nss.pc to use system provided libs + + * debian/firefox-nspr.pc, debian/firefox-nss.pc: drop old .pc files + * debian/firefox-dev.install: don't install those handcrafted .pc files anymore + * debian/firefox-dev.links: in turn setup compatibility links + /usr/lib/pkgconfig/firefox-nss.pc -> /usr/lib/pkgconfig/nss.pc + /usr/lib/pkgconfig/firefox-nspr.pc -> /usr/lib/pkgconfig/nspr.pc + (LP: #112818) + + ++ + + migrate ubuntu help menu entries to ubufox: + * debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem.patch, + debian/patches/ubuntu-look-and-feel-disable-help-translate-menu.patch: + remove patch which completely lives in ubufox as of version 0.3 + * debian/patches/series: remove that patch from series accordingly + * debian/patches/ubuntu-look-and-feel-patch.patch: drop menu entry modifications + from main look-and-feel patch as they live in ubufox since 0.3 + + -- Alexander Sack Tue, 31 Jul 2007 14:19:57 +0200 + +firefox (2.0.0.5+2-0ubuntu3) UNRELEASED; urgency=low + + * fix firefox-nspr.pc/firefox-nss.pc to use system provided libs + (LP: #112818): + + debian/firefox-nspr.pc, debian/firefox-nss.pc: drop old .pc files + + debian/firefox-dev.install: don't install those handcrafted .pc files anymore + + debian/firefox-dev.links: in turn setup compatibility links + /usr/lib/pkgconfig/firefox-nss.pc -> /usr/lib/pkgconfig/nss.pc + /usr/lib/pkgconfig/firefox-nspr.pc -> /usr/lib/pkgconfig/nspr.pc + + -- Alexander Sack Sat, 28 Jul 2007 22:48:17 +0200 + +firefox (2.0.0.5+2-0ubuntu2) gutsy; urgency=low + + * debian/patches/dont-reset-user-prefs-on-upgrade, + debian/patches/series: patch to prevent user prefs being reset to + default during upgrade + * debian/firefox.install, debian/firefox.links: install + browserconfig.properties properly (LP: #123800) + + -- Alexander Sack Fri, 20 Jul 2007 15:37:22 +0200 + +firefox (2.0.0.5+2-0ubuntu1) gutsy; urgency=low + + * New security/stability upstream release (v2.0.0.5) + * MFSA 2007-18 aka CVE-2007-3734 (browser), CVE-2007-3735 (Javascript) + * MFSA 2007-19 aka CVE-2007-3736 + * MFSA 2007-20 aka CVE-2007-3089 + * MFSA 2007-21 aka CVE-2007-3737 + * MFSA 2007-22 aka CVE-2007-3285 + * MFSA 2007-23 aka CVE-2007-3670 + * MFSA 2007-24 aka CVE-2007-3656 + * MFSA 2007-25 aka CVE-2007-3738 + + -- Alexander Sack Wed, 18 Jul 2007 10:54:27 +0200 + +firefox (2.0.0.4+2-0ubuntu4) gutsy; urgency=low + + * debian/firefox.install: Resurrect /etc/firefox/profile/. Without it, + Firefox creates an empty profile as a file instead of a directory, which + both makes it break, and also would not have our Ubuntu specific + bookmarks, settings, etc. (LP: #123917) + + -- Martin Pitt Wed, 18 Jul 2007 20:11:59 +0200 + +firefox (2.0.0.4+2-0ubuntu3) gutsy; urgency=low + + * drop more patches: + * debian/patches/ubuntu-look-and-feel-patch.patch: drop patch removes + File->Import dialog (LP: #28563) + * debian/patches/series: drop ubuntu-look-and-feel-geometries.patch + from patch series; remove that patch-file from debian/patches dir + accordingly + * debian/control: firefox recommends ubufox - the ubuntu firefox extension + * drop config tweaks from patchset as they are now shipped in + ubufox extension: + * debian/patches/disable-default-setting-for-app.update.enabled-and-app.update.auto.patch, + debian/patches/enable-kerberos-for-https.patch, + debian/patches/locale-my-matchOS.patch, + debian/patches/ubuntu-disable-default-browser-check.patch, + debian/patches/use-intl.properties.patch: drop property only + patches from patchset + * debian/patches/ubuntu-no-nss-chk-create.patch: drop useless patch + as we are now using system nss. + * debian/patches/series: remove property only patches above from + series file as well. + * debian/patches/ubuntu-disable-welcome-update-url.patch, + debian/patches/ubuntu-look-and-feel-disable-help-translate-menu.patch, + debian/patches/ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch, + debian/patches/ubuntu-look-and-feel-patch.patch, + debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem.patch, + debian/patches/ubuntu-printing-patch.patch: drop property parts + and add TODO for patches that contain tweakings that can be + moved to distro mods extension by overlays or other tricks. + * debian/patches/no-have-stdint-h-ftbfs.patch: drop unused trunk + patch from release branch package. + * debian/build-tools/obscure.c, debian/rules: provide C helper + (obscure-tool) to obscure firefox.cfg; build this helper in rules on + pre-build:: and clean up on clean:: + * debian/firefox-dev.install: ship obscure-tool binary in pkglibdir of + firefox-dev package. + * Obscure firefox.cfg: + - debian/firefox.cfg renamed to debian/firefox.cfg.source + - debian/rules: produce obscured debian/firefox.cfg in pre-build:: and + remove it in clean::" debian/rules debian/firefox.cfg.source + - debian/firefox.cfg.source: don't tweak obscure_value anymore + * debian/patches/bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs, + debian/patches/series: added patch for bugzilla bug bz270159 "Download + manager adds extension regardless of file's own extension" and bugzilla + bug bz336113 "empty file saving on download (NTFS/FAT/SMB)" - patch + submitted to bugzilla (LP: #65164). + * debian/firefox.links: install compatibility links for libnspr4 and + libnss3 shared libraries. This is done because our libnss and libnspr libs + don't have same library name as upstream ones (e.g. we use versioned soname); + so now we install links with original filename to pkglibdir of each mozilla + application. + + [ Andrea Veri ] + * Added svedish translations support to firefox's .desktop file. + (LP: #107683) + + -- Alexander Sack Fri, 8 Jun 2007 01:11:00 +0200 + +firefox (2.0.0.4+2-0ubuntu2) gutsy; urgency=low + + Cherry pick release for tribe-2: + * debian/docs, debian/MPL: ship MPL (LP: #119814) + * debian/patches/bz384304_lp117575_linkrecursion_fix_in_startscript.patch, + debian/patches/series: patch to fix symlink handling of startup-script + by Hilario Montoliu - (LP: #117575). + * debian/apport/firefox.py, debian/firefox.install: new apport hook for + firefox by Hilario J. Montoliu ; install hook to + /usr/share/apport/package-hooks/ (LP: #88506) + + -- Alexander Sack Mon, 25 Jun 2007 10:38:55 +0200 + +firefox (2.0.0.4+2-0ubuntu1) gutsy; urgency=low + + * new upstream security/stability update (LP: #117990) + * MFSA2007-17 aka CVE-2007-2871: XUL Popup Spoofing + * MFSA2007-16 aka CVE-2007-2870: XSS using addEventListener + * MFSA2007-14 aka CVE-2007-1362: Path Abuse in Cookies + * MFSA2007-13 aka CVE-2007-2869: Persistent Autocomplete Denial of Service + * MFSA2007-12 aka CVE-2007-2867 (layout engine) + CVE-2007-2868 + (javascript engine): Crashes with evidence of memory corruption + * drop upstream applied patches: + bz312998-GetVisibility-patch.patch, + bz358930-gradient-spread-method-pad-fix.patch, + bz366844-mozilla-configure-in-patch-to-workaround-gcc-visibility-bug.patch + * adapted patches to upstream codebase changes: + bz273524-gnome-mime-registry-ubuntu.patch + * debian/firefox.1, debian/firefox.manpages: install firefox.1 (LP: #115112) + * install gnome-www-browser alternative in postinst and remove + that alternative in prerm - copied over from feisty + * debian/firefox.preinst: uninstall x-www-browser and mozilla alternative + * debian/firefox-dev.install: install nsBuildID.h to /usr/include/firefox/ + (LP: #115630) + + -- Alexander Sack Fri, 1 Jun 2007 12:10:00 +0200 + +firefox (2.0.0.3+3-0ubuntu4) gutsy; urgency=low + + * firefox: conflicts libnss3 to install proper symlink + /usr/lib/firefox/libnssckbi.so -> ../nss/libnssckbi.so + * add DisplayIf: instruction to test for running firefox; this is ment to + prevent restart notification from being displayed if ffox has been crashed in + the time between file replacement and update notification + * debian/firefox.postinst added - which was accidentially left behind when + migrating to new package layout + + -- Alexander Sack Tue, 15 May 2007 12:10:00 +0200 + +firefox (2.0.0.3+3-0ubuntu3) gutsy; urgency=low + + * firefox-dev: Depend on libnss3-dev. + + -- Matthias Klose Sun, 06 May 2007 14:11:05 +0000 + +firefox (2.0.0.3+3-0ubuntu2) gutsy; urgency=low + + * don't use -Xnss for dh_install of firefox-dev files - fix missing headers + for epiphany + + -- Alexander Sack Fri, 4 May 2007 18:10:00 +0200 + +firefox (2.0.0.3+3-0ubuntu1) gutsy; urgency=low + + * debian/patches/series, debian/patches/ubuntu-prevent-distributor-user-agent-part-reset.patch: + enable update of user-agent parts on startup again + * debian/firefox.install: install default.xpm in /usr/share/firefox/chrome/icons + by debhelper + * debian/rules, debian/vendor.js.in: create vendor.js pref file from + .in template with data from /etc/lsb-release; add preprocessing of + vendor.js.in to cdbs 'common-install-arch' target. + * merging down patches and tweaks from old firefox package to + new package structure with cdbs. + * debian/cdbs-rules/debhelper.mk: custom cdbs rules which allows + to specify dh_install extra args on a per package base + * debian/control.in, debian/control, debian/rules: use + system-nspr and system-nss; drop libnss3 and libnspr4 and + friends from control files; remove debhelper files + accordingly + * debian/rules: added update-orig target + * merging down modification and changelog entries for firefox updates + (2.0.0.2+1-0ubuntu1, 2.0.0.2+1-0ubuntu2, 2.0.0.3+1-0ubuntu1, + 2.0.0.3+1-0ubuntu2) imported using (feisty) approved patchset + at http://people.ubuntu.com/~asac/moz-screen.3 + + == Bugzilla Patches == + + + bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch + + bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch + + bz273524-gnome-mime-registry-ubuntu.patch + + bz289394-align-double-on-ia64-deb-bug-303518.patch + + bz312998-GetVisibility-patch.patch + + bz331818-fix-crash-xpidl-zero-arguments.patch + + bz335810-pango-cursor-up-down-fix.patch + + bz343360-feed-flat-chrome-fix.patch + + bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch + + bz358930-gradient-spread-method-pad-fix.patch + + bz366844-mozilla-configure-in-patch-to-workaround-gcc-visibility-bug.patch + + bz51429-anti-netstat-zombie-linux.patch + + bz7969-a-thai-patch.patch + + + == Patches for Upstream == + + + bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch + + bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch + + deb299697-lp42559-use-FC_ANY_METRICS.patch + + disable-default-setting-for-app.update.enabled-and-app.update.auto.patch + + myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch + + == Patches Ubuntu/Distribution == + + + enable-kerberos-for-https.patch + + flat-chrome-fix.patch + + locale-my-matchOS.patch + + add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch + + ubuntu-disable-default-browser-check.patch, + + ubuntu-disable-welcome-update-url.patch, + + ubuntu-look-and-feel-disable-help-translate-menu.patch, + + ubuntu-look-and-feel-geometries.patch, + + ubuntu-look-and-feel-home-folder.patch, + + ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch, + + ubuntu-look-and-feel-patch.patch, + + ubuntu-look-and-feel-report-a-bug-menuitem.patch, + + ubuntu-no-nss-chk-create.patch, + + ubuntu-prevent-distributor-user-agent-part-reset.patch + + + == Misc Patches == + + build-system-garbage.patch + + == Debian Directory == + + debian/firefoxrc: fix old malone url in comment + (LP: #94392) + + debian/control.in, debian/control: fix missing firefox-libthai + depends on firefox; produce firefox-libthai binary package, + which contains libthai component introduced in patch + + -- Alexander Sack Fri, 4 May 2007 01:16:00 +0200 + +firefox (2.0.0.3+1-0ubuntu2) feisty; urgency=low + + * debian/control: fix missing firefox-libthai depends on firefox + * xpfe/components/killAll/Makefile.in: drop unapproved/useless patch + to install/remove nsKillAll.js component. + * browser/locales/en-US/profile/bookmarks.html: fix bookmarks urls; + www.ubuntulinux.org/wiki/FrontPage -> wiki.ubuntu.com; www.ubuntulinux.org + -> www.ubuntu.com (LP: #93502) + * browser/base/content/baseMenuOverlay.xul: commenting out ubuntu help + menu entries: Get Help Online; Translate This application. Reenable as + soon as launchpad supports these features. + * layout/svg/renderer/src/cairo/nsSVGCairoGradient.cpp: fix for bz358930 + (LP: #69721): 2.0 doesn't respect SVG gradient spreadMethod="pad" + * gfx/src/gtk/nsFontMetricsPango.cpp: fix for bz335810: cursor up/down + keypresses do not preserve horizontal position when using pango (LP: #36571) + * debian/firefoxrc: fix old malone url in comment (LP: #94392) + + -- Alexander Sack Tue, 3 Apr 2007 12:45:00 +0200 + +firefox (2.0.0.3+1-0ubuntu1) feisty; urgency=low + + * new upstream security/stability update (v2.0.0.3) + * MFSA-2006-11 aka CVE-2007-1562: FTP PASV port-scanning + * add Report a Bug ... menu entry to Help menu overlay (LP: #85041) + * gfx/src/gtk/nsFontMetricsXft.cpp: revert not-approved patch + bz252033-gtk2-xft-text-clipping-problem, because fix seems to + have pretty bad performance overhead. + * config/autoconf.mk.in, configure.in, gfx/src/gtk/mozilla-decoder.cpp: + revert not-approved patch bz305185-system-pango-fix-for-gtk-2-8, because + no longer necessary, upstream bug was duped to + https://bugzilla.mozilla.org/show_bug.cgi?id=338446 + * xpfe/components/killAll/Makefile.in: revert not-approved patch + bz333289-nskillall-not-installed, because its just cruft from + old suite and not used for firefox. + * debian/control: add depends on libnspr4 to libnss3 (LP: #84481) + + -- Alexander Sack Fri, 23 Mar 2007 22:00:00 +0100 + +firefox (2.0.0.2+1-0ubuntu2) feisty; urgency=low + + * reworked patchset and updated thai patch to latest + * debian/firefox.desktop: updated finnish translation for + .desktop file (Contributed by Timo Jyrinki ) + * browser/app/profile/firefox.js: set pref browser.startup.homepage_override.mstone + to "ignore" (LP: #91798) + * browser/components/nsBrowserContentHandler.js: disable welcome and update + url feature completely (LP: #91798) + * use pref distributionID only ... don't hard code this anymore + * produce chromelist.txt files again (e.g. drop patch that prevents that) + * exclude patch that disabled mangle dir in + security/nss/cmd/shlibsign/manifest.mn + + [ Theppitak Karoonboonyanan ] + * Update Thai line breaker patch based on libthai. + - Replace old patch with componentized mozlibthai patch extracted and + adapted from submitted patch in Debian #366306, which was backported + from patch against HEAD proposed in bz#7969. + - debian/control, debian/firefox-libthai.{install,postinst,prerm}: + + Add firefox-libthai sub-package and Build-Depends: libthai-dev + + Remove Suggests: libthai0 from firefox (we don't need PR_LoadLibrary() + hack any more), and Suggests: firefox-libthai instead + - debian/rules: + + Add --enable-libthai configure option + + Exclude mozlibthai component from firefox + + Add dh_install -pfirefox-libthai. + + -- Alexander Sack Tue, 13 Mar 2007 20:00:00 +0100 + +firefox (2.0.0.2+1-0ubuntu1) feisty; urgency=low + + * new upstream release 2.0.0.2 + * MFSA2007-01 - Crashes with evidence of memory corruption + (rv:1.8.0.10/1.8.1.2): + - CVE-2007-0775 - layout engine crashes + - CVE-2007-0776 - SVG + - CVE-2007-0777 - javascript engine corruption + * MFSA2007-02 - Improvements to help protect against Cross-Site + Scripting attacks: + - CVE-2007-0995 - Invalid trailing characters in HTML tag attributes + - CVE-2007-0996 - Child frame character set inheritance + - CVE-2006-6077 - Injected password forms + * MFSA2007-03 aka CVE-2007-0778: Information disclosure through cache + collisions + * MFSA2007-04 aka CVE-2007-0779: Spoofing using custom cursor and CSS3 + hotspot + * MFSA2007-05 aka CVE-2007-0780, CVE-2007-0800: XSS and local file access + by opening blocked popups + * MFSA2007-06 aka CVE-2007-0008, CVE-2007-0009: Mozilla Network Security + Services (NSS) SSLv2 buffer overflow + * MFSA2007-07 aka CVE-2007-0981: Embedded nulls in location.hostname + confuse same-domain checks + + -- Alexander Sack Sat, 24 Feb 2007 23:00:00 +0100 + +firefox-trunk (2.99+2cvs20070328-0ubuntu0) feisty; urgency=low + + * update upstream cvs + + -- Alexander Sack Wed, 28 Mar 2007 11:00:00 +0200 + +firefox-trunk (2.99+1-3.0a.20070201-0ubuntu0) feisty; urgency=low + + * package firefox 3 preview + * rewrite packaging, make use of cdbs with quilt patch + system. + + imported initial patches + + -- Alexander Sack Thu, 22 Feb 2007 09:00:00 +0200 + +firefox (2.0.0.1+1-0ubuntu2) feisty; urgency=low + + * browser/app/Makefile.in: link firefox-bin with + --no-as-needed again. (regression from + 2.0.0.1+1-0ubuntu1) + * browser/components/feeds/src/FeedWriter.js: fix + RSS preview/subscription for flat chrome + (Closes lp#61182) + * debian/rules: set BUILD_OFFICIAL and MOZILLA_OFFICIAL environment + so build gets a proper BUILD_ID. + + -- Alexander Sack Mon, 19 Feb 2007 12:45:00 +0100 + +firefox (2.0.0.1+1-0ubuntu1) feisty; urgency=low + + * repackage with new upstream mozilla.org and split up patches + into distinct feature patches available at + http://people.ubuntu.com/~asac/firefox-patches/ + * make use of original source tarball as distributed from + ftp.mozilla.org + * debian/rules: use --enable-official-branding to produce + official firefox branding; remove icons in debian/ dir; + add more garbage cleanup + * debian/firefox.links: /usr/share/pixmaps/firefox.png and + usr/share/pixmaps/mozilla-firefox.png now link to + usr/share/firefox/icons/mozicon128.png + * drop FeedWriter.js patch, no rational available. + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp, + xpcom/reflect/xptcall/src/md/unix/Makefile.in, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s, + configure.in, config/rules.mk, security/coreconf/Linux.mk: + drop debian architecture patches for + not ubuntu platforms + * debian/control: taking over maintainership + * configure.in: update hidden visibility patch from bugzilla + * configure.in: drop + * Makefile.in: drop explicit export of nss as build system is not + broken anymore + * browser/app/Makefile.in: drop linker tweaks for now. + * browser/app/profile/firefox.js: drop override for homepage + * browser/locales/en-US/chrome/branding/brand.properties: drop further + branding hacks not needed anymore + * browser/components/search/nsSearchService.js: drop not needed + official browser hacks + * prefs-size.diff: removed garbage file from source + + -- Alexander Sack Wed, 15 Feb 2007 23:15:00 +0100 + +firefox (2.0.0.1+0dfsg-0ubuntu2) feisty; urgency=low + + * Build using hunspell instead of myspell. + - debian/control: Build-depend on libhunspell-dev instead of libmyspell-dev. + - config/autoconf.mk.in: Add MOZ_MYSPELL_CFLAGS. + - extensions/spellcheck/myspell/src/Makefile.in: Use MOZ_MYSPELL_CFLAGS. + - extensions/spellcheck/myspell/src/mozMySpell.h: Include hunspell.cxx + instead of myspell.cxx. + - configure.in, configure: Overwrite myspell detection with hunspell. + + -- Matthias Klose Thu, 18 Jan 2007 11:57:14 +0000 + +firefox (2.0.0.1+0dfsg-0ubuntu1) feisty; urgency=low + + * New upstream security update: + - CVE-2006-6507, MFSA 2006-76: XSS using outer window's Function object. + - CVE-2006-6506, MFSA 2006-75: RSS Feed-preview referrer leak. + - CVE-2006-6504, MFSA 2006-73: SVG Processing Remote Code Execution. + - CVE-2006-6503, MFSA 2006-72: XSS by setting img.src to javascript: URI. + - CVE-2006-6502, MFSA 2006-71: LiveConnect crash finalizing JS objects. + - CVE-2006-6501, MFSA 2006-70: Privilege escallation using watch point. + - CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, MFSA 2006-68: Crashes + with evidence of memory corruption. + * debian/rules: use original upstream icons (LP: #68180). + * debian/debsearch.src: make feisty the default debsearch target. + * browser/base/content/utilityOverlay.js: change Launchpad translation/help + pages for Feisty. + + -- Kees Cook Thu, 21 Dec 2006 09:51:22 -0800 + +firefox (2.0+0dfsg-0ubuntu3) edgy; urgency=low + + * Patch from upstream CVS to fix RSS preview/subscription, thanks to Mike + Connor and Martin Jürgens (LP: #61182) + + -- Matt Zimmerman Mon, 23 Oct 2006 10:20:25 +0100 + +firefox (2.0+0dfsg-0ubuntu2) edgy; urgency=low + + * uudecode debsearch.gif too. Fixes FTBFS + * Make edgy the default debsearch target. Closes: Malone: #61687 + + -- Tollef Fog Heen Mon, 23 Oct 2006 08:52:11 +0200 + +firefox (2.0+0dfsg-0ubuntu1) edgy; urgency=low + + * Bump version to 2.0 (no upstream changes from rc3) + * browser/components/search/nsSearchService.js + - Set MOZ_OFFICIAL to "official", distributionID to "com.ubuntu" + * debian/branding: new subdirectory with images + * debian/rules: + - build: uudecode and substitute images in source tree, use debian/branding/icon64.png + instead of debian/firefox.png + - clean: restore images in source tree, remove uudecoded versions + + -- Matt Zimmerman Fri, 20 Oct 2006 15:56:42 -0700 + +firefox (1.99+2.0rc3+dfsg-0ubuntu1) edgy; urgency=low + + * New upstream version 2.0rc3, UVF exception approved by Matt Zimmerman. + * configure: Fix bashism to let the gcc visibility=hidden bug detection + work. + * configure{,.in}: Change MOZ_APP_DISPLAYNAME from 'BonEcho' to 'Firefox' to + make UserAgent string work with web sites which evaluate it. + * browser/base/content/utilityOverlay.js: Open the Launchpad + translation/help pages for Edgy, not Dapper. + * For the sake of automatic vulnerability tracking: All 1.5.0.x and earlier + vulnerabilities were fixed in the 2.0 branch as well: + CVE-2005-0752 CVE-2005-1531 CVE-2005-1532 CVE-2005-2114 CVE-2006-0749 + CVE-2006-1731 CVE-2006-1732 CVE-2006-1733 CVE-2006-1734 CVE-2006-1735 + CVE-2006-1736 CVE-2006-1737 CVE-2006-1738 CVE-2006-1739 CVE-2006-1740 + CVE-2006-1741 CVE-2006-1742 CVE-2006-1790 CVE-2006-2775 CVE-2006-2776 + CVE-2006-2777 CVE-2006-2778 CVE-2006-2779 CVE-2006-2780 CVE-2006-2782 + CVE-2006-2783 CVE-2006-2784 CVE-2006-2785 CVE-2006-2786 CVE-2006-2787 + CVE-2006-2788 CVE-2006-3113 CVE-2006-3677 CVE-2006-3801 CVE-2006-3802 + CVE-2006-3803 CVE-2006-3805 CVE-2006-3806 CVE-2006-3807 CVE-2006-3808 + CVE-2006-3809 CVE-2006-3810 CVE-2006-3811 CVE-2006-3812 CVE-2006-4253 + CVE-2006-4340 CVE-2006-4565 CVE-2006-4566 CVE-2006-4567 CVE-2006-4568 + CVE-2006-4569 CVE-2006-4571 + + -- Martin Pitt Thu, 19 Oct 2006 09:28:15 +0200 + +firefox (1.99+2.0rc2+dfsg-0ubuntu3) edgy; urgency=low + + * debian/firefox-runner: Disable Pango if a Sinhala locale is present. LP + 66270. + + -- Colin Watson Sun, 15 Oct 2006 20:29:26 +0100 + +firefox (1.99+2.0rc2+dfsg-0ubuntu2) edgy; urgency=low + + * Delete /usr/lib/firefox/components/compreg.dat in the postinst. + This is a partial workaround for LP 30791. + + -- Ian Jackson Thu, 12 Oct 2006 12:19:11 +0100 + +firefox (1.99+2.0rc2+dfsg-0ubuntu1) edgy; urgency=low + + * New upstream version 2.0rc2. + * Fix/workaround for epiphany GtkSocket lifetype crash: + apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814. + * Change application name to `Firefox', as requested by mdz. + Files changed: + - browser/locales/en-US/chrome/branding/brand.dtd + - browser/locales/en-US/chrome/branding/brand.properties; + New values: + - brandShortName and brandFullName: `Bon Echo' => `Firefox' + - vendorShortName: `Mozilla' => `Ubuntu' + * Make preferences dialogue fit again (bah!). + + -- Ian Jackson Tue, 10 Oct 2006 18:49:32 +0100 + +firefox (1.99+2.0b2+dfsg-1ubuntu3) edgy; urgency=low + + * Remove /usr/lib/mozilla-thunderbird from the LD_LIBRARY_PATH + if we find it there. Workaround for LP 57923. + * Remove pocket name (eg `-security') from distribution identifier in + the browser user agent string. LP 55289. + + -- Ian Jackson Tue, 3 Oct 2006 19:01:34 +0100 + +firefox (1.99+2.0b2+dfsg-1ubuntu2) edgy; urgency=low + + * Ship xpidl et al, in firefox-dev. Relates to Debian #362190. + Fixes Malone #61160. + + -- Ian Jackson Thu, 21 Sep 2006 16:33:50 +0100 + +firefox (1.99+2.0b2+dfsg-1ubuntu1) edgy; urgency=low + + * Merged from Debian unstable; new upstream version. + * Remaining differences between + Debian and Ubuntu in no particular order: + - Build libnspr and libnss and corresponding -dev packages from this + source package. Plus changes to make these libs build nicely. + - Various changes to preferences, default bookmarks and search engines. + - Support for `Get Help Online' and `Translate This Application'. + - Size changes for various dialogue boxes to make the contents fit. + - Downloads go to separate `Desktop' folder by default. + - Fix some underquoted m4 arguments. + - Minor changes in directories, symlinks and debian/control + to cope with Ubuntu and Debian's different histories. + - disable File / Import (wizard is nonfunctional). + Malone #28563, Debian #350599, Mozilla Bugzilla 117844. + - Change `Latest Headlines' to `Latest BBC Headlines' to properly + disclose the source up front, and use a corresponding RSS URL. + - Default for FIREFOX_DSP is none. + - Pango support is enabled only if an installed locale seems to need + it. + - Note in README.Debian about how to run xpcshell. + - Disable xprint. + - No build dependency on libxp-dev; build-depend on zip instead. + - Various icon changes. + - Some currently-unused directory merging code in firefox.preinst. + - Less detail in the user agent string. + - Belt-and-braces removal for some cruft left over by some versions of + the Mozilla build system. + - Better firefox.menu entry (says `Firefox Web Browser'). + - Build dynamically linked, since in Ubuntu embedders use firefox. + - EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998. + - Pass FC_ANY_METRICS to Fontconfig where appropriate. + - Extensive Thai language patch. + - Print in serif by default even though default display is sans. + - Some fixes to the (upstream-unused) nss makefiles. + - Strip PostScript/ from printer names. + - Better message about updates of read-only extension. + - Include pointer to the Gecko Runtime (GRE registration). + - Prevent websites from disabling context menus. + All of these changes are fully documented in the changelog below. + Please see those changelog entries for full details. Much historical + information about changes either taken up by Debian or upstream, or + dropped by us, is retained in this changelog. + + -- Ian Jackson Wed, 13 Sep 2006 16:40:06 +0100 + +firefox (1.99+2.0b2+dfsg-1) experimental; urgency=low + + * New upstream beta release. + + * extensions/inspector/build/src/Makefile.in, + extensions/inspector/build/src/inspector.pkg, + extensions/inspector/build/src/nsInspectorModule.cpp: Removed, the problem + was lying in debian/rules. /me goes hiding under a rock. + * layout/inspector/public/Makefile.in: Reverted previous changes. + * debian/rules: Don't exclude inspector files when dh_installing the firefox + package. We need the inspector.xpt file from the components directory. The + files for the dom-inspector package are already excluded from the + firefox.install file anyway. + * debian/firefox-dom-inspector.install, + debian/firefox-dom-inspector.links: Simplified. + * debian/control: + + Turn firefox-dom-inspector into an arch: all package, since the binary + component has been merged into the firefox binary. + + Adjust dependencies for binNMU safety. + * xpcom/reflect/xptcall/src/md/unix/Makefile.in, configure.in, configure: + Use ${host_cpu} instead of uname -m so that firefox can safely build on + s390x with a s390 target, and on amd64 with an x86 target. + * uriloader/exthandler/unix/nsGNOMERegistry.cpp, + uriloader/exthandler/unix/nsGNOMERegistry.h, + uriloader/exthandler/unix/nsOSHelperAppService.cpp, + uriloader/exthandler/unix/nsMIMEInfoUnix.cpp, + uriloader/exthandler/unix/nsMIMEInfoUnix.h: Adapted patch from bz#273524 to + make helper applications with parameters work. (Closes: #355511) + * debian/copyright: Adjusted with updated information for firefox 2.0, which + is now properly tri-licensed \o/. (Closes: #330295) + * debian/rules: Install the MPL file taken from the upstream LICENSE file. + + -- Mike Hommey Fri, 1 Sep 2006 08:36:26 +0200 + +firefox (1.5.dfsg+1.5.0.6-3) unstable; urgency=low + + * browser/app/Makefile.in: Workaround to force link the xpcom library to + the firefox binary despite -Wl,--as-needed in the LDFLAGS. + (Closes: #378667) + * debian/firefox.install: Don't install xpt_link, xpt_dump, xpidl, + xpicleanup, xpcshell nor regxpcom. They are of no use to firefox users and + are provided with xulrunner anyway. (Closes: #362190) + + -- Mike Hommey Sun, 20 Aug 2006 19:49:25 +0200 + +firefox (1.5.dfsg+1.5.0.6-2) unstable; urgency=low + + * debian/firefox.desktop: + - Polish translation from Ian Jackson by way of an Ubuntu user. + (Closes: #382079) + - Patch from Ian Jackson to stop claiming dav:// URLs when firefox + doesn't understand them. (Closes: #382080) + * editor/libeditor/text/nsPlaintextEditor.cpp: Apply patch from + bz#271815 to fix OverTheSpot mode used by many Asian language input + modules. (Closes: #379935) + + -- Eric Dorland Tue, 15 Aug 2006 00:09:55 -0400 + +firefox (1.5.dfsg+1.5.0.6-1) unstable; urgency=low + + * New upstream release. + + -- Eric Dorland Thu, 3 Aug 2006 13:17:45 -0400 + +firefox (1.5.dfsg+1.5.0.5-1) unstable; urgency=high + + [ Eric Dorland ] + * New upstream release. Urgency high because it fixes MFSA 2006-44 to + MFSA 2006-56 excluiding MFSA-2006-49. (Closes: #380463) + + [ Mike Hommey ] + * debian/firefox.prerm: Remove /usr/lib/firefox/.autoreg instead of + /var/lib/firefox/.autoreg. + * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in: + Removed very old and now useless changes. + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp: Removed + useless new line that showed up in the diff.gz. + + -- Eric Dorland Sun, 30 Jul 2006 17:08:38 -0400 + +firefox (1.99+2.0b1+dfsg-1) experimental; urgency=low + + * New upstream beta targetted at experimental: + - Much better search plugins handling. They can be added and removed at + will, and even better, system-wise search plugins can be ignored at the + profile level. (Closes: #352195, #320957, #296425, #308005) + * browser/components/shell/src/Makefile.in: Correctly install the + setDefaultBrowser component. + * config/rules.mk: Don't install extensions in the chrome. + * debian/firefox.links: Link /usr/lib/firefox/dictionaries to + /usr/share/myspell/dicts. + * config/autoconf.mk.in, configure, configure.in: Add the + --enable-system-myspell argument to configure to use the system myspell + library. + * extensions/spellcheck/myspell/src/Makefile.in: Use the system myspell + library when asked to. + * debian/rules: + - Add --enable-system-myspell to configure call. + - Do shlibsign libfreebl's (there can be several depending on the arch). + * debian/control: Add libmyspell-dev to build dependencies. + * browser/components/microsummaries/src/Makefile.in, config/Makefile.in: + Add rules so that make clean cleans everything. + * allmakefiles.sh: Removed references to nonexisting Makefiles in + extensions/xmlextras/base. + * configure, configure.in: Apply patches from bz#334866, bz#319012 and + bz#335949 + fixups to workaround gcc visibility hidden bugs, especially + #331460 (an instance of which is actually still present in C++, + see gcc#26905). + * extensions/inspector/build/src/Makefile.in, + extensions/inspector/build/src/inspector.pkg, + extensions/inspector/build/src/nsInspectorModule.cpp: Added missing files + for the DOM Inspector component. + * extensions/inspector/build/src/Makefile.in, + layout/inspector/public/Makefile.in: Adapted so that the DOM Inspector + component would build correctly and the xpt would be installed in + the extensions directory. + * extensions/reporter/Makefile.in: Install missing reporter's preference. + + -- Mike Hommey Fri, 21 Jul 2006 07:05:25 +0200 + +firefox (1.5.dfsg+1.5.0.4-3) unstable; urgency=low + + [ Eric Dorland ] + * debian/control: + - Fix silly typo of binutils. (Closes: #378582) + - Standards-Version to 3.7.2.1. + + [ Mike Hommey ] + * debian/rules: + - Use a specific LD_LIBRARY_PATH at link time so that we don't need to + link against indirect dependencies. (Closes: #378378) + - Run shlibsign after the files are stripped so that it is accurate and + FIPS mode can correctly work. + - Removed old commented out OPTFLAGS that were kept in case gcc 4.0 did + no better than gcc 3.x. + - Removed old exported variables that are useless nowadays. + - Removed dh_strip call in binary-indep. Who wants to strip + arch-independant files ;) + * debian/presubj: Added notes about plugins and crash reports. + * security/manager/Makefile.in, security/nss/cmd/shlibsign/Makefile: + Don't build nor install the .chk files but still build shlibsign. + * debian/firefox.install: Don't install .chk files since we generate them + after dh_strip. + * security/nss/cmd/shlibsign/manifest.mn: Don't build in shlibsign/mangle. + It doesn't build anyway. + + -- Eric Dorland Wed, 19 Jul 2006 23:56:22 -0400 + +firefox (1.5.dfsg+1.5.0.4-2) unstable; urgency=low + + [ Eric Dorland ] + * netwerk/base/public/security-prefs.js: Disable SSLv2 by default. I + thought the weak cipher warning took care of this. (Closes: #371153) + * debian/firefox-runner: Simplify the dsp autodetection and add aoss to + the roster. (Closes: #372848) + * firefox-restart-required.update-notifier, firefox.postinst, + firefox.install: Add update-notifier to indicate that firefox needs to + be restarted on upgrade. Based on Ian Jackson's patch, but reworked a + little. Also with a bad French translation. Translators, assemble! + (Closes: #365865) + * config/rules.mk, debian/control: Apply patch from Thiemo Seufer to + remove mips -xgot hack and build depend on the appropriate binutils on + mips and mipsel. (Closes: #374372) + * debian/presubj, debian/README.Debian: Add a bit more information about + disabling Pango, which often seems to be the source of problems. + * debian/firefox-runner: + - Print out MOZ_NO_REMOTE in verbose mode. + - Fix some unreachable logic, Thanks Daniel Jacobowitz. + + [ Mike Hommey ] + * debian/rules: + - Fix for Gecko date extraction from client.mk. + - Disabled strict aliasing from optimized builds. + - Added -Wl,--as-needed to the LDFLAGS, so that we don't get indirect + libraries linked. + * config/static-config.mk: Add MOZ_XFT_LIBS to STATIC_EXTRA_LIBS. It used to + get linked as a side effect of linking to indirect libraries, but should + be linked directly since Xft symbols are used. + * debian/firefox-restart-required.update-notifier: Fixed the french + translation. ;) + * content/html/content/src/nsGenericHTMLElement.cpp, + content/html/content/src/nsHTMLInputElement.cpp, + dom/src/base/nsGlobalWindow.cpp: Fixed crasher and potential crashers. + Reported bz#343953. + + -- Eric Dorland Sun, 9 Jul 2006 02:37:28 -0400 + +firefox (1.5.dfsg+1.5.0.4-1) unstable; urgency=low + + * The "Post-DebConf Hangover" release. + + [ Eric Dorland ] + * New upstream release. Fixes various security issues. MFSA 2006-31 to + MFSA 2006-43, excluding MFSA 2006-40. + * debian/control: + - Standards-Version to 3.7.2.0. + - Set priority of -dbg to extra and Section to devel. + * gfx/src/gtk/nsFontMetricsPango.cpp, + intl/lwbrk/src/nsJISx4501LineBreaker.cpp, + intl/unicharutil/util/nsUnicharUtils.h, + intl/unicharutil/util/nsUnicharUtils.cpp, + layout/generic/nsTextFrame.cpp: Patch from Jurij Smakov (from + bz#161826) to fix alignment issues on sparc64. (Closes: #354725) + + [ Mike Hommey ] + * Applied distclean patch from xulrunner (in + debian/patches/01_distclean.dpatch), except for the javaxpcom stuff we + don't build anyway. + * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}, + config/static-rules.mk: More cleaning for firefox. + * nsprpub/configure: Apply change to nsprpub/configure.in. + (Closes: #350616) + * gfx/src/gtk/nsFontMetricsPango.cpp: Some more changes so that it + actually builds without errors, and use PR_Malloc and PR_Free instead + of malloc and free. + + -- Eric Dorland Fri, 2 Jun 2006 12:13:18 -0400 + +firefox (1.5.dfsg+1.5.0.3-2) unstable; urgency=low + + * debian/firefox.desktop: Add spanish translation, just in time for + DebConf 6! Thanks Ian Jackson. (Closes: #365870) + * debian/firefox-runner: Actually apply the patch from Morita Sho in + #364566. I'm a moron. (Closes: #365956, #365960) + * debian/control: Standards-Version to 3.7.1.0. Go policy team! + + -- Eric Dorland Thu, 4 May 2006 01:38:18 -0400 + +firefox (1.5.dfsg+1.5.0.3-1) unstable; urgency=critical + + * The "secure enough for ya!" release. + * New upstream release. Contains security fixes, hence severity + critical. + - Fixes CVE-2006-1993 aka MFSA 2006-30. (Closes: #364810) + + [ Mike Hommey ] + * security/manager/Makefile.in, debian/firefox.install: Build and + install the .chk file again. That will make the FIPS mode work again. + * debian/control: Bumped Standards-Version to 3.7.0.0. No changes. + * debian/rules: Fix the navigator.ProductSub value for dumb scripts. + Closes: #364640, #365099. We now use the date of the client.mk file, + which is likely to be the closest value to the release date, instead of + useless build date. + Add the debian version after the firefox version string. + * debian/rules: Use dpkg-architecture to find out the host and build that + we want to pass to the configure script. (Closes: #365738) + + [ Eric Dorland ] + * debian/firefox-runner: + - Quote the APPLICATION_ID variable to handle profiles with a space + in the name. Inspired by Morita Sho's patch. (Closes: #364566) + - echo MOZ_DISABLE_PANGO on verbose. + * debian/rules: It's baaaackkk. Reenable xprint. + + -- Eric Dorland Wed, 3 May 2006 00:32:49 -0400 + +firefox (1.5.dfsg+1.5.0.3-0ubuntu3) dapper; urgency=low + + * Thai-related crash fix (Malone 45395): + - nsCopySupport.cpp, nsCopySupport::HTMLCopy: + do not crash if htmlConverter->Convert fails. + - nsHTMLFormatConverter.cpp, nsHTMLFormatConverter::Convert: + properly report failure if dataStr.IsEmpty. + - nsJISx4501LineBreaker.cpp: fix printf(stderr -> fprintf. + * Add Polish translation for firefox.desktop (Malone 45447). + Thanks to contribution from Tomasz Dominikowski. + * Do not attempt to merge /usr/lib/mozilla-firefox and /usr/lib/firefox + and make the former a link to the latter; this is unfortunately + error-prone and makes more problems than it solves. + Fixes Malone 44487; regresses the plugins directory confusion bug. + * Include MFSA and CVE numbers in changelog entry for 1.5.dfsg-1. + + -- Ian Jackson Tue, 23 May 2006 17:45:30 +0100 + +firefox (1.5.dfsg+1.5.0.3-0ubuntu2) dapper; urgency=low + + * Fix memory leak in large clipboard handling. Malone 41093. + Mozilla Bugzilla 289897; applied attachments 218749, 218753. + * Provide symlink /usr/lib/mozilla-firefox -> /usr/lib/firefox + (and shuffle stuff across if both directories exist). + * Remove update-notifier `restart required' on removal so that if you + remove firefox you're no longer asked to restart it. Malone 36739. + * Increase size of prefs window explicitly. Malone 43528. + * Suppress the error if /var/lib/locales/supported.d/* can't be read + (probably because it doesn't exist). If you get EIO or EACCES or some + such then having pango mysteriously disabled will be the least of your + worries. Malone 44016. + * Really use firefox_1.5.dfsg+1.5.0.3.orig.tar.gz from Debian. + + -- Ian Jackson Fri, 12 May 2006 19:20:30 +0100 + +firefox (1.5.dfsg+1.5.0.3-0ubuntu1) dapper; urgency=low + + * New upstream version, 1.5.0.3, security/stability fix from upstream: + MFSA 2006-30, CVE-2006-1993: Deleted + object reference when designMode="on" + This package is based on Debian's firefox_1.5.dfsg+1.5.0.3.orig.tar.gz + but has none of the corresponding Debian changes. + + -- Ian Jackson Wed, 10 May 2006 12:13:30 +0100 + +firefox (1.5.dfsg+1.5.0.2-3) unstable; urgency=low + + * debian/rules, debian/control: Build the -dbg package again. + * debian/firefox.1: Fix some incorrect references to mozilla. Thanks + Loïc Minier. (Closes: #364101) + * debian/firefox-runner: Patch from Mikhail Gusarov to be able to use + Network Audio Server's dsp wrapper. (Closes: #363124) + * debian/firefox.install: Fix screwed up path to firefox.xpm. (Closes: + #364359) + * debian/README.Debian: Document that firefox doesn't allow connections + on certain ports. Thanks W. Borgert. (Closes: #362785) + + -- Eric Dorland Sun, 23 Apr 2006 22:41:15 -0400 + +firefox (1.5.dfsg+1.5.0.2-2) unstable; urgency=critical + + * The "ftp-master's aren't my friends today" release. + * debian/rules, debian/control: Don't build the -dbg package for now, to + get around NEW queue processing. + + -- Eric Dorland Thu, 20 Apr 2006 22:33:18 -0400 + +firefox (1.5.dfsg+1.5.0.2-1) unstable; urgency=critical + + [ Eric Dorland ] + * New upstream release. Contains security fixes, hence severity + critical. + - Fixes the following vulnerabilites (Thanks Alexander Sack for + compiling the list): CVE-2006-1724, CVE-2006-0884, + CVE-2006-1730, CVE-2006-1729, CVE-2006-1728, CVE-2006-1727, + CVE-2006-1045, CVE-2006-0748, CVE-2006-1726, CVE-2006-1725, + CVE-2005-2353. (Closes: #362656) + * debian/firefox-runner: Patch from Paul Collins to fix some lingering + ProfileManager launch issues. (Closes: #356250) + * browser/components/preferences/privacy.xul, + browser/locales/en-US/chrome/browser/preferences/preferences.dtd: + Patch from Ian Jackson to make the preferences window bigger for + people with high rez displays. His changelog entry reads: + * Make Preferences window not chop off various elements: + - specify a width of 50em instead of 42em + - do not specify a height + - add another to the bottom of privacy.xul's prefpane. + I have no idea why this is necessary :-(. + Malone 36985. + * configure.in, configure: Small typo in configure.in that wasn't + setting TARGET_XPCOM_ABI properly and breaking binary extensions on + some arches. (Closes: #359228) + + [ Mike Hommey ] + * debian/rules: Disable elf-dynstr-gc, which is pretty useless nowadays. + * security/coreconf/rules.mk: Fix perl code that got broken by newer make. + Taken from bz#325148. + * browser/app/Makefile.in: Apply patch from bz#314927 to install default.xpm + in the correct place. + * debian/rules, debian/firefox.dirs, debian/firefox.install: Updated to fit + this change. + * security/coreconf/rules.mk: Force use of the -g flag in the CFLAGS. + + -- Eric Dorland Sun, 16 Apr 2006 18:40:02 -0400 + +firefox (1.5.dfsg+1.5.0.2-0ubuntu2) dapper; urgency=low + + * Increase sizes of various dialogue boxes so that all of the contents + fit. Malone 26225, 36985, and probably others. + * Set MOZ_DISABLE_PANGO=1 to disable pango, unless some locale is + selected as supported which would need pango for rendering; the + default can be overridden by setting MOZ_DISABLE_PANGO to 0 or 1. + Malone 32561 (workaround). + * Use update-notifier to request a firefox restart. Malone 36739. + * Added Spanish translation to firefox.desktop. + Malone 39972. Thanks to Rocco Stanzione for the patch. + * Add a couple of missing trailing newlines. + Malone 39972 again. Thanks Rocco Stanzione for the report. + * EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998, + thanks to chpe for the patch and discussion. + * Add FC_ANY_METRICS set to FcTrue to all patterns that are going to be + used for finding (rather than enumerating) fonts. Malone 42559. + + -- Ian Jackson Tue, 2 May 2006 18:59:32 +0100 + +firefox (1.5.dfsg+1.5.0.2-0ubuntu1) dapper; urgency=low + + * New upstream version, 1.5.0.2. + Described as `stability and security fixes' by upstream but many + changes are included and producing a complete list is infeasible :-(. + Fixes are known to be included for: + - MFSA 2006-29, CVE-2006-1725: Spoofing with translucent windows + - MFSA 2006-28, CVE-2006-1726: Security check of + js_ValueToFunctionObject() can be circumvented + - MFSA 2006-27, CVE-2006-0748: Table Rebuilding Code Execution + Vulnerability + - MFSA 2006-25, CVE-2006-1727: Privilege escalation through Print Preview + - MFSA 2006-24, CVE-2006-1728: Privilege escalation using + crypto.generateCRMFRequest + - MFSA 2006-23, CVE-2006-1729: File stealing by changing input type + - MFSA 2006-22, CVE-2006-1730: CSS Letter-Spacing Heap Overflow + Vulnerability + - MFSA 2006-20, CVE-2006-1529, CVE-2006-1530, CVE-2006-1531, + CVE-2006-1723, CVE-2006-1724: Crashes with evidence of memory + corruption. + This package is based on Debian's firefox_1.5.dfsg+1.5.0.2.orig.tar.gz + but has none of the corresponding Debian changes. + + -- Ian Jackson Wed, 26 Apr 2006 16:53:22 +0100 + +firefox (1.5.dfsg+1.5.0.1-5) unstable; urgency=low + + [ Mike Hommey ] + * debian/rules: + - Add -g to the build flags when building with DEB_BUILD_OPTIONS=nostrip. + If we ask for nostrip, we want the debugging + symbols, right? ;) + - Changed the way we identificate ourselves in vendor.js. + * layout/build/Makefile.in, layout/build/nsLayoutModule.cpp: Remove useless + useragent setter at startup so that general.useragent.product and + general.useragent.productSub set in our vendor.js preference file work at + startup time. + * security/coreconf/Linux.mk: + - Patch from Martin Michlmayr for mips64 builds. + - Don't use x86 as CPU_ARCH when building on an unsupported architecture. + * security/manager/Makefile.in, security/nss/lib/ckfw/builtins/Makefile, + security/nss/lib/manifest.mn: Don't build the stuff we don't need, and + dynamically link libnssckbi to both libplc4 and libplds4 instead of + linking statically. + * debian/firefox.postinst, debian/firefox.prerm, + debian/firefox-gnome-support.postinst, debian/firefox-gnome-support.prerm: + Touch a .autoreg file at configure time, or removal of gnome-support and + remove it with the package. This will trigger autoregistration of the + components if the compreg.dat and xpti.dat files are older than the + .autoreg file. We used to remove compatibility.ini for that reason, but + stopped doing that because firefox was supposed to do that correctly, + which actually only correctly works on new upstream versions, not new + debian revisions, or installation of gnome-support. + * xpfe/components/killAll/Makefile.in: Correctly install the killAll + component. + + [ Eric Dorland ] + * debian/control: + - Set Section of firefox-gnome-support and + mozilla-firefox-gnome-support to gnome. + - Standards-Version to 3.6.2.2. + - debhelper build-dep to >= 5.0. + - Add firefox-dbg package. + * debian/compat: Set to 5. + * debian/rules: + - Remove silly CVS tarball cleanup target. + - Add arch-independant debhelper calls, and make other debhelper + calls arch-dependent. + - Add --dbg-package=firefox-dbg to dh_strip call. + - Always build with the -g flag. (Based on a change Mike made) + - Patch from Andreas Jochens to use -mminimal-toc when building on + ppc64. (Closes: #361035) + - Use --disable-strip, --disable-strip-libs in configure parameters. + Thanks Ian Jackson. + - Use .upstream instead of .orig to make it more clear and not + confuse the clean target. Thanks Ian Jackson. (Closes: #362186) + - Disable xprint support for now, while the Xorg 7 transition sorts + itself out. Should be reenabled next release. + * debian/firefox.xpm: Add more Debian compliant menu icon. + * debian/firefox.install, debian/rules: Install new Debian compliant + icon. + * debian/firefox.desktop: Add StartupNotify=true for pretty waiting + cursor. Thanks Sven Arvidsson. (Closes: #361527) + * debian/firefox-dom-inspector.preinst, + debian/firefox-dom-inspector.links, + debian/firefox-dom-inspector.install: Install non-architecture + specific bits of the inspector into /usr/share/firefox. + * debian/firefoxrc: Disable the dsp wrapper by default. esddsp is just + too buggy to allow this to continue. May reenable later if they clean + up their act. Leaving the bugs open for now. + * debian/firefox.NEWS: + - Document the dsp wrapper changes. + - Remove old mozilla-firefox entries. + * debian/firefox.1: Fix typo of firefox, thanks Andrew Rendle. (Closes: + #362413) + * debian/firefox.install: We don't get .chk files anymore for some + reason. + + -- Eric Dorland Fri, 14 Apr 2006 15:52:41 -0400 + +firefox (1.5.dfsg+1.5.0.1-4) unstable; urgency=low + + [ Mike Hommey ] + * debian/firefox-runner, debian/firefox.1: Patch from Ian Jackson to + make -P, -CreateProfile and -ProfileManager options correctly work + again, and improve the manual page. (Closes: #356250) + * debian/firefox.desktop: + - Fix trivial syntax problems. (Closes: #356263) + - Added Japanese and Korean translations. + * debian/firefox.dirs: Removed remainings of the time when we had a file + in /usr/sbin. (Closes: #356268) + * debian/firefox-gnome-support.prerm, + debian/firefox-gnome-support.postinst: Removed bashisms. (Closes: + #349946) + * debian/README.Debian: + - Replaced the bug reporting information by an invitation to read + /usr/share/bug/firefox/presubj. (Closes: #356269) + - Changed the heading to "Firefox for Debian". + + [ Eric Dorland ] + * debian/firefox-gnome-support.postinst, + debian/firefox-gnome-support.prerm: Add forgotten #DEBHELPER# token. + + -- Eric Dorland Sun, 12 Mar 2006 21:34:14 -0500 + +firefox (1.5.dfsg+1.5.0.1-3) unstable; urgency=low + + [ Eric Dorland ] + * debian/control: Use strict dependencies for the transition packages, + no reason a transition package should be upgraded before the real + package. + * debian/README.Debian: Fix all references to + /etc/mozilla-firefox/mozilla-firefoxrc. (Closes: #351956) + * debian/firefox.desktop: Patch from Ian Jackson to add more + translations and more inline with the GNOME HIG. (Closes: #351807) + * widget/src/gtk2/nsWindow.cpp: Apply new ignore extended mouse buttons + patch from Peter Colberg (Closes: #351972) + * debian/firefox.1: Lower case first letter of -ContentLocale. + * debian/firefox.1, debian/firefox-runner: Add -no-remote switch to turn + on MOZ_NO_REMOTE. Use it for profile related commands as + well. (Closes: #351717, #344849) + * wikipedia.gif.uu, wikipedia.src, rules, firefox.install: Patch from + Ian Jackson to add wikipedia search engine. (Closes: #354107) + + [ Mike Hommey ] + * modules/libpref/src/init/all.js: Set default fonts for all languages to + serif, sans-serif and monospace. It might solve a lot of fonts problems. + * config/config.mk, config/make-jars.pl, configure.in, + security/nss/lib/fortcrypt/swfort/pkcs11/config.mk, + extensions/inspector/Makefile.in: Allow building without zip when + building flat chrome. + * configure: Ran autoconf accordingly to changes in configure.in. + * debian/control: Removed build dependency on zip. + * debian/rules: Build flat chrome. + * debian/firefox.install: Changed wildcards accordingly. + * config/rules.mk: + + Don't build chromelist.txt files. + + Fixed "jar" build so that inspector files don't get duplicated in the + extension directory. + + -- Eric Dorland Sun, 26 Feb 2006 11:45:15 -0500 + +firefox (1.5.dfsg+1.5.0.1-2) unstable; urgency=low + + [ Mike Hommey ] + * debian/firefox-runner: export MOZ_DISABLE_PANGO. (Closes: #351959) + * debian/README.Debian: changed reference to the rc file in /etc. + (Closes: #351956) + + [ Eric Dorland ] + * debian/firefox.preinst: Fix {}'s bashism. Thanks Jeff King. (Closes: + #351811) + * modules/libpref/src/init/all.js: Make print.postscript.print_command + space-safe. Thanks Ian Jackson. (Closes: #351809) + * debian/firefox-runner: Don't completely override + $MOZ_PLUGIN_PATH. Thanks Ian Jackson. (Closes: #351806) + + -- Eric Dorland Thu, 9 Feb 2006 01:23:35 -0500 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu12) dapper; urgency=low + + * Sponsored upload for Theppitak Karoonboonyanan + * Updated Thai word breaking patch: + - load `libthai.so.0' instead of `libthai.so'. + - print debug message only when DEBUG is defined. + - debian/control: Suggests libthai0 + + -- Michael Vogt Thu, 13 Apr 2006 13:25:14 +0200 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu11) dapper; urgency=low + + * Fix silly lack of [ ] quoting in AC_DEFUN use. + Malone 36659, Mozilla bugzilla 298457. + * Make Preferences window not chop off various elements: + - specify a width of 50em instead of 42em + - do not specify a height + - add another to the bottom of privacy.xul's prefpane. + I have no idea why this is necessary :-(. + Malone 36985. + * Fix broken UTF-8 in .desktop file (again). Malone 37779. + * Document how to use xpcshell in README.Debian. Malone 35333. + * Clarify updateReadOnlyMessage to refer to `system package manager' + which will help the misunderstanding in Malone 31284. + + -- Ian Jackson Wed, 12 Apr 2006 17:18:52 +0100 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu10) dapper; urgency=low + + * Generate `firefox-dbg' package with debugging symbols. + This involves changing debian/compat to 5, which should be safe. + * Fix Norwegian translation in firefox.desktop. (Malone 30603.) + * Fix trivial syntax problems in firefox.desktop. (Malone 33567.) + * Remove x-directory/webdav x-directory/webdav-prefer-directory + from MimeType list in desktop file. (Malone 35928.) + * Use `about.png.upstream' instead of `about.png.orig' is the saved + original version for the branding; *.orig tends to get clobbered. + + -- Ian Jackson Fri, 24 Mar 2006 18:49:46 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu9) dapper; urgency=low + + * added thai linebreaking support (thanks to Theppitak Karoonboonyanan) + + -- Michael Vogt Tue, 14 Mar 2006 15:16:52 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu8) dapper; urgency=low + + * debian/rules: + - renamed the idl directory to match the .pc name, + replace mozilla-firefox by firefox for firefox-config too + + -- Sebastien Bacher Mon, 13 Mar 2006 15:12:43 +0100 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu7) dapper; urgency=low + + * Pointing the .pc files to /usr/include/firefox is not enough, + better install the headers there too. + + -- Matthias Klose Sat, 11 Mar 2006 17:41:24 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu6) dapper; urgency=low + + * Replace Ubuntu Bugzilla bookmark with Launchpad's `Request + support with Ubuntu' ticket creation page. (Malone 28896.) + * Reinstate `Translate This Application' in Help menu, despite the fact + that Launchpad doesn't do this yet - you just get a page saying there + are no translations for Firefox. mdz assures us that this will be + done some time during dapper's service life. + * Make -P, -CreateProfile and -ProfileManager imply sensible + values for -a, and document -a in firefox(1). (Malone 31746.) + * Fix md5sum mismatch which causes spurious conffile prompt on + bookmarks.html. + * Set browser.startup.homepage_override.mstone to ignore, + to avoid the silly thing where the first time after the upgrade, + firefox looks like it has lost your home page because it is so keen to + tell you about the release notes. (Malone 33895.) + * Change `Latest Headlines' to `Latest BBC Headlines' to properly + disclose the source up front, and use a corresponding RSS URL. + * Revert the `you have chosen to open' dialogue, as discussed on + ubuntu-devel. + * Fix firefox-*.pc files to contain correct references to libs and + includes, just like the mozilla-*.pc files. (Malone 34200.) + + -- Ian Jackson Thu, 9 Mar 2006 19:56:58 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu5) dapper; urgency=low + + * Disable `Translate This Application' and don't try to have `Get Help + Online' translated because we don't know how to translate firefox: + https://launchpad.net/products/rosetta/+spec/rosetta-firefox-support + + -- Ian Jackson Fri, 24 Feb 2006 14:49:23 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu4) dapper; urgency=low + + * Disable (by default) the `you have chosen to open' dialogue box; + instead, we just take the default (which is to open with the + application from the Gnome MIME database). This behaviour is + controlled by browser.helperApps.defaultNoAsk.openFile. + + Bookmark, search and translation reference regression fixes: + * Restore `Translate This Application' and `Get Help Online' + * Add Ubuntu and Free Software links back to bookmarks + + Bookmark, search and translation references improvements: + * Add Wikipedia to search box. + * Remove `Quick searches' from bookmarks (these just replicate + entries from the search box, and are broken anyway). + + * Get rid of README.Ubuntu - the contents are now no longer relevant. + + -- Ian Jackson Thu, 23 Feb 2006 14:44:42 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu3) dapper; urgency=low + + * Move /usr/lib/libxpcom*.so etc. back to /usr/lib/firefox; avoids + clashes with other packages (eg mozilla). + * Add rpath setting for /usr/lib/firefox to all .pc files in + firefox-dev. This is suboptimal, but at least it allows programs + which use firefox-dev at compile-time to find firefox's .so's. + * Take some redundant and perhaps privacy-leaking information out + of the default User-Agent (Malone 30677). + + -- Ian Jackson Fri, 10 Feb 2006 17:42:12 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu2) dapper; urgency=low + + * Fix stupid FTBFS on default.xpm introduced in last upload. + * Retrospectively insert CVE numbers into 1ubuntu1 changelog entry. + + -- Ian Jackson Thu, 9 Feb 2006 12:45:15 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu1) dapper; urgency=low + + Changes since 1.5.dfsg-4ubuntu6: + * New upstream version (1.5.0.1) - security and stability fixes, + allegedly. (About 7000 lines of diff, so not reviewed for Ubuntu.) + Security fixes included: + - CVE-2006-0292, CVE-2006-0293, MFSA 2006-01: JavaScript garbage-collection + hazards + - CVE-2006-0294, MFSA 2006-02: Changing position:relative to static + corrupts memory + - CVE-2005-4134, MFSA 2006-03: Long document title causes startup denial of + Service + - CVE-2006-0295, MFSA 2006-04: Memory corruption via QueryInterface on + Location, Navigator objects + - CVE-2006-0296, MFSA 2006-05: Localstore.rdf XML injection through + XULDocument.persist() + - CVE-2006-0297, MFSA 2006-06: Integer overflows in E4X, SVG and Canvas + - CVE-2006-0298, MFSA 2006-07: Read beyond buffer while parsing XML + - CVE-2006-0299, MFSA 2006-08: "AnyName" entrainment and access control + hazard + * Fix Norwegian translation in .desktop file. (Malone #30603.) + * mkdir /usr/include/mozilla in firefox-dev.preinst to avoid + maintainer script sometimes preventing installation. + * Move the shlibs needed for gtkmozembed to /usr/lib (avoids + need for rpath and nonsense in firefox-gtkmozembed.pc). + * Work around new GNU make braindamage by adding seddery to + security/coreconf/rules.mk. + + Expected-permanent differences between Ubuntu and Debian: + * Build nspr and nss for use by all other programs in the distribution + (Packages: libnspr-dev, libnss-dev, libnspr4, libnss3. Fairly main + changes to parts of the build system.) This is so that mozilla + can be in Ubuntu universe. + * Disable xprint. (xprint is not used in Ubuntu.) + * Slightly different arrangements do with with transitional arrangements + related to package renaming from mozilla-firefox-*. + * Removed transitional packages mozilla-firefox-dom-inspector and + mozilla-firefox-gnome-support (not needed in Ubuntu). + * Build firefox-dev; applications which embed a browser in Ubuntu + generally embed Firefox rather than mozilla. This also means that we + build firefox with dynamic linking so that embedders and load ff. + * Debian package search replaced by Ubuntu package search (and defaults + to searching only in dapper, not all releases). + * Changes to various icons (and their installation paths). + * Strip CUPS/ from the front of displayed printer names, since + all printing in Ubuntu is done via CUPS. + + Other differences remaining between Ubuntu and Debian: + * debian/rules clean removes various junk left over by the mozilla build + system. (Debian #350616.) + * Exclude libssl3.so from dpkg_shlibdeps as this triggers a bug in + fakeroot on amd64 in Ubuntu. + * Set FIREFOX_DSP=none by default. Will sometimes break sound from eg + Flash. See https://launchpad.net/malone/bugs/29760 for rationale. + (Debian maintainers notified but no bug filed.) + * Append our plugin path to any previous value of MOZ_PLUGIN_PATH. + (Malone 29412. Debian #351806) + * firefox.desktop file has more translations and consistently calls the + application `Firefox Web Browser' (for better UI in the menus - this + change is also in firefox.menu). Debian #351807. + * Default printing command doesn't break if printer name contains + spaces (actually a preference, in all.js). (Debian #351809, + Mozilla Bugzilla #326245). + * security/coreconf/rules.mk adjusted with awful seddery to cope with + GNU make change to POSIXly interpretation of backslash line-joining. + See http://lists.debian.org/debian-devel/2005/12/msg00988.html. + Mozilla Bugzilla #325148. + * security/coreconf/ruleset.mk has a set -e added. + * Use GNOME mime database instead of mailcap. Patch imported from Red + Hat; see debian/gnome-mime-handling.diff. + * Change various preferences: + - Ubuntu-specific default homepage + - Ubuntu-specific release notes + - default homepage can be locale-specific + - middlebutton paste disabled + - do not load a special home page on first start after an upgrade + - disable File / Import (wizard is nonfunctional). + Malone #28563, Debian #350599, Mozilla Bugzilla 117844. + - save files to Desktop by default + - README.Ubuntu file (still rather full of junk) + - Prevent websites disabling the right-button context menu. + - Default font for display is sans, but: + - Default CSS for printing uses a serif font. + + -- Ian Jackson Tue, 7 Feb 2006 17:14:17 +0000 + +firefox (1.5.dfsg+1.5.0.1-1) unstable; urgency=low + + * The "those Ubuntu guys are great after all" release. + * New upstream release. (Closes: #351442) + + [ Mike Hommey ] + * debian/presubj: Added indications to try to reproduce without extensions + before actually filing a bug, and a hint to the safe mode. + * debian/firefox.install: added the reporter chrome files. (Closes: #344888) + * widget/src/gtk2/nsWindow.cpp: Revert additional stale patch for + extended mouse buttons support. + * debian/firefox.postinst, debian/firefox.prerm: unbashified. + (Closes: #349946) + * debian/control, debian/firefox-gnome-support.postinst, + debian/firefox-gnome-support.prerm: Let the firefox-gnome-support + package provide gnome-www-browser and handle a gnome-www-browser + alternative. Thanks Loïc Minier. (Closes: #350788) + * debian/firefox-runner: Enable Pango support by default. The + MOZ_ENABLE_PANGO environment variable is now useless. (Closes: #338716) + * debian/README.Debian: Change the paragraph about Pango to hint about + the MOZ_DISABLE_PANGO variable. + + [ Eric Dorland ] + * content/events/src/nsEventStateManager.cpp, + modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h: Apply + patch from Ian Jackson to revert a stale patch for multiple mouse + button support that was fixed in a different way in 1.5 + (Closes: #348375) + * debian/firefox.preinst: Check md5sum's of old conffiles before cp'ing + them on upgrade. This won't stop all unnecessary conffile prompting in + all situations (especially from really old versions), but should + definitely should work for upgrading from testing or stable. (Closes: + #345112) + * debian/firefox.install: + - Remove run-mozilla.sh. (Closes: #348902) + - Reorganize things a bit. + - Move profile into /etc/firefox here, instead of in the rules file. + * debian/firefox.install, debian/firefox.preinst, debian/firefox.links, + debian/firefox.dirs, debian/rules: Move chrome, defaults, greprefs + into /usr/share/firefox for more FHS goodnesss. + * debian/firefox.1: Document -new-tab and -new-window options, and + remove deprecated -remote option. (Closes: #348699) + * debian/firefox-runner: Apply patch to properly URL escape local + files. Thanks Morita Sho. (Closes: #348451) + * browser/app/profile/firefox.js: + - Reallow 40-bit ciphers, since now firefox warns people who + use them. (Closes: #349624) + - Enable bidi UI elements for our bi-directional friends. + (Closes: #348069) + * debian/rules: Remove glob pattern from dh_install invocation. Thanks + Ian Jackson. (Closes: #350571) + * browser/base/content/aboutDialog.xul: Fix spurious scrollbar in the + about dialog box. Thanks Ian Jackson. (Closes: #350608) + * js/src/fdlibm/fdlibm.h: Patch to fix little endianess of + mipsel. Thanks Ian Jackson and Thiemo Seufer. (Closes: #350621) + * browser/base/content/search.xml: Patch from Ian Jackson to remove + misleading Clear option from search box context menu. (Closes: #350611) + * debian/watch: Fix regex to actually find the upstream tarballs. + * modules/libpref/src/init/all.js: Cope better with printers with spaces + in the name. Thanks Ian Jackson. + * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Take patch + from bz#235336 as suggested by Ian Jackson to allow password manager + to work with sites that only have a password field, no username. + + -- Eric Dorland Mon, 6 Feb 2006 23:10:29 -0500 + +firefox (1.5.dfsg-4) unstable; urgency=low + + [ Eric Dorland ] + * debian/control, debian/rules: + - Remove Kerberos options, it is now loaded dynamically. + - Use /usr/share/firefox now for finding default.xpm. + * debian/firefox.install, debian/firefox.links, debian/firefox.preinst: + Start moving some clearly non-arch specific things + (/usr/lib/firefox/searchplugins, /usr/lib/firefox/icons, + /usr/lib/firefox/res) out of /usr/lib/firefox and into + /usr/share/firefox to make things more FHS friendly. Can't believe no + one ever called me on this before. + * toolkit/components/remote/nsGTKRemoteService.cpp, + widget/src/xremoteclient/XRemoteClient.cpp: Apply patch from bz#312154 + to fix remote interface on PPC (and probably other arches). (Closes: + #343913) + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp: Patch from + Zack Weinberg to fix FTBFS on m68k. (Closes: #343687) + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp: Patch from Antti + P Miettinen to fix small optimization problem with newer gcc's + (Closes: #344846) + + [ Mike Hommey ] + * debian/firefox-runner: Cleaned up now useless variables. + + -- Eric Dorland Tue, 10 Jan 2006 10:11:34 -0500 + +firefox (1.5.dfsg-3) unstable; urgency=low + + * debian/control: + - Need explicit build dependency on gtk >= 2.8. + - Upgrade Standards-Version to 3.6.2.1. No changes. + - Add compatibility packages for mozilla-firefox-dom-inspector + and mozilla-firefox-gnome-support and make all the upgrade packages + Architecture: all. (Closes: #343879, #344379) + * debian/watch: Add watch file. + * debian/about.png.uu: Add uuencoded version of previous about box + graphic. + * debian/rules: uudecode and install the about.png into the right + location. + * debian/firefox-runner: Add MOZ_PLUGIN_PATH to include plugins at the + old location for now. (Closes: #344085, #341682) + * widget/src/gtk2/nsWindow.cpp: Patch from bz#305970 to fix broken + contextual menu on Save File As. (Closes: #344430) + + * config/mkdepend/imakemdep.h, security/nss/lib/pki1/pki1.h: Remove some + patches that are now useless (suggested by Mike Hommey). + * mailnews/extensions/palmsync/palm.html, + browser/themes/pinstripe/browser/browser.css, + gfx/src/mac/nsNativeThemeMac.h, + directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt, + layout/html/tests/table/bugs/bug123862.html, + layout/html/tests/table/bugs/bug119786.html, + layout/html/tests/table/bugs/bug101759.html, + layout/html/tests/table/bugs/bug14489.html, + layout/html/tests/table/bugs/bug222846.html, + layout/html/tests/block/bugs/155333-1.html, + layout/html/tests/block/bugs/185411-2.html, + layout/html/tests/block/bugs/13599.html, + layout/html/tests/block/bugs/53960.html, + layout/html/tests/block/bugs/155333-2.html, + layout/html/tests/block/bugs/38157-a.html, + layout/html/tests/block/bugs/38157-b.html, + layout/html/tests/block/bugs/46918.html, + layout/html/tests/block/printing/145305-11.html, + layout/html/tests/block/printing/145305-21.html, + layout/html/tests/block/printing/145305-13.html, + layout/html/tests/block/printing/145305-17.html, + layout/html/tests/block/printing/145305-19.html, + layout/html/tests/block/printing/145305-4.html, + layout/html/tests/block/printing/127145-1.html, + layout/html/tests/block/printing/145305-3.html, + layout/html/tests/block/printing/145305-7.html, + layout/html/tests/block/printing/145305-9.html, + layout/html/tests/frameset/core/r3.html, + layout/html/tests/frameset/core/r4.html, + layout/html/tests/frameset/core/blank2.html, + xpinstall/packager/stage_mfcembed.pl, xpinstall/packager/stage_gre.pl, + embedding/qa/testembed/Tests.cpp, + embedding/qa/testembed/nsihttpchanneltests.cpp, + embedding/qa/testembed/BrowserImpl.cpp, + embedding/qa/testembed/Tests.h, embedding/qa/testembed/QaUtils.cpp, + embedding/qa/testembed/resource.h, + embedding/qa/testembed/DomWindow.cpp, + embedding/qa/testembed/QaUtils.h, build/unix/abs2rel.pl, + xpfe/bootstrap/icons/windows/readme.txt, + security/nss/cmd/ssltap/ssltap-manual.html: Fix mess my subversion + repository made of line endings. This should reduce the size of the + diff.gz dramatically. + + -- Eric Dorland Sat, 24 Dec 2005 03:23:02 -0500 + +firefox (1.5.dfsg-2) unstable; urgency=low + + * browser/locales/en-US/chrome/branding/brand.dtd, + browser/locales/en-US/chrome/branding/brand.properties: Change brand + name from Deer Park to Firefox. About box graphic still needs to be + fixed. *grumble* *grumble* (Closes: #343704) + + -- Eric Dorland Sat, 17 Dec 2005 13:45:14 -0500 + +firefox (1.5.dfsg-1) unstable; urgency=low + + * New upstream release. No actual code changes from RC3. Took the + opportunity to completely empty the /other-licenses directory of the + upstream tarball. + * configure, configure.in: Change MOZ_APP_DISPLAYNAME to Firefox, so we + can be called Firefox without using + --enable-official-branding. *grumble* + * config/autoconf.mk.in, gfx/src/gtk/mozilla-decoder.cpp, configure.in: + Apply patch from bz#305185 to fix problems building against gtk+ 2.8. + * debian/control: + - Build-Depend on libfreetype6-dev since we do link + against it directly. + - Add mozilla-firefox package for easy transition. + - Conflict against older mozilla-firefox packages. + * debian/firefox-runner: + - Fix typo. (Closes: #341113) + - Check /usr/lib/mozilla-firefox/plugins for plugins too for the + time being. (Closes: #341682) + * debian/firefox-dom-inspector.preinst: Remove, not needed since the + name change. + * debian/firefox.preinst: + - Remove old upgrade code. + - Move old mozilla-firefox configs into place on install. + * debian/mozilla-firefox.preinst: Move upgrade code in here. Remove + mozilla-firefox alternative. + * debian/mozilla-firefox.postrm: Remove /etc/mozilla-firefox on purge. + + * Some patches missed when merging from Mike Hommey: + * browser/locales/en-US/searchplugins/answers.src: Change updateDays to + 0. + * config/mkdepend/imakemdep.h: Define for amd64. + * configure, configure.in: Visibility patch for recent gcc's. (Closes: + #341766) + * modules/libpref/src/nsPrefService.cpp: Patch to load preferences from + defaults/syspref. + * content/events/src/nsEventStateManager.cpp: Extended mouse events + patch. + * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp, + gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.h, + gfx/src/x11shared/nsFontFreeType.cpp, + gfx/src/x11shared/nsFontFreeType.h, + layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch to + use new freetype API. + + -- Eric Dorland Fri, 16 Dec 2005 11:37:23 -0500 + +firefox (1.4.99+1.5rc3.dfsg-2) unstable; urgency=low + + * The "Grand Renaming" release. Thanks to Mike Hommey for sherperding + the 1.5 series through experimental. Now it's my turn to muck it up. A + transition packages will be in the next release. + * debian/mozilla-firefox*: Rename to firefox*. + * debian/firefox.install, debian/firefox-dom-inspector.install, + debian/firefox-gnome-support.install, debian/firefox-runner, + firefox-xremote-client, firefox.1, firefox.desktop, firefox.dirs, + debian/firefox.js, debian/firefox.links, debian/firefox.manpages, + debian/firefox.menu, debian/firefox.mime, debian/firefox.postinst, + debian/firefox.prerm, debian/firefox.png.uu, debian/README.Debian, + debian/control, debian/rules: Search/Replace mozilla-firefox -> + firefox where appropriate. + * debian/firefox.links: Link old icon name to new. + * debian/README.Debian: Fix path to .mozilla/firefox/rc. (Closes: + #335433) + * config/autoconf.mk.in: Set mozappdir to /usr/lib/firefox. + + -- Eric Dorland Sun, 27 Nov 2005 20:03:02 -0500 + +mozilla-firefox (1.4.99+1.5rc3.dfsg-1) experimental; urgency=low + + * New upstream 1.5 preview release. Release Candidate 3. + * debian/mozilla-firefox-runner: Removed the ping stuff, it's now done by + firefox itself. + + -- Mike Hommey Fri, 18 Nov 2005 07:24:05 +0100 + +mozilla-firefox (1.4.99+1.5rc2.dfsg-1) experimental; urgency=low + + * New upstream 1.5 preview release. Release Candidate 2. + * xpcom/typelib/xpidl/xpidl.c: Fix crash when no file is given on the + command line (Closes: #323639). Also fix the error message about extra + arguments given showing before the crash. + * configure.in, configure: Work around dash's bug #337294 so that we can + build fine when sh is dash (Closes: #211010, #256384). + * debian/mozilla-firefox-runner: + - Removed the code to detect the JVM and set LD_ASSUME_KERNEL=2.2.5 for + b0rked 1.3 JVMs: it's been a long time they've not been ABI compatible. + - Removed setting of MOZILLA_FIVE_HOME. We already have a default one + built-in. + - Removed /usr/lib/mozilla/plugins from EXTENT_LD_LIB_PATH, since we never + get the plugins from there. + - Removed cleanup of the profile. It is correctly done by firefox, now. + + -- Mike Hommey Fri, 11 Nov 2005 08:07:05 +0100 + +mozilla-firefox (1.4.99+1.5rc1.dfsg-1) experimental; urgency=low + + * New upstream 1.5 preview release. Release Candidate 1. + * debian/mozilla-firefox.install: Don't install + /usr/lib/mozilla-firefox/extensions/reporter@mozilla.org, it got moved in + the chrome. + + -- Mike Hommey Tue, 1 Nov 2005 22:01:15 +0100 + +mozilla-firefox (1.4.99+1.5beta2.dfsg-1) experimental; urgency=low + + * build/unix/run-mozilla.sh, netwerk/base/src/nsStandardURL.cpp: + Reverted debian changes: they got applied upstream. + * configure: Applied configure.in changes by hand. + * debian/rules: Disabled both the installer and the updater, we don't need + them. + + -- Mike Hommey Fri, 7 Oct 2005 15:06:05 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-5) experimental; urgency=low + + * debian/control: Bumped Standards-Version to 3.6.2. + * nsprpub/configure.in: Reverted changed. + * configure.in: Use -fvisibility=hidden in all cases. There is another bug + in gcc that makes it generate position dependent code when using the + system wrappers. + * configure, nsprpub/configure: Applied configure.in changes with + autoconf2.13. + * debian/rules: Put back the /usr/share/pixmaps/mozilla-firefox.xpm file. + + -- Mike Hommey Mon, 3 Oct 2005 18:46:50 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-4) experimental; urgency=low + + * xpcom/typelib/xpt/src/Makefile.in: Reverted changes. + * configure.in, nsprpub/configure.in: Added a detection of the gcc bug about + visibility for builtins, and use -fvisibility=hidden instead of the system + wrappers in case the bug is found. + * configure, nsprpub/configure: Applied configure.in changes with + autoconf2.13. (Really closes: #329642) + + -- Mike Hommey Tue, 27 Sep 2005 20:16:34 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-3) experimental; urgency=low + + * Sync with unstable branch. + * xpcom/typelib/xpt/src/Makefile.in: disable visibility stuff for ppc, as a + workaround for FTBFS. (Closes: #329642) + + -- Mike Hommey Mon, 26 Sep 2005 18:35:11 +0200 + +mozilla-firefox (1.0.7-1) unstable; urgency=high + + * New upstream release. Contains fixes for various security issues. + * debian/mozilla-firefox-runner: Remove /usr/lib from + LD_LIBRARY_PATH. (Closes: #321789) + + -- Eric Dorland Thu, 22 Sep 2005 01:23:10 -0400 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-2) experimental; urgency=low + + * debian/rules: enabled support for canvas. + + -- Mike Hommey Tue, 20 Sep 2005 07:56:01 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-1) experimental; urgency=low + + * Cleaned-up source tarball from trademarked content and CVS directories. + * debian/mozilla-firefox-small.xpm, debian/mozilla-firefox.xpm: Removed. + * debian/mozilla-firefox.dirs, debian/rules: + + Create /usr/lib/mozilla-firefox/chrome/icons/default and move + default.xpm in it. (Closes: #327828) + + Stop using our own xpm icons, upstream provide them, now. + * debian/rules: changed the build system a bit. + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Somewhat these + files disappeared. Put them back. (Closes: #328074) + + -- Mike Hommey Tue, 13 Sep 2005 18:25:48 +0200 + +mozilla-firefox (1.4.99+1.5beta1-2) experimental; urgency=critical + + * Sync with unstable branch. + * netwerk/base/src/nsStandardURL.cpp: Apply the patch for the 1.8 branch + from bz#307259 to fix CAN-2005-2871. (Closes: #327452) + * debian/mozilla-firefox-gnome-support.install, debian/rules: Move out + imgicon module in mozilla-firefox-gnome-support. (Closes: #327451) + + -- Mike Hommey Sun, 11 Sep 2005 10:45:34 +0200 + +mozilla-firefox (1.0.6-5) unstable; urgency=critical + + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: Fix for previous + arm fix. Thanks Steve. (Closes: #325535) + * netwerk/base/src/nsStandardURL.cpp: Patch from bz#307259 to fix + CAN-2005-2871, a buffer overflow vulnerability in IDN + processing. (Closes: #327452) + + -- Eric Dorland Sat, 10 Sep 2005 23:03:26 -0400 + +mozilla-firefox (1.4.99+1.5beta1-1) experimental; urgency=low + + * New upstream beta release. + + Find toolbar doesn't show up when in text fields. Closes: #280852. + + Better use of GTK2 themes. The most common case was highlighted menu + item text appearing in white on a white background. Closes: #223696, + #257430, #258181, #266334, #278559, #289326, #297320, #310098. + + Download manager correctly closes. Closes: #259015, #269975. + + Doesn't crash with the http://ln.hixie.ch/resources/style/orange + stylesheet. Closes: #277987. + + Locale extensions can properly be disabled. Closes: #279749 (to check). + + Doesn't crash on + http://einsteinmg.dyndns.org/cgi-bin/remangle.cgi?=0x27b9b660 anymore. + Closes: #294372. + + Downloads don't freeze when a modal window opens. Closes: #211332. + + Use GTK stock images. Closes: #281660. + * Sync with unstable branch changes. + * browser/app/profile/firefox.js, debian/firefox.js: + + Removed outdated extensions.update.autoUpdateEnabled and + extensions.update.autoUpdate; + + Removed general.useragent.locale. + + Allow extensions updates. It works correctly with system-wide installed + ones, now. + * netwerk/protocol/http/src/nsHttpConnectionMgr.cpp, + nsprpub/pr/include/md/_linux.cfg, widget/src/gtk2/mozdrawingarea.c, + widget/src/gtk2/nsDragService.cpp: Reversed changes, since they got + applied upstream. + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: correctly set + __attribute__. Closes: #325535. + * debian/rules: + + set --enable-extensions=default instead of a full list. + We will get the default set of extensions provided by upstream, and + won't need to check if they changed. + + set --enable-pango. + + set --enable-system-cairo. + * debian/control: added build dependency on libgnomeui-dev and libcairo2-dev. + * debian/mozilla-firefox.install, debian/rules: don't install files in + /usr/lib/mozilla-firefox/chrome/icons/ anymore. + * debian/mozilla-firefox-runner: Force MOZ_DISABLE_PANGO to 1 if + MOZ_ENABLE_PANGO is not set. + * debian/README.Debian: + + Removed the note about IDN, it is now enabled by default, with correct + whitelist set. + + Added a note about MOZ_ENABLE_PANGO. + + Changed notes about application update, extensions, and packaged + extensions. + * modules/libpref/src/init/all.js: + + Set general.config.obscure_value to 0, we don't care about the config + file not to be "obscured". + + Set general.config.filename to firefox.cfg. + * debian/firefox.cfg: Create configuration to lock some properties. + * debian/mozilla-firefox.install: Install this firefox.cfg in + /usr/lib/mozilla-firefox + + -- Mike Hommey Fri, 9 Sep 2005 17:40:40 +0200 + +mozilla-firefox (1.0.6-4) unstable; urgency=low + + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp: Patch + from Steve Langasek to fix unused vs. used gcc attribute on alpha and + arm. (Closes: #325535) + * browser/app/profile/firefox.js: Revert patch to remove the "I'm + feeling lucky" search. Some like it, some hate it, so upstream + behaviour wins. If you still feel strongly about it, make your case + upstream. + * gfx/src/gtk/nsFontMetricsXft.cpp: Apply patch from bz#252033 to work + around a bug in XRender that might be causing #319349. + + -- Eric Dorland Tue, 6 Sep 2005 02:10:07 -0400 + +mozilla-firefox (1.0.99+deerpark-alpha2-2) experimental; urgency=low + + * Sync with unstable branch changes, except the controversial "I'm feeling + lucky" change. I prefer waiting for the controversy to get to a + conclusion. + * debian/rules, debian/control: Remove build dependency on libmng-dev and + the --with-system-mng option to configure, the MNG support has been + removed upstream. + * debian/rules: Explicitely set the svg-renderer as cairo. It will use an + old cairo version bundled with firefox, but there's no other solution for + the moment. We have to wait for upstream 0.9.x and greater support + (hoped for 1.5). + + -- Mike Hommey Sun, 4 Sep 2005 09:01:54 +0200 + +mozilla-firefox (1.0.6-3) unstable; urgency=low + + * debian/rules, nsprpub/pr/include/md/_linux.cfg, + security/coreconf/Linux.mk: Apply patch from Andreas Jochens to allow + ppc64 builds. (Closes: #322617) + * debian/mozilla-firefox.prerm: Move -depth option to find to suppress + warnings. Thanks Mike Hommey. + * debian/presubj: Have bugzilla bug URL point to a page where you can + enter a bug. + * browser/app/profile/firefox.js: removed the "I'm feeling lucky" from + the keyword.URL, so now if you enter search terms in the address bar + you will be presented with search results and not taken to the first + result. Thanks Torok Edwin. (Closes: #321823) + + -- Eric Dorland Mon, 22 Aug 2005 01:20:28 -0400 + +mozilla-firefox (1.0.6-2) unstable; urgency=medium + + * modules/libpr0n/src/imgLoader.cpp, modules/libpr0n/src/imgLoader.h: + Apply ported patch from Serge Belyshev from bz#293307 to fix problem + with gcc-4.0 on amd64. (Closes: #319336) + * debian/rules: Remove silly --enable-freetype configure line. Thanks + Antony Gelberg. (Closes: #319886) + + -- Eric Dorland Sat, 30 Jul 2005 02:11:03 -0400 + +mozilla-firefox (1.0.6-1) unstable; urgency=low + + * New upstream release. (Closes: #318672) + * debian/rules: Remove hack to use gcc 3.4 on amd64, since now we're all + on gcc 4.0. (Closes: #318684) + * debian/control: + - Remove gcc 3.4 build depends on amd64 + - Explicitly build depend on libxinerama-dev. + * gfx/src/gtk/nsScreenGtk.cpp: Patch from Loic Minier to fix + gdk_property_get warnings. + * widget/src/gtk2/mozdrawingarea.c: Patch from Loic Minier to fix + crashes under GTK 2.7. (Closes: #318903) + + -- Eric Dorland Wed, 20 Jul 2005 02:57:44 -0400 + +mozilla-firefox (1.0.99+deerpark-alpha2-1) experimental; urgency=low + + * New upstream alpha release. Be aware that you WILL have troubles with + debian packages for firefox extensions. + * Reverted patches that got incorporated upstream. + * content/events/src/nsEventStateManager.cpp: Some changes to the previous + patch to fit changes in API. + * debian/update-mozilla-firefox-chrome, + debian/update-mozilla-firefox-chrome.8, + debian/mozilla-firefox-dom-inspector.post(inst|rm), + debian/mozilla-firefox-gnome-support.post(inst|rm), + debian/theme/*, debian/inspector/*: Removed. + * debian/mozilla-firefox.postinst: Removed call to + update-mozilla-firefox-chrome. + * debian/mozilla-firefox-dom-inspector.install: Only install files from + /usr/lib/mozilla-firefox/extensions/inspector@mozilla.org + * debian/mozilla-firefox.dirs: Don't create /var/lib/mozilla-firefox/*, + /usr/lib/mozilla-firefox/extensions nor /usr/lib/mozilla-firefox/plugins. + * debian/mozilla-firefox.install: + - Don't install regxpchrome, chrome/pipnss.jar and chrome/help.jar which + don't exist anymore. + - Install manifest files in addition to jar files in chrome. + - Install classic.jar in the normal chrome directory (awaiting EM + modifications so that it can actually go back in the extensions + directory). + - Don't install debian/theme/00classic and debian/theme/Uninstall, + which got removed. + - Get the theme in the correct directory (it's not in + defaults/profile/extensions anymore). + - Install the reporter extension. + - Selectively install subdirectories of /usr/lib/mozilla-firefox/defaults, + since some of them are useless. + - Install the unixprint plugin. + * debian/mozilla-firefox.manpages: Removed manual page for + update-mozilla-firefox-chrome. + * debian/mozilla-firefox.links: Removed all links in + /var/lib/mozilla-firefox/. + * debian/rules: + - Enable freetype in the build, we'll see if deerpark is any better than + 1.0.x. + - Commented out OPTFLAGS set for some architectures. We will see if gcc + 4.0 is doing any better. + - Enabled SVG support. (Closes: #215990) + - Enabled some more extensions to fit extensions provided by upstream. + - Added needed --enable-application=browser to the ./configure call. + - Don't install update-mozilla-firefox-chrome. + - Don't create installed-chrome.txt. + - Don't remove installed-extensions.txt, it doesn't exist anyway. + - Don't move classic theme's install.rdf, it's already at the correct + place. + - Remove unneeded removals of preferences files which are not there + anymore. + * debian/mozilla-firefox.preinst: Clean-up old generated files (those in + /var/lib/mozilla-firefox and + /usr/lib/mozilla-firefox/extensions/*/uninstall/Uninstall. (Note that for + the latter, some packages do provide them, but they were overwritten by + update-mozilla-firefox-chrome. They have actually no use, and it is safe + to remove them. Extensions packages will eventually remove them anyway) + * debian/mozilla-firefox.prerm: Put -depth option of find before -type d. + + -- Mike Hommey Sat, 16 Jul 2005 10:18:40 +0200 + +mozilla-firefox (1.0.5-1) unstable; urgency=high + + * New upstream release, fixes security issues. (Closes: #318061) + * debian/rules: Disable freetype in the build for the time being. This + *might* break printing in some cases. + * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp, + gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.cpp, + gfx/src/ps/nsFontMetricsPS.h, gfx/src/x11shared/nsFontFreeType.cpp, + gfx/src/x11shared/nsFontFreeType.h, + layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch + from bz#234035 to try to get building with the new freetype. (Closes: + #314243) + + -- Eric Dorland Sat, 16 Jul 2005 00:43:54 -0400 + +mozilla-firefox (1.0.4-3) unstable; urgency=low + + * debian/mozilla-firefox.desktop: Add Czech translation from Jan + Outrata. (Closes: #311376) + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp, + xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Revert patch from + David Mosberger for 7+ args on ia64 that was added 1.0.3-2. + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp, + xpcom/reflect/xptcall/public/genstubs.pl: Better patch from bz#291378 + which has been accepted upstream for ia64 7+ args fix. + * xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Call genstubs.pl to + regenerate this file. + * dom/src/base/nsGlobalWindow.cpp, + embedding/components/windowwatcher/src/nsWindowWatcher.cpp: Fix + injection spoofing, patch from bz#296850. Fixes CAN-2004-0718. + + -- Eric Dorland Thu, 9 Jun 2005 23:54:41 -0400 + +mozilla-firefox (1.0.4-2) unstable; urgency=critical + + * debian/control: Build-depend on libxft-dev not libxft2-dev to appease + finicky sparc buildd. + + -- Eric Dorland Mon, 16 May 2005 21:17:57 -0400 + +mozilla-firefox (1.0.4-1) unstable; urgency=critical + + * New upstream release. Fixes CAN-2005-1477 and CAN-2005-1476. (Closes: #308620) + * debian/update-mozilla-firefox-chrome.8: Patch from A Costa to fix the + spelling of maintenace. (Closes: #305968) + * debian/mozilla-firefox.desktop: Patch from Steinar H. Gunderson to add + a Norwegian translation. (Closes: #305983) + + -- Eric Dorland Thu, 12 May 2005 22:59:47 -0400 + +mozilla-firefox (1.0.3-2) unstable; urgency=high + + * browser/app/profile/firefox.js: Disable SSLv2 and 40-bit ciphers by + default. + * debian/mozilla-firefox.NEWS: Explain the SSL change. + * extensions/transformiix/source/base/Double.cpp: Patch from David + Mosberger-Tang (fixed up by me) to fix unaligned access on ia64 (and + perhaps other platforms). (Closes: #303518) + * xpcom/reflect/xptcall/public/xptcstubsdecl.inc, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp: Another patch + from David Mosberger-Tang to fix extension loading on ia64. (Closes: + #303515) + + -- Eric Dorland Thu, 21 Apr 2005 01:25:02 -0400 + +mozilla-firefox (1.0.3-1) unstable; urgency=low + + * New upstream release, fixes various security issues, so urgency high. + * js/src/fdlibm/fdlibm.h: Fix from David Mosberger to define ia64 as + little-endian arch (also added for mipsel). (Closes: #303438) + + -- Eric Dorland Sun, 17 Apr 2005 23:13:01 -0400 + +mozilla-firefox (1.0.2-3) unstable; urgency=high + + * gfx/src/freetype/nsFreeType.cpp, + netwerk/protocol/http/src/nsHttpConnectionMgr.cpp, + security/nss/lib/pki1/oiddata.h, security/nss/lib/pki1/pki1.h, + widget/src/gtk2/nsDragService.cpp: Fixes for gcc-4.0, + bz#289238. (Closes: #301485) + * js/src/jsstr.c: Fix for JS memory access security bug, patch from + bz#288688. (Closes: #302775) + + -- Eric Dorland Wed, 6 Apr 2005 01:36:11 -0400 + +mozilla-firefox (1.0.2-2) unstable; urgency=high + + * Last upload should of been marked urgency=high because of the security + fixes. + * debian/mozilla-firefox.postinst: Fix ridiculous typos. (Closes: + #300685) + * debian/mozilla-firefox-runner: Use pgrep to detect esd and arts + instead. Thanks Craig Small for the advice. (Closes: #302086) + + -- Eric Dorland Fri, 1 Apr 2005 01:18:18 -0500 + +mozilla-firefox (1.0.2-1) unstable; urgency=low + + * New upstream release. Fixes CAN-2005-0399, CAN-2005-0401, + CAN-2005-0402. (Closes: #301243) + * debian/control: Update suggest for xprint rename. (Closes: #300976) + * xpcom/reflect/xptcall/src/md/unix/{Makefile.in, + xptcinvoke_asm_parisc_linux.s, xptcstubs_asm_parisc_linux.s}: Apply + patch from Ivar (Contributed by Randolph Chung) to fix Firefox on + hppa. (Closes: #286038) + + -- Eric Dorland Fri, 25 Mar 2005 02:30:10 -0500 + +mozilla-firefox (1.0.1-3) unstable; urgency=low + + * widget/src/gtk2/nsGtkKeyUtils.cpp: Patch from bz#108170 to fix broken + keymap for Germans. (Closes: #299781) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: avoid + crashing when extension's install.rdf is broken. (Closes: #298796) + (MH) + * debian/mozilla-firefox.prerm: Remove + /usr/lib/mozilla-firefox/defaults/profile/extensions/Extensions.rdf on + uninstall. (Closes: #298636) + * debian/mozilla-firefox.postinst: Add little echo to tell people to + restart firefox after upgrades. + * debian/presubj: Add a note there about restarting firefox before + submitting bugs. + * debian/mozilla-firefox-runner: Properly quote $@ expansion. (Closes: + #300195) + * browser/locales/en-US/searchplugins/ + {yahoo.src,google.src,eBay.src,dictionary.src,creativecommons.src, + amazondotcom.src}: Set updateCheckDays to 0, which avoids duplicated + search entries in the menu. (Closes: #299006, #299813) + + -- Eric Dorland Sun, 20 Mar 2005 17:08:12 -0500 + +mozilla-firefox (1.0.1-2) unstable; urgency=high + + * Changes by Mike Hommey: + * Urgency: high due to RC bug fix. + * debian/update-mozilla-firefox-chrome: Re-initialize Extensions.rdf + inside the script instead of relying on mozilla-firefox's default + behaviour, which just fails when defaults/profile/extensions/ \ + Extensions.rdf doesn't exist (and it seems some people like to remove + files in /etc). (Closes: #294175) + + * Changes by Eric Dorland: + * debian/mozilla-firefox.menu: Capitalize "browsers". Thanks Gerfried + Fuchs. + * debian/mozilla-firefox-runner: Fix from Marc Horowitz to fix sound + device detection. (Closes: #297088) + * toolkit/content/widgets/tabbrowser.xml: Apply patch from bz#283063, to + fix a memory leak when closing tabs. (Closes: #296749) + * xpfe/global/resources/content/bindings/browser.xml, + xpfe/global/resources/content/bindings/tabbrowser.xml, + toolkit/content/widgets/browser.xml, + toolkit/content/widgets/tabbrowser.xml: Apply patches from bz#131456 + to fix various tab related memory leaks. (Closes: #280586) + * netwerk/protocol/http/src/nsHttpHandler.cpp: Patch from bz#265536 to + differentiate between AMD64 and i386. (Closes: #282592) + + -- Eric Dorland Sat, 5 Mar 2005 18:46:09 -0500 + +mozilla-firefox (1.0.1-1) unstable; urgency=high + + * New upstream release. (Closes: #296851) + - This release fixes the Secunia window injection bug, + CAN-2004-1156. (Closes: #293664) + + * Changes by Mike Hommey: + * debian/rules: Some clean-up. + * debian/control: Changed my maintainer address. + * debian/README.Debian: Add a note about automatic updates for + extensions. (Closes: #296761) + + * Changes by Eric Dorland: + * browser/app/profile/firefox.js: Remove disable IDN pref, it's the + default now anyway. + + -- Eric Dorland Tue, 1 Mar 2005 02:03:48 -0500 + +mozilla-firefox (1.0+dfsg.1-6) unstable; urgency=high + + * The "And I thought IE had security bugs!" release. + * toolkit/content/widgets/tabbrowser.xml, + xpfe/global/resources/content/bindings/tabbrowser.xml: Fix + "Firetabbing" vulnerability from bugzilla#280056, fixes + CAN-2005-0231. (Closes: #294415) + * modules/plugin/base/src/nsPluginHostImpl.cpp: Fix "Fireflashing" + vulnerability from bugzilla#280664, fixes CAN-2005-0232. (Also Closes: + #294415) + * build/unix/run-mozilla.sh: Patch from Javier Fernández-Sanguino Peña + to fix insecure temp file usage in run-mozilla.sh. (Closes: #294127) + * netwerk/base/src/nsStandardURL.cpp, netwerk/base/src/nsStandardURL.h: + Patch from bugzilla#261934 to make the network.enableIDN preference + work and again. + * browser/app/profile/firefox.js: Disable IDN by default. This doesn't + close #293975, but drops its severity. + * debian/README.Debian: Add warning and describe how to enable IDN. + + -- Eric Dorland Wed, 9 Feb 2005 22:56:17 -0500 + +mozilla-firefox (1.0+dfsg.1-5) unstable; urgency=low + + * debian/mozilla-firefox.desktop: Don't translate "Mozilla Firefox" into + French. + * browser/app/profile/firefox.js: Set mozilla.widget.raise-on-setfocus + to false to prevent unecessary window raising. (Closes: #292049) + * debian/rules: Don't compile statically on mips and mipsel, since it's + broken for now. + + -- Eric Dorland Sun, 6 Feb 2005 15:02:36 -0500 + +mozilla-firefox (1.0+dfsg.1-4) unstable; urgency=low + + * debian/mozilla-firefox.desktop: Add French translations from Jerome + Warnier. I will accept more, but closing this bug. (Closes: #292506) + * debian/README.Debian: Update the Emacs keybindings instructions. + (Closes: #291691) + * debian/mozilla-firefox.1: + - Remove -splash from the manpage, it has never worked. (Closes: + #287088) + - Add units to -height and -width description. (Closes: #285142) + + -- Eric Dorland Wed, 2 Feb 2005 01:42:53 -0500 + +mozilla-firefox (1.0+dfsg.1-3) experimental; urgency=low + + * debian/mozilla-firefox.desktop: Add %u to the exec line so that apps + know it can handle URLs. (Closes: #290132) + * debian/README.Debian: + - Improve button reversal instructions. Thanks Christian Mayrhuber + - Fix reference to ~/.firefox. + * debian/rules: Enable static building. This will build firefox as one + large binary (mostly) and should speed a few things up, especially + program load time. I'd like to hear about any speedup (or slow down) + you exprience. Porters, please build this for your arch to make sure + this doesn't break anything. + + -- Eric Dorland Thu, 20 Jan 2005 01:40:34 -0500 + +mozilla-firefox (1.0+dfsg.1-2) unstable; urgency=medium + + * debian/mozilla-firefox-gnome-support.postrm, + debian/mozilla-firefox-dom-inspector.postrm: Don't die if + update-mozilla-firefox-chrome dies. (Closes: #287355) + + -- Eric Dorland Sun, 9 Jan 2005 23:51:10 -0500 + +mozilla-firefox (1.0+dfsg.1-1) unstable; urgency=low + + * Not a new upstream release. + * other-licenses/branding/firefox, other-licenses/7zstub/firefox: Remove + these from the .orig.tar.gz, since they are not DFSG-free. We're not + using the files anyway, so out they go. (Not sure the 7zstub stuff is + non-free, but it's Windows only so no harm) + * debian/rules: + - Remove explicit low-optimization on alpha, since Falk + Hueffner claims it works. + - Move entire defaults/profile directory into /etc/mozilla-firefox, + rather than just the bookmarks.html. (Closes: #285538) + * debian/mozilla-firefox.links: Link entire defaults/profile now. + * debian/mozilla-firefox.preinst: Add upgrade code to remove old + defaults/profile to make way for new symlink. + * debian/mozilla-firefox.dirs: Just create etc/mozilla-firefox. + + -- Eric Dorland Sun, 19 Dec 2004 01:31:44 -0500 + +mozilla-firefox (1.0-5) unstable; urgency=medium + + * Changes by Mike Hommey: + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Make the + extensions upgrade work again. (Closes: #282143) + * debian/rules: Better DEB_BUILD_OPTIONS handling, better debugging + build (DEB_BUILD_OPTIONS="nostrip debug") + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + toolkit/mozapps/extensions/content/extensions.js: Allow users to + disable globally installed extensions. + + * Changes by Eric Dorland: + * debian/rules: Remove explicit low-optimization on sparc. Apparently + there was an issue for a number of arches that required lower + optimization settings, but it is now resolved. So porters, please + check -O2 on arm, alpha, powerpc and ia64 and let me know if it's + safe. Thanks David S. Miller. (Closes: #284533) + + -- Eric Dorland Tue, 7 Dec 2004 01:06:48 -0500 + +mozilla-firefox (1.0-4) unstable; urgency=medium + + * debian/control: Make mozilla-firefox-gnome-support and xprt-xprintorg + Suggests, no Recommends after a look at policy. (Closes: #282432) + * debian/README.Debian: + - Refer to .mozilla/firefox, not .firefox. + - Explain how to reenable emacs style keybindings. (Closes: #282321) + + -- Eric Dorland Sat, 27 Nov 2004 20:40:10 -0500 + +mozilla-firefox (1.0-3) unstable; urgency=low + + * Changes by Mike Hommey + * The "becoming more and more an iceweasel" release. + * debian/firefox.js: + + Enable firefox's internal locale autodetection. + + Disable default browser question at startup. (Closes: #280752) + * debian/mozilla-firefox-runner: Removed our locale autodetection. + That means now locales installed in user profiles are automatically + used, and that there is no need for /var/lib/mozilla-firefox/locales.d + anymore. + * debian/mozilla-firefox.dirs: Removed creation of + /var/lib/mozilla-firefox/locales.d. + * debian/rules: Removed creation of the locale file in + /var/lib/mozilla-firefox/locales.d. + * debian/presubj: Put some more recent information. + * htmlparser/src/nsParser.cpp: Applied patch from bz#57717 so that empty + html files don't get when viewing source. + * browser/base/content/aboutDialog.css: increase the User Agent element + height as in bz#238137 (but up to MacOSX's height) to show the full User + Agent string. + * xpcom/io/nsAppDirectoryServiceDefs.h, + xpcom/io/nsAppFileLocationProvider.cpp, + xpfe/components/search/src/nsInternetSearchService.cpp: Applied patch from + bz#123315 so that Internet search services in user profiles are supported. + (Closes: #219053) + * debian/mozilla-firefox-runner: + + Remove compatibility.ini only if it is older than + /usr/lib/mozilla-firefox/components.ini. That way, we only rebuild it + after an update-mozilla-firefox-chrome. + + Detect if we're being run through sudo without the -H option, in which + case we force setting of $HOME. (Closes: #218156) + * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js. + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: + + Removed some error messages that get there because firefox is trying to + write in the /usr/lib/mozilla-firefox directory as a user. They are + useless and lead users to think something is going wrong while it's the + (stupid but) normal way firefox works. + + Avoid creation of directories when attempting to read files, that + throwed uncaught exceptions breaking some stuff in several different + ways when extensions don't follow the new scheme for extensions. + + Avoid copying stuff from + /usr/lib/mozilla-firefox/defaults/profile/extensions/ to + /usr/lib/mozilla-firefox/extensions/, that's the *very* old way of + installing extensions, which, since the old scheme has been thrown away, + won't work anyway, if any extension provides files out there. + + CheckForMismatches: Avoid to disable already disabled global extensions, + and don't propose to upgrade the locked extensions. That fixes a + never-ending loop occuring when running firefox for the first time in a + user account, while some global extensions are expired. + (Closes: #278722, #281537) + * debian/mozilla-firefox.prerm, debian/mozilla-firefox.preinst: Moved + removal of links to /usr/lib/mozilla-firefox/defaults/profile/extensions/ + sitting in /usr/lib/mozilla-firefox/extensions/, if any remaining, from + prerm to preinst. We remove them once and for all, they won't be created + by us anymore. + * debian/update-mozilla-firefox-chrome: + + Removed support for extensions in + /usr/lib/mozilla-firefox/defaults/profile/extensions/. + + Removed some clean-up that had been introduced to help the Extensions + Manager not to die, and which, actually, did not work out quite so well. + Anyways, with the changes this time, the EM is supposed to support much + more problems than ever before (as usual ;) ) so we don't need that + anymore. + + Avoid stupid mv error messages when firefox-bin -register fails (which + is not supposed to happen, but you're never too careful) + * debian/update-mozilla-firefox-chrome, debian/mozilla-firefox.preinst: + Move removal of some very old stuff to preinst, to do it once and for all + instead of doing it every time we run update-mozilla-firefox-chrome. + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Applied patch from + bz#124561 to get a prompt for username/password in case anonymous login + fails. + * debian/mozilla-firefox-runner: + + Added check for more arguments so that the url in the command line get + detected more accurately. + + When a file name is given on the command line, prepend "file://" and + change spaces into %20. (Closes: #281800) + + * Changes by Eric Dorland + * debian/mozilla-firefox.prerm: Patch from Philipp Weis to fix order of + find arguments. (Closes: #280852) + * debian/mozilla-firefox.desktop: Support new mime type handler in Gnome + 2.8. (Closes: #281274) (MH: I added some more myme-types) + * debian/mozilla-firefox.postinst: Run update-desktop-database if it + exists. + * widget/src/gtk/nsWidget.cpp: We don't use gtk anymore, might as well + revert these patches. Thanks Stephane Despret. + + -- Eric Dorland Thu, 18 Nov 2004 22:16:28 -0500 + +mozilla-firefox (1.0-2) unstable; urgency=low + + * Changes by Mike Hommey + * The "don't do too much on the same day, it's bad for health" release. + * debian/firefox.js: Re-activated the extensions update service, and + removed the update url. + * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js. + * debian/mozilla-firefox-dom-inspector.preinst: Removed old inspector.js + file. + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + toolkit/mozapps/extensions/content/extensions.js: Disabled possibility + to update locked extensions and themes. Locked extensions being the + ones installed by the packaging system, they should be updated through + that. + * toolkit/mozapps/update/src/nsUpdateService.js.in: Disabled application + update functionnality. Firefox should be updated through the packaging + system. + * browser/components/prefwindow/content/pref-advanced.xul: Removed the + preferences panel item to activate application update, since it is + totally disabled. + * debian/mozilla-firefox-runner: Remove compatibility.ini instead of + compreg.dat. (Eric: This will cause a rebuild of the compreg.dat) + + * Changes by Eric Dorland: + * debian/mozilla-firefox.NEWS: Fix typos. + * README.Debian: + - Add note about application update being completely disabled. + - Fix path to XUL.mfsal + + -- Eric Dorland Wed, 10 Nov 2004 22:56:22 -0500 + +mozilla-firefox (1.0-1) unstable; urgency=medium + + * New upstream release (Closes: #280449) + + * Changes by Mike Hommey: + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch + #164795 from bz#266835 + some tweaks as previously. This might lead to + encoding problems with the password, but it is supposed to be ASCII + anyway. + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Reworked the + previous patches so that the Extensions Manager shows extensions that + have been disabled due to version mismatch, and added a workaround so + that components registration works correctly. + * debian/update-mozilla-firefox-chrome: Removed part that is useless due + to last changes in the Extensions Manager. + * Make the inspector a real extension again: + - debian/inspector/00dom-inspector: File for + /var/lib/mozilla-firefox/extensions.d. + - debian/inspector/Uninstall: Uninstall file needed in extension + directory. + - debian/inspector/install.rdf: install.rdf taken from older versions, + and adapted to newer versions, adding registered chrome. + - debian/mozilla-firefox-dom-inspector.dirs: Removed. Everything will + be created by dh_install. + - debian/mozilla-firefox-dom-inspector.install: install + debian/inspector.rdf and most inspector files in the right place in + /usr/lib/mozilla-firefox/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9} + and /var/lib/mozilla-firefox + * Make the classic theme a real extension, even though it's still in + the main package: + - debian/theme/00classic: File for + /var/lib/mozilla-firefox/extensions.d. + - debian/theme/Uninstall: Uninstall file needed in extension + directory. + - debian/mozilla-firefox.install: Install all files in the right + place in + /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + - debian/mozilla-firefox.dirs: Removed creation of + /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome, + it will be done by dh_install. + - browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in: + Added chrome to be registered. + * Removed support for /var/lib/mozilla-firefox/chrome.d: + - debian/mozilla-firefox.dirs: Removed creation of the directory. + - debian/rules: Removed creation of files there, and put the + installed-chrome.txt, excluding inspector and classic theme stuff, + directly in /usr/lib/mozilla-firefox/chrome. + - debian/update-mozilla-firefox-chrome: Removed all + /var/lib/mozilla-firefox/chrome.d related stuff. + - debian/mozilla-firefox.links: Removed installed-chrome.txt link. + - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: disable + extensions that fail to install chrome. + * debian/mozilla-firefox-runner: Remove user profile compreg.dat at + launch time. + * Moved some files in /var/lib/mozilla-firefox: + - debian/mozilla-firefox.links: Add a symlink for Extensions.rdf + and components.ini, from /usr to /var. + - debian/mozilla-firefox.prerm: Don't remove files we don't + provide and remove files at their new locations. + - debian/mozilla-firefox.preinst: Remove + /var/lib/mozilla-firefox/installed-chrome.txt. + - debian/update-mozilla-firefox-chrome: Create links for + Extensions.rdf and components.ini after register call, and remove + components.ini before. + * Clean-up in files generated by update-mozilla-firefox-chrome: + - debian/mozilla-firefox.links: Put all the links generated by + update-mozilla-firefox-chrome into the package. + - debian/mozilla-firefox.prerm: Remove all /var files generated + in the remove target, and changed the way we clean-up + /var/lib/mozilla-firefox. + * debian/mozilla-firefox.install: Removed chromelist.txt. + * Add support for extensions preferences: + - debian/update-mozilla-firefox-chrome: Handle + /usr/lib/mozilla-firefox/defaults.ini file. + - debian/mozilla-firefox.links: Add a symlink to /var for + defaults.ini. + - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added + defaults registration in -register command. + - mozilla-firefox-dom-inspector.install: Move inspector.js into + the appropriate extension specific directory. + * Move preferences back into /usr: + - debian/rules: Don't move the prefs into + /etc/mozilla-firefox/pref, and put the vendor thing into /usr + as well, and remove firefox-l10.js file. + - debian/mozilla-firefox.preinst: remove old prefs in /etc and + old symlink /usr/lib/mozilla-firefox/defaults/pref. + - debian/firefox.js: new Debian default preferences file. + - debian/mozilla-firefox.install: install firefox.js in + /etc/mozilla-firefox/pref. + - debian/mozilla-firefox.links: rename + /usr/lib/mozilla-firefox/defaults/pref symlink to + /usr/lib/mozilla-firefox/defaults/syspref. + - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added + a hook so that defaults/syspref gets registered in defaults.ini + after all other extensions preferences. + * debian/mozilla-firefox.preinst: only clean-up stuff if we are + upgrading from a version known to still have the files. Added some + more clean-up. + * debian/mozilla-firefox.install: Removed useless init.d. + * modules/libpref/src/init/all.js: Fixed all chrome URLs which refered to + mozilla stuff. + * debian/update-mozilla-firefox-chrome: Remove some more files before running + firefox-bin -register. + + * Changes by Eric Dorland: + * debian/mozilla-firefox.NEWS: Add warning about broken extension and + locale packages with this release. + * debian/mozilla-firefox-runner: Comment out warning about xprint, + xprint isn't necessarily needed for printing since postscript was + reenabled. (Closes: #279858) + + -- Eric Dorland Wed, 10 Nov 2004 00:33:44 -0500 + +mozilla-firefox (0.99+1.0RC1-4) unstable; urgency=low + + * debian/mozilla-firefox-runner: + - Fixed to run properly with dash. (Closes: #279549). + - Fixed indentation. + - Added a basic debugger support. + * debian/mozilla-firefox.1: Added information about debugger options. + * debian/rules: Added a debug option to DEB_BUILD_OPTIONS. If you want to + build a fully gdb'able package, use DEB_BUILD_OPTIONS="noopt nostrip + debug" + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch from + bz#266835. + - Further change this patch to use Append rather than AppendLiteral, + which doesn't seem to exist. (ED) + + -- Mike Hommey Thu, 4 Nov 2004 22:01:51 +0900 + +mozilla-firefox (0.99+1.0RC1-3) unstable; urgency=low + + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply patch from + bz#266835 to fix anonymous user password issue. (Closes: #226784) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: (MH) + - Fully apply previous patches, which for some reason left a spurious code + line which made the extensions manager not like expired extensions + anymore. (Closes: #279140) + - Enhanced extensions manager so that the behaviour described in + https://bugzilla.mozilla.org/show_bug.cgi?id=247846#c14 *actually* + works. Extensions packagers are invited to move their chrome files + accordingly, and remove /var/lib/mozilla-firefox/chrome.d files so that + extensions chrome don't get registered when they are forced-disable due + to version mismatch or some other reason. + * debian/mozilla-firefox-runner: + - Fix some thinkos. (MH) + - Fix for loading files from the command line. (Closes: #279018) (MH) + - Removed setting --display from $DISPLAY, let it get it from the + environment, but pass --display if it is set. (Mike, + I'm worried this will screw up some session + managers, let me know what you think, we can revert it) + - Removed FIREFOX_OPEN_IN stuff, so that firefox now obeys to "open + links from other applications in" setting. (Closes: #279073) (MH) + - Enhanced command line parsing, and drop empty arguments. + (Closes: #279138) (MH) + - No need for a find to look for XUL.mfasl, we already have its + location from the path list taken from profiles.ini. (MH) + - Better detection of dsp wrapper, when FIREFOX_DSP=auto. + (Closes: #254611) (MH) + - Correctly open local files even when firefox was not previously + running. (Closes: #279018) (MH) + * debian/mozilla-firefox.1: (MH) + - Removed references to FIREFOX_OPEN_IN. + - Added the -safe-mode option. + * debian/mozilla-firefoxrc: Removed FIREFOX_OPEN_IN. (MH) + + -- Eric Dorland Tue, 2 Nov 2004 00:46:28 -0500 + +mozilla-firefox (0.99+1.0RC1-2) unstable; urgency=medium + + * browser/app/profile/firefox.js: Disable browser update checking by + default. + * debian/mozilla-firefox-runner: Apply patch from Aurelien Jarno to fix + variable name typo. (Closes: #278844) + + -- Eric Dorland Fri, 29 Oct 2004 23:50:59 -0400 + +mozilla-firefox (0.99+1.0RC1-1) unstable; urgency=medium + + * New upstream release. + * layout/xul/base/src/nsImageBoxFrame.{cpp,h}: Remove some conflicts + from a previous patch. + + -- Eric Dorland Thu, 28 Oct 2004 23:33:46 -0400 + +mozilla-firefox (0.10.1+1.0PR-5) unstable; urgency=low + + * debian/rules: (MH) + - Use upstream extensions set. This will eventually get a + correct help menu and fix some yet undiscovered UI issues. + (Closes: #257946) + - Added support for DEB_BUILD_OPTIONS=noopt. + - Changed OPTFLAGS assignment. + - Remove whitespace characters in version number for UserAgent + branding. + - Install mozilla-firefox-runner into /usr/lib/mozilla-firefox/firefox + (Closes: #278477) + * debian/mozilla-firefox.links: (MH) + - Link /usr/bin/firefox and /usr/bin/mozilla-firefox to + /usr/lib/mozilla-firefox/firefox. + - Removed obsolete profile/US links. + * debian/mozilla-firefox.dirs: Create /etc/mozilla/profile instead of + /etc/mozilla/profile/US. (MH) + * toolkit/xre/nsAppRunner.cpp: Fix crash in nsCmdLineService::Initialize + when argc is changed by gtk (when treating gtk specific arguments) + (MH) + * debian/mozilla-firefox-runner (Changes by MH): + - Removed workaround for bug #122990. First, xmlterm is not an activated + extension, and secondly, if it still requires the TERM environment + variable, it is the user's duty to set it to whatever he wants, not + firefox's start script's. + - Removed the ulimit -c setting. First, it is set by default to 0 on a + newly installed debian, and secondly, it is user's choice to set it or + not if he needs to get core files. + - Removed unused shell variables. + - Removed unsetting AUDIODEV variable. If it still crashes, it does belong + to some other code than firefox. The AUDIODEV environment variable is + used nowhere in firefox code: + http://lxr.mozilla.org/aviarybranch/search?string=AUDIODEV + Note that there is a "A crash which occurred when AUDIODEV doesn't + contain "/" was fixed." log message in esound version 0.2.33 changes and + that the bug may have belonged there. + - Replaced ${HOME}/.mozilla-firefoxrc file by a ${HOME}/.mozilla/firefox/rc + file. The former is still supported, though, but will bring a warning + message. If both are present, only the latter is taken into account. + - Changed the way system and user FIREFOX_DSP and FIREFOX_OPEN_IN + variables are handled. First, use system values defined in + /etc/mozilla-firefox/mozilla-firefoxrc, then override with + ${HOME}/.mozilla/firefox/rc and then with runtime environment variables. + - Don't die when DISPLAY is not set. Display can be passed by --display + option, and if not set and needed (some options don't require it), + firefox will complain. + - Some shell code simplifications by using some coreutils. + - Added better command line parsing. + - Added verbosity mode. + - Removed setting of FONTCONFIG_PATH, /usr/lib/mozilla-firefox/res/Xft + doesn't exist + - Factorized localization detection. + * debian/mozilla-firefox.1 (MH): + - Made some clean-up between dashes and hyphens. + - Removed obsolete options and added new ones. + - Added informations about some debian specific stuff. + * debian/update-mozilla-firefox-chrome: Changed the way we move files to + /var/lib/mozilla-firefox. It will avoid creating files with a * in their + name whenever registration failed. (MH) + * debian/README.Debian: Update java instructions, tell them to just use + java-package. + + -- Eric Dorland Thu, 28 Oct 2004 21:30:40 -0400 + +mozilla-firefox (0.10.1+1.0PR-4) unstable; urgency=medium + + * This release mostly courtesy Mike Hommey. + * layout/src/xul/base/src/nsImageBoxFrame.*: Backported patch from + bz#255372. (Closes: #278046) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Force locking + globally installed extensions, that will prevent extensions packages + files to be unexpectedly removed by firefox. + * debian/control: Add Mike Hommey as an Uploader. + * debian/mozilla-firefox.install: Removed content-packs.jar which is + mozilla-browser specific. + * debian/mozilla-firefox.dirs: + - Remove leading /'s. + - Create + /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + /chrome directory so that preview is shown in the Themes Manager. Yes, + this is stupid, but it is the way firefox wants it (and it's not even + created by make install, nor in the official binary tarball. It is + only created at run time, but you know what ? under *nix, a normal + user can't create that directory) (Closes: #276404) + * debian/rules: Add a /etc/mozilla-firefox/pref/vendor.js file adding + the debian package version to the UserAgent. (Closes: #268654) + * debian/README.Debian: Update java instructions. I'd love some more + definitive pointers. (Closes: #277983) + + -- Eric Dorland Tue, 26 Oct 2004 00:11:48 -0400 + +mozilla-firefox (0.10.1+1.0PR-3) experimental; urgency=low + + * debian/control: + - Rename the mozilla-firefox-gnome-vfs package + mozilla-firefox-gnome-support since it does more than vfs. No + need for Replaces or anything, since it never actually made it to + the archive. + - Remove strict build dependencies on g++ and binutils, since the + fixed versions have hit sarge. + - Remove hppa build depends, since gcc has also been fixed there. + - Build-depend on libgnome2-dev and libgconf2-dev to build in more + gnome support. + - Have mozilla-firefox recommend it's gnome support. + * debian/rules: + - Remove hppa CC redefinitions. + - Exclude *gnome* not just *gnomevfs*. + - dh_install for gnome-support. + * debian/mozilla-firefox-gnome-vfs.*: Rename to + mozilla-firefox-gnome-support.*. + * debian/mozilla-firefox-gnome-support.install: Grab *gnome*, not just + *gnomevfs*. + + -- Eric Dorland Thu, 21 Oct 2004 23:04:53 -0400 + +mozilla-firefox (0.10.1+1.0PR-2) experimental; urgency=low + + * debian/mozilla-firefox-runner: + - Patch from Sam Morris to handle cleanup of directories with + unusual names. + - Fix return value check, patch from rgselk. (Closes: #269690) + * debian/mozilla-firefox.1: List full path to firefox-bin. (Closes: + #275563) + * debian/rules: + - --with-gssapi=/usr, enable Negotiate extension. (Closes: + #274258) + - Enable gnomevfs support, + * debian/control: + - Build-depend on libkrb5-dev. + - Build-depend on libgnomevfs2-dev. + - New gnomevfs package, based on work by Mike Hommey. (Closes: + #262062) + * debian/mozilla-firefox-gnome-vfs.post{inst,rm}: Added, same as + corresponding files from mozilla-firefox-dom-inspector. + * debian/mozilla-firefox-gnome-vfs.install: Install gnomevfs components. + * browser/app/profile/firefox.js: Set + network.negotiate-auth.trusted-uris to https:// to enable the + negotiate extension over secure links. + * config/rules.mk: Tweak patch from Thiemo Seufer to include svg_doc in + non-optimization. (Closes: #273353) + + -- Eric Dorland Sun, 17 Oct 2004 21:25:08 -0400 + +mozilla-firefox (0.10.1+1.0PR-1) experimental; urgency=critical + + * New upstream release, fixes security issue bz#259708. (Closes: + #274493) + + -- Eric Dorland Sun, 3 Oct 2004 03:32:43 -0400 + +mozilla-firefox (0.10+1.0PR-1) experimental; urgency=low + + * New upstream release. (Closes: #273700, #267003) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + netwerk/dns/src/nsIDNService.cpp, + modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp, + gfx/src/windows/nsImageWin.cpp, gfx/src/shared/gfxImageFrame.cpp, + browser/app/profile/firefox.js: Resolve conflicts between my tree and + upstream. + * browser/app/Makefile.in: Fix $(DESTDIR) variable. + * accessible/src/atk/nsAccessibleWrap.cpp, + accessible/src/atk/nsAccessibleWrap.h: Apply patch from bugzilla for + alpha fix that's more likely to make it into CVS. + * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to make + update-mozilla-firefox-chrome more verbose on -v. + * debian/rules: + - Remove typeaheadfind for new find toolbar to work. (Mike Hommey) + (Closes: #267170) + - Changes to reflect new upstream files. + * debian/control: + - Remove build-depend on libcairo-dev. + - Build depend on libxt-dev, seems to be necessary now. (Closes: + #274311) + * debian/docs: Removed, as browser/README.html disappeared. (Mike Hommey) + * debian/mozilla-firefox.dirs: + - Changes to reflect new upstream files. + - Removed obsolete libnullplugin.so. + * debian/mozilla-firefox.install: + - Remove .jar's that aren't there anymore. + - Removed obsolete libnullplugin.so. + * debian/mozilla-firefox-dom-inspector.dirs, + debian/mozilla-firefox-dom-inspector.install, debian/rules: Upstream + doesn't consider DOM Inspector as a real extension, and do not provide + the appropriate files to make it appear in the extensions + manager. Removed all the extension related stuff in the package. (Mike + Hommey) + * other-licenses/libart_lgpl: Removed, was for SVG, no longer needed. + * modules/plugin/samples/default/unix/*: Reverted debian specific + changes, we don't want them in the diff since libnullplugin won't get + installed. + + -- Eric Dorland Fri, 1 Oct 2004 18:50:46 -0400 + +mozilla-firefox (0.9.3-6) unstable; urgency=high + + * gfx/src/gtk/fontEncoding.properties: Uncomment symbol fonts. (Closes: + #272927) + * debian/control: Build-depend on binutils (>= 2.15-4) but only on mips + and mipsel. (Closes: #273353) + * configure.in, configure, rules.mk: Patch from Thiemo Seufer to + increase stability and performance on mips. (Closes: #272159) + * debian/mozilla-firefox-runner: Detect failure of ping() + better. (Closes: #267393) + * layout/html/document/src/html.css: Testing fix for xprint problems. + + -- Eric Dorland Mon, 27 Sep 2004 17:07:37 -0400 + +mozilla-firefox (0.9.3-5) unstable; urgency=high + + * debian/update-mozilla-firefox-chrome: Apply another patch form Mike + Hommey to fix a few more issues in the script. (Closes: #271480) + * Fixes to Secunia security bugs, ported from bugzilla: + (Closes: #271888) + - browser/base/content/browser.js, + xpfe/communicator/resources/content/contentAreaDD.js: Fix for + drag and drop exploit, bz#250862. + - caps/include/nsScriptSecurityManager.h, caps/src/caps.properties, + caps/src/nsScriptSecurityManager.cpp: Fix for enablePrivilege + exploit, bz#253942. + - gfx/src/shared/gfxImageFrame.cpp, gfx/src/windows/nsImageWin.cpp, + modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp: Fix for various + overflows in the BMP code, bz#255067. + - netwerk/dns/src/nsIDNService.cpp: Fix for bug in non-ASCII + characters in domain names, bz#256316 + - content/xbl/src/nsXBLPrototypeHandler.cpp: Clipboard injection + fix, bz#257523. + + -- Eric Dorland Thu, 16 Sep 2004 20:06:47 -0400 + +mozilla-firefox (0.9.3-4) unstable; urgency=high + + * Urgency high, go into testing dammit! + * Apply patch from Mike Hommey as -3.1, which wasn't actually + released. See below. (Closes: #271480) + * debian/rules: Patch from Matthew Mueller to fix underquoted + argument. (Closes: #271432) + * debian/control: Build depend on binutils (>= 2.15-3) with fixed mips + support. We still need a fixed gcc. + + -- Eric Dorland Mon, 13 Sep 2004 20:41:27 -0400 + +mozilla-firefox (0.9.3-3.1) unstable; urgency=low + + * debian/rules: removed + /usr/lib/mozilla-firefox/defaults/profile/extensions/installed-extensions.txt + * debian/update-mozilla-firefox-chrome: + + Added a "verbose" mode. + + Added warning messages (only shown in verbose mode) about some + extensions specific issues. This is intended to be useful for extensions + maintainers. + + Check if the installed-extensions.txt file disappears, which tells if the + mozilla-firefox -register went ok. + * debian/update-mozilla-firefox-chrome.8: + + Fixed typos. + + Added reference to the -v option for the verbose mode. + * debian/mozilla-firefox-runner: enhanced the profile directory check. It + didn't work if the path indicated in the profiles.ini was not absolute. + + -- Mike Hommey Mon, 13 Sep 2004 20:31:21 +0900 + +mozilla-firefox (0.9.3-3) unstable; urgency=high + + * Acknowlege NMU from Mike Hommey. He did a fantastic job in porting a + large amount of fixes from upstream CVS. I owe him several large + beverages of his choice. (Closes: #259046, #259836) + * Port all of Mike's changes to my local CVS. + * debian/mozilla-firefox-runner: + - Pass command-line arguments to get_locale so they can actually + be used. (Closes: #240058) + - Apply patch from Mike Hommey to use the profiles.ini to find the + path to the profile to clean XUL.mfasl. (Closes: #267326) + * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to fix + some bashisms introduced by his NMU. + * xpcom/reflect/xptcall/src/md/unix/Makefile.in, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Patch from + Thiemo Seufer to fix mips. This requires patches to gcc and binutils + to work and fully close #270621. + + -- Eric Dorland Wed, 8 Sep 2004 21:13:35 -0400 + +mozilla-firefox (0.9.3-2.2) unstable; urgency=high + + * The "never edit the diff file unless you're sure nothing will be + missing" release. + * debian/mozilla-firefox.prerm: restore the uncut version. + * debian/control, debian/rules: Use gcc-3.2 to build on hppa, because of + toolchain bug #254549. + + -- Mike Hommey Mon, 23 Aug 2004 19:45:54 +0900 + +mozilla-firefox (0.9.3-2.1) unstable; urgency=high + + * Non Maintainer Upload for RC Fixes. + * Applied changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in + and toolkit/mozapps/extensions/locale/extensions.properties to solve some + issues with extensions management. (taken from CVS) + * Applied other changes to + toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + toolkit/mozapps/extensions/public/nsIExtensionManager.idl and + mozilla/toolkit/xre/nsAppRunner.cpp to be able to use -register + instead of -list-global-items for extensions/components/chrome + registration through update-mozilla-firefox-chrome, thus not needing + Xvfb anymore (-register option doesn't require a X server). + (taken from CVS) + * Applied some more changes to + toolkit/mozapps/extensions/src/nsExtensionManager.js.in in order to + avoir overlayinfo deletion during extensions registration process. + (taken from CVS) + * Final changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in + to avoid registering out of date extensions so that firefox doesn't enter + a loop at startup when no profile was found, and to only write in the + installed-extensions-processed.txt file the list of actually installed + extensions. Note that for packaged extensions installing their files + directly into the chrome or components directories, that only means they + won't appear in the Extensions Manager. They will still be available in + the GUI. + * All these fixes improve the Extensions Manager. Closes: #259046. + * accessible/src/atk/nsAccessibleWrap.cpp, + accessible/src/atk/nsAccessibleWrap.h: fixed 32-bit abuse of gobject + (Steve Langasek). Closes: #259836. + * debian/control: Removed dependency upon xvfb. + * debian/update-mozilla-firefox-chrome: + + Removed use of Xvfb. + + Removed creation of a root default profile, but kept the fake home + hack to avoid creation of a .mozilla directory in root's home. + + Changed extensions handling so that the overall process is cleaner. + Extensions packages will have to move extensions {uid} directories + to /usr/lib/mozilla-firefox/extensions/, while the current location + is still supported for compatibility purpose (but is strongly not + recommended). + + Removed use of regxpcom and regchrome, since what they both do is + done by firefox-bin -register. + * debian/rules: force GnomeVFS support to be disabled. (Josselin Mouette) + * debian/README.Debian: + + Added a note about potential problems with packaged "old" extensions. + + Added a note about how to manually disable packaged extensions in user + profile. + + Removed some old notes that don't apply anymore. + * debian/mozilla-firefox-dom-inspector.install, debian/rules: Move + extensions files to /usr/lib/mozilla-firefox/extensions/ instead of + /usr/lib/mozilla-firefox/defaults/profile/extensions/. + * debian/mozilla-firefox.links: Move installed-extensions.txt symlink + from /usr/lib/mozilla-firefox/defaults/profile/extensions/ to + /usr/lib/mozilla-firefox/extensions/. + * debian/mozilla-firefox.prerm: More cleanup on removal of package. + + -- Mike Hommey Sun, 22 Aug 2004 21:43:47 +0900 + +mozilla-firefox (0.9.3-2) unstable; urgency=low + + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Comment out + NARGSAVE, like I did in 0.9.1-7, should fully fix #262571. + * debian/mozilla-firefox.preinst: Remove brace expansion + bashism. (Closes: #264200) + * debian/control: Depend on debianutils (>= 1.16) since we use mktemp + -d. (Closes: #263958) + * debian/mozilla-firefox-runner: Make -contentLocale COUNTRY, not + lang-COUNTRY. (Closes: #263940) + + -- Eric Dorland Sun, 8 Aug 2004 23:41:02 -0400 + +mozilla-firefox (0.9.3-1) unstable; urgency=low + + * New upstream release. (Closes: #263193) + * debian/update-mozilla-firefox-chrome.8: Add manpage from Mark Suter + for update-mozilla-firefox-chrome.8. (Closes: #263149) + * debian/mozilla-firefox.manpages: Add update-mozilla-firefox-chrome.8. + * debian/control: Add build-deps on gcc-3.4 for amd64. (Closes: #262679) + + -- Eric Dorland Wed, 4 Aug 2004 20:21:22 -0400 + +mozilla-firefox (0.9.1-7) unstable; urgency=low + + * debian/mozilla-firefox-runner: + - Reintroduce check for command-line arguments (I broke this last + release). (Closes: #262692, #262462, #262537, #262588, #262727) + - Allow overriding of -contentLocale and -UILocale. (Closes: + #240058) + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s: Comment out + NARGSAVE reassignment, it is defined elsewhere. (Closes: #262571) + * debian/rules: Force amd64 to build with gcc 3.4. (Closes: #262679) + + -- Eric Dorland Mon, 2 Aug 2004 10:16:46 -0400 + +mozilla-firefox (0.9.1-6) unstable; urgency=low + + * widget/src/gtk2/keysym2ucs.c: Patch from Eugeniy Meshcheryakov to + allow mozilla firefox to enter a ghe with upturn. (Closes: #261543) + * debian/mozilla-firefox-runner: + - Remove some mail and composer cruft. + - Add warning if DISPLAY is not set. (Closes: #261465) + + -- Eric Dorland Thu, 29 Jul 2004 22:49:59 -0400 + +mozilla-firefox (0.9.1-5) unstable; urgency=low + + * debian/control: Goodbye mozilla-firebird transition package. + * debian/mozilla-firefox-runner: Add -a firefox flag when running + firefox-bin. (Closes: #259237) + * debian/mozilla-firefox.desktop: Add GenericName field. + * debian/update-mozilla-firefox-chrome: Fix quoting problem with + {*}. (Closes: #257243) + * debian/rules: + - Re-enable postscript printing support, since the security + issues turned out to be bogus. (Closes: #257628) + - Disable SVG support, it's still too broken to be usable. + (Closes: #259544) + + -- Eric Dorland Sun, 18 Jul 2004 20:09:14 -0400 + +mozilla-firefox (0.9.1-4) unstable; urgency=low + + * The "Let's try unstable" release. There are still issues, but there + are issues with 0.8 as well, so no more point in waiting. + * debian/update-mozilla-firefox-chrome: + - Copy over empty Extensions.rdf file on update. (Closes: #257243) + - Increase sleep to 15 seconds, hopefully this will work on most + people's machines. + * My apologies to Mike Hommey for mispelling his name in last release. + + -- Eric Dorland Sun, 11 Jul 2004 23:51:24 -0400 + +mozilla-firefox (0.9.1-3) experimental; urgency=low + + * Ok, I was wrong, we're still in experimental. I think we need to fix a + few more issues before getting this in unstable, like #257258, and + make sure the hacky extensions mechanism is more bullet-proof. + * debian/rules: --disable-installer, since we don't use it. + * debian/update-mozilla-firefox-chrome: + - Wait 8 seconds instead of 5 for the hack, might help some + people reporting problems. + - Remove ${LIBDIR}/extensions/{*}. I may move that to + /var/lib/mozilla-firefox eventually, but let's leave it for now. + * debian/mozilla-firefox.png.uu: Make a nicer png icon, based on the + about box graphic. + * debian/mozilla-firefox.preinst: Remove old config files in + /etc/mozilla-firefox/pref. (Closes: #257711, 257557) + * browser/app/profile: firefox.js: Revert change to app.version, + apparently it breaks extensions. (Closes: #257941) + + -- Eric Dorland Wed, 7 Jul 2004 21:26:55 -0400 + +mozilla-firefox (0.9.1-2) experimental; urgency=low + + * The "Mike Homey, lord of the bugs" release. Thanks to Mike for being a + huge help with bug triage. That's right, help with bugs and your name + could have a prestigious place in the changelog. + * I'd like my next release to be to unstable, so let me know about + profile transition bugs, etc. + * debian/control: Build-depend on libcairo1-dev. + * debian/rules: Enable svg support using cairo renderer. (Closes: + #215990) + * debian/mozilla-firefox-xremote-client: Add -a firefox switch to make + the remote client find firefox only. Thanks Jonathan Black. (Closes: + #256967) + * debian/mozilla-firefox.desktop: Make comment Gnome HIG + compliant. (Closes: #257592) + * browser/app/profile/firefox.js: + - app.version = 0.9.1. + - Disable app updates by default. We're debian, we handle updates. + * debian/update-mozilla-firefox-chrome: + - Remove installed-extensions-processed.txt before regenerating. + (Closes: #257243) + - Take some, but not all advice from Alexandru Fomin. Improve Xvfb + and extension registration hacks. + + -- Eric Dorland Sun, 4 Jul 2004 16:58:17 -0400 + +mozilla-firefox (0.9.1-1) experimental; urgency=low + + * New upstream release. + * config/autoconf.mk.in: Alright, /usr/lib/firefox-0.9 was a bad idea, + use /usr/lib/mozilla-firefox. Change all the instances + /usr/lib/firefox-0.9 back to /usr/lib/mozilla-firefox. I feel + silly. (Closes: #256991) + * debian/mozilla-firefox-runner: Actually check for the existence of the + .mozilla/firefox directory before trying to clean it. + * debian/update-mozilla-firefox-runner: + - Call firefox-bin, not firefox you silly goose. + - Use mozilla-firefox tempfile, not mozilla-browser. + - The horrible hackiness continues: For my previous hack to work, + I need to preseed a profile directory in the home directory I + create. Now things should work. (Closes: #256812) + + -- Eric Dorland Thu, 1 Jul 2004 17:16:29 -0400 + +mozilla-firefox (0.9-1) experimental; urgency=low + + * New upstream release. There may be regressions from 0.8. (Closes: + #254522) + * widget/src/gtk/nsGtkMozRemoteHelper.cpp, + widget/src/gtk2/nsGtkMozRemoteHelper.cpp, + widget/src/xremoteclient/XRemoteClient.cpp: Fix previously applied to + fix -remote behaviour undone. Mozilla now includes the program name in + the properties to distinguish between various Mozilla apps. + * xpcom/reflect/xptcall/src/md/unix/Makefile.in: remove extra endif. + * dom/public/idl/core/nsIDOMNSDocument.idl: Reintroduce referrer + attribute that got lost somehow. + * content/events/src/nsEventStateManager.cpp: Fix a strange broken + function call to GetContainer. + + * debian/rules: + - Follow upstream and --enable-single-profile and + --disable-profilesharing. + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - --user-app-dir=.mozilla to jive with new location. + - Remove dom-inspector extension dir from the regular package. + * debian/control: Depend on xvfb for insane hack below. + * debian/mozilla-firefox.install: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Remove ipc dir, mozipcd. + - Add init.d, greprefs dirs. + * debian/mozilla-firefox.dirs: + - Add /var/lib/mozilla-firefox/extensions{,.d} + * debian/mozilla-firefox-dom-inspector.dirs: Add + /var/lib/mozilla-firefox/extensions.d. + * debian/mozilla-firefox-dom-inspector.install: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Install dom-inspector extension dir. + * debian/mozilla-firefox.links: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Link /usr/lib/mozilla-firefox to /usr/lib/firefox-0.9. + - Link installed-extensions.txt to our place in + /var/lib/mozilla-firefox. + * debian/mozilla-firefox-runner: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Fix xprintorg typo. (Closes: #255706) + - Search .mozilla/firefox for XUL.mfasl files. + * debian/mozilla-firefox-xremote-client: Replace + /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + * debian/update-mozilla-firefox-chrome: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Capture return values from reg* commands on error, stolen + from mozilla source. + - Remove returns from check_running. + - Pull in snippets from /var/lib/mozilla-firefox/extensions.d + to generate installed-extensions.txt for new extensions mechanism. + - An insane hack, but necessary because of upstream: Launch a Xvfb + to run firefox to generate the necessary extension metadata. I've + been told this will not be necessary in the next version. + + -- Eric Dorland Mon, 28 Jun 2004 23:40:59 -0400 + +mozilla-firefox (0.8-12) unstable; urgency=low + + * The "Last Chance Before 0.9" release. + * debian/mozilla-firefox-runner: Fix unescaped \n, thanks Olly + Betts. (Closes: #252436) + * debian/update-mozilla-firefox-chrome: Watch out for empty + LD_LIBRARY_PATH. Thanks George Cristian Birzan. (Closes: #254142) + * debian/README.Debian: Restructure and update a bit. + * debian/presubj: Add bug information from README.Debian for reportbug. + * debian/mozilla-firefox.install: Install the presubj. + + -- Eric Dorland Mon, 14 Jun 2004 19:39:27 -0400 + +mozilla-firefox (0.8-11) unstable; urgency=low + + * Apply amd64 fix from #249211. + * debian/README.Debian: Shamelessly stole the java plugin installation + instructions from the mozilla package. (Closes: #243513) + * nsCommonWidget.cpp, nsCommonWidget.h, nsWindow.cpp: Apply patch (with + some hand massaging) from upstream bugzilla bug #209342 to fix initial + window placement. (Closes: #235209, 241519) + * nsprpub/pr/src/misc/prnetdb.c: Apply patch from Miquel van Smoorenburg + to prevent unless reverse DNS lookups. (Closes: #251978) + * debian/mozilla-firefox-runner: Apply patch from Jasper Spaans to fix + remote xprint printing. (Closes: #252072) + + -- Eric Dorland Tue, 1 Jun 2004 23:12:36 -0400 + +mozilla-firefox (0.8-10) unstable; urgency=low + + * debian/mozilla-firefox.install: Don't install uuencoded file. (Closes: + #251441) + * debian/mozilla-firefox-runner: unset AUDIODEV which can cause + crashes. Thanks Christopher Armstrong. (Closes: #236231) + * update-mozilla-firefox-chrome: Port security fix from #249613 to + handle insecure tempfile creation. + * debian/rules: Following the advice of #247585 I'm disabling postscript + printing. Perhaps this will alleviate some of the other printing + problems. + + -- Eric Dorland Sun, 30 May 2004 01:47:52 -0400 + +mozilla-firefox (0.8-9) unstable; urgency=low + + * debian/control: + - Suggest latex-xft-fonts for MathML fonts. Thanks Michael + JasonSmith. (Closes: #216925) + - Build depend on libx11-dev & libxp-dev instead of xlibs-dev to + reflect new X packages. + * widget/src/gtk2/nsWindow.cpp: Apply patch from Peter Colberg to ignore + unused mouse buttons. (Closes: #244305) + * debian/README.Debian: Document the fact that the loopback interface + has to be up and unfiltered for things to work right. + + -- Eric Dorland Wed, 5 May 2004 23:30:42 -0400 + +mozilla-firefox (0.8-8) unstable; urgency=low + + * security/nss/lib/freebl/unix_rand.c: Remove code that called netstat + to gain so entropy. It's pretty useless on a Linux system. Thanks + Wichert. (Closes: #241200) + * debian/README.Debian: Add note about changing the button order in the + dialog boxes. (Closes: #240261) + * debian/control: Add dummy package for mozilla-firebird to smooth + upgrades. (Closes: #235577) + + -- Eric Dorland Sat, 3 Apr 2004 16:19:34 -0500 + +mozilla-firefox (0.8-7) unstable; urgency=low + + * debian/mozilla-firefox-runner: + - Cleanup XUL.mfasl whenever firefox is run with no + command-line. (Closes: #238717) + - Add patch from Laurent Buffler to add config to allow + new tabs to be opened instead of new windows. (Closes: #239323) + * debian/mozilla-firefoxrc: Put the new FIREFOX_OPEN_IN variable in + there and document it's use. + + -- Eric Dorland Sat, 27 Mar 2004 17:21:51 -0500 + +mozilla-firefox (0.8-6) unstable; urgency=low + + * debian/control: Build-depend on g++-3.3 (>= 3.3.3-4) to work around + broken 3.3.3-3 release. (Closes: #238318, #238241, #238441, #238523, + #238534) + * debian/rules: Install new small-firefox icon. + * debian/mozilla-firefox{.png, .xpm, -small.xpm}: Use the new DFSG-free + icons, the old pretty ones are trademarked and not DSFG-free. I know, + it's stupid. Complain to the Mozilla Foundation, not me. (Closes: + #234869) + + -- Eric Dorland Sun, 21 Mar 2004 22:09:16 -0500 + +mozilla-firefox (0.8-5) unstable; urgency=low + + * Rebuild with g++-3.3 3.3.3-2 to work around broken g++. (Closes: + #238318) + + -- Eric Dorland Wed, 17 Mar 2004 21:38:58 -0500 + +mozilla-firefox (0.8-4) unstable; urgency=low + + * debian/README.Debian: + - Tell people not to remove their ~/.firefox directory. Just move it + out of the way. (Closes: #235594) + - Add notes about the sound dsp. (Closes: #236678) + * debian/mozilla-firefox-runner: + - Don't redirect stderr. (Closes: #236160) + - Add get_locale code from Aurelien Jarno (Closes: #235521) + - Fix dsp auto-detection code. (Closes: #236678) + * debian/rules: Add default locale file. + * debian/mozilla-firefox.dirs: Add locales dir. + + * browser/app/profile/all.js, + content/events/src/nsEventStateManager.cpp, + modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h, + widget/src/gtk/nsWidget.cpp: Reapply extended mouse events patch from + Derek Upham. (Closes: #235385, #230876) + * browser/base/content/browser-sets.inc: Make ESC stop animations + again. (Closes: #235474) + + -- Eric Dorland Tue, 16 Mar 2004 00:31:19 -0500 + +mozilla-firefox (0.8-3) unstable; urgency=low + + * debian/mozilla.firefox.menu: Change the case of + mozilla-Firefox. (Closes: #234982, #234755) + * debian/NEWS.Debian: Move to debian/mozilla-firefox.NEWS so that it + actually gets installed. (Closes: #234700) + * debian/update-mozilla-firefox-chrome: Setup dummy home directory to + capture silly .firefox directory. (Closes: #234855) + * debian/mozilla-firefox.png.uu, debian/mozilla-firefox.xpm: Use the + new, pretty mozilla-firefox icons. (Closes: #234869) + * debian/rules: Install the pretty icon in the right places. + + -- Eric Dorland Thu, 26 Feb 2004 21:10:27 -0500 + +mozilla-firefox (0.8-2) unstable; urgency=low + + * The "what he taketh, he giveth back" release. + * debian/rules: + - Disable the wallet extension, this really closes #222447. + - Remove some more cruft left over from the patch system. + - Reinstall the dom-inspector. + * debian/control: Add the dom-inspector back, now that it is supported + upstream. + * debian/mozilla-firefox-dom-inspector.{install,dirs,postinst,postrm}: + Bring these files back. + * docshell/base/nsWebShell.cpp: Only do keyword lookup on when DNS + entries don't exist. (Closes: #233916, #218033, #211524) + + -- Eric Dorland Mon, 23 Feb 2004 21:48:03 -0500 + +mozilla-firefox (0.8-1) unstable; urgency=low + + * The "Let's Change Our Name Every Other Day" release. + * New upstream release, mozilla-firebird has been renamed to + mozilla-firefox. Let's hope it lasts. (Closes: #231903, #222447) + * debian/mozilla-firebird.*: Renamed to debian/mozilla-firefox.*. + + * debian/README.Debian: Update for firefox, remove blurb about the + inspector. + * debian/NEWS.Debian: Explain how to move your configs over. I may make + this automatic if enough people complain, but I'm loathe to muck + around in pople's home directories. + + * debian/control: + - Rename the package. + - Tweak description to list Firefox's previous aliases. + - Remove conflicts on mozilla-firebird-dom-inspector. + + * debian/rules: + - s/firebird/firefox/g, s/MozillaFirebird/firebird/g. + - Comment out some old inspector code. + - Remove unused patch subsystem. + - Disable gtktest. We don't need no stinking tests. + - Remove disable plaintext editor line, not sure why it's there. + - Disable LDAP support. We don't use it. + - Remove executable bit on *.so files. + - Remove useless preference files. + - Exclude the inspector files. + - Don't remove installed-chrome, we don't install it anymore. + - user-app-dir = .firefox. (Closes: #212301) + - export MOZILLA_OFFICIAL for the build ID. (Closes: #231133) + + * debian/mozilla-firefox-runner: + - s/firebird/firefox/g. + - Remove composer and editor functions. + - Use .firefox directory. + + * debian/mozilla-firefox.install: + - s/firebird/firefox/g, s/MozillaFirebird/firefox/g. + - Don't install timebombgen. + - Install icons directory. + - Don't install installed-chrome.txt, we just remove it anyway. + + * debian/mozilla-firefox.desktop, debian/mozilla-firefox.dirs, + debian/mozilla-firefox.manpages, debian/mozilla-firefox.links, + debian/mozilla-firefox.menu, debian/mozilla-firefox.mime, + debian/mozilla-firefoxrc, debian/mozilla-firefox.postinst, + debian/mozilla-firefox.prerm, debian/update-mozilla-firefox-chrome, + debian/mozilla-firefox.1, debian/mozilla-firefox-xremote-client: + s/firebird/firefox/g, s/MozillaFirebird/firefox/g. + + * debian/mozilla-firefox.links: Link mozilla-firefox.1 to firefox.1. + + * debian/mozilla-firefox.preinst: Remove, at least with the rename I can + erase some of my previous blunders. + + * debian/mozilla-firefox.{png.uu,xpm}: Use the package icon. + + * browser/app/nsBrowserApp.cpp: Change package name to Firefox, so now + the ~/.firefox is used. (Closes: #196550) + + * browser/app/profile/all.js: Merge in autoscroll fixes. + * browser/base/content/browser-sets.inc: Merge in upstream stop button + fix. + * modules/plugin/samples/default/unix/nullplugin.c: Merge in removal of + commented code. + * nsprpub/pr/include/md/_linux.cfg, nsprpub/pr/include/md/_linux.h, + security/coreconf/Linux.mk: Merge in hppa build fixes from upstream. + * config/autoconf.mk.in: Install into /usr/lib/mozilla-firefox now. + * content/base/src/nsDocumentViewer.cpp: Remove redundant stop patch + since it has been merged upstream. + * content/events/src/nsEventStateManager.cpp, + modules/libpref/src/init/all.js, widget/src/gtk/nsWidget.cpp: Revert + back to upstream version. There was a patch here to add support for + extended mouse buttons, but I'm removing it since I don't trust that + it works in the new version correctly. Send me another patch if you + want this functionality back. + * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Revert this + back to upstream, I'm not sure which patches I applied to this file, + likely something to try and fix the double password prompt. + * widget/src/xremoteclient/XRemoteClient.cpp, + widget/src/xremoteclient/XRemoteClient.h: Revert to upstream version, + I believe it does the right thing now, but the patch I used does not + apppear to have been used. Restore the properties to _FIREFOX_* + though. + * widget/src/gtk/nsGtkMozRemoteHelper.cpp, + widget/src/gtk2/nsGtkMozRemoteHelper.cpp: Change the _FIREBIRD_* to + _FIREFOX_* here as well. + * content/base/src/nsDocument.cpp: Comment out nsDocument::GetDomConfig, + needed to get things to compile. + + -- Eric Dorland Sun, 15 Feb 2004 21:28:45 -0500 + +mozilla-firebird (0.7-7) unstable; urgency=low + + * debian/mozilla-firebird-runner: Open a new window when loading a + regular file. (Closes: #228853) + + -- Eric Dorland Thu, 29 Jan 2004 22:12:30 -0500 + +mozilla-firebird (0.7-6) unstable; urgency=medium + + * The "Indian-giver-christmas" release. + * Urgency medium since we're closing some critical bugs that need to get + in before a freeze. + * Completely remove mozilla-firebird-dom-browser. No one stepped up to + help fix it's brokeness in 0.7 and I don't use it or particularly care + about it. So it is no more. If someone steps up to take responsibility + I might put it back, but otherwise it may RIP. (Closes: #222085) + * debian/mozilla-firebird-runner: Remove XUL.mfasl uncoditionally + now. There is a corner case where this file is corrupted on upgrade + when firebird was running. This is a total hack, and not an elegant + solution, but at least it fixes the problem. (Closes: #224779, + #224323) + * debian/control: Conflict against old mozilla-firebird-dom-inspector + since it doesn't work anymore. + + -- Eric Dorland Thu, 25 Dec 2003 15:54:21 -0500 + +mozilla-firebird (0.7-5) unstable; urgency=low + + * browser/base/content/browser-sets.inc: Patch to make ESC stop actually + work. (Closes: #223382) + * debian/rules: Turn down optimizations on sparc. (Closes: #223760) + + -- Eric Dorland Sun, 14 Dec 2003 23:01:59 -0500 + +mozilla-firebird (0.7-4) unstable; urgency=low + + * The "All of Takuo's hard work really pays off" release. + * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Patch from + upstream bugzilla (#220214) to fix double password prompt + problem. (Closes: #222696) + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Stolen + patch from mozilla package to make mozilla-firebird build on + mips. (Closes: #222743) + * content/base/src/nsDocumentViewer.cpp: Port yet another patch to allow + the ESC key to stop animated gifs. (Closes: #223382) + + -- Eric Dorland Mon, 8 Dec 2003 23:59:16 -0500 + +mozilla-firebird (0.7-3) unstable; urgency=low + + * debian/control: Add dependency on psmisc since we use fuser. Thanks + Daniel Schröter. + * widget/src/xremoteclient/XRemoteClient.{cpp,h}: Apply patch from + bugzilla to fix -remote behaviour on modern WMs. Thanks Nikolai + Prokoschenko. (Closes: #197632) + * nsprpub/pr/src/misc/prdtoa.c: Apply fix from mozilla package (#215067) + to fix building on arm. This is a partial fix to #222743. + * debian/patches: Remove these. Put everything in CVS. + + -- Eric Dorland Fri, 5 Dec 2003 20:03:46 -0500 + +mozilla-firebird (0.7-2) unstable; urgency=low + + * Apply excellent patch from Alexander Sack to fix the + issues with mozilla running and firebird not starting. (Closes: + #216264) + * browser/app/profile/all.js: Set the default of "general.autoScroll" to + false because it annoyes me. (Closes: #221661) + + -- Eric Dorland Wed, 19 Nov 2003 20:59:55 -0500 + +mozilla-firebird (0.7-1) unstable; urgency=low + + * New upstream release. (Closes: #216019) + * debian/patches/dom-inspector.diff: Remove, and apply directly into my + CVS. + * debian/patches/pref.diff: Removed, doesn't seem applicable anymore. + * debian/rules: export MOZ_FIREBIRD=1. + * debian/control: + - Change Chimera to Camino. (Closes: #220821) + - Fix typos in descriptions. (Closes: #218202) + - Add build-deps on m4. (Closes: #219681) + + -- Eric Dorland Wed, 12 Nov 2003 23:01:35 -0500 + +mozilla-firebird (0.6.1-8) unstable; urgency=low + + * Apply patch to make forward and back buttons work on mice. (Closes: + #211606) + * debian/rules: Use -O optimization on alpha, so it will build + again. (Closes: #213603) + + -- Eric Dorland Fri, 3 Oct 2003 00:07:44 -0400 + +mozilla-firebird (0.6.1-7) unstable; urgency=low + + * Rebuild with the latest and greatest from unstable. This seems to fix + the problems with bookmarks people were having, at least for me. No + idea why. Please reopen if this doesn't fix it for you. (Closes: + #209339, #211706, #211286, #211146, #212011) + + -- Eric Dorland Mon, 22 Sep 2003 00:00:08 -0400 + +mozilla-firebird (0.6.1-6) unstable; urgency=low + + * Patch from Eric Wong to make plugin requests + less annoying. (Closes: #196609) + * debian/rules: Stop building libart. + * debian/mozilla-firebird.links: Fix path to bookmarks file. (Partial + fix to #211286) + + -- Eric Dorland Wed, 17 Sep 2003 20:22:56 -0400 + +mozilla-firebird (0.6.1-5) unstable; urgency=low + + * The "sorry Chris Gray" release. + * debian/rules: disable SVG. This was causing drag and drop to lock up + X and possibly fixes #208630. (Closes: #209371) + * debian/mozilla-firebird-runner: Remove XUL.mfasl if we have upgraded, + since it can cause problems. (Closes: #200073, #202130, #207351) + + -- Eric Dorland Sat, 13 Sep 2003 20:15:37 -0400 + +mozilla-firebird (0.6.1-4) unstable; urgency=low + + * The "pleasing Chris Gray" release. + * other-licenses/libart_gpl: Add this library for svg. + * debian/rules: + - Enable svg. + - Move bookmarks.html file into /etc. (Closes: #207398) + * debian/mozilla-firebird.links: Add links back to files moved to /etc. + * security/coreconf/Linux2.6.mk: Add this as a copy of Linux2.5.mk to + get mozilla-firebird to build on 2.6. (Closes: #207821) + + -- Eric Dorland Sun, 31 Aug 2003 04:40:30 -0400 + +mozilla-firebird (0.6.1-3) unstable; urgency=low + + * debian/mozilla-firebird.prerm: Remove mozilla alternative on + remove. (Closes: #205310) + * debian/debsearch.{gif.uu,src}: Debian search plugin graciously + contributed by Fergus McKenzie-Kay . + * debian/rules: + - uudecode and clean up debsearch.gif.uu. + - Steal platform specific optimization code from mozilla + package. Thanks Brian Nelson. (Closes: #206309) + * debian/mozilla-firebird.install: Install the above files. + * debian/control: Update Standards-Version to 3.6.1. + + -- Eric Dorland Sun, 24 Aug 2003 19:09:11 -0400 + +mozilla-firebird (0.6.1-2) unstable; urgency=low + + * The "Stop Pestering Me Already!" release. + * debian/control: Only recommend xprt-xprintorg, don't require + it. (Closes: #204176) + + -- Eric Dorland Sun, 10 Aug 2003 20:00:11 -0400 + +mozilla-firebird (0.6.1-1) unstable; urgency=low + + * New upstream release. (Closes: #203518, #201203) + * debian/control: + - Standards-Version to 3.6.0. + - Don't provide www-browser anymore. (Closes: #201035) + - Depend on xprt-xprintorg so printing will work. (Closes: #202418) + * debian/mozilla-firebird.preinst: Remove www-browser alternative. + * debian/mozilla-firebird.postinst: Don't install www-browser alternative. + * debian/mozilla-firebird.prerm: Don't remove www-browser alternative + anymore. + * debian/README.Debian: Added note about configuration breaking on + upgrade. (Closes: #202130) + * debian/patches/classic.diff: Removed. Not sure what it's point was. + * debian/rules: Add --disable-pedantic to the configure options. + + -- Eric Dorland Sun, 3 Aug 2003 14:58:12 -0400 + +mozilla-firebird (0.6-8) unstable; urgency=low + + * debian/patches/alpha-build-fix.diff: Steal patch from mozilla to allow + building on alpha. (Closes: #198638) + * debian/patches/hppa-build-fix.diff: Steal patch from mozilla to allow + building on hppa, clean it up so it applies cleanly. (Closes: #199068) + * debian/mozilla-firebird.png.uu: Added uuencoded nice png icon. + * debian/rules: Add code to decode and clean up the new icon file. + * debian/mozilla-firebird.install: Install new icon. + * debian/mozilla-firebird.desktop: Use the new icon. + + -- Eric Dorland Fri, 27 Jun 2003 23:21:56 -0400 + +mozilla-firebird (0.6-7) unstable; urgency=low + + * debian/mozilla-firebird.1: Stole the mozilla manpage for my own + nefarious purposes. (Closes: #196638) + * debian/mozilla-firebird.postrm: Add slave links to the + mozilla-firebird manpage. (Closes: #197145) + * debian/mozilla-firebird-xremote-client: Set up the environment + properly so it returns correct information. (Closes: #197632) + * debian/mozilla-firebird.xpm: Added icon from + http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png to have + a nice menu icon. (Closes: #197565) + * Updated the README.Debian with some helpful bug reporting tips. + * debian/rules: Replaced dh_installmanpages with dh_installman. + + -- Eric Dorland Sun, 22 Jun 2003 15:15:37 -0400 + +mozilla-firebird (0.6-6) unstable; urgency=low + + * debian/mozilla-firebird.postinst: Add priority 0 alternative on + mozilla. (Closes: #196444) + * debian/control: Add build-depends on libxrender-dev, libmng-dev, + libpng12-dev, libjpeg62-dev. + * debian/rules: + - Build with system jpeg, mng and png libs. + - Exclude inspector files from mozilla-firebird. + (Closes: #196432, #196509) + + -- Eric Dorland Sat, 7 Jun 2003 15:19:23 -0400 + +mozilla-firebird (0.6-5) unstable; urgency=low + + * The "Mike Hommey is my homey" release. + * Thanks to Mike Hommey for his excellent work on this + version (it's 99% his), which I've shamelessly stolen. + * Added a README.Debian file. + * Added a separate mozilla-firebird-dom-inspector package. + * debian/patches/dom-inspector.diff: + - add DOM Inspector to Tools menu. (note: DOM Inspector is still + not very well integrated with Firebird) + - remove modern skin references. + * debian/patches/xpinstall.diff: remove unneeded chrome registrations + from xpinstall/packager/unix/browser.jst. + * debian/patches/classic.diff: remove + themes/classic/global/win/preview.gif from jar file and modify + preview image reference in rdf file to Preview.png. + * debian/patches/pref.diff: remove preview image constraints in + browser/components/prefwindow/skin/pref.css file to avoid deformation + of preview image in classic theme. + * debian/mozilla-firebird.preinst: added #DEBHELPER#. + * debian/mozilla-firebird.install: + - Don't install the modern.jar and embed-sample.jar files. + - Remove files related to dom-inspector. + * debian/rules: + - enabling xinerama support. + - disabling build of chatzilla and venkman. + - moved /var/lib/mozilla-firebird/chrome.d/99default to + /var/lib/mozilla-firebird/chrome.d/00all + - remove references to embed-sample.jar in + /var/lib/mozilla-firebird/chrome.d/00all + - Add some comments. + - Change == to =, for more strict /bin/sh's. + * debian/control: Build-Depend on libidl-dev (>= 0.8.0) because the + configure script requires at least this version. + * debian/copyright: Make this a real debian copyright file. + + -- Eric Dorland Thu, 5 Jun 2003 01:00:32 -0400 + +mozilla-firebird (0.6-4) unstable; urgency=low + + * debian/rules: Change -O2 to -O for building on powerpc. + * debian/mozilla-firebird.preinst: Delete + /usr/lib/mozilla-firebird/defaults/pref on upgrade to facilitate + transition to prefs in /etc. Thanks to all who reported this. + + -- Eric Dorland Tue, 27 May 2003 21:45:06 -0400 + +mozilla-firebird (0.6-3) unstable; urgency=low + + * First attempt at a debian upload. (Closes: #163270) + * debian/rules: + + Small fix to Mike Hommey's chrome patch. + + Suggestion from Bernhard R. Link to install + /usr/lib/mozilla-firebird/defaults/pref to + /etc/mozilla-firebird/pref + + Add dh_installmime call. + * debian/mozilla-firebird.mime: Install mime type handlers for firebird. + * debian/mozilla-firebird.links: Link + /usr/lib/mozilla-firebird/defaults/pref to /etc/mozilla-firebird/pref + * debian/mozilla-firebird.install: Don't install the inspector.jar. + + -- Eric Dorland Mon, 26 May 2003 00:28:40 -0400 + +mozilla-firebird (0.6-2) unstable; urgency=low + + * debian/rules: + + Add --with-user-appdir=.mozilla-firebird, since it still + defaults to .phoenix. + + Don't use the ${prefix} variable, use /usr, since ${prefix} + doesn't seem to work. + + Use --without-system-nspr. + * debian/mozilla-firebird.install: + + Be picky about what chrome files we install, since there's + quite a few we don't need, and a bunch of empty dirs. + * Excellent patch from Mike Hommey to add a + update-mozilla-firebird-chrome script. + + -- Eric Dorland Sat, 24 May 2003 13:00:44 -0400 + +mozilla-firebird (0.6-1) unstable; urgency=low + + * New upstream release. + * Renamed to mozilla-firebird. + * Changed phoenix to mozilla-firebird where appropriate. + * debian/mozilla-firebird.links: Add link mozilla-firebird to + MozillaFirebird. + * debian/control: + + Standars-Version to 3.5.10.0. + + Build-depend on gtk2 libs now. + + Build-depend on libidl-dev. + + Add Provides x-www-browser. + * debian/rules: + + Enable building with the gtk2 libs. + + Make mozilla-firebird-xremote-client executable in install target. + * debian/mozilla-firebird.desktop: Added gnome menu entry. + * debian/mozilla-firebird.{prerm,postinst}: Add alternatives to + www-browser and x-www-browser. + + -- Eric Dorland Mon, 19 May 2003 20:43:39 -0400 + +phoenix (0.5-4) unstable; urgency=low + + * debian/control: Depend on fontconfig. + * debian/rules: Add source-tarball-from-cvs to build a orig tarball from + a checked out cvs tree. Now I can provide source package. And there + was much rejoicing. + + -- Eric Dorland Fri, 17 Jan 2003 21:06:47 -0500 + +phoenix (0.5-3) unstable; urgency=low + + * debian/phoenix-xremote-client: Added to send remote commands to + phoenix. Just a wrapper that calls phoenix-bin -remote. + * debian/phoenix-runner: + + Use phoenix-xremote-client. + + Replace MOZILLA_DSP with PHOENIX_DSP. + * debian/phoenixrc: phoenix-runner uses this file to determine what dsp + to start. + * debian/phoenix.install: + + Install phoenix-xremote-client, and don't install + mozilla-xremote-client. + + Install phoenixrc. + + -- Eric Dorland Mon, 23 Dec 2002 02:52:21 -0500 + +phoenix (0.5-2) unstable; urgency=low + + * debian/control: + + Add Provides: www-browser. + + Build-depend on libxft2-dev, libnspr-dev. + * debian/rules: + + Use xft and the system nspr. + + Install phoenix-runner. + * debian/phoenix-runner: Stolen from the mozilla package to run phoenix. + + -- Eric Dorland Sat, 21 Dec 2002 02:03:11 -0500 + +phoenix (0.5-1) unstable; urgency=low + + * New upstream release. + * debian/phoenix.install: Fix paths to phoenix libs. + * debian/control: + + Standards-Version to 3.5.8 + + Improve build-deps. + * debian/rules: + + Have configure options here, no more .mozconfig. + + Steal some patch code from Colin. + * debian/patches/mozappdir.diff: Change the mozappdir. + + -- Eric Dorland Mon, 9 Dec 2002 02:43:13 -0500 + +phoenix (0.4-3) unstable; urgency=low + + * debian/phoenix.menu: Add menu entry. + * Rebuild to fix libstdc++ dependency. + * .mozonfig: Disable more tests. + + -- Eric Dorland Wed, 20 Nov 2002 19:13:18 -0500 + +phoenix (0.4-2) unstable; urgency=low + + * debian/control: + + Add build-depends. + + Fix section and description. + * .mozconfig: + + Use system zlib. + + -- Eric Dorland Wed, 13 Nov 2002 19:03:52 -0500 + +phoenix (0.4-1) unstable; urgency=low + + * Initial release. + + -- Eric Dorland Mon, 11 Nov 2002 23:09:41 -0500 --- firefox-2.0.0.12+2nobinonly+2.orig/debian/copyright +++ firefox-2.0.0.12+2nobinonly+2/debian/copyright @@ -0,0 +1,738 @@ +This package was debianized by Eric Dorland on +Thu, 05 Jun 2003 01:01:22 -0400 + +It was downloaded from http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/ + +The source tarball is an aggregate of several different works in which the +main one, developed by the Mozilla Project, is firefox. + +Other works include gzip, bzip2, sqlite, libjpeg, libpng, cairo, and others. +Please see the sections following the copyright statements for firefox for +these. + +=== firefox + +Overall, the firefox project is licensed under the terms of the Mozilla +Public License version 1.1 or, at your option, under the terms of the GNU +eneral Public License version 2 or subsequent, or the terms of the GNU +Lesser General Public License version 2.1 or subsequent. + +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL' ; +the complete text of the GNU Lesser General Public License can be +found in the file `/usr/share/common-licenses/LGPL'. + +The complete text of the Mozilla Public License can be found in the MPL file +in the same directory as this file. + +Some files may still contain licensing notices claiming licensing under +other combinations of NPL, MPL, GPL and LGPL. They are files that were missed +by the upstream relicensing script, but all the permissions required for +relicensing were indeed provided. + +The file db/mork/src/morkQuickSort.cpp is licensed under the following terms: + + Copyright (c) 1992, 1993 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +The embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl file and the files +under the embedding/tests directory are licensed under the following terms: + + Copyright (c) 2002 Netscape Communications Corporation and + other contributors + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this Mozilla sample software and associated documentation files + (the "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to permit + persons to whom the Software is furnished to do so, subject to the + following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +The modules/plugin/base/public/npruntime.h file is licensed under the +following terms: + + Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla + Foundation ("Mozilla") nor the names of their contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR + THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The toolkit/mozapps/update/src/updater/bspatch.cpp and +toolkit/mozapps/update/src/updater/bspatch.h files are licensed under the +following terms: + + Copyright 2003,2004 Colin Percival + All rights reserved + + Redistribution and use in source and binary forms, with or without + modification, are permitted providing that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Some but not all the files in netwerk/dns/src/ are licensed under the +following terms: + + Copyright (c) 2001,2002 Japan Network Information Center. + All rights reserved. + + By using this file, you agree to the terms and conditions set forth bellow. + + LICENSE TERMS AND CONDITIONS + + The following License Terms and Conditions apply, unless a different + license is obtained from Japan Network Information Center ("JPNIC"), + a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda, + Chiyoda-ku, Tokyo 101-0047, Japan. + + 1. Use, Modification and Redistribution (including distribution of any + modified or derived work) in source and/or binary forms is permitted + under this License Terms and Conditions. + + 2. Redistribution of source code must retain the copyright notices as they + appear in each source code file, this License Terms and Conditions. + + 3. Redistribution in binary form must reproduce the Copyright Notice, + this License Terms and Conditions, in the documentation and/or other + materials provided with the distribution. For the purposes of binary + distribution the "Copyright Notice" refers to the following language: + "Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved." + + 4. The name of JPNIC may not be used to endorse or promote products + derived from this Software without specific prior written approval of + JPNIC. + + 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JPNIC BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +Some files in plugin/oji/JEP/ are licensed under the following terms: + + Copyright (c) 2004, Steven Michaud, All Rights Reserved + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +The extensions/auth/gssapi.h file is licensed under the following terms: + + Copyright 1993 by OpenVision Technologies, Inc. + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appears in all copies and + that both that copyright notice and this permission notice appear in + supporting documentation, and that the name of OpenVision not be used + in advertising or publicity pertaining to distribution of the software + without specific, written prior permission. OpenVision makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + + OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +The gfx/src/xlib/xregion.h and gfx/src/gtk/xregion.h are licensed under the +following terms: + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, + and the Massachusetts Institute of Technology, Cambridge, Massachusetts. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the names of Digital or MIT not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + +=== sqlite + +The db/sqlite3 directory contains a copy of sqlite with the following +licensing terms: + + The author disclaims copyright to this source code. In place of + a legal notice, here is a blessing: + + May you do good and not evil. + May you find forgiveness for yourself and forgive others. + May you share freely, never taking more than you give. + +=== dbm + +The dbm directory, except some files added by the mozilla project, is +licensed under the following terms: + + Copyright (c) 1991, 1993, 1994 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== myspell + +The extensions/spellcheck/myspell directory is licensed under the following +terms: + + Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada + And Contributors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All modifications to the source code must be clearly marked as + such. Binary redistributions based on modified source code + must be clearly marked as modified versions in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== boehm + +The gc/boehm directory, except the files listed under the xulrunner section, +is licensed under the following terms: + + Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers + Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. + Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved. + + THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + + Permission is hereby granted to use or copy this program + for any purpose, provided the above notices are retained on all copies. + Permission to modify the code and to distribute modified code is granted, + provided the above notices are retained, and a notice that the code was + modified is included with the above copyright notice. + +=== cairo + +The gfx/cairo/cairo directory is licensed under the following terms: + + Copyright (c) 2003 University of Southern California + Copyright (c) 1999 Tom Tromey + Copyright (c) 2002, 2003 University of Southern California + Copyright (c) 2004 Calum Robinson + Copyright (c) 2004 David Reveman + Copyright (c) 2000, 2002, 2004 Keith Packard + Copyright (c) 2004, 2005 Red Hat, Inc + + Cairo is free software and is available to be redistributed and/or + modified under the terms of either the GNU Lesser General Public + License (LGPL) version 2.1 or the Mozilla Public License (MPL) version + 1.1. + +=== libpixman + +The gfx/cairo/libpixman directory is licensed under the following terms: +(from gfx/cairo/libpixman/COPYING) + + libpixregion + + Copyright 1987, 1998 The Open Group + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Digital not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + + ---------------------------------------------------------------------- + libic + + Copyright © 2001 Keith Packard + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of Keith Packard not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Keith Packard makes no + representations about the suitability of this software for any purpose. It + is provided "as is" without express or implied warranty. + + KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + ---------------------------------------------------------------------- + slim + + slim is Copyright © 2003 Richard Henderson + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Richard Henderson not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. Richard Henderson + makes no representations about the suitability of this software for + any purpose. It is provided "as is" without express or implied + warranty. + + RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +=== libjpeg + +The jpeg directory, except the files under the xulrunner section, are licensed +under the following terms: + + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. + All Rights Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. + +=== bzip2 + +The modules/libbz2/src directory is licensed under the following terms: +(from modules/libbz2/src/LICENSE) + + This program, "bzip2", the associated library "libbzip2", and all + documentation, are copyright (C) 1996-2005 Julian R Seward. All + rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Julian Seward, Cambridge, UK. + jseward@acm.org + bzip2/libbzip2 version 1.0.3 of 15 February 2005 + +=== libpng + +The directory modules/libimg/png is licensed under the following terms: +(from modules/libimg/png/LICENSE) + + This copy of the libpng notices is provided for your convenience. In case of + any discrepancy between this copy and the notices in the file png.h that is + included in the libpng distribution, the latter shall prevail. + + COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + + If you modify libpng you may insert additional notices immediately following + this sentence. + + libpng version 1.2.6, September 12, 2004, is + Copyright (c) 2004 Glenn Randers-Pehrson, and is + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors + + Cosmin Truta + + libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are + Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.0.6 + with the following individuals added to the list of Contributing Authors + + Simon-Pierre Cadieux + Eric S. Raymond + Gilles Vollant + + and with the following additions to the disclaimer: + + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. + + libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are + Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-0.96, + with the following individuals added to the list of Contributing Authors: + + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik + + libpng versions 0.89, June 1996, through 0.96, May 1997, are + Copyright (c) 1996, 1997 Andreas Dilger + Distributed according to the same disclaimer and license as libpng-0.88, + with the following individuals added to the list of Contributing Authors: + + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner + + libpng versions 0.5, May 1995, through 0.88, January 1996, are + Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + + For the purposes of this copyright and license, "Contributing Authors" + is defined as the following set of individuals: + + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + + The PNG Reference Library is supplied "AS IS". The Contributing Authors + and Group 42, Inc. disclaim all warranties, expressed or implied, + including, without limitation, the warranties of merchantability and of + fitness for any purpose. The Contributing Authors and Group 42, Inc. + assume no liability for direct, indirect, incidental, special, exemplary, + or consequential damages, which may result from the use of the PNG + Reference Library, even if advised of the possibility of such damage. + + Permission is hereby granted to use, copy, modify, and distribute this + source code, or portions hereof, for any purpose, without fee, subject + to the following restrictions: + + 1. The origin of this source code must not be misrepresented. + + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + + The Contributing Authors and Group 42, Inc. specifically permit, without + fee, and encourage the use of this source code as a component to + supporting the PNG file format in commercial products. If you use this + source code in a product, acknowledgment is not required but would be + appreciated. + + + A "png_get_copyright" function is available, for convenient use in "about" + boxes and the like: + + printf("%s",png_get_copyright(NULL)); + + Also, the PNG logo (in PNG format, of course) is supplied in the + files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + + Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a + certification mark of the Open Source Initiative. + + Glenn Randers-Pehrson + glennrp@users.sourceforge.net + September 12, 2004 + +=== zlib + +The directories modules/zlib/src and security/nss/cmd/zlib are licensed under +the following terms: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* + receiving lengthy legal documents to sign. The sources are provided + for free but without warranty of any kind. The library has been + entirely written by Jean-loup Gailly and Mark Adler; it does not + include third-party code. + + If you redistribute modified sources, we would appreciate that you include + in the file ChangeLog history information documenting your changes. Please + read the FAQ for more information on the distribution of modified source + versions. + +=== expat + +The directory parser/expat is licensed under the following terms: +(from parser/expat/COPYING) + + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + Copyright (c) 2001, 2002 Expat maintainers. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-dev.install +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-dev.install @@ -0,0 +1,10 @@ +debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig +debian/tmp/usr/share/idl/firefox-2/* usr/share/idl/firefox/ +debian/tmp/usr/include/firefox-2/* usr/include/firefox/ +debian/tmp/usr/bin/firefox-2-config usr/bin + +debian/tmp/usr/lib/firefox-2/regxpcom usr/lib/firefox +debian/build-tools/obscure-tool usr/lib/firefox +debian/tmp/usr/lib/firefox-2/xp* usr/lib/firefox + +debian/tmp/nsBuildID.h usr/include/firefox/ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.links +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.links @@ -0,0 +1,27 @@ +usr/lib/firefox/firefox-2 usr/bin/firefox-2 +usr/share/firefox/chrome usr/lib/firefox/chrome +usr/share/firefox/defaults usr/lib/firefox/defaults +usr/share/firefox/greprefs usr/lib/firefox/greprefs +usr/share/firefox/icons usr/lib/firefox/icons +usr/share/firefox/res usr/lib/firefox/res +usr/share/firefox/searchplugins usr/lib/firefox/searchplugins +usr/share/firefox/browserconfig.properties usr/lib/firefox/browserconfig.properties + +/etc/firefox/pref /usr/share/firefox/defaults/syspref +/etc/firefox/profile /usr/share/firefox/defaults/profile + +/usr/share/firefox/icons/mozicon50.png /usr/share/pixmaps/firefox.png +/usr/share/firefox/icons/mozicon50.png /usr/share/pixmaps/mozilla-firefox.png + +/usr/share/myspell/dicts /usr/lib/firefox/dictionaries + +usr/lib/libnspr4.so.0d usr/lib/firefox/libnspr4.so +usr/lib/libplc4.so.0d usr/lib/firefox/libplc4.so +usr/lib/libplds4.so.0d usr/lib/firefox/libplds4.so + +usr/lib/nss/libnssckbi.so usr/lib/firefox/libnssckbi.so +usr/lib/libnss3.so.0d usr/lib/firefox/libnss3.so +usr/lib/libsmime3.so.0d usr/lib/firefox/libsmime3.so +usr/lib/libsoftokn3.so.0d usr/lib/firefox/libsoftokn3.so +usr/lib/libssl3.so.0d usr/lib/firefox/libssl3.so + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-gnome-support.install +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-gnome-support.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/firefox-2/components/libmozgnome.so usr/lib/firefox/components/ +debian/tmp/usr/lib/firefox-2/components/mozgnome.xpt usr/lib/firefox/components/ +debian/tmp/usr/lib/firefox-2/components/libnkgnomevfs.so usr/lib/firefox/components/ +debian/tmp/usr/lib/firefox-2/components/libimgicon.so usr/lib/firefox/components/ +debian/tmp/usr/lib/firefox-2/components/imgicon.xpt usr/lib/firefox/components/ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.install +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.install @@ -0,0 +1,46 @@ +debian/tmp/usr/lib/firefox-2/*.so usr/lib/firefox +debian/tmp/usr/lib/firefox-2/components usr/lib/firefox +debian/tmp/usr/lib/firefox-2/firefox-2-bin usr/lib/firefox +debian/tmp/usr/lib/firefox-2/run-mozilla.sh usr/lib/firefox +debian/tmp/usr/bin/firefox-2 usr/lib/firefox + +debian/tmp/usr/lib/firefox-2/defaults/autoconfig usr/share/firefox/defaults +debian/tmp/usr/lib/firefox-2/defaults/pref usr/share/firefox/defaults +debian/tmp/usr/lib/firefox-2/defaults/profile etc/firefox +debian/tmp/usr/lib/firefox-2/greprefs usr/share/firefox +debian/tmp/usr/lib/firefox-2/res usr/share/firefox +debian/tmp/usr/lib/firefox-2/searchplugins usr/share/firefox +debian/tmp/usr/lib/firefox-2/icons usr/share/firefox +debian/tmp/usr/lib/firefox-2/chrome/browser* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/chrome/comm* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/chrome/en-US* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/chrome/toolkit* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/chrome/pippki* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/chrome/reporter* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/chrome/classic* usr/share/firefox/chrome +debian/tmp/usr/lib/firefox-2/icons/default.xpm usr/share/firefox/chrome/icons/default + +debian/tmp/usr/lib/firefox-2/browserconfig.properties usr/share/firefox/ + +debian/firefox-2.ubuntu-prefs.js usr/share/firefox/greprefs + +debian/firefox-2.desktop usr/share/applications +debian/firefoxrc etc/firefox +debian/presubj usr/share/bug/firefox + +debian/firefox-2.js etc/firefox/pref +debian/firefox-2.cfg usr/lib/firefox + +debian/debsearch.gif usr/share/firefox/searchplugins +debian/debsearch.src usr/share/firefox/searchplugins + +debian/wikipedia.gif usr/share/firefox/searchplugins +debian/wikipedia.src usr/share/firefox/searchplugins + +debian/firefox-2-restart-required.update-notifier usr/share/firefox + +debian/tmp/usr/lib/firefox-2/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/firefox/extensions + +debian/tmp/usr/lib/firefox-2/plugins/libunixprintplugin.so usr/lib/firefox/plugins + +debian/apport/firefox-2.py usr/share/apport/package-hooks/ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/debsearch.gif.uu +++ firefox-2.0.0.12+2nobinonly+2/debian/debsearch.gif.uu @@ -0,0 +1,20 @@ +begin 664 debsearch.gif +MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```]A```/80&H/Z=I````!W1)344'U`D3$C`=J25# +MK0```GA)1$%4>-J%DUM(5&$0QW_?.6=WL337-AI-*B"Y)&]=I# +M)@6!3T$0!`4%/522#VD4=*.')**2BB(A,;4+^516$!1=UBZ&ZU+8;KIZ])SO +MFU[,Q+;ZPS#,,`S_F?F/$A$RX5=6`6;")SN[DB8]1-ZFS6'+M@%P^`O,R!"Z +M[[7H>"\J',4=A'AU-5K[Z.9FB6[?KC(V,("88=S;I\2Y<("0!B\:06\^"C@8 +M?,0WD_5_-/"?-8KTM1,H.X1_,XJ=_HZ52A+Z?(_H^4;\X6%RJ\HGZ]74'?C] +MCX4;ZU&NB]EP%C]4ANTXX'MX#UNP7MPEZ+J,9643JN]HL&=%]B,BB`A:!+=M +MFT@#XIV+BM??+4:$J3;2>EJ\-8B_$G%O-8D1P3%C:=SK)P0WC;-H*3IX#;.P +MEL#<"J6FC1?<6*?6?2.7,01F%\7SW!>8NQ\DI1&`7?>FF`````$E%3D2N0F"" +` +end --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-gnome-support.postinst +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-gnome-support.postinst @@ -0,0 +1,11 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then + update-alternatives --install /usr/bin/gnome-www-browser \ + gnome-www-browser /usr/bin/firefox-2 30 \ + --slave /usr/share/man/man1/gnome-www-browser.1.gz \ + gnome-www-browser.1.gz /usr/share/man/man1/firefox-2.1.gz + touch /usr/lib/firefox/.autoreg +fi + +#DEBHELPER# --- firefox-2.0.0.12+2nobinonly+2.orig/debian/MPL +++ firefox-2.0.0.12+2nobinonly+2/debian/MPL @@ -0,0 +1,567 @@ + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``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 Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "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 Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." --- firefox-2.0.0.12+2nobinonly+2.orig/debian/build-tools/obscure.c +++ firefox-2.0.0.12+2nobinonly+2/debian/build-tools/obscure.c @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2006 Canonical Ltd. + * Author: Alexander Sack + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. See http://www.gnu.org/copyleft/gpl.html for + * the full text of the license. + */ + +#include +#include +#include +#include +#include +#include + + +const char *obscure_program_version = +"obscure 0.1"; +const char *obscure_program_bug_address = +"Alexander Sack "; + +static char doc[] = +"obscure #1 -- a program shift a firefox configuration file by 'obscure_value'"; + +/* A description of the arguments we accept. */ +static char args_doc[] = "INPUTFILE [OUTPUTFILE]"; + +static struct argp_option options[] = { + {"offset", 'o', "INTEGER", 0, "[DEFAULT=13] obscure value offset" }, + {"reverse", 'r', 0, 0, "reverse direction of shift to unobscure" }, + {0} +}; + +struct arguments +{ + int obscure_value; + int do_reverse; + char *inputfile; + char *outputfile; +}; + +static error_t +parse_opt (int key, char *arg, struct argp_state *state); + +/* Our argp parser. */ +static struct argp argp = { options, parse_opt, args_doc, doc }; + +static struct arguments arguments; + +int main(int argc, char** argv) +{ + memset(&arguments, '\0', sizeof(struct arguments)); + + arguments.obscure_value = 13; + + argp_parse (&argp, argc, argv, 0, 0, &arguments); + + if(arguments.do_reverse) + arguments.obscure_value *= -1; + + int ifd = open(arguments.inputfile, O_RDONLY); + int ofd = 1; + + if(arguments.outputfile) { + ofd = open(arguments.outputfile, O_WRONLY | O_CREAT, 0644); + } + + if(ifd == -1) + { + perror("cannot open inputfile"); + } + if(ofd == -1) + { + perror("cannot open outputfile"); + } + + char buf[4096]; + int readn; + while( (readn = read(ifd, buf, 4096)) > 0) + { + int writen=0; + int i; + + for(i=0; i < readn; i++) + buf[i]+=arguments.obscure_value; + + while(writen < readn) + writen += write(ofd, buf, readn-writen); + } + + return 0; +} + + +static error_t +parse_opt (int key, char *arg, struct argp_state *state) +{ + struct arguments *arguments = state->input; + switch (key) + { + case 'r': + arguments->do_reverse = 1; + break; + case 'o': + arguments->obscure_value = atoi(arg); + break; + case ARGP_KEY_ARG: + if(state->arg_num == 0) + arguments->inputfile = arg; + else if(state->arg_num == 1) + arguments->outputfile = arg; + else + argp_usage(state); + break; + case ARGP_KEY_END: + if(state->arg_num < 1) + argp_usage(state); + break; + default: + return ARGP_ERR_UNKNOWN; + } + return 0; +} --- firefox-2.0.0.12+2nobinonly+2.orig/debian/wikipedia.src +++ firefox-2.0.0.12+2nobinonly+2/debian/wikipedia.src @@ -0,0 +1,24 @@ +# Firefox plugin file +# +# Wikipedia search +# by Ian Jackson for Ubuntu copying code +# by Fergus McKenzie-Kay copying code +# by Spencer Wysinger +# ported to Ubuntu by Alex Converse +# +# Last updated: June 5, 2005 + + + + + + + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz331818-fix-crash-xpidl-zero-arguments.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz331818-fix-crash-xpidl-zero-arguments.patch @@ -0,0 +1,38 @@ +From 30b1bbc3c3d380aa459b932cf3c0c4b448a91086 Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:16 +0100 +Subject: [PATCH] bz331818-fix-crash-xpidl-zero-arguments + + + patch that fixes a crash if xpidl gets not enough arguments +--- + xpcom/typelib/xpidl/xpidl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: mozilla/xpcom/typelib/xpidl/xpidl.c +=================================================================== +--- mozilla.orig/xpcom/typelib/xpidl/xpidl.c 2006-02-03 15:41:11.000000000 +0100 ++++ mozilla/xpcom/typelib/xpidl/xpidl.c 2007-04-04 18:49:07.000000000 +0200 +@@ -255,21 +255,21 @@ + } + } + done_options: + if (!mode) { + fprintf(stderr, "ERROR: must specify output mode\n"); + xpidl_usage(argc, argv); + return 1; + } +- if (argc != i + 1) { ++ if (argc > i + 1) { + fprintf(stderr, "ERROR: extra arguments after input file\n"); + } + + /* + * Don't try to process multiple files, given that we don't handle -o + * multiply. + */ +- if (xpidl_process_idl(argv[i], inc_head, file_basename, mode)) ++ if ((i < argc) && xpidl_process_idl(argv[i], inc_head, file_basename, mode)) + return 0; + + return 1; + } --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch @@ -0,0 +1,55 @@ +From e7e6dbd0957507df85863b89cb5dcb213507f78b Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:15 +0100 +Subject: [PATCH] =?utf-8?q?bz241535_=E2=80=93_Assertion_failure_on_destroying_XEmbed_plug-in?= +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp +=================================================================== +--- mozilla.orig/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp 2003-12-17 20:49:44.000000000 +0100 ++++ mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp 2007-04-04 18:48:47.000000000 +0200 +@@ -83,16 +83,19 @@ + ws_info = nsnull; + type = nsPluginWindowType_Window; + mGtkSocket = 0; + } + + nsPluginNativeWindowGtk2::~nsPluginNativeWindowGtk2() + { + if(mGtkSocket) { ++ GtkWidget **widget = &mGtkSocket; ++ g_object_remove_weak_pointer(G_OBJECT(mGtkSocket), (gpointer*)widget); ++ + gtk_widget_destroy(mGtkSocket); + mGtkSocket = 0; + } + } + + nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow) + { + NS_ENSURE_ARG_POINTER(aPluginNativeWindow); +@@ -142,16 +145,19 @@ + return NS_OK; + } + + nsresult nsPluginNativeWindowGtk2::CreateXEmbedWindow() { + if(!mGtkSocket) { + GdkWindow *win = gdk_window_lookup((XID)window); + mGtkSocket = gtk_socket_new(); + ++ GtkWidget **widget = &mGtkSocket; ++ g_object_add_weak_pointer(G_OBJECT(mGtkSocket), (gpointer*)widget); ++ + //attach the socket to the container widget + gtk_widget_set_parent_window(mGtkSocket, win); + + // Make sure to handle the plug_removed signal. If we don't the + // socket will automatically be destroyed when the plug is + // removed, which means we're destroying it more than once. + // SYNTAX ERROR. + g_signal_connect(mGtkSocket, "plug_removed", --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/ubuntu-disable-welcome-update-url.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/ubuntu-disable-welcome-update-url.patch @@ -0,0 +1,60 @@ +From 3c34bdc00acb0323ad11d8a6ec4a455d43957550 Mon Sep 17 00:00:00 2001 +From: asac +Date: Mon, 19 Mar 2007 14:08:43 +0100 +Subject: [PATCH] ubuntu-disable-welcome-update-url + +TODO: can this be moved to distromods somehow? + +--- + browser/components/nsBrowserContentHandler.js | 27 ++------------------------ + 1 file changed, 3 insertions(+), 24 deletions(-) + +Index: mozilla/browser/components/nsBrowserContentHandler.js +=================================================================== +--- mozilla.orig/browser/components/nsBrowserContentHandler.js 2007-04-03 17:14:04.000000000 +0000 ++++ mozilla/browser/components/nsBrowserContentHandler.js 2007-06-01 10:24:48.000000000 +0000 +@@ -470,41 +470,20 @@ + get defaultArgs() { + var prefb = Components.classes["@mozilla.org/preferences-service;1"] + .getService(nsIPrefBranch); + var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"] + .getService(Components.interfaces.nsIURLFormatter); + + var overridePage = ""; + var haveUpdateSession = false; +- try { +- switch (needHomepageOverride(prefb)) { +- case OVERRIDE_NEW_PROFILE: +- // New profile. +- overridePage = formatter.formatURLPref("startup.homepage_welcome_url"); +- break; +- case OVERRIDE_NEW_MSTONE: +- // Existing profile. +- copyPrefOverride(); +- +- // Check whether we have a session to restore. If we do, we assume +- // that this is an "update" session. +- var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"] +- .getService(Components.interfaces.nsISessionStartup); +- haveUpdateSession = ss.doRestore(); +- overridePage = formatter.formatURLPref("startup.homepage_override_url"); +- break; +- } +- } catch (e) {} +- +- // formatURLPref might return "about:blank" if getting the pref fails +- if (overridePage == "about:blank") +- overridePage = ""; +- + var startPage = ""; ++ ++ // needHomepageOverride actually *updates* the mstone pref ++ var overrideState = needHomepageOverride(prefb); + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1) + startPage = this.startPage; + + if (choice == 2) + startPage = Components.classes["@mozilla.org/browser/global-history;2"] + .getService(nsIBrowserHistory).lastPageVisited; --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/build-system-garbage.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/build-system-garbage.patch @@ -0,0 +1,446 @@ +From b2020068aa3b9d34685cbf50ce1796fe72415e4e Mon Sep 17 00:00:00 2001 +From: Alexander Sack +Date: Mon, 12 Feb 2007 16:11:52 +0000 +Subject: [PATCH] build system garbage + + + Makefile.in, browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in, browser/components/microsummaries/src/Makefile.in, build/unix/Makefile.in, config/Makefile.in, config/static-rules.mk, extensions/pref/system-pref/src/gconf/Makefile.in, profile/dirserviceprovider/standalone/Makefile.in, security/manager/Makefile.in, toolkit/library/Makefile.in, toolkit/mozapps/downloads/src/Makefile.in, toolkit/mozapps/extensions/src/Makefile.in, toolkit/mozapps/update/src/Makefile.in, toolkit/xre/Makefile.in, xpcom/build/Makefile.in, xpcom/glue/standalone/Makefile.in, xpfe/components/filepicker/src/Makefile.in: adding GARBAGE files that are not properly cleaned up during make clean/distclean. + +cleaned files: +--- + Makefile.in | 1 + browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in | 2 + + browser/components/microsummaries/src/Makefile.in | 1 + browser/components/shell/src/Makefile.in | 11 ++-------- + browser/locales/Makefile.in | 2 + + build/unix/Makefile.in | 2 - + config/Makefile.in | 2 + + config/static-rules.mk | 2 + + extensions/pref/system-pref/src/gconf/Makefile.in | 2 + + profile/dirserviceprovider/standalone/Makefile.in | 2 + + security/manager/Makefile.in | 2 + + toolkit/library/Makefile.in | 4 +++ + toolkit/mozapps/downloads/src/Makefile.in | 1 + toolkit/mozapps/extensions/src/Makefile.in | 1 + toolkit/mozapps/update/src/Makefile.in | 1 + toolkit/xre/Makefile.in | 6 +---- + xpcom/build/Makefile.in | 2 - + xpcom/glue/standalone/Makefile.in | 2 - + xpfe/components/filepicker/src/Makefile.in | 1 + 19 files changed, 32 insertions(+), 15 deletions(-) + +Index: mozilla/Makefile.in +=================================================================== +--- mozilla.orig/Makefile.in ++++ mozilla/Makefile.in +@@ -442,16 +442,17 @@ + + endif # BUILD_MODULES == all + + STATIC_MAKEFILES := nsprpub directory/c-sdk security/nss + + GARBAGE_DIRS += dist + DIST_GARBAGE = config.cache config.log config.status config-defs.h \ + dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \ ++ gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ + unallmakefiles mozilla-config.h \ + $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out + + # Build pseudo-external modules first when export is explicitly called + export:: + $(RM) -rf $(DIST)/sdk + $(MAKE) -C config export + $(MAKE) nspr +Index: mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in +=================================================================== +--- mozilla.orig/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in ++++ mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in +@@ -50,8 +50,10 @@ + $(NULL) + + libs:: + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf + $(INSTALL) $(FILES) $(DIST)/bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + + install:: + $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} ++ ++GARBAGE += $(FILES) +Index: mozilla/browser/components/microsummaries/src/Makefile.in +=================================================================== +--- mozilla.orig/browser/components/microsummaries/src/Makefile.in ++++ mozilla/browser/components/microsummaries/src/Makefile.in +@@ -39,13 +39,14 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + + include $(DEPTH)/config/autoconf.mk + + MODULE = microsummaries + + EXTRA_COMPONENTS = nsMicrosummaryService.js ++GARBAGE += nsMicrosummaryService.js + + include $(topsrcdir)/config/rules.mk + + nsMicrosummaryService.js: nsMicrosummaryService.js.in + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ +Index: mozilla/browser/components/shell/src/Makefile.in +=================================================================== +--- mozilla.orig/browser/components/shell/src/Makefile.in ++++ mozilla/browser/components/shell/src/Makefile.in +@@ -71,26 +71,21 @@ + CPPSRCS = nsGNOMEShellService.cpp + REQUIRES += mozgnome + endif + endif + endif + + ifdef CPPSRCS + LIBRARY_NAME = shellservice_s +-endif +- ++endif + FORCE_STATIC_LIB = 1 + ++EXTRA_COMPONENTS = nsSetDefaultBrowser.js ++ + include $(topsrcdir)/config/rules.mk + + DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" + +-JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js +- + CXXFLAGS += $(TK_CFLAGS) + +-libs:: +- $(INSTALL) $(srcdir)/$(JS_SET_BROWSER_COMPONENT) $(DIST)/bin/components +- + clobber:: + rm -f $(DIST)/lib/$(LIBRARY_NAME).lib +- rm -f $(DIST)/bin/components/$(JS_SET_BROWSER_COMPONENT) +Index: mozilla/browser/locales/Makefile.in +=================================================================== +--- mozilla.orig/browser/locales/Makefile.in ++++ mozilla/browser/locales/Makefile.in +@@ -51,16 +51,18 @@ + run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi) + _ABS_DIST := $(shell cd $(DIST) && pwd) + + ifdef MOZ_BRANDING_DIRECTORY + SUBMAKEFILES += \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ + $(NULL) ++ ++GARBAGE = $(SUBMAKEFILES) + endif + + # This makefile uses variable overrides from the libs-% target to + # build non-default locales to non-default dist/ locations. Be aware! + + AB = $(firstword $(subst -, ,$(AB_CD))) + + APP_VERSION := $(shell cat $(srcdir)/../config/version.txt) +Index: mozilla/build/unix/Makefile.in +=================================================================== +--- mozilla.orig/build/unix/Makefile.in ++++ mozilla/build/unix/Makefile.in +@@ -66,17 +66,17 @@ + endif + + _DEFS = $(subst \,\\\\\,$(ACDEFINES)) + + pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \ + $(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \ + $(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc + +-GARBAGE = $(pkg_config_files) mozilla-config ++GARBAGE = $(pkg_config_files) $(MOZ_APP_NAME)-config + + $(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + cat $< | sed \ + -e "s|%prefix%|$(prefix)|" \ + -e "s|%exec_prefix%|$(exec_prefix)|" \ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%libdir%|$(mozappdir)|" \ + -e "s|%idldir%|$(idldir)|" \ +Index: mozilla/config/Makefile.in +=================================================================== +--- mozilla.orig/config/Makefile.in ++++ mozilla/config/Makefile.in +@@ -136,16 +136,18 @@ + if test ! -d system_wrappers; then mkdir system_wrappers; fi + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ + -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \ + -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ + -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ + $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers + $(INSTALL) system_wrappers $(DIST)/include ++ ++GARBAGE_DIRS += system_wrappers + endif + + # we don't use an explicit dependency here because then we would + # regenerate nsBuildID.h during the make install phase and that would + # be bad. + install:: + @if test ! -f nsBuildID.h; then\ + echo "You must have done at least a make export before trying to do a make install."; \ +Index: mozilla/config/static-rules.mk +=================================================================== +--- mozilla.orig/config/static-rules.mk ++++ mozilla/config/static-rules.mk +@@ -9,11 +9,13 @@ + $(warning FINAL_LINK_COMPS = $(FINAL_LINK_COMPS)) + + nsStaticComponents.cpp: $(topsrcdir)/config/nsStaticComponents.cpp.in Makefile Makefile.in $(FINAL_LINK_COMP_NAMES) + rm -f $@ + cat $< | \ + sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \ + > $(_TARGET) + ++GARBAGE += nsStaticComponents.cpp ++ + ifeq ($(OS_ARCH),IRIX) + LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=80 + endif +Index: mozilla/extensions/pref/system-pref/src/gconf/Makefile.in +=================================================================== +--- mozilla.orig/extensions/pref/system-pref/src/gconf/Makefile.in ++++ mozilla/extensions/pref/system-pref/src/gconf/Makefile.in +@@ -82,8 +82,10 @@ + + CFLAGS += $(MOZ_GTK2_CFLAGS) + CXXFLAGS += $(MOZ_GTK2_CFLAGS) + + LOCAL_INCLUDES = -I$(srcdir)/.. + + export:: + $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . ++ ++GARBAGE += nsSystemPrefFactory.cpp +Index: mozilla/profile/dirserviceprovider/standalone/Makefile.in +=================================================================== +--- mozilla.orig/profile/dirserviceprovider/standalone/Makefile.in ++++ mozilla/profile/dirserviceprovider/standalone/Makefile.in +@@ -60,8 +60,10 @@ + FORCE_STATIC_LIB = 1 + + include $(topsrcdir)/config/rules.mk + + LOCAL_INCLUDES = -I$(srcdir)/../src + + export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS) + $(INSTALL) $^ . ++ ++GARBAGE = $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)) +Index: mozilla/security/manager/Makefile.in +=================================================================== +--- mozilla.orig/security/manager/Makefile.in ++++ mozilla/security/manager/Makefile.in +@@ -221,16 +221,18 @@ + $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean + ifndef SKIP_CHK + $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean + $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean + endif + touch $@ + endif + ++GARBAGE += .nss.cleaned ++ + .nss.checkout: + ifndef MOZ_NATIVE_NSS + touch $(srcdir)/$@ + endif + + dependclean export packages chrome:: + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ +Index: mozilla/toolkit/library/Makefile.in +=================================================================== +--- mozilla.orig/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -401,14 +401,18 @@ + export:: dlldeps.cpp dlldeps-obs.cpp + + dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp + $(INSTALL) $^ . + + dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp + $(INSTALL) $^ . + ++GARBAGE += dlldeps.cpp dlldeps-obs.cpp ++ + ifdef MOZ_JAVAXPCOM + export:: dlldeps-javaxpcom.cpp + + dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp + $(INSTALL) $^ . ++ ++GARBAGE += dlldeps-javaxpcom.cpp + endif +Index: mozilla/toolkit/mozapps/downloads/src/Makefile.in +=================================================================== +--- mozilla.orig/toolkit/mozapps/downloads/src/Makefile.in ++++ mozilla/toolkit/mozapps/downloads/src/Makefile.in +@@ -40,14 +40,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + + include $(DEPTH)/config/autoconf.mk + + MODULE = helperAppDlg + + EXTRA_COMPONENTS = nsHelperAppDlg.js ++GARBAGE += nsHelperAppDlg.js + + include $(topsrcdir)/config/rules.mk + + nsHelperAppDlg.js: nsHelperAppDlg.js.in + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ + +Index: mozilla/toolkit/mozapps/extensions/src/Makefile.in +=================================================================== +--- mozilla.orig/toolkit/mozapps/extensions/src/Makefile.in ++++ mozilla/toolkit/mozapps/extensions/src/Makefile.in +@@ -40,14 +40,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + + include $(DEPTH)/config/autoconf.mk + + MODULE = extensions + + EXTRA_COMPONENTS = nsExtensionManager.js ++GARBAGE += nsExtensionManager.js + + include $(topsrcdir)/config/rules.mk + + nsExtensionManager.js: nsExtensionManager.js.in + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ + +Index: mozilla/toolkit/mozapps/update/src/Makefile.in +=================================================================== +--- mozilla.orig/toolkit/mozapps/update/src/Makefile.in ++++ mozilla/toolkit/mozapps/update/src/Makefile.in +@@ -44,16 +44,17 @@ + + MODULE = extensions + + ifdef MOZ_UPDATER + DIRS = updater + endif + + EXTRA_COMPONENTS = nsUpdateService.js ++GARBAGE += nsUpdateService.js + + ifeq ($(OS_ARCH),WINNT) + EXTRA_COMPONENTS += nsPostUpdateWin.js + endif + + include $(topsrcdir)/config/rules.mk + + nsUpdateService.js: nsUpdateService.js.in +Index: mozilla/toolkit/xre/Makefile.in +=================================================================== +--- mozilla.orig/toolkit/xre/Makefile.in ++++ mozilla/toolkit/xre/Makefile.in +@@ -155,26 +155,24 @@ + + STACKWALK_CPPSRCS := $(addprefix $(topsrcdir)/xpcom/base/, $(STACKWALK_SRC_LCSRCS)) + ifndef MOZ_ENABLE_LIBXUL + CPPSRCS += nsStackFrameUnix.cpp + endif + SHAREDCPPSRCS += nsSigHandlers.cpp + endif + +-GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + ifeq ($(OS_ARCH),WINNT) +-GARBAGE += $(addprefix $(srcdir)/,$(SHAREDSRCS)) ++GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS)) + endif + + ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) +-ifndef MOZ_ENABLE_LIBXUL + GARBAGE += $(STACKWALK_SRC_LCSRCS) + endif +-endif + + SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX) + + ifdef MOZ_ENABLE_XREMOTE + SHARED_LIBRARY_LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX) + LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient + endif + +Index: mozilla/xpcom/build/Makefile.in +=================================================================== +--- mozilla.orig/xpcom/build/Makefile.in ++++ mozilla/xpcom/build/Makefile.in +@@ -146,17 +146,17 @@ + ifndef MINIMO + FORCE_SHARED_LIB = 1 + endif + endif + + # UNIX98 iconv support + OS_LIBS += $(LIBICONV) + +-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUENS_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + + include $(topsrcdir)/config/rules.mk + + DEFINES += \ + -D_IMPL_NS_COM \ + -D_IMPL_NS_STRINGAPI \ + -DEXPORT_XPT_API \ + -DEXPORT_XPTC_API \ +Index: mozilla/xpcom/glue/standalone/Makefile.in +=================================================================== +--- mozilla.orig/xpcom/glue/standalone/Makefile.in ++++ mozilla/xpcom/glue/standalone/Makefile.in +@@ -91,17 +91,17 @@ + $(NULL) + + # we don't want the shared lib, but we want to force the creation of a static lib. + FORCE_STATIC_LIB = 1 + + # Force use of PIC + FORCE_USE_PIC = 1 + +-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + + SRCS_IN_OBJDIR = 1 + + include $(topsrcdir)/config/rules.mk + + export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) + $(INSTALL) $^ . + +Index: mozilla/xpfe/components/filepicker/src/Makefile.in +=================================================================== +--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in ++++ mozilla/xpfe/components/filepicker/src/Makefile.in +@@ -64,16 +64,17 @@ + $(NULL) + + CPPSRCS = \ + nsFileView.cpp \ + nsWildCard.cpp \ + $(NULL) + + EXTRA_COMPONENTS = nsFilePicker.js ++GARBAGE += nsFilePicker.js + + include $(topsrcdir)/config/rules.mk + + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + + nsFilePicker.js: nsFilePicker.js.in + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/stable-fsh +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/stable-fsh @@ -0,0 +1,37 @@ +--- + config/autoconf.mk.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: mozilla/config/autoconf.mk.in +=================================================================== +--- mozilla.orig/config/autoconf.mk.in 2007-04-04 18:45:15.000000000 +0200 ++++ mozilla/config/autoconf.mk.in 2007-04-04 18:45:17.000000000 +0200 +@@ -52,24 +52,24 @@ + MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@ + MOZ_APP_VERSION = @MOZ_APP_VERSION@ + + MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/$(MOZ_APP_NAME) + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl/$(MOZ_APP_NAME) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/$(MOZ_APP_NAME) ++mredir = $(libdir)/mre/mre + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist + + MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@ + + MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@ + MOZ_GFX_TOOLKIT = $(MOZ_WIDGET_TOOLKIT) --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz289394-align-double-on-ia64-deb-bug-303518.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz289394-align-double-on-ia64-deb-bug-303518.patch @@ -0,0 +1,96 @@ +From f7d8435e8a3923eb783a404a9db6187ee8ce40ff Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:16 +0100 +Subject: [PATCH] bz289394-align-double-on-ia64-deb-bug-303518 + + + align double on ia64 ... deb bug 303518 +--- + extensions/transformiix/source/base/Double.cpp | 35 ++++++++++++------------- + 1 file changed, 17 insertions(+), 18 deletions(-) + +Index: mozilla/extensions/transformiix/source/base/Double.cpp +=================================================================== +--- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2006-06-22 21:13:00.000000000 +0200 ++++ mozilla/extensions/transformiix/source/base/Double.cpp 2007-04-04 18:49:14.000000000 +0200 +@@ -70,33 +70,32 @@ + * differently: the 32 bit words are in little endian byte order, the two words + * are stored in big endian`s way. + */ + + #if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__) + #define CPU_IS_ARM + #endif + +-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 +-/** +- * This version of the macros is safe for the alias optimizations +- * that gcc does, but uses gcc-specific extensions. +- */ +- + typedef union txdpun { +- PRFloat64 d; + struct { + #if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) + PRUint32 lo, hi; + #else + PRUint32 hi, lo; + #endif + } s; ++ PRFloat64 d; + } txdpun; + ++#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 ++/** ++ * This version of the macros is safe for the alias optimizations ++ * that gcc does, but uses gcc-specific extensions. ++ */ + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + + #else // __GNUC__ + + /* We don't know of any non-gcc compilers that perform alias optimization, + * so this code should work. + */ +@@ -112,30 +111,30 @@ + #endif // __GNUC__ + + #define TX_DOUBLE_HI32_SIGNBIT 0x80000000 + #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 + #define TX_DOUBLE_HI32_MANTMASK 0x000fffff + + //-- Initialize Double related constants + #ifdef IS_BIG_ENDIAN +-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, +- 0xffffffff}; +-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; +-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; ++const txdpun nanMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, ++ 0xffffffff}; ++const txdpun infMask = {TX_DOUBLE_HI32_EXPMASK, 0}; ++const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; + #else +-const PRUint32 nanMask[2] = {0xffffffff, +- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; +-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; +-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; ++const txdpun nanMask = {0xffffffff, ++ TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; ++const txdpun infMask = {0, TX_DOUBLE_HI32_EXPMASK}; ++const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; + #endif + +-const double Double::NaN = *((double*)nanMask); +-const double Double::POSITIVE_INFINITY = *((double*)infMask); +-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); ++const double Double::NaN = nanMask.d; ++const double Double::POSITIVE_INFINITY = infMask.d; ++const double Double::NEGATIVE_INFINITY = negInfMask.d; + + /* + * Determines whether the given double represents positive or negative + * inifinity + */ + MBool Double::isInfinite(double aDbl) + { + return ((TX_DOUBLE_HI32(aDbl) & ~TX_DOUBLE_HI32_SIGNBIT) == TX_DOUBLE_HI32_EXPMASK && --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/deb299697-lp42559-use-FC_ANY_METRICS.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/deb299697-lp42559-use-FC_ANY_METRICS.patch @@ -0,0 +1,141 @@ +From f32be5dff40a8243f6cfc0061ede2c67c0cc93d1 Mon Sep 17 00:00:00 2001 +From: asac +Date: Mon, 12 Mar 2007 17:02:56 +0100 +Subject: [PATCH] deb299697-lp42559-use-FC_ANY_METRICS + +--- + gfx/cairo/cairo/src/cairo-ft-font.c | 1 + + gfx/src/cairo/nsFontMetricsXft.cpp | 4 ++++ + gfx/src/gtk/nsFontMetricsXft.cpp | 4 ++++ + gfx/src/ps/nsFontMetricsPS.cpp | 2 ++ + 4 files changed, 11 insertions(+) + +Index: mozilla/gfx/cairo/cairo/src/cairo-ft-font.c +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairo-ft-font.c 2007-04-04 18:45:11.000000000 +0200 ++++ mozilla/gfx/cairo/cairo/src/cairo-ft-font.c 2007-04-04 18:45:33.000000000 +0200 +@@ -1583,16 +1583,17 @@ + goto FREE_PATTERN; + if (!FcPatternAddInteger (pattern, FC_WEIGHT, fcweight)) + goto FREE_PATTERN; + + cairo_matrix_multiply (&scale, font_matrix, ctm); + _compute_transform (&sf, &scale); + + FcPatternAddInteger (pattern, FC_PIXEL_SIZE, sf.y_scale); ++ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); + + FcConfigSubstitute (NULL, pattern, FcMatchPattern); + cairo_ft_font_options_substitute (options, pattern); + FcDefaultSubstitute (pattern); + + resolved = FcFontMatch (NULL, pattern, &result); + if (!resolved) + goto FREE_PATTERN; +Index: mozilla/gfx/src/cairo/nsFontMetricsXft.cpp +=================================================================== +--- mozilla.orig/gfx/src/cairo/nsFontMetricsXft.cpp 2007-04-04 18:45:11.000000000 +0200 ++++ mozilla/gfx/src/cairo/nsFontMetricsXft.cpp 2007-04-04 18:45:33.000000000 +0200 +@@ -1054,16 +1054,18 @@ + // Add the slant type + FcPatternAddInteger(mPattern, FC_SLANT, + NS_CalculateSlant(mFont.style)); + + // Add the weight + FcPatternAddInteger(mPattern, FC_WEIGHT, + NS_CalculateWeight(mFont.weight)); + ++ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); ++ + // Set up the default substitutions for this font + FcConfigSubstitute(0, mPattern, FcMatchPattern); + XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), + mPattern); + } + + void + nsFontMetricsXft::DoMatch(PRBool aMatchAll) +@@ -1216,16 +1218,18 @@ + + FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)"monospace"); + + FcPatternAddInteger(pattern, FC_PIXEL_SIZE, int(0.5 * mPixelSize)); + + FcPatternAddInteger(pattern, FC_WEIGHT, + NS_CalculateWeight(mFont.weight)); + ++ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); ++ + FcConfigSubstitute(0, pattern, FcMatchPattern); + XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), + pattern); + + FcResult res; + + FcPattern *pat = FcFontMatch(0, pattern, &res); + +Index: mozilla/gfx/src/gtk/nsFontMetricsXft.cpp +=================================================================== +--- mozilla.orig/gfx/src/gtk/nsFontMetricsXft.cpp 2007-04-04 18:45:11.000000000 +0200 ++++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2007-04-04 18:45:33.000000000 +0200 +@@ -1112,16 +1112,18 @@ + // Add the slant type + FcPatternAddInteger(mPattern, FC_SLANT, + NS_CalculateSlant(mFont.style)); + + // Add the weight + FcPatternAddInteger(mPattern, FC_WEIGHT, + NS_CalculateWeight(mFont.weight)); + ++ FcPatternAddBool (mPattern, FC_ANY_METRICS, FcTrue); ++ + // Set up the default substitutions for this font + FcConfigSubstitute(0, mPattern, FcMatchPattern); + XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), + mPattern); + } + + void + nsFontMetricsXft::DoMatch(PRBool aMatchAll) +@@ -1274,16 +1276,18 @@ + + FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)"monospace"); + + FcPatternAddInteger(pattern, FC_PIXEL_SIZE, int(0.5 * mPixelSize)); + + FcPatternAddInteger(pattern, FC_WEIGHT, + NS_CalculateWeight(mFont.weight)); + ++ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); ++ + FcConfigSubstitute(0, pattern, FcMatchPattern); + XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), + pattern); + + FcResult res; + + FcPattern *pat = FcFontMatch(0, pattern, &res); + +Index: mozilla/gfx/src/ps/nsFontMetricsPS.cpp +=================================================================== +--- mozilla.orig/gfx/src/ps/nsFontMetricsPS.cpp 2007-04-04 18:45:11.000000000 +0200 ++++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2007-04-04 18:45:33.000000000 +0200 +@@ -945,16 +945,18 @@ + NS_AddFFRE(pattern, fpi.mGenericFont, PR_FALSE); + + // Add the slant type + FcPatternAddInteger(pattern, FC_SLANT, NS_CalculateSlant(aFont.style)); + + // Add the weight + FcPatternAddInteger(pattern, FC_WEIGHT, NS_CalculateWeight(aFont.weight)); + ++ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); ++ + // Set up the default substitutions for this font + FcConfigSubstitute(0, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + + FcResult result; + FcFontSet *set = FcFontSort(0, pattern, FcTrue, 0, &result); + if (!set) { + return nsnull; --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz7969-a-thai-patch.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz7969-a-thai-patch.patch @@ -0,0 +1,1094 @@ +From e6370628c3b2c49dc093adea3b81e09b938e8d19 Mon Sep 17 00:00:00 2001 +From: asac +Date: Tue, 13 Mar 2007 20:10:08 +0100 +Subject: [PATCH] bz7969-a-thai-patch + + * updated to latest on Mar 7 2006, received from Theppitak + Karoonboonyanan +--- + Makefile.in | 4 + allmakefiles.sh | 2 + config/autoconf.mk.in | 3 + configure.in | 18 + + intl/lwbrk/components/Makefile.in | 48 +++ + intl/lwbrk/components/libthai/Makefile.in | 74 +++++ + intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp | 221 +++++++++++++++++ + intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h | 148 +++++++++++ + intl/lwbrk/components/libthai/nsLibThaiModule.cpp | 52 ++++ + intl/lwbrk/idl/Makefile.in | 1 + intl/lwbrk/idl/nsIThaiLineBreaker.idl | 61 ++++ + intl/lwbrk/src/nsJISx4501LineBreaker.cpp | 68 ++++- + intl/lwbrk/src/nsJISx4501LineBreaker.h | 7 + 13 files changed, 694 insertions(+), 13 deletions(-) + +Index: mozilla/Makefile.in +=================================================================== +--- mozilla.orig/Makefile.in 2007-04-04 18:47:46.000000000 +0200 ++++ mozilla/Makefile.in 2007-04-04 18:48:32.000000000 +0200 +@@ -284,16 +284,20 @@ + ifndef MINIMO + ifdef MOZ_XUL_APP + ifdef MOZ_ENABLE_GTK2 + tier_50_dirs += toolkit/components/gnome + endif + endif + endif + ++ifdef MOZ_ENABLE_LIBTHAI_COMPONENT ++tier_50_dirs += intl/lwbrk/components/libthai ++endif ++ + ifdef MOZ_LEAKY + tier_50_dirs += tools/leaky + endif + + ifdef MOZ_MAPINFO + tier_50_dirs += tools/codesighs + endif + +Index: mozilla/allmakefiles.sh +=================================================================== +--- mozilla.orig/allmakefiles.sh 2007-04-04 18:47:46.000000000 +0200 ++++ mozilla/allmakefiles.sh 2007-04-04 18:48:32.000000000 +0200 +@@ -220,16 +220,18 @@ + intl/locale/public/Makefile + intl/locale/idl/Makefile + intl/locale/src/Makefile + intl/locale/src/unix/Makefile + intl/locale/src/os2/Makefile + intl/locale/src/windows/Makefile + intl/locale/tests/Makefile + intl/lwbrk/Makefile ++intl/lwbrk/components/Makefile ++intl/lwbrk/components/libthai/Makefile + intl/lwbrk/src/Makefile + intl/lwbrk/public/Makefile + intl/lwbrk/tests/Makefile + intl/unicharutil/Makefile + intl/unicharutil/idl/Makefile + intl/unicharutil/src/Makefile + intl/unicharutil/public/Makefile + intl/unicharutil/tables/Makefile +Index: mozilla/config/autoconf.mk.in +=================================================================== +--- mozilla.orig/config/autoconf.mk.in 2007-04-04 18:47:46.000000000 +0200 ++++ mozilla/config/autoconf.mk.in 2007-04-04 18:48:32.000000000 +0200 +@@ -111,16 +111,19 @@ + MOZ_COMPOSER = @MOZ_COMPOSER@ + BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@ + BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@ + MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@ + MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@ + ENABLE_TESTS = @ENABLE_TESTS@ + IBMBIDI = @IBMBIDI@ + SUNCTL = @SUNCTL@ ++MOZ_ENABLE_LIBTHAI_COMPONENT = @MOZ_ENABLE_LIBTHAI_COMPONENT@ ++MOZ_LIBTHAI_CFLAGS = @MOZ_LIBTHAI_CFLAGS@ ++MOZ_LIBTHAI_LIBS = @MOZ_LIBTHAI_LIBS@ + ACCESSIBILITY = @ACCESSIBILITY@ + MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@ + MOZ_XPINSTALL = @MOZ_XPINSTALL@ + MOZ_JSLOADER = @MOZ_JSLOADER@ + MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@ + MOZ_SINGLE_PROFILE = @MOZ_SINGLE_PROFILE@ + MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@ + MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@ +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in 2007-04-04 18:47:46.000000000 +0200 ++++ mozilla/configure.in 2007-04-04 18:48:32.000000000 +0200 +@@ -4878,16 +4878,33 @@ + dnl complex text support off by default + dnl ======================================================== + MOZ_ARG_ENABLE_BOOL(ctl, + [ --enable-ctl Enable Thai Complex Script support], + SUNCTL=1, + SUNCTL= ) + + dnl ======================================================== ++dnl mozlibthai word break component, ++dnl built on libthai existence ++dnl ======================================================== ++MOZ_ENABLE_LIBTHAI_COMPONENT= ++MOZ_ARG_DISABLE_BOOL(libthai, ++[ --disable-libthai Disable Thai word break support with libthai], ++ MOZ_ENABLE_LIBTHAI_COMPONENT=, ++ MOZ_ENABLE_LIBTHAI_COMPONENT=1) ++if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; then ++ PKG_CHECK_MODULES(MOZ_LIBTHAI, libthai,[ ++ MOZ_ENABLE_LIBTHAI_COMPONENT=1 ++ ],[ ++ MOZ_ENABLE_LIBTHAI_COMPONENT= ++ ]) ++fi ++ ++dnl ======================================================== + dnl view source support on by default + dnl ======================================================== + MOZ_ARG_DISABLE_BOOL(view-source, + [ --disable-view-source Disable view source support], + MOZ_VIEW_SOURCE=, + MOZ_VIEW_SOURCE=1 ) + if test "$MOZ_VIEW_SOURCE"; then + AC_DEFINE(MOZ_VIEW_SOURCE) +@@ -7115,16 +7132,17 @@ + AC_SUBST(XPCOM_USE_LEA) + AC_SUBST(BUILD_SHARED_LIBS) + AC_SUBST(BUILD_STATIC_LIBS) + AC_SUBST(MOZ_STATIC_COMPONENT_LIBS) + AC_SUBST(MOZ_ENABLE_LIBXUL) + AC_SUBST(ENABLE_TESTS) + AC_SUBST(IBMBIDI) + AC_SUBST(SUNCTL) ++AC_SUBST(MOZ_ENABLE_LIBTHAI_COMPONENT) + AC_SUBST(ACCESSIBILITY) + AC_SUBST(MOZ_XPINSTALL) + AC_SUBST(MOZ_VIEW_SOURCE) + AC_SUBST(MOZ_SINGLE_PROFILE) + AC_SUBST(MOZ_XPFE_COMPONENTS) + AC_SUBST(MOZ_USER_DIR) + + AC_SUBST(ENABLE_STRIP) +Index: mozilla/intl/lwbrk/components/Makefile.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/intl/lwbrk/components/Makefile.in 2007-04-04 18:48:32.000000000 +0200 +@@ -0,0 +1,48 @@ ++# ++# ***** 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 of 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 ++ ++DIRS = libthai ++ ++include $(topsrcdir)/config/rules.mk ++ +Index: mozilla/intl/lwbrk/components/libthai/Makefile.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/intl/lwbrk/components/libthai/Makefile.in 2007-04-04 18:48:32.000000000 +0200 +@@ -0,0 +1,74 @@ ++# ***** 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): ++# ++# 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 = mozlibthai ++MOZILLA_INTERNAL_API = 1 ++ ++ifeq ($(MOZ_ENABLE_LIBTHAI_COMPONENT), 1) ++ ++LIBRARY_NAME = mozlibthai ++FORCE_SHARED_LIB = 1 ++IS_COMPONENT = 1 ++ ++REQUIRES = \ ++ xpcom \ ++ unicharutil \ ++ lwbrk \ ++ $(NULL) ++ ++CPPSRCS = \ ++ nsLibThaiLineBreaker.cpp \ ++ nsLibThaiModule.cpp \ ++ $(NULL) ++ ++CXXFLAGS += $(MOZ_LIBTHAI_CFLAGS) ++EXTRA_DSO_LDOPTS += \ ++ $(MOZ_COMPONENT_LIBS) \ ++ $(NSPR_LIBS) \ ++ $(MOZ_LIBTHAI_LIBS) \ ++ $(NULL) ++ ++endif ++ ++include $(topsrcdir)/config/rules.mk ++ +Index: mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp 2007-04-04 18:48:32.000000000 +0200 +@@ -0,0 +1,221 @@ ++/* -*- 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): ++ * - Theppitak Karoonboonyanan ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either of 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 ++#include ++ ++#include "nsLibThaiLineBreaker.h" ++ ++ ++//// class BreakEntry implementation //// ++ ++void BreakEntry::Set (const PRUnichar* pText, PRUint32 textLen, ++ int* pvPos, int posLen) ++{ ++ Clear(); ++ ++ mText = new PRUnichar [textLen+1]; ++ for (PRUnichar i = 0; i < textLen; i++) ++ mText[i] = pText[i]; ++ mText[textLen] = 0; ++ mTextLen = textLen; ++ ++ mPos = new int [posLen]; ++ for (int j = 0; j < posLen; j++) ++ mPos[j] = pvPos[j]; ++ mPosLen = posLen; ++} ++ ++//// class BreakCache implementation //// ++ ++static PRUint16 StringHash (const PRUnichar* pText, PRUint32 textLen) ++{ ++ PRUint16 h = 0; ++ for (PRUint32 i = 0; i < textLen; i++) { ++ h = (h >> 12) ^ (h << 4) ^ pText[i]; ++ } ++ return h; ++} ++ ++BreakEntry& BreakCache::LookUp (const PRUnichar* pText, PRUint32 textLen) ++{ ++ return mvBucket [StringHash (pText, textLen) % N_BUCKETS]; ++} ++ ++ ++//// class nsLibThaiLineBreaker implementation //// ++ ++static thchar_t* GetTISText (const PRUnichar* pText, PRUint32 textLen) ++{ ++ thchar_t* pTISText = new thchar_t [textLen + 1]; ++ PRUint32 i; ++ for (i = 0; i < textLen; i++) ++ pTISText[i] = th_uni2tis (pText[i]); ++ pTISText[i] = '\0'; ++ ++ return pTISText; ++} ++ ++static void FreeTISText (thchar_t* pTISText) ++{ ++ delete pTISText; ++} ++ ++static PRBool IsStrEqual (const PRUnichar* pText1, PRUint32 len1, ++ const PRUnichar* pText2, PRUint32 len2) ++{ ++ if (len1 != len2) ++ return PR_FALSE; ++ ++ for (PRUint32 i = 0; i < len1; ++i) ++ if (pText1[i] != pText2[i]) ++ return PR_FALSE; ++ ++ return PR_TRUE; ++} ++ ++int nsLibThaiLineBreaker::GetBreaks ( ++ const PRUnichar* pText, PRUint32 textLen, int vPos[], int nPos) ++{ ++ // Call the expensive th_brk() only if uncached ++ BreakEntry& breakEntry = mBreakCache.LookUp (pText, textLen); ++ if (!IsStrEqual (breakEntry.Text(), breakEntry.TextLength(), pText, textLen)) ++ { ++ thchar_t* pTISText = GetTISText (pText, textLen); ++ int* pBreaks = new int [nPos]; ++ int nBreaks = th_brk (pTISText, pBreaks, nPos); ++ FreeTISText (pTISText); ++ ++ breakEntry.Set (pText, textLen, pBreaks, nBreaks); ++ delete pBreaks; ++ } ++ ++ for (int i = 0; i < breakEntry.PosLength(); ++i) ++ vPos [i] = breakEntry.Pos (i); ++ return breakEntry.PosLength(); ++} ++ ++NS_IMPL_ISUPPORTS1 (nsLibThaiLineBreaker, nsIThaiLineBreaker) ++ ++ ++NS_IMETHODIMP nsLibThaiLineBreaker::BreakInBetween( ++ const PRUnichar* aText1 , PRUint32 aTextLen1, ++ const PRUnichar* aText2 , PRUint32 aTextLen2, ++ PRBool* oCanBreak) ++{ ++ if (!aText1 || !aText2 || (0 == aTextLen1) || (0 == aTextLen2)) ++ { ++ *oCanBreak = PR_FALSE; ++ return NS_OK; ++ } ++ ++ PRBool result = PR_FALSE; ++ ++ PRUnichar *pConcat = new PRUnichar [aTextLen1 + aTextLen2]; ++ for (PRUint32 i = 0; i < aTextLen1; i++) ++ pConcat[i] = aText1[i]; ++ for (PRUint32 i = 0; i < aTextLen2; i++) ++ pConcat[aTextLen1 + i] = aText2[i]; ++ ++ int* pBreaks = new int [aTextLen1 + aTextLen2 + 1]; ++ int nBreaks = GetBreaks (pConcat, aTextLen1 + aTextLen2, ++ pBreaks, int (aTextLen1 + aTextLen2 + 1)); ++ for (int i = 0; i < nBreaks; i++) { ++ if (PRUint32 (pBreaks[i]) == aTextLen1) { ++ result = PR_TRUE; ++ break; ++ } ++ } ++ delete pBreaks; ++ ++ delete pConcat; ++ ++ *oCanBreak = result; ++ return NS_OK; ++} ++ ++ ++NS_IMETHODIMP nsLibThaiLineBreaker::Next( ++ const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos, ++ PRUint32* oNext, PRBool* oNeedMoreText) ++{ ++ NS_ASSERTION(aText, "aText shouldn't be null"); ++ NS_ASSERTION(aLen > aPos, "Illegal value (length > position)"); ++ ++ *oNeedMoreText = PR_TRUE; ++ *oNext = aLen; ++ ++ int* pBreaks = new int [aLen + 1]; ++ int nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1)); ++ for (int i = 0; i < nBreaks; i++) { ++ if (PRUint32 (pBreaks[i]) > aPos) { ++ *oNext = pBreaks[i]; ++ *oNeedMoreText = PR_FALSE; ++ break; ++ } ++ } ++ delete pBreaks; ++ ++ return NS_OK; ++} ++ ++ ++NS_IMETHODIMP nsLibThaiLineBreaker::Prev( ++ const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos, ++ PRUint32* oPrev, PRBool* oNeedMoreText) ++{ ++ NS_ASSERTION(aText, "aText shouldn't be null"); ++ NS_ASSERTION(aLen > aPos, "Illegal value (length > position)"); ++ ++ *oNeedMoreText = PR_TRUE; ++ *oPrev = 0; ++ ++ int* pBreaks = new int [aLen + 1]; ++ int nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1)); ++ for (int i = nBreaks - 1; i >= 0; i--) { ++ if (PRUint32 (pBreaks[i]) < aPos) { ++ *oPrev = pBreaks[i]; ++ *oNeedMoreText = PR_FALSE; ++ break; ++ } ++ } ++ delete pBreaks; ++ ++ return NS_OK; ++} ++ +Index: mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h 2007-04-04 18:48:32.000000000 +0200 +@@ -0,0 +1,148 @@ ++/* -*- 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): ++ * - Theppitak Karoonboonyanan ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either of 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 nsLibThaiLineBreaker_h__ ++#define nsLibThaiLineBreaker_h__ ++ ++#include "nsIThaiLineBreaker.h" ++ ++/* ++ * Break Positions Info Entry ++ */ ++class BreakEntry { ++public: ++ BreakEntry(); ++ ~BreakEntry(); ++ ++ void Set (const PRUnichar* pText, PRUint32 textLen, int* pvPos, int posLen); ++ ++ const PRUnichar* Text() const; ++ PRUint32 TextLength() const; ++ int Pos(int index) const; ++ int PosLength() const; ++ ++private: ++ void Clear(); ++ ++private: ++ PRUnichar* mText; ++ PRUint32 mTextLen; ++ int* mPos; ++ int mPosLen; ++}; ++ ++inline BreakEntry::BreakEntry() ++ : mText (nsnull), mTextLen (0), mPos (nsnull), mPosLen (0) ++{ ++} ++ ++inline BreakEntry::~BreakEntry() ++{ ++ Clear(); ++} ++ ++inline void BreakEntry::Clear() ++{ ++ if (mText) ++ delete mText; ++ if (mPos) ++ delete mPos; ++} ++ ++inline const PRUnichar* BreakEntry::Text() const ++{ ++ return mText; ++} ++ ++inline PRUint32 BreakEntry::TextLength() const ++{ ++ return mTextLen; ++} ++ ++inline int BreakEntry::Pos (int index) const ++{ ++ return (mPos && index < mPosLen) ? mPos[index] : -1; ++} ++ ++inline int BreakEntry::PosLength() const ++{ ++ return mPosLen; ++} ++ ++ ++/* ++ * Break Positions Info Cache ++ */ ++class BreakCache ++{ ++public: ++ BreakEntry& LookUp (const PRUnichar* pText, PRUint32 textLen); ++ ++private: ++ enum { N_BUCKETS = 19 }; ++ BreakEntry mvBucket[N_BUCKETS]; ++}; ++ ++ ++/* ++ * Thai Line Breaker using LibThai ++ */ ++class nsLibThaiLineBreaker : public nsIThaiLineBreaker ++{ ++ NS_DECL_ISUPPORTS ++ ++public: ++ NS_IMETHOD BreakInBetween (const PRUnichar* aText1 , PRUint32 aTextLen1, ++ const PRUnichar* aText2 , PRUint32 aTextLen2, ++ PRBool* oCanBreak); ++ ++ NS_IMETHOD Next (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos, ++ PRUint32* oNext, PRBool* oNeedMoreText); ++ ++ NS_IMETHOD Prev (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos, ++ PRUint32* oPrev, PRBool* oNeedMoreText); ++ ++protected: ++ int GetBreaks (const PRUnichar* pText, PRUint32 textLen, ++ int vPos[], int nPos); ++ ++private: ++ BreakCache mBreakCache; ++}; ++ ++#endif /* nsLibThaiLineBreaker_h__ */ +Index: mozilla/intl/lwbrk/components/libthai/nsLibThaiModule.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/intl/lwbrk/components/libthai/nsLibThaiModule.cpp 2007-04-04 18:48:32.000000000 +0200 +@@ -0,0 +1,52 @@ ++/* -*- 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 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): ++ * Theppitak Karoonboonyanan ++ * ++ * 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 "nsLibThaiLineBreaker.h" ++#include "nsIGenericFactory.h" ++ ++NS_GENERIC_FACTORY_CONSTRUCTOR(nsLibThaiLineBreaker) ++ ++static const nsModuleComponentInfo components[] = { ++ { "LibThai Line Breaker", ++ NS_THAILINEBREAKER_CID, ++ NS_THAILINEBREAKER_CONTRACTID, ++ nsLibThaiLineBreakerConstructor } ++}; ++ ++NS_IMPL_NSGETMODULE(mozlibthai, components) ++ +Index: mozilla/intl/lwbrk/idl/Makefile.in +=================================================================== +--- mozilla.orig/intl/lwbrk/idl/Makefile.in 2007-04-04 18:47:46.000000000 +0200 ++++ mozilla/intl/lwbrk/idl/Makefile.in 2007-04-04 18:48:32.000000000 +0200 +@@ -41,11 +41,12 @@ + VPATH = @srcdir@ + + include $(DEPTH)/config/autoconf.mk + + MODULE = lwbrk + + XPIDLSRCS = \ + nsISemanticUnitScanner.idl \ ++ nsIThaiLineBreaker.idl \ + $(NULL) + + include $(topsrcdir)/config/rules.mk +Index: mozilla/intl/lwbrk/idl/nsIThaiLineBreaker.idl +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/intl/lwbrk/idl/nsIThaiLineBreaker.idl 2007-04-04 18:48:32.000000000 +0200 +@@ -0,0 +1,61 @@ ++/* -*- 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): ++ * Theppitak Karoonboonyanan ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either of 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" ++ ++%{C++ ++// {5E1CD5F3-C757-45A5-BDA2-60D530236473} ++#define NS_THAILINEBREAKER_CID { 0x5e1cd5f3, 0xc757, 0x45a5, { 0xbd, 0xa2, 0x60, 0xd5, 0x30, 0x23, 0x64, 0x73}} ++#define NS_THAILINEBREAKER_CONTRACTID "@mozilla.org/intl/thailinebreaker;1" ++%} ++ ++/** ++ * Provides Thai line breaker ++ */ ++[scriptable, uuid(5e1cd5f3-c757-45a5-bda2-60d530236473)] ++interface nsIThaiLineBreaker : nsISupports { ++ boolean breakInBetween (in wstring aText1, in unsigned long aTextLen1, ++ in wstring aText2, in unsigned long aTextLen2); ++ ++ void next (in wstring aText, in unsigned long aLen, in unsigned long aPos, ++ out unsigned long pos, out boolean needMoreText); ++ ++ void prev (in wstring aText, in unsigned long aLen, in unsigned long aPos, ++ out unsigned long pos, out boolean needMoreText); ++}; ++ +Index: mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp +=================================================================== +--- mozilla.orig/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2007-04-04 18:47:46.000000000 +0200 ++++ mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2007-04-04 18:48:32.000000000 +0200 +@@ -44,16 +44,17 @@ + #include "pratom.h" + #include "nsLWBRKDll.h" + #include "jisx4501class.h" + #define TH_UNICODE + #include "th_char.h" + #include "rulebrk.h" + #include "nsUnicharUtils.h" + ++#include "nsIServiceManager.h" + + /* + + Simplification of Pair Table in JIS X 4051 + + 1. The Origion Table - in 4.1.3 + + In JIS x 4051. The pair table is defined as below +@@ -233,33 +234,39 @@ + { + return ((0x1100 <= (u) && (u) <= 0x11ff) || + (0x2e80 <= (u) && (u) <= 0xd7ff) || + (0xf900 <= (u) && (u) <= 0xfaff) || + (0xff00 <= (u) && (u) <= 0xffef) ); + } + + static inline int ++IS_THAI(PRUnichar u) ++{ ++ return (0x0e01 <= (u) && (u) <= 0x0e5b); ++} ++ ++static inline int + IS_SPACE(PRUnichar u) + { + return ((u) == 0x0020 || (u) == 0x0009 || (u) == 0x000a || (u) == 0x000d || (u)==0x200b); + } + + PRInt8 nsJISx4051LineBreaker::GetClass(PRUnichar u) + { + PRUint16 h = u & 0xFF00; + PRUint16 l = u & 0x00ff; + PRInt8 c; + + // Handle 3 range table first + if( 0x0000 == h) + { + c = GETCLASSFROMTABLE(gLBClass00, l); + } +- else if(th_isthai(u)) ++ else if(IS_THAI(u)) + { + c = CLASS_THAI; + } + else if( 0x2000 == h) + { + c = GETCLASSFROMTABLE(gLBClass20, l); + } + else if( 0x2100 == h) +@@ -337,21 +344,27 @@ + PRBool nsJISx4051LineBreaker::GetPair(PRInt8 c1, PRInt8 c2) + { + NS_ASSERTION( c1 < MAX_CLASSES ,"illegal classes 1"); + NS_ASSERTION( c2 < MAX_CLASSES ,"illegal classes 2"); + + return (0 == ((gPair[c1] >> c2 ) & 0x0001)); + } + ++nsCOMPtr nsJISx4051LineBreaker::GetThaiLineBreaker() ++{ ++ if (!mThaiLineBreaker) ++ mThaiLineBreaker = do_GetService (NS_THAILINEBREAKER_CONTRACTID); ++ return mThaiLineBreaker; ++} + + nsJISx4051LineBreaker::nsJISx4051LineBreaker( + const PRUnichar* aNoBegin, PRInt32 aNoBeginLen, + const PRUnichar* aNoEnd, PRInt32 aNoEndLen +-) ++) : mThaiLineBreaker(nsnull) + { + } + + nsJISx4051LineBreaker::~nsJISx4051LineBreaker() + { + } + + NS_IMPL_ISUPPORTS1(nsJISx4051LineBreaker, nsILineBreaker) +@@ -422,25 +435,25 @@ + //search for CJK characters until a space is found. + //if CJK char is found before space, use 4051, otherwise western + PRInt32 cur; + + for (cur= aTextLen1-1; cur>=0; cur--) + { + if (IS_SPACE(aText1[cur])) + break; +- if (IS_CJK_CHAR(aText1[cur])) ++ if (IS_CJK_CHAR(aText1[cur]) || IS_THAI(aText1[cur])) + goto ROUTE_CJK_BETWEEN; + } + + for (cur= 0; cur < (PRInt32)aTextLen2; cur++) + { + if (IS_SPACE(aText2[cur])) + break; +- if (IS_CJK_CHAR(aText2[cur])) ++ if (IS_CJK_CHAR(aText2[cur]) || IS_THAI(aText2[cur])) + goto ROUTE_CJK_BETWEEN; + } + + //now apply western rule. + *oCanBreak = IS_SPACE(aText1[aTextLen1-1]) || IS_SPACE(aText2[0]); + return NS_OK; + + ROUTE_CJK_BETWEEN: +@@ -458,17 +471,22 @@ + aText2[0], + (aTextLen2>1)?aText2[1]:0); + else + c2 = this->GetClass(aText2[0]); + + /* Handle cases for THAI */ + if((CLASS_THAI == c1) && (CLASS_THAI == c2)) + { +- *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2)); ++ nsCOMPtr pThaiLineBreaker = GetThaiLineBreaker(); ++ if (pThaiLineBreaker) ++ return pThaiLineBreaker->BreakInBetween(aText1, aTextLen1, ++ aText2, aTextLen2, oCanBreak); ++ else ++ *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2)); + } + else + { + *oCanBreak = GetPair(c1,c2); + } + return NS_OK; + } + +@@ -488,16 +506,19 @@ + for (cur = aPos; cur < aLen; ++cur) + { + if (IS_SPACE(GetUnichar(&aText[cur]))) + { + *oNext = cur; + *oNeedMoreText = PR_FALSE; + return NS_OK; + } ++ // [thep's version]: ++ // if (IS_CJK_CHAR(&aText[cur]) || IS_THAI(&aText[cur])) ++ // [with RISC unichar fix]: + if (IS_CJK_CHAR(GetUnichar(&aText[cur])) || IS_THAI(GetUnichar(&aText[cur]))) + goto ROUTE_CJK_NEXT; + } + *oNext = aLen; + *oNeedMoreText = PR_TRUE; + return NS_OK; + + ROUTE_CJK_NEXT: +@@ -509,19 +530,24 @@ + GetUnichar(&aText[cur]), + (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); + } else { + c1 = this->GetClass(GetUnichar(&aText[cur])); + } + + if(CLASS_THAI == c1) + { +- *oNext = PRUint32(TrbFollowing(aText, aLen, aPos)); +- *oNeedMoreText = PR_FALSE; +- return NS_OK; ++ nsCOMPtr pThaiLineBreaker = GetThaiLineBreaker(); ++ if (pThaiLineBreaker) { ++ return pThaiLineBreaker->Next(aText, aLen, aPos, oNext, oNeedMoreText); ++ } else { ++ *oNext = PRUint32(TrbFollowing(aText, aLen, aPos)); ++ *oNeedMoreText = PR_FALSE; ++ return NS_OK; ++ } + } + + for(cur++; cur ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, + GetUnichar(&aText[cur]), +@@ -558,17 +584,17 @@ + if (IS_SPACE(aText[cur])) + { + if (cur != aPos - 1) // XXXldb Why? + ++cur; + *oPrev = cur; + *oNeedMoreText = PR_FALSE; + return NS_OK; + } +- if (IS_CJK_CHAR(aText[cur])) ++ if (IS_CJK_CHAR(aText[cur]) || IS_THAI(aText[cur])) + goto ROUTE_CJK_PREV; + } + + *oPrev = 0; + *oNeedMoreText = PR_TRUE; + return NS_OK; + + ROUTE_CJK_PREV: +@@ -577,20 +603,36 @@ + if(NEED_CONTEXTUAL_ANALYSIS(aText[cur-1])) + { + c2 = this->ContextualAnalysis(((cur-1)>0)?aText[cur-2]:0, + aText[cur-1], + (curGetClass(aText[cur-1]); + } +- // To Do: +- // +- // Should handle CLASS_THAI here +- // ++ ++ if(CLASS_THAI == c2) ++ { ++ nsCOMPtr pThaiLineBreaker = GetThaiLineBreaker(); ++ if (pThaiLineBreaker) { ++ return pThaiLineBreaker->Prev(aText, aLen, aPos, oPrev, oNeedMoreText); ++ } else { ++ // TODO: do some fallback analysis instead ++ for (aPos--; aPos > 0; aPos--) { ++ if (!IS_THAI(aText[aPos])) { ++ *oPrev = aPos; ++ *oNeedMoreText = PR_FALSE; ++ return NS_OK; ++ } ++ } ++ *oNeedMoreText = PR_TRUE; ++ return NS_OK; ++ } ++ } ++ + for(cur--; cur > 0; cur--) + { + if(NEED_CONTEXTUAL_ANALYSIS(aText[cur-1])) + { + c1= this->ContextualAnalysis(((cur-1)>0)?aText[cur-2]:0, + aText[cur-1], + (cur GetThaiLineBreaker(); ++ ++protected: ++ nsCOMPtr mThaiLineBreaker; + }; + + #endif /* nsJISx4501LineBreaker_h__ */ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz343360-feed-flat-chrome-fix.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz343360-feed-flat-chrome-fix.patch @@ -0,0 +1,43 @@ +From 405bf272fde7da634e824d9ac32709522c267267 Mon Sep 17 00:00:00 2001 +From: asac +Date: Sat, 24 Feb 2007 21:21:21 +0100 +Subject: [PATCH] bz343360-feed-flat-chrome-fix + + + browser/components/feeds/src/FeedWriter.js: apply fix from bugzilla + bug #343360; FileWriter's security check doesn't work with flat chrome +--- + browser/components/feeds/src/FeedWriter.js | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +Index: mozilla/browser/components/feeds/src/FeedWriter.js +=================================================================== +--- mozilla.orig/browser/components/feeds/src/FeedWriter.js 2007-01-07 01:53:49.000000000 +0100 ++++ mozilla/browser/components/feeds/src/FeedWriter.js 2007-04-04 18:49:18.000000000 +0200 +@@ -790,18 +790,25 @@ + * The window of the document invoking the BrowserFeedWriter + */ + _getOriginalURI: function FW__getOriginalURI(window) { + var chan = + window.QueryInterface(Ci.nsIInterfaceRequestor). + getInterface(Ci.nsIWebNavigation). + QueryInterface(Ci.nsIDocShell_MOZILLA_1_8_BRANCH). + currentDocumentChannel; +- const kPrefix = "jar:file:"; +- if (chan.URI.spec.substring(0, kPrefix.length) == kPrefix) ++ const SUBSCRIBE_PAGE_URI = "chrome://browser/content/feeds/subscribe.xhtml"; ++ var uri = Cc["@mozilla.org/network/io-service;1"]. ++ getService(Ci.nsIIOService). ++ newURI(SUBSCRIBE_PAGE_URI, "", null); ++ var resolvedURI = Cc["@mozilla.org/chrome/chrome-registry;1"]. ++ getService(Ci.nsIChromeRegistry). ++ convertChromeURL(uri); ++ ++ if (resolvedURI.equals(chan.URI)) + return chan.originalURI; + else + return null; + }, + + _window: null, + _document: null, + _feedURI: null, --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/moz_app_name_binaries +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/moz_app_name_binaries @@ -0,0 +1,64 @@ +--- + browser/app/Makefile.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +Index: mozilla/browser/app/Makefile.in +=================================================================== +--- mozilla.orig/browser/app/Makefile.in ++++ mozilla/browser/app/Makefile.in +@@ -57,19 +57,19 @@ + endif + + # hardcode en-US for the moment + AB_CD = en-US + + DEFINES += -DAB_CD=$(AB_CD) + + ifeq ($(USE_SHORT_LIBNAME), 1) +-PROGRAM = firefox$(BIN_SUFFIX) ++PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) + else +-PROGRAM = firefox-bin$(BIN_SUFFIX) ++PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX) + endif + + REQUIRES = \ + xpcom \ + $(NULL) + + CPPSRCS = nsBrowserApp.cpp + +@@ -228,29 +228,29 @@ + @echo WinSetProperty = PMMERGE.5452 >>$(EXE_DEF_FILE) + + LDFLAGS += -Zlinker /NOE + endif + endif + + ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) + +-firefox:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk ++$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ + -e "s|%MOZ_USER_DIR%|.mozilla/firefox|" \ + -e "s|%MREDIR%|$(mredir)|" > $@ + chmod +x $@ + +-libs:: firefox ++libs:: $(MOZ_APP_NAME) + $(INSTALL) $< $(DIST)/bin + +-install:: firefox ++install:: $(MOZ_APP_NAME) + $(SYSINSTALL) $< $(DESTDIR)$(bindir) + +-GARBAGE += firefox ++GARBAGE += $(MOZ_APP_NAME) + GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) + + endif + + ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) + + ICON_FILES = \ + $(DIST)/branding/mozicon128.png \ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz345080-myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz345080-myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch @@ -0,0 +1,143 @@ +--- + config/autoconf.mk.in | 4 ++++ + configure.in | 16 ++++++++++++++++ + extensions/spellcheck/myspell/src/Makefile.in | 24 ++++++++++++++++-------- + extensions/spellcheck/myspell/src/mozMySpell.h | 2 +- + 4 files changed, 37 insertions(+), 9 deletions(-) + +Index: mozilla/config/autoconf.mk.in +=================================================================== +--- mozilla.orig/config/autoconf.mk.in 2007-04-18 09:22:51.000000000 +0000 ++++ mozilla/config/autoconf.mk.in 2007-04-18 09:26:37.000000000 +0000 +@@ -188,16 +188,20 @@ + + MOZ_XUL = @MOZ_XUL@ + + NECKO_PROTOCOLS = @NECKO_PROTOCOLS@ + NECKO_DISK_CACHE = @NECKO_DISK_CACHE@ + NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@ + NECKO_COOKIES = @NECKO_COOKIES@ + ++MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@ ++MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@ ++MOZ_MYSPELL_CFLAGS = @MOZ_MYSPELL_CFLAGS@ ++ + MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@ + MOZ_NATIVE_JPEG = @SYSTEM_JPEG@ + MOZ_NATIVE_PNG = @SYSTEM_PNG@ + MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@ + + MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@ + MOZ_MATHML = @MOZ_MATHML@ + MOZ_XTF = @MOZ_XTF@ +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in 2007-04-18 09:22:51.000000000 +0000 ++++ mozilla/configure.in 2007-04-18 09:26:38.000000000 +0000 +@@ -3859,16 +3859,32 @@ + + if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then + PNG_CFLAGS="-I${PNG_DIR}/include" + PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" + fi + + fi # SKIP_LIBRARY_CHECKS + ++dnl system MySpell Support ++dnl ======================================================== ++MOZ_ARG_ENABLE_BOOL(system-myspell, ++[ --enable-system-myspell Use system myspell (located with pkgconfig)], ++ SYSTEM_MYSPELL=1 ) ++ ++if test -n "$SYSTEM_MYSPELL"; then ++ dnl PKG_CHECK_MODULES(MOZ_MYSPELL, myspell) ++ MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell" ++ MOZ_MYSPELL_LIBS="-lhunspell" ++fi ++ ++AC_SUBST(SYSTEM_MYSPELL) ++AC_SUBST(MOZ_MYSPELL_LIBS) ++AC_SUBST(MOZ_MYSPELL_CFLAGS) ++ + dnl ======================================================== + dnl Java SDK support + dnl ======================================================== + JAVA_INCLUDE_PATH= + MOZ_ARG_WITH_STRING(java-include-path, + [ --with-java-include-path=dir Location of Java SDK headers], + JAVA_INCLUDE_PATH=$withval) + +Index: mozilla/extensions/spellcheck/myspell/src/Makefile.in +=================================================================== +--- mozilla.orig/extensions/spellcheck/myspell/src/Makefile.in 2006-06-29 21:23:45.000000000 +0000 ++++ mozilla/extensions/spellcheck/myspell/src/Makefile.in 2007-04-18 09:26:38.000000000 +0000 +@@ -55,30 +55,38 @@ + REQUIRES = xpcom \ + string \ + uconv \ + unicharutil \ + spellchecker \ + xulapp \ + $(NULL) + +-CPPSRCS = affentry.cpp \ +- affixmgr.cpp \ +- hashmgr.cpp \ +- suggestmgr.cpp \ +- csutil.cpp \ +- myspell.cpp \ +- mozMySpell.cpp \ +- mozMySpellFactory.cpp \ ++CPPSRCS = mozMySpell.cpp \ ++ mozMySpellFactory.cpp \ + $(NULL) ++ifndef MOZ_NATIVE_MYSPELL ++CPPSRCS += affentry.cpp \ ++ affixmgr.cpp \ ++ hashmgr.cpp \ ++ suggestmgr.cpp \ ++ csutil.cpp \ ++ myspell.cpp \ ++ $(NULL) ++endif + + ifdef MOZ_XUL_APP + CPPSRCS += mozMySpellDirProvider.cpp + endif + + EXTRA_DSO_LDOPTS = \ + $(LIBS_DIR) \ + $(XPCOM_LIBS) \ + $(NSPR_LIBS) \ + $(MOZ_UNICHARUTIL_LIBS) \ ++ $(MOZ_MYSPELL_LIBS) \ + $(NULL) + + include $(topsrcdir)/config/rules.mk ++ ++ifdef MOZ_NATIVE_MYSPELL ++CXXFLAGS += $(MOZ_MYSPELL_CFLAGS) ++endif +Index: mozilla/extensions/spellcheck/myspell/src/mozMySpell.h +=================================================================== +--- mozilla.orig/extensions/spellcheck/myspell/src/mozMySpell.h 2006-06-29 21:46:59.000000000 +0000 ++++ mozilla/extensions/spellcheck/myspell/src/mozMySpell.h 2007-04-18 09:26:38.000000000 +0000 +@@ -51,17 +51,17 @@ + * and affix compression in general, please see: + * http://www.cs.ucla.edu/ficus-members/geoff/ispell.html + * (the home page for ispell) + * + * ***** END LICENSE BLOCK ***** */ + #ifndef mozMySpell_h__ + #define mozMySpell_h__ + +-#include "myspell.hxx" ++#include "hunspell.hxx" + #include "mozISpellCheckingEngine.h" + #include "mozIPersonalDictionary.h" + #include "nsString.h" + #include "nsCOMPtr.h" + #include "nsIObserver.h" + #include "nsIUnicodeEncoder.h" + #include "nsIUnicodeDecoder.h" + #include "nsInterfaceHashtable.h" --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch @@ -0,0 +1,45 @@ +From edbcc401e0ec0ceae7c3c1091a5866fa3e2d1e93 Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:15 +0100 +Subject: [PATCH] add a recognized pref folder called 'syspref' inside the defaults/ hierarchy. + +--- + modules/libpref/src/nsPrefService.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +Index: mozilla/modules/libpref/src/nsPrefService.cpp +=================================================================== +--- mozilla.orig/modules/libpref/src/nsPrefService.cpp 2007-02-05 02:38:32.000000000 +0100 ++++ mozilla/modules/libpref/src/nsPrefService.cpp 2007-04-04 18:48:52.000000000 +0200 +@@ -753,16 +753,31 @@ + #endif + }; + + rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); + if (NS_FAILED(rv)) { + NS_WARNING("Error parsing application default preferences."); + } + ++ // Load files from defaults/syspref ++ nsCOMPtr SysPrefDir; ++ rv = defaultPrefDir->GetParent(getter_AddRefs(SysPrefDir)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ rv = SysPrefDir->AppendNative(NS_LITERAL_CSTRING("syspref")); ++ NS_ENSURE_SUCCESS(rv, rv); ++ PRBool exists; ++ if (NS_SUCCEEDED(SysPrefDir->Exists(&exists)) && exists) { ++ rv = pref_LoadPrefsInDir(SysPrefDir, nsnull, 0); ++ if (NS_FAILED(rv)) { ++ NS_WARNING("Error parsing system default preferences."); ++ } ++ ++ } ++ + // xxxbsmedberg: TODO load default prefs from a category + // but the architecture is not quite there yet + + nsCOMPtr dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) return rv; + + nsCOMPtr dirList; + dirSvc->Get(NS_APP_PREFS_DEFAULTS_DIR_LIST, --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/ubuntu-look-and-feel-patch.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/ubuntu-look-and-feel-patch.patch @@ -0,0 +1,160 @@ +From 63f6dfe9758ca3726a93cb0d2bd575176d7a6cfe Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:15 +0100 +Subject: [PATCH] ubuntu look and feel patch + +DONE moved prefs from .js files to distromods extenions +TODO -> migrate modified properties, bookmarks and xul-overlay and js modifications +contained in this patch to distromods + + + browser/app/profile/firefox.js: set pref browser.startup.homepage_override.mstone + to "ignore" (Closes LP#91798) +--- + browser/locales/en-US/chrome/browser-region/region.properties | 5 ++++ + browser/locales/en-US/profile/bookmarks.html | 12 ++++++++-- + gfx/src/gtk/fontEncoding.properties | 4 +-- + widget/src/gtk2/nsWindow.cpp | 5 +++- + xpfe/browser/resources/locale/en-US/region.properties | 8 +++--- + 5 files changed, 25 insertions(+), 9 deletions(-) + +Index: mozilla/browser/locales/en-US/chrome/browser-region/region.properties +=================================================================== +--- mozilla.orig/browser/locales/en-US/chrome/browser-region/region.properties ++++ mozilla/browser/locales/en-US/chrome/browser-region/region.properties +@@ -8,10 +8,15 @@ + # These are the default web service based feed readers + browser.contentHandlers.types.0.title=Bloglines + browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s + browser.contentHandlers.types.1.title=My Yahoo + browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s + browser.contentHandlers.types.2.title=Google + browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s + ++releaseNotesURL=http://www.ubuntu.com/download/releasenotes/610 ++homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html ++browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html ++browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html ++ + # Keyword URL (for location bar searches) + keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= +Index: mozilla/browser/locales/en-US/profile/bookmarks.html +=================================================================== +--- mozilla.orig/browser/locales/en-US/profile/bookmarks.html ++++ mozilla/browser/locales/en-US/profile/bookmarks.html +@@ -8,19 +8,27 @@ + +

+

Get Bookmark Add-ons +
+

Bookmarks Toolbar Folder

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

+

Getting Started +-
Latest Headlines ++
Latest BBC Headlines +

+

+-

Mozilla Firefox

++

Ubuntu and Free Software links

++
Information and resources about Ubuntu, Debian and Free Software in general +

++

Ubuntu ++
Ubuntu Support Home ++
Ubuntu Wiki (community-edited website) ++
Make a Support Request to the Ubuntu Community ++
Free Software Foundation ++
Debian (Ubuntu is based on Debian) ++

Mozilla Firefox

+
Help and Tutorials +
Customize Firefox +
Get Involved +
About Us +

+

+Index: mozilla/gfx/src/gtk/fontEncoding.properties +=================================================================== +--- mozilla.orig/gfx/src/gtk/fontEncoding.properties ++++ mozilla/gfx/src/gtk/fontEncoding.properties +@@ -65,18 +65,18 @@ + # - the 'value' for ftcmap is either mac_roman + # or unicode. + + # If you have Symbol (Adobe) type 1 font, keep the following lines + # commented out (you do NOT need them). However, with truetype Symbol + # font, you do need them. + + # Symbol font +-#encoding.symbol.ttf = Adobe-Symbol-Encoding +-#encoding.symbol.ftcmap = mac_roman ++encoding.symbol.ttf = Adobe-Symbol-Encoding ++encoding.symbol.ftcmap = mac_roman + + # TeX's Computer Modern fonts (Roman, Math Italic, Symbol and Extension) + + encoding.cmr10.ttf = x-ttf-cmr + encoding.cmmi10.ttf = x-ttf-cmmi + encoding.cmsy10.ttf = x-ttf-cmsy + encoding.cmex10.ttf = x-ttf-cmex + +Index: mozilla/widget/src/gtk2/nsWindow.cpp +=================================================================== +--- mozilla.orig/widget/src/gtk2/nsWindow.cpp ++++ mozilla/widget/src/gtk2/nsWindow.cpp +@@ -1660,24 +1660,27 @@ + containerWindow->mActivatePending = PR_FALSE; + DispatchActivateEvent(); + } + if (check_for_rollup(aEvent->window, aEvent->x_root, aEvent->y_root, + PR_FALSE)) + return; + + switch (aEvent->button) { ++ case 1: ++ eventType = NS_MOUSE_LEFT_BUTTON_DOWN; ++ break; + case 2: + eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN; + break; + case 3: + eventType = NS_MOUSE_RIGHT_BUTTON_DOWN; + break; + default: +- eventType = NS_MOUSE_LEFT_BUTTON_DOWN; ++ return; + break; + } + + nsCOMPtr kungFuDeathGrip = this; + + nsMouseEvent event(PR_TRUE, eventType, this, nsMouseEvent::eReal); + InitButtonEvent(event, aEvent); + +Index: mozilla/xpfe/browser/resources/locale/en-US/region.properties +=================================================================== +--- mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties ++++ mozilla/xpfe/browser/resources/locale/en-US/region.properties +@@ -1,20 +1,20 @@ + # navigator.properties +-homePageDefault=http://www.mozilla.org/ ++homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html + keywordList=http://home.netscape.com/escapes/keywords + webmailKeyword=http://webmail.netscape.com + fallbackDefaultSearchURL=http://www.google.com/search?q= + otherSearchURL=http://www.google.com + # + # all.js + # +-browser.startup.homepage=http://www.seamonkey-project.org/start/ +-browser.throbber.url=http://www.seamonkey-project.org/ ++browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html ++browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html + browser.search.defaulturl=http://www.google.com/search?q= + general.useragent.contentlocale=US + + browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= + browser.translation.serviceDomain=translate.google.com + + #config.js + # +-startup.homepage_override_url=http://www.seamonkey-project.org/start/ ++startup.homepage_override_url=file:///usr/share/ubuntu-artwork/home/index.html --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/series +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/series @@ -0,0 +1,32 @@ +stable-fsh +build-system-garbage.patch +deb299697-lp42559-use-FC_ANY_METRICS.patch +bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch +bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch +bzXXX-fix-build-flat-chrome.patch +ubuntu-look-and-feel-patch.patch +ubuntu-look-and-feel-home-folder.patch +ubuntu-printing-patch.patch +bz273524-gnome-mime-registry-ubuntu.patch +bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch +bz7969-a-thai-patch.patch +bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch +add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch +bz51429-anti-netstat-zombie-linux.patch +bz331818-fix-crash-xpidl-zero-arguments.patch +bz289394-align-double-on-ia64-deb-bug-303518.patch +bz343360-feed-flat-chrome-fix.patch +bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch +ubuntu-disable-welcome-update-url.patch +ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch +bz335810-pango-cursor-up-down-fix.patch +bz345080-myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch +bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs +bzXXX-lp23369-dont-use-gconf-system-prefs-if-not-gnome.patch +bzXXX-dont-reset-user-prefs-on-upgrade +bz344818_att264996.patch +bz399589_fix_missing_symbol_with_new_nss.patch +force-no-pragma-visibility-for-gcc-4.2_4.3 +rename_firefox_2.patch +moz_app_name_binaries +configure-autoconf2-13-reconfigure.patch --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/ubuntu-printing-patch.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/ubuntu-printing-patch.patch @@ -0,0 +1,93 @@ +From bb95c1b7ad520edee9e172118fc3418d13096a99 Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:15 +0100 +Subject: [PATCH] ubuntu-printing patch + +--- + layout/style/html.css | 7 +++++++ + toolkit/components/printing/content/printdialog.js | 5 +++++ + xpfe/global/resources/content/printdialog.js | 7 ++++++- + 4 files changed, 20 insertions(+), 3 deletions(-) + +Index: mozilla/layout/style/html.css +=================================================================== +--- mozilla.orig/layout/style/html.css 2007-04-04 18:47:49.000000000 +0200 ++++ mozilla/layout/style/html.css 2007-04-04 18:48:19.000000000 +0200 +@@ -462,16 +462,23 @@ + marquee[direction="up"], marquee[direction="down"] { + -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical'); + height: 200px; + } + + /* PRINT ONLY rules follow */ + @media print { + ++ body { ++ font-family: times, serif; ++ } ++ tt, pre, listing, xmp, plaintext, code, kbd, samp { ++ font-family: courier, monospace; ++ } ++ + marquee { -moz-binding: none; } + + /* XXX this should not be necessary, we should be stopping blinking + of any kind in print preview, not just the element */ + blink { + text-decoration: none; + } + +Index: mozilla/toolkit/components/printing/content/printdialog.js +=================================================================== +--- mozilla.orig/toolkit/components/printing/content/printdialog.js 2007-04-04 18:47:49.000000000 +0200 ++++ mozilla/toolkit/components/printing/content/printdialog.js 2007-04-04 18:48:19.000000000 +0200 +@@ -155,16 +155,21 @@ + // build popup menu from printer names + while (aDataObject.hasMoreElements()) { + printerName = aDataObject.getNext(); + printerName = printerName.QueryInterface(Components.interfaces.nsISupportsString); + var printerNameStr = printerName.toString(); + if (strDefaultPrinterName == "") + strDefaultPrinterName = printerNameStr; + ++ // We strip PostScript/ from the front of displayed printer ++ // names. It's a bit kludgy to do this here but at least ++ // for Ubuntu all the printers come via CUPS. ++ var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), ""); ++ + list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr)); + } + if (strDefaultPrinterName != "") { + this.listElement.removeAttribute("disabled"); + } else { + var stringBundle = srGetStrBundle("chrome://global/locale/printing.properties"); + this.listElement.setAttribute("value", strDefaultPrinterName); + this.listElement.setAttribute("label", stringBundle.GetStringFromName("noprinter")); +Index: mozilla/xpfe/global/resources/content/printdialog.js +=================================================================== +--- mozilla.orig/xpfe/global/resources/content/printdialog.js 2007-04-04 18:47:49.000000000 +0200 ++++ mozilla/xpfe/global/resources/content/printdialog.js 2007-04-04 18:48:19.000000000 +0200 +@@ -155,17 +155,22 @@ + // build popup menu from printer names + while (aDataObject.hasMoreElements()) { + printerName = aDataObject.getNext(); + printerName = printerName.QueryInterface(Components.interfaces.nsISupportsString); + var printerNameStr = printerName.toString(); + if (strDefaultPrinterName == "") + strDefaultPrinterName = printerNameStr; + +- list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr)); ++ // We strip PostScript/ from the front of displayed printer ++ // names. It's a bit kludgy to do this here but at least ++ // for Ubuntu all the printers come via CUPS. ++ var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), ""); ++ ++ list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr)); + } + if (strDefaultPrinterName != "") { + this.listElement.removeAttribute("disabled"); + } else { + var stringBundle = srGetStrBundle("chrome://global/locale/printing.properties"); + this.listElement.setAttribute("value", strDefaultPrinterName); + this.listElement.setAttribute("label", stringBundle.GetStringFromName("noprinter")); + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3 +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3 @@ -0,0 +1,34 @@ + +pragma push hidden fails to build on gcc-4.3 even though GCC bug 26905 and 20297 are +fixed; apparently some symbols lack a proper visibility hint. This patch makes build +use -fvisibility=hidden flag even for compilers that don't have the visibility bugs +mentioned above. + +--- + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in 2007-08-21 15:52:32.000000000 +0000 ++++ mozilla/configure.in 2007-08-21 15:54:29.000000000 +0000 +@@ -2642,18 +2642,17 @@ + if test `grep -c "@PLT" conftest.S` = 0; then + ac_cv_visibility_builtin_bug=yes + fi + fi + rm -f conftest.{c,S} + ]) + if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ + "$ac_cv_have_visibility_class_bug" = "no"; then +- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' +- WRAP_SYSTEM_INCLUDES=1 ++ VISIBILITY_FLAGS='-fvisibility=hidden' + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug + fi # have visibility pragma + fi # have visibility(default) attribute + fi # have visibility(hidden) attribute + fi # GNU_CC + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bzXXX-lp23369-dont-use-gconf-system-prefs-if-not-gnome.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bzXXX-lp23369-dont-use-gconf-system-prefs-if-not-gnome.patch @@ -0,0 +1,60 @@ +Index: extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp +=================================================================== +RCS file: /cvsroot/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp,v +retrieving revision 1.8 +diff -u -8 -p -r1.8 nsSystemPrefService.cpp +--- mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp 23 Feb 2005 16:15:37 -0000 1.8 ++++ mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp 22 Jun 2007 09:19:11 -0000 +@@ -38,16 +38,17 @@ + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + + #include + #include + + #include "plstr.h" ++#include "prenv.h" + #include "nsCOMPtr.h" + #include "nsIPref.h" + #include "nsIServiceManager.h" + #include "nsIObserver.h" + #include "nsWeakReference.h" + + #include "nsString.h" + #include "nsSystemPrefLog.h" +@@ -234,25 +235,34 @@ nsSystemPrefService::~nsSystemPrefServic + (void)mObservers->EnumerateForwards(sysPrefDeleteObserver, nsnull); + delete mObservers; + } + } + + nsresult + nsSystemPrefService::Init() + { ++ char* gnomeSessionId; ++ + 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; + ++ gnomeSessionId = PR_GetEnv("GNOME_DESKTOP_SESSION_ID"); ++ ++ if (!gnomeSessionId) { ++ SYSPREF_LOG(("nsSystemPrefService:: Init failed - not a gnome session!\n")); ++ return NS_ERROR_FAILURE; ++ } ++ + if (!mGConf) { + mGConf = new GConfProxy(this); + if (!mGConf->Init()) { + delete mGConf; + mGConf = nsnull; + return NS_ERROR_FAILURE; + } + } --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs @@ -0,0 +1,33 @@ +Index: ./toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in,v +retrieving revision 1.46 +diff -u -8 -p -r1.46 nsHelperAppDlg.js.in +--- mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in 17 Apr 2007 18:51:34 -0000 1.46 ++++ mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in 21 Jun 2007 15:41:20 -0000 +@@ -278,23 +278,25 @@ nsUnknownContentTypeDialog.prototype = { + aLeafName = aLeafName.replace(/^\.+/, ""); + + if (aLeafName == "") + aLeafName = "unnamed" + (aFileExt ? "." + aFileExt : ""); + aLocalFile.append(aLeafName); + + this.makeFileUnique(aLocalFile); + ++#ifdef XP_WIN + if (aLocalFile.isExecutable() && !this.mLauncher.targetFile.isExecutable()) { + var f = aLocalFile.clone(); + aLocalFile.leafName = aLocalFile.leafName + "." + this.mLauncher.MIMEInfo.primaryExtension; + + f.remove(false); + this.makeFileUnique(aLocalFile); + } ++#endif + + return aLocalFile; + }, + + /** + * Generates and returns a uniquely-named file from aLocalFile. If + * aLocalFile does not exist, it will be the file returned; otherwise, a + * file whose name is similar to that of aLocalFile will be returned. --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bzXXX-dont-reset-user-prefs-on-upgrade +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bzXXX-dont-reset-user-prefs-on-upgrade @@ -0,0 +1,102 @@ + +This bug is due to the fact, applications are restarted before extension +defaults are loaded. + +To reproduce, choose any preference and set the values like: +system default: + pref("prefkey",systemvalue); +extension default: + pref("prefkey", extensiondefault); +user pref: + user_pref("prefkey", systemvalue); + +Next, trigger application behaviour similar to upgrade by removing compreg.dat +from profile and start the application. + +Result: +User sees extensiondefault after upgrade, because the user_pref has been +eliminated ... which is definitly not what the user expects because he explicitly +had *systemvalue* set before the upgrade. + +Evaluation: +The bug happens because restart is performed *before* extension defaults have been +loaded and the prefapi.cpp always eliminate user preference if the user preference +is equal to the actual default (which happens to be extensiondefault normally - so +no reset, but is systemvalue during restart). + +Fix: +1. savePrefs should not try to be smart ... this patch removes the heuristic that guesses +whether a setting can be eliminated or not; it should be sufficient to only eliminate +prefs in hashPrefs. + +2. This patch prevents hashPrefs from eliminating the user pref in case we are in +*startup* ... unfortunately no such state info exists, which lets us guess that +we are in startup for the previously not dealt case: !set_default && +!pref_ValueChanged(pref->defaultPref, value, type) && !PREF_HAS_USER_VALUE(pref). + +If is the case we explicitly remember that this setting is a user-pref ... +even though it might be temporarily equal to the default pref. + +--- + modules/libpref/src/prefapi.cpp | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +Index: mozilla/modules/libpref/src/prefapi.cpp +=================================================================== +--- mozilla.orig/modules/libpref/src/prefapi.cpp 2006-07-14 02:58:20.000000000 +0200 ++++ mozilla/modules/libpref/src/prefapi.cpp 2007-07-20 13:07:53.000000000 +0200 +@@ -319,23 +319,20 @@ + if (!pref) + return PL_DHASH_NEXT; + + nsCAutoString prefValue; + + // where we're getting our pref from + PrefValue* sourcePref; + +- if (PREF_HAS_USER_VALUE(pref) && +- pref_ValueChanged(pref->defaultPref, +- pref->userPref, +- (PrefType) PREF_TYPE(pref))) +- sourcePref = &pref->userPref; +- else if (PREF_IS_LOCKED(pref)) ++ if (PREF_IS_LOCKED(pref)) + sourcePref = &pref->defaultPref; ++ else if (PREF_HAS_USER_VALUE(pref)) ++ sourcePref = &pref->userPref; + else + // do not save default prefs that haven't changed + return PL_DHASH_NEXT; + + #if MOZ_PROFILESHARING + if ((argData->saveTypes == SAVE_SHARED && + !gSharedPrefHandler->IsPrefShared(pref->key)) || + (argData->saveTypes == SAVE_NONSHARED && +@@ -732,16 +729,27 @@ + Otherwise, set the user value only if it has changed */ + if ( !pref_ValueChanged(pref->defaultPref, value, type) ) + { + if (PREF_HAS_USER_VALUE(pref)) + { + pref->flags &= ~PREF_USERSET; + if (!PREF_IS_LOCKED(pref)) + valueChanged = PR_TRUE; ++ } else { ++ // this is tricky: we have !set_default ... ++ // thus we are setting a user pref; however the user ++ // pref set is same as *current default*; this normally ++ // means to un-set ... however since we have ++ // !PREF_HAS_USER_VALUE(pref) this can only be during ++ // startup ++ pref_SetValue(&pref->userPref, value, type); ++ pref->flags |= PREF_USERSET; ++ if (!PREF_IS_LOCKED(pref)) ++ valueChanged = PR_TRUE; + } + } + else if ( !PREF_HAS_USER_VALUE(pref) || + pref_ValueChanged(pref->userPref, value, type) ) + { + pref_SetValue(&pref->userPref, value, type); + pref->flags |= PREF_USERSET; + if (!PREF_IS_LOCKED(pref)) --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch @@ -0,0 +1,47 @@ +From 37ede619fcb71435d153d565a6f6c82dac225e20 Mon Sep 17 00:00:00 2001 +From: asac +Date: Mon, 12 Mar 2007 17:03:02 +0100 +Subject: [PATCH] bz345077-make-install-installs-extensions-in-chrome-and-extensions + + * https://bugzilla.mozilla.org/show_bug.cgi?id=345077 + * https://bugzilla.mozilla.org/attachment.cgi?id=229687 +--- + config/rules.mk | 2 ++ + 1 file changed, 2 insertions(+) + +Index: mozilla/config/rules.mk +=================================================================== +--- mozilla.orig/config/rules.mk 2007-04-04 18:45:08.000000000 +0200 ++++ mozilla/config/rules.mk 2007-04-04 18:45:44.000000000 +0200 +@@ -1564,29 +1564,31 @@ + $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \ + $(FINAL_TARGET)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \ + fi + endif + + install:: $(CHROME_DEPS) + ifndef NO_INSTALL ++ifndef XPI_NAME + @$(EXIT_ON_ERROR) \ + if test -f $(JAR_MANIFEST); then \ + if test ! -d $(DESTDIR)$(mozappdir)/chrome; then $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/chrome; fi; \ + if test ! -d $(MAKE_JARS_TARGET)/chrome; then $(NSINSTALL) -D $(MAKE_JARS_TARGET)/chrome; fi; \ + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \ + $(JAR_MANIFEST) | \ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \ + -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \ + $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \ + $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \ + fi + endif ++endif + + ifneq ($(DIST_FILES),) + libs:: $(DIST_FILES) + @$(EXIT_ON_ERROR) \ + for f in $(DIST_FILES); do \ + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl \ + $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) \ + $(srcdir)/$$f > $(FINAL_TARGET)/`basename $$f`; \ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/rename_firefox_2.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/rename_firefox_2.patch @@ -0,0 +1,27 @@ +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in ++++ mozilla/configure.in +@@ -4323,17 +4323,17 @@ + MOZ_SUITE=1 + MOZ_PROFILESHARING= + MOZ_APP_VERSION=$SEAMONKEY_VERSION + MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" + AC_DEFINE(MOZ_SUITE) + ;; + + browser) +- MOZ_APP_NAME=firefox ++ MOZ_APP_NAME=firefox-2 + MOZ_APP_DISPLAYNAME=BonEcho + MOZ_XUL_APP=1 + MOZ_PHOENIX=1 + MOZ_SAFE_BROWSING=1 + MOZ_APP_VERSION=$FIREFOX_VERSION + MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" + AC_DEFINE(MOZ_PHOENIX) + ;; --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch @@ -0,0 +1,345 @@ +From efddcc063cb31a0c48072f2f50181a6bf4f592d3 Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:15 +0100 +Subject: [PATCH] bzXXX-syntax fixes for .m4 files needed for proper embedding + +--- + build/autoconf/altoptions.m4 | 20 ++++++++++---------- + build/autoconf/freetype2.m4 | 2 +- + build/autoconf/glib.m4 | 2 +- + build/autoconf/gtk.m4 | 2 +- + build/autoconf/libIDL-2.m4 | 2 +- + build/autoconf/libIDL.m4 | 2 +- + build/autoconf/libart.m4 | 2 +- + build/autoconf/nspr.m4 | 2 +- + build/autoconf/pkg.m4 | 2 +- + directory/c-sdk/config/autoconf/nspr.m4 | 2 +- + nsprpub/config/nspr.m4 | 2 +- + 11 files changed, 20 insertions(+), 20 deletions(-) + +Index: mozilla/build/autoconf/altoptions.m4 +=================================================================== +--- mozilla.orig/build/autoconf/altoptions.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/altoptions.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -50,80 +50,80 @@ + dnl MOZ_ARG_WITHOUT_BOOL( NAME, HELP, IF-NO [, IF-YES [, ELSE]) + dnl MOZ_ARG_WITH_STRING( NAME, HELP, IF-SET [, ELSE]) + dnl MOZ_ARG_HEADER(Comment) + dnl MOZ_CHECK_PTHREADS( NAME, IF-YES [, ELSE ]) + dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file + + + dnl MOZ_TWO_STRING_TEST(NAME, VAL, STR1, IF-STR1, STR2, IF-STR2 [, ELSE]) +-AC_DEFUN(MOZ_TWO_STRING_TEST, ++AC_DEFUN([MOZ_TWO_STRING_TEST], + [if test "[$2]" = "[$3]"; then + ifelse([$4], , :, [$4]) + elif test "[$2]" = "[$5]"; then + ifelse([$6], , :, [$6]) + else + ifelse([$7], , + [AC_MSG_ERROR([Option, [$1], does not take an argument ([$2]).])], + [$7]) + fi]) + + dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]]) +-AC_DEFUN(MOZ_ARG_ENABLE_BOOL, ++AC_DEFUN([MOZ_ARG_ENABLE_BOOL], + [AC_ARG_ENABLE([$1], [$2], + [MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4])], + [$5])]) + + dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]]) +-AC_DEFUN(MOZ_ARG_DISABLE_BOOL, ++AC_DEFUN([MOZ_ARG_DISABLE_BOOL], + [AC_ARG_ENABLE([$1], [$2], + [MOZ_TWO_STRING_TEST([$1], [$enableval], no, [$3], yes, [$4])], + [$5])]) + + dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE]) +-AC_DEFUN(MOZ_ARG_ENABLE_STRING, ++AC_DEFUN([MOZ_ARG_ENABLE_STRING], + [AC_ARG_ENABLE([$1], [$2], [$3], [$4])]) + + dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]]) +-AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING, ++AC_DEFUN([MOZ_ARG_ENABLE_BOOL_OR_STRING], + [ifelse([$5], , + [errprint([Option, $1, needs an "IF-SET" argument. + ]) + m4exit(1)], + [AC_ARG_ENABLE([$1], [$2], + [MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4], [$5])], + [$6])])]) + + dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]) +-AC_DEFUN(MOZ_ARG_WITH_BOOL, ++AC_DEFUN([MOZ_ARG_WITH_BOOL], + [AC_ARG_WITH([$1], [$2], + [MOZ_TWO_STRING_TEST([$1], [$withval], yes, [$3], no, [$4])], + [$5])]) + + dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]) +-AC_DEFUN(MOZ_ARG_WITHOUT_BOOL, ++AC_DEFUN([MOZ_ARG_WITHOUT_BOOL], + [AC_ARG_WITH([$1], [$2], + [MOZ_TWO_STRING_TEST([$1], [$withval], no, [$3], yes, [$4])], + [$5])]) + + dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE]) +-AC_DEFUN(MOZ_ARG_WITH_STRING, ++AC_DEFUN([MOZ_ARG_WITH_STRING], + [AC_ARG_WITH([$1], [$2], [$3], [$4])]) + + dnl MOZ_ARG_HEADER(Comment) + dnl This is used by webconfig to group options + define(MOZ_ARG_HEADER, [# $1]) + + dnl + dnl Apparently, some systems cannot properly check for the pthread + dnl library unless is included so we need to test + dnl using it + dnl + dnl MOZ_CHECK_PTHREADS(lib, success, failure) +-AC_DEFUN(MOZ_CHECK_PTHREADS, ++AC_DEFUN([MOZ_CHECK_PTHREADS], + [ + AC_MSG_CHECKING([for pthread_create in -l$1]) + echo " + #include + void *foo(void *v) { int a = 1; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { +@@ -140,17 +140,17 @@ + [$2] + else + AC_MSG_RESULT([no]) + [$3] + fi + ]) + + dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file +-AC_DEFUN(MOZ_READ_MOZCONFIG, ++AC_DEFUN([MOZ_READ_MOZCONFIG], + [AC_REQUIRE([AC_INIT_BINSH])dnl + # Read in '.mozconfig' script to set the initial options. + # See the mozconfig2configure script for more details. + _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf + . $_AUTOCONF_TOOLS_DIR/mozconfig2configure]) + + dnl This gets inserted at the top of the configure script + MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR) +Index: mozilla/build/autoconf/freetype2.m4 +=================================================================== +--- mozilla.orig/build/autoconf/freetype2.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/freetype2.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,15 +1,15 @@ + # Configure paths for FreeType2 + # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor + + dnl AM_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS + dnl +-AC_DEFUN(AC_CHECK_FT2, ++AC_DEFUN([AC_CHECK_FT2], + [dnl + dnl Get the cflags and libraries from the freetype-config script + dnl + AC_ARG_WITH(freetype-prefix, + [ --with-ft-prefix=PFX Prefix where FreeType is installed (optional)], + ft_config_prefix="$withval", ft_config_prefix="") + AC_ARG_WITH(freetype-exec-prefix, + [ --with-ft-exec-prefix=PFX +Index: mozilla/build/autoconf/glib.m4 +=================================================================== +--- mozilla.orig/build/autoconf/glib.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/glib.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,16 +1,16 @@ + # Configure paths for GLIB + # Owen Taylor 97-11-3 + + dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) + dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or + dnl gthread is specified in MODULES, pass to glib-config + dnl +-AC_DEFUN(AM_PATH_GLIB, ++AC_DEFUN([AM_PATH_GLIB], + [dnl + dnl Get the cflags and libraries from the glib-config script + dnl + AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") + AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX + Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +Index: mozilla/build/autoconf/gtk.m4 +=================================================================== +--- mozilla.orig/build/autoconf/gtk.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/gtk.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,16 +1,16 @@ + # Configure paths for GTK+ + # Owen Taylor 97-11-3 + # (copy of gtk.m4 (public domain)) + + dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS + dnl +-AC_DEFUN(AM_PATH_GTK, ++AC_DEFUN([AM_PATH_GTK], + [dnl + dnl Get the cflags and libraries from the gtk-config script + dnl + AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") + AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX + Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +Index: mozilla/build/autoconf/libIDL-2.m4 +=================================================================== +--- mozilla.orig/build/autoconf/libIDL-2.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/libIDL-2.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,14 +1,14 @@ + # Configure paths for LIBIDL + + dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) + dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS + dnl +-AC_DEFUN(AM_PATH_LIBIDL_2, ++AC_DEFUN([AM_PATH_LIBIDL_2], + [dnl + dnl Get the cflags and libraries from the libIDL-config-2 script + dnl + AC_ARG_WITH(libIDL-prefix,[ --with-libIDL-prefix=PFX + Prefix where libIDL is installed (optional)], + libIDL_config_prefix="$withval", libIDL_config_prefix="") + AC_ARG_WITH(libIDL-exec-prefix,[ --with-libIDL-exec-prefix=PFX + Exec prefix where libIDL is installed (optional)], +Index: mozilla/build/autoconf/libIDL.m4 +=================================================================== +--- mozilla.orig/build/autoconf/libIDL.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/libIDL.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,14 +1,14 @@ + # Configure paths for LIBIDL + + dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) + dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS + dnl +-AC_DEFUN(AM_PATH_LIBIDL, ++AC_DEFUN([AM_PATH_LIBIDL], + [dnl + dnl Get the cflags and libraries from the libIDL-config script + dnl + AC_ARG_WITH(libIDL-prefix,[ --with-libIDL-prefix=PFX + Prefix where libIDL is installed (optional)], + libIDL_config_prefix="$withval", libIDL_config_prefix="") + AC_ARG_WITH(libIDL-exec-prefix,[ --with-libIDL-exec-prefix=PFX + Exec prefix where libIDL is installed (optional)], +Index: mozilla/build/autoconf/libart.m4 +=================================================================== +--- mozilla.orig/build/autoconf/libart.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/libart.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -3,17 +3,17 @@ + # stolen from Manish Singh 98-9-30 + # stolen back from Frank Belew + # stolen from Manish Singh + # Shamelessly stolen from Owen Taylor + + dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS + dnl +-AC_DEFUN(AM_PATH_LIBART, ++AC_DEFUN([AM_PATH_LIBART], + [dnl + dnl Get the cflags and libraries from the libart-config script + dnl + AC_ARG_WITH(libart-prefix,[ --with-libart-prefix=PFX Prefix where LIBART is installed (optional)], + libart_prefix="$withval", libart_prefix="") + AC_ARG_WITH(libart-exec-prefix,[ --with-libart-exec-prefix=PFX Exec prefix where LIBART is installed (optional)], + libart_exec_prefix="$withval", libart_exec_prefix="") + AC_ARG_ENABLE(libarttest, [ --disable-libarttest Do not try to compile and run a test LIBART program], +Index: mozilla/build/autoconf/nspr.m4 +=================================================================== +--- mozilla.orig/build/autoconf/nspr.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/nspr.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,16 +1,16 @@ + # -*- tab-width: 4; -*- + # Configure paths for NSPR + # Public domain - Chris Seawood 2001-04-05 + # Based upon gtk.m4 (also PD) by Owen Taylor + + dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS +-AC_DEFUN(AM_PATH_NSPR, ++AC_DEFUN([AM_PATH_NSPR], + [dnl + + AC_ARG_WITH(nspr-prefix, + [ --with-nspr-prefix=PFX Prefix where NSPR is installed], + nspr_config_prefix="$withval", + nspr_config_prefix="") + + AC_ARG_WITH(nspr-exec-prefix, +Index: mozilla/build/autoconf/pkg.m4 +=================================================================== +--- mozilla.orig/build/autoconf/pkg.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/build/autoconf/pkg.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,13 +1,13 @@ + + dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) + dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page + dnl also defines GSTUFF_PKG_ERRORS on error +-AC_DEFUN(PKG_CHECK_MODULES, [ ++AC_DEFUN([PKG_CHECK_MODULES], [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" +Index: mozilla/directory/c-sdk/config/autoconf/nspr.m4 +=================================================================== +--- mozilla.orig/directory/c-sdk/config/autoconf/nspr.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/directory/c-sdk/config/autoconf/nspr.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,16 +1,16 @@ + # -*- tab-width: 4; -*- + # Configure paths for NSPR + # Public domain - Chris Seawood 2001-04-05 + # Based upon gtk.m4 (also PD) by Owen Taylor + + dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS +-AC_DEFUN(AM_PATH_NSPR, ++AC_DEFUN([AM_PATH_NSPR], + [dnl + + AC_ARG_WITH(nspr-prefix, + [ --with-nspr-prefix=PFX Prefix where NSPR is installed], + nspr_config_prefix="$withval", + nspr_config_prefix="") + + AC_ARG_WITH(nspr-exec-prefix, +Index: mozilla/nsprpub/config/nspr.m4 +=================================================================== +--- mozilla.orig/nsprpub/config/nspr.m4 2007-04-04 18:47:47.000000000 +0200 ++++ mozilla/nsprpub/config/nspr.m4 2007-04-04 18:48:27.000000000 +0200 +@@ -1,16 +1,16 @@ + # -*- tab-width: 4; -*- + # Configure paths for NSPR + # Public domain - Chris Seawood 2001-04-05 + # Based upon gtk.m4 (also PD) by Owen Taylor + + dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS +-AC_DEFUN(AM_PATH_NSPR, ++AC_DEFUN([AM_PATH_NSPR], + [dnl + + AC_ARG_WITH(nspr-prefix, + [ --with-nspr-prefix=PFX Prefix where NSPR is installed], + nspr_config_prefix="$withval", + nspr_config_prefix="") + + AC_ARG_WITH(nspr-exec-prefix, --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/configure-autoconf2-13-reconfigure.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/configure-autoconf2-13-reconfigure.patch @@ -0,0 +1,9863 @@ +--- + configure | 1845 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1041 insertions(+), 804 deletions(-) + +Index: mozilla/configure +=================================================================== +--- mozilla.orig/configure ++++ mozilla/configure +@@ -55,16 +55,18 @@ + Use system libjpeg [installed at prefix PFX]" + ac_help="$ac_help + --with-system-zlib[=PFX] + Use system libz [installed at prefix PFX]" + ac_help="$ac_help + --with-system-png[=PFX] + Use system libpng [installed at prefix PFX]" + ac_help="$ac_help ++ --enable-system-myspell Use system myspell (located with pkgconfig)" ++ac_help="$ac_help + --with-java-include-path=dir Location of Java SDK headers" + ac_help="$ac_help + --with-java-bin-path=dir Location of Java binaries (java, javac, jar)" + ac_help="$ac_help + --enable-default-toolkit=TK + Select default toolkit + Platform specific defaults: + BeOS - beos +@@ -141,16 +143,18 @@ + ac_help="$ac_help + --disable-oji Disable Open JVM Integration support" + ac_help="$ac_help + --enable-xinerama Enable Xinerama support + ( not safe for Red Hat 7.0 ) " + ac_help="$ac_help + --enable-ctl Enable Thai Complex Script support" + ac_help="$ac_help ++ --disable-libthai Disable Thai word break support with libthai" ++ac_help="$ac_help + --disable-view-source Disable view source support" + ac_help="$ac_help + --disable-accessibility Disable accessibility support" + ac_help="$ac_help + --disable-xpfe-components + Disable xpfe components" + ac_help="$ac_help + --disable-xpinstall Disable xpinstall support" +@@ -955,17 +959,17 @@ + + + # Make sure we can run config.sub. + if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : + else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } + 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 + NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } +@@ -976,17 +980,17 @@ + + host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` + host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + 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 + NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +@@ -994,17 +998,17 @@ + + target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` + target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + 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 + NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +@@ -1064,22 +1068,22 @@ + WINDRES_VERSION=2.14.90 + W32API_VERSION=2.4 + GNOMEVFS_VERSION=2.0 + GNOMEUI_VERSION=2.2.0 + GCONF_VERSION=1.2.1 + LIBGNOME_VERSION=2.0 + + 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:1082: 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 + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1167,17 +1171,17 @@ + fi + + + for ac_prog in nsinstall + 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:1176: checking for $ac_word" >&5 ++echo "configure:1180: 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 + case "$NSINSTALL_BIN" in + /*) + ac_cv_path_NSINSTALL_BIN="$NSINSTALL_BIN" # Let the user override the test with a path. + ;; + ?:/*) +@@ -1209,17 +1213,17 @@ + + if test -z "$COMPILE_ENVIRONMENT"; then + if test -z "$NSINSTALL_BIN" || test "$NSINSTALL_BIN" = ":"; then + for ac_prog in $PYTHON python + 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:1218: checking for $ac_word" >&5 ++echo "configure:1222: 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 + case "$PYTHON" in + /*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + ?:/*) +@@ -1280,23 +1284,23 @@ + echo "cross compiling from $host to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 +-echo "configure:1289: checking for host c compiler" >&5 ++echo "configure:1293: 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:1295: checking for $ac_word" >&5 ++echo "configure:1299: 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 + if test -n "$HOST_CC"; then + ac_cv_prog_HOST_CC="$HOST_CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1321,23 +1325,23 @@ + done + test -n "$HOST_CC" || HOST_CC="""" + + if test -z "$HOST_CC"; then + { echo "configure: error: no acceptable c compiler found in \$PATH" 1>&2; exit 1; } + fi + echo "$ac_t""$HOST_CC" 1>&6 + echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 +-echo "configure:1330: checking for host c++ compiler" >&5 ++echo "configure:1334: 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:1336: checking for $ac_word" >&5 ++echo "configure:1340: 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 + if test -n "$HOST_CXX"; then + ac_cv_prog_HOST_CXX="$HOST_CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1376,17 +1380,17 @@ + if test -z "$HOST_LDFLAGS"; then + HOST_LDFLAGS="$LDFLAGS" + fi + for ac_prog in $HOST_RANLIB ranlib + 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:1385: checking for $ac_word" >&5 ++echo "configure:1389: 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 + if test -n "$HOST_RANLIB"; then + ac_cv_prog_HOST_RANLIB="$HOST_RANLIB" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy=":" +@@ -1411,17 +1415,17 @@ + done + test -n "$HOST_RANLIB" || HOST_RANLIB="ranlib" + + for ac_prog in $HOST_AR ar + 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:1420: checking for $ac_word" >&5 ++echo "configure:1424: 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 + if test -n "$HOST_AR"; then + ac_cv_prog_HOST_AR="$HOST_AR" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy=":" +@@ -1446,50 +1450,50 @@ + done + test -n "$HOST_AR" || HOST_AR="ar" + + CC="$HOST_CC" + CFLAGS="$HOST_CFLAGS" + 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:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1459: 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:1468: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: installation or configuration problem: host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + + CC="$HOST_CXX" + 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:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1483: 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:1492: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: installation or configuration problem: host compiler $HOST_CXX cannot create executables." 1>&2; exit 1; } + fi +@@ -1508,17 +1512,17 @@ + ;; + esac + + for ac_prog in $CC "${target_alias}-gcc" "${target}-gcc" + 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:1517: checking for $ac_word" >&5 ++echo "configure:1521: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1542,17 +1546,17 @@ + test -n "$CC" && break + done + test -n "$CC" || CC=":" + + unset ac_cv_prog_CC + # 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:1551: checking for $ac_word" >&5 ++echo "configure:1555: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1572,17 +1576,17 @@ + else + echo "$ac_t""no" 1>&6 + fi + + if test -z "$CC"; then + # 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:1581: checking for $ac_word" >&5 ++echo "configure:1585: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +@@ -1623,17 +1627,17 @@ + fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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:1632: checking for $ac_word" >&5 ++echo "configure:1636: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1655,33 +1659,33 @@ + fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1668: 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. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext << EOF + +-#line 1675 "configure" ++#line 1679 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1684: \"$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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi + else +@@ -1697,31 +1701,31 @@ + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 + if test $ac_cv_prog_cc_works = no; then + { 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:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1710: 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:1711: checking whether we are using GNU C" >&5 ++echo "configure:1715: 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 + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1724: \"$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 + fi + fi + + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +@@ -1730,17 +1734,17 @@ + else + GCC= + fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1743: 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 + echo 'void f(){}' > conftest.c + if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes + else + ac_cv_prog_cc_g=no +@@ -1766,17 +1770,17 @@ + fi + fi + + for ac_prog in $CXX "${target_alias}-g++" "${target}-g++" + 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:1775: checking for $ac_word" >&5 ++echo "configure:1779: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1802,17 +1806,17 @@ + test -n "$CXX" || CXX=":" + + unset ac_cv_prog_CXX + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + 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:1811: checking for $ac_word" >&5 ++echo "configure:1815: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1834,33 +1838,33 @@ + fi + + test -n "$CXX" && break + done + test -n "$CXX" || CXX="gcc" + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1847: 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. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext << EOF + +-#line 1854 "configure" ++#line 1858 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1863: \"$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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi + else +@@ -1876,31 +1880,31 @@ + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 + if test $ac_cv_prog_cxx_works = no; then + { 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:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1889: 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:1890: checking whether we are using GNU C++" >&5 ++echo "configure:1894: 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 + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1903: \"$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 + fi + fi + + echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +@@ -1909,17 +1913,17 @@ + else + GXX= + fi + + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1922: 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 + echo 'void f(){}' > conftest.cc + if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes + else + ac_cv_prog_cxx_g=no +@@ -1940,81 +1944,30 @@ + else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + 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:1967: \"$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*) + CFLAGS=$_SAVE_CFLAGS + CXXFLAGS=$_SAVE_CXXFLAGS + ;; + esac + + for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib" + 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:2013: checking for $ac_word" >&5 ++echo "configure:1966: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2039,17 +1992,17 @@ + done + test -n "$RANLIB" || RANLIB=":" + + for ac_prog in $AR "${target_alias}-ar" "${target}-ar" + 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:2048: checking for $ac_word" >&5 ++echo "configure:2001: 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 + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2074,17 +2027,17 @@ + done + test -n "$AR" || AR=":" + + for ac_prog in $AS "${target_alias}-as" "${target}-as" + 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:2083: checking for $ac_word" >&5 ++echo "configure:2036: 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 + case "$AS" in + /*) + ac_cv_path_AS="$AS" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2115,17 +2068,17 @@ + done + test -n "$AS" || AS=":" + + for ac_prog in $LD "${target_alias}-ld" "${target}-ld" + 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:2124: checking for $ac_word" >&5 ++echo "configure:2077: 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 + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2150,17 +2103,17 @@ + done + test -n "$LD" || LD=":" + + for ac_prog in $STRIP "${target_alias}-strip" "${target}-strip" + 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:2159: checking for $ac_word" >&5 ++echo "configure:2112: 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 + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2185,17 +2138,17 @@ + done + test -n "$STRIP" || STRIP=":" + + for ac_prog in $WINDRES "${target_alias}-windres" "${target}-windres" + 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:2194: checking for $ac_word" >&5 ++echo "configure:2147: 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 + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2223,17 +2176,17 @@ + cat >> confdefs.h <<\EOF + #define CROSS_COMPILE 1 + EOF + + else + # 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:2232: checking for $ac_word" >&5 ++echo "configure:2185: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2253,17 +2206,17 @@ + else + echo "$ac_t""no" 1>&6 + fi + + if test -z "$CC"; then + # 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:2262: checking for $ac_word" >&5 ++echo "configure:2215: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +@@ -2304,17 +2257,17 @@ + fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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:2313: checking for $ac_word" >&5 ++echo "configure:2266: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2336,33 +2289,33 @@ + fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2298: 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. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext << EOF + +-#line 2356 "configure" ++#line 2309 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2314: \"$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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi + else +@@ -2378,31 +2331,31 @@ + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 + if test $ac_cv_prog_cc_works = no; then + { 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:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2340: 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:2392: checking whether we are using GNU C" >&5 ++echo "configure:2345: 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 + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2354: \"$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 + fi + fi + + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +@@ -2411,17 +2364,17 @@ + else + GCC= + fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2373: 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 + echo 'void f(){}' > conftest.c + if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes + else + ac_cv_prog_cc_g=no +@@ -2447,17 +2400,17 @@ + fi + fi + + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + 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:2456: checking for $ac_word" >&5 ++echo "configure:2409: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2479,33 +2432,33 @@ + fi + + test -n "$CXX" && break + done + test -n "$CXX" || CXX="gcc" + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2441: 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. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext << EOF + +-#line 2499 "configure" ++#line 2452 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2457: \"$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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi + else +@@ -2521,31 +2474,31 @@ + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 + if test $ac_cv_prog_cxx_works = no; then + { 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:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2483: 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:2535: checking whether we are using GNU C++" >&5 ++echo "configure:2488: 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 + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2497: \"$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 + fi + fi + + echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +@@ -2554,17 +2507,17 @@ + else + GXX= + fi + + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2516: 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 + echo 'void f(){}' > conftest.cc + if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes + else + ac_cv_prog_cxx_g=no +@@ -2585,71 +2538,20 @@ + else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + 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:2612: \"$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:2648: checking for $ac_word" >&5 ++echo "configure:2550: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2671,17 +2573,17 @@ + echo "$ac_t""no" 1>&6 + fi + + for ac_prog in $AS as + 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:2680: checking for $ac_word" >&5 ++echo "configure:2582: 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 + case "$AS" in + /*) + ac_cv_path_AS="$AS" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2712,17 +2614,17 @@ + done + test -n "$AS" || AS="$CC" + + for ac_prog in ar + 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:2721: checking for $ac_word" >&5 ++echo "configure:2623: 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 + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2747,17 +2649,17 @@ + done + test -n "$AR" || AR=":" + + for ac_prog in ld + 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:2756: checking for $ac_word" >&5 ++echo "configure:2658: 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 + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2782,17 +2684,17 @@ + done + test -n "$LD" || LD=":" + + for ac_prog in strip + 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:2791: checking for $ac_word" >&5 ++echo "configure:2693: 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 + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2817,17 +2719,17 @@ + done + test -n "$STRIP" || STRIP=":" + + for ac_prog in windres + 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:2826: checking for $ac_word" >&5 ++echo "configure:2728: 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 + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2906,17 +2808,17 @@ + if test "$GCC" != "yes"; then + # Check to see if we are really running in a msvc environemnt + _WIN32_MSVC=1 + for ac_prog in midl + 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:2915: checking for $ac_word" >&5 ++echo "configure:2817: 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 + if test -n "$MIDL"; then + ac_cv_prog_MIDL="$MIDL" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2948,24 +2850,24 @@ + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2866: \"$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* + { echo "configure: error: \$(CC) test failed. You must have MS VC++ in your path to build." 1>&2; exit 1; } + fi + rm -f conftest* +@@ -2973,24 +2875,24 @@ + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + 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:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2891: \"$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* + { echo "configure: error: \$(CXX) test failed. You must have MS VC++ in your path to build." 1>&2; exit 1; } + fi + rm -f conftest* +@@ -3036,17 +2938,17 @@ + + # Check midl version + _MIDL_FULL_VERSION=`"${MIDL}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"` + _MIDL_MAJOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $1 }'` + _MIDL_MINOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $2 }'` + _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:3045: checking for midl flags" >&5 ++echo "configure:2947: 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 + # compatible with versions of Windows older than Win2k. + # This switches us back to the old behaviour. When we drop + # support for Windows older than Win2k, we should remove + # this. + MIDL_FLAGS="${MIDL_FLAGS} -no_robust" +@@ -3058,47 +2960,47 @@ + + unset _MSVC_VER_FILTER + + else + # Check w32api version + _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:3067: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:2969: checking for w32api version >= $W32API_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { + #if (__W32API_MAJOR_VERSION < $_W32API_MAJOR_VERSION) || \ + (__W32API_MAJOR_VERSION == $_W32API_MAJOR_VERSION && \ + __W32API_MINOR_VERSION < $_W32API_MINOR_VERSION) + #error "test failed." + #endif + + ; return 0; } + EOF +-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + res=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + res=no + fi + rm -f conftest* + echo "$ac_t""$res" 1>&6 + if test "$res" != "yes"; then + { echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&2; exit 1; } + fi + # Check windres version + echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 +-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:2999: 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 }'` + _WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'` + _WINDRES_RELEASE_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $3 }'` + WINDRES_MAJOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $1 }'` + WINDRES_MINOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $2 }'` + WINDRES_RELEASE_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $3 }'` +@@ -3115,72 +3017,72 @@ + ;; + esac + + if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3124: checking how to run the C preprocessor" >&5 ++echo "configure:3026: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # 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:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3047: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3064: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3081: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +@@ -3198,27 +3100,27 @@ + ac_cv_prog_CPP="$CPP" + fi + echo "$ac_t""$CPP" 1>&6 + + for ac_hdr in mmintrin.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3207: checking for $ac_hdr" >&5 ++echo "configure:3109: 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:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3119: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -3239,41 +3141,41 @@ + fi + done + + fi + + 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:3248: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3150: 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:3251: checking whether cc understands -c and -o together" >&5 ++echo "configure:3153: 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]/_/'`" + if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'foo(){}' > conftest.c + # Make sure it works both with $CC and with simple cc. + # 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:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3166: \"$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:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3171: \"$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:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi +@@ -3299,72 +3201,72 @@ + _OLDCC=$CC + _OLDCXX=$CXX + CC="${srcdir}/build/hcc '$CC'" + CXX="${srcdir}/build/hcpp '$CXX'" + fi + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3308: checking how to run the C preprocessor" >&5 ++echo "configure:3210: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # 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:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3231: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3248: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:3363: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +@@ -3379,35 +3281,35 @@ + fi + CPP="$ac_cv_prog_CPP" + else + ac_cv_prog_CPP="$CPP" + fi + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3388: checking how to run the C++ preprocessor" >&5 ++echo "configure:3290: 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 + else + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + 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:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3308: \"$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 + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +@@ -3444,17 +3346,17 @@ + # SunOS /usr/etc/install + # IRIX /sbin/install + # AIX /bin/install + # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # 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:3453: checking for a BSD compatible install" >&5 ++echo "configure:3355: 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 + else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in +@@ -3497,17 +3399,17 @@ + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + + test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:3506: checking whether ln -s works" >&5 ++echo "configure:3408: 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 + rm -f conftestdata + if ln -s X conftestdata 2>/dev/null + then + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" +@@ -3522,17 +3424,17 @@ + echo "$ac_t""no" 1>&6 + fi + + for ac_prog in $PERL perl5 perl + 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:3531: checking for $ac_word" >&5 ++echo "configure:3433: 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 + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3562,40 +3464,40 @@ + test -n "$PERL" && break + done + + if test -z "$PERL" || test "$PERL" = ":"; then + { echo "configure: error: perl not found in \$PATH" 1>&2; exit 1; } + fi + + echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 +-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3473: 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 + + if test "$_perl_res" != 0; then + { echo "configure: error: Perl $PERL_VERSION or higher is required." 1>&2; exit 1; } + fi + + echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 +-echo "configure:3581: checking for full perl installation" >&5 ++echo "configure:3483: 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 + echo "$ac_t""no" 1>&6 + { echo "configure: error: Cannot find Config.pm or \$Config{archlib}. A full perl installation is required." 1>&2; exit 1; } + else + echo "$ac_t""yes" 1>&6 + fi + + # 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:3594: checking for $ac_word" >&5 ++echo "configure:3496: 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 + case "$DOXYGEN" in + /*) + ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3621,17 +3523,17 @@ + echo "$ac_t""$DOXYGEN" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # 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:3630: checking for $ac_word" >&5 ++echo "configure:3532: 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 + case "$WHOAMI" in + /*) + ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3657,17 +3559,17 @@ + echo "$ac_t""$WHOAMI" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # 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:3666: checking for $ac_word" >&5 ++echo "configure:3568: 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 + case "$AUTOCONF" in + /*) + ac_cv_path_AUTOCONF="$AUTOCONF" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3693,17 +3595,17 @@ + echo "$ac_t""$AUTOCONF" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # 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:3702: checking for $ac_word" >&5 ++echo "configure:3604: 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 + case "$UNZIP" in + /*) + ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3731,17 +3633,17 @@ + echo "$ac_t""no" 1>&6 + fi + + for ac_prog in zip + 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:3740: checking for $ac_word" >&5 ++echo "configure:3642: 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 + case "$ZIP" in + /*) + ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3766,23 +3668,20 @@ + echo "$ac_t""$ZIP" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + test -n "$ZIP" && break + done + +-if test -z "$ZIP" || test "$ZIP" = ":"; then +- { echo "configure: error: zip not found in \$PATH" 1>&2; exit 1; } +-fi + # 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:3781: checking for $ac_word" >&5 ++echo "configure:3680: 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 + case "$SYSTEM_MAKEDEPEND" in + /*) + ac_cv_path_SYSTEM_MAKEDEPEND="$SYSTEM_MAKEDEPEND" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3807,17 +3706,17 @@ + echo "$ac_t""$SYSTEM_MAKEDEPEND" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # 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:3816: checking for $ac_word" >&5 ++echo "configure:3715: 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 + case "$XARGS" in + /*) + ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3870,17 +3769,17 @@ + fi + fi + + for ac_prog in pbbuild xcodebuild pbxbuild + 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:3879: checking for $ac_word" >&5 ++echo "configure:3778: 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 + case "$PBBUILD" in + /*) + ac_cv_path_PBBUILD="$PBBUILD" # Let the user override the test with a path. + ;; + ?:/*) +@@ -3920,17 +3819,17 @@ + HAS_XCODE_2_1=1; + fi + ;; + esac + + # 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:3929: checking for $ac_word" >&5 ++echo "configure:3828: 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 + case "$SDP" in + /*) + ac_cv_path_SDP="$SDP" # Let the user override the test with a path. + ;; + ?:/*) +@@ -4051,34 +3950,34 @@ + CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}" + + if test "$GCC_VERSION_FULL" = "4.0.0" ; then + LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}" + fi + fi + + echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 +-echo "configure:4060: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3959: 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' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { return 0; } + int main() { + result=yes + ; return 0; } + EOF +-if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result=no + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + +@@ -4093,17 +3992,17 @@ + + case "$host_os" in + cygwin*|mingw*|mks*|msvc*) + for ac_prog in $MAKE make gmake + 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:4102: checking for $ac_word" >&5 ++echo "configure:4001: 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 + case "$MAKE" in + /*) + ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path. + ;; + ?:/*) +@@ -4136,17 +4035,17 @@ + + ;; + *) + for ac_prog in $MAKE gmake make + 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:4145: checking for $ac_word" >&5 ++echo "configure:4044: 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 + case "$MAKE" in + /*) + ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path. + ;; + ?:/*) +@@ -4204,17 +4103,17 @@ + + if test "$COMPILE_ENVIRONMENT"; then + + # If we find X, set shell vars x_includes and x_libraries to the + # paths, otherwise set no_x=yes. + # 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:4213: checking for X" >&5 ++echo "configure:4112: checking for X" >&5 + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then + withval="$with_x" + : + fi + + # $have_x is `yes', `no', `disabled', or empty when we do not yet know. +@@ -4266,22 +4165,22 @@ + fi + + if test "$ac_x_includes" = NO; then + # Guess where to find include files, by looking for this one X11 .h file. + test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h + + # 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:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4179: \"$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* + # We can compile using X headers with no special include directory. + ac_x_includes= + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 +@@ -4340,24 +4239,24 @@ + test -z "$x_direct_test_library" && x_direct_test_library=Xt + test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc + + # See if we find them without any special options. + # Don't add to $LIBS permanently. + 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:4255: \"$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. + ac_x_libraries= + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +@@ -4453,50 +4352,50 @@ + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + 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:4462: checking whether -R must be followed by a space" >&5 ++echo "configure:4361: 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:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_nospace=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_R_nospace=no + fi + rm -f conftest* + if test $ac_R_nospace = yes; then + echo "$ac_t""no" 1>&6 + X_LIBS="$X_LIBS -R$x_libraries" + 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:4394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_R_space=no + fi +@@ -4518,39 +4417,39 @@ + + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X + # 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:4527: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4426: 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 + else + 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:4448: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -4562,39 +4461,39 @@ + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + else + echo "$ac_t""no" 1>&6 + fi + + 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:4571: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4470: 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 + else + 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:4492: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -4613,22 +4512,22 @@ + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # 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:4622: checking for gethostbyname" >&5 ++echo "configure:4521: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif +@@ -4644,17 +4543,17 @@ + #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) + choke me + #else + gethostbyname(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4552: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyname=no" + fi +@@ -4665,39 +4564,39 @@ + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + fi + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:4674: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4573: 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 + else + 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:4595: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -4717,22 +4616,22 @@ + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says simon@lia.di.epfl.ch: it contains + # gethostby* variants that don't use the nameserver (or something). + # -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:4726: checking for connect" >&5 ++echo "configure:4625: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif +@@ -4748,17 +4647,17 @@ + #if defined (__stub_connect) || defined (__stub___connect) + choke me + #else + connect(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4656: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_connect=no" + fi +@@ -4769,39 +4668,39 @@ + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + fi + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:4778: checking for connect in -lsocket" >&5 ++echo "configure:4677: 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 + else + 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:4699: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -4815,22 +4714,22 @@ + else + echo "$ac_t""no" 1>&6 + fi + + fi + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +-echo "configure:4824: checking for remove" >&5 ++echo "configure:4723: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif +@@ -4846,17 +4745,17 @@ + #if defined (__stub_remove) || defined (__stub___remove) + choke me + #else + remove(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4754: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_remove=no" + fi +@@ -4867,39 +4766,39 @@ + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + fi + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +-echo "configure:4876: checking for remove in -lposix" >&5 ++echo "configure:4775: 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 + else + 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:4797: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -4913,22 +4812,22 @@ + else + echo "$ac_t""no" 1>&6 + fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +-echo "configure:4922: checking for shmat" >&5 ++echo "configure:4821: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif +@@ -4944,17 +4843,17 @@ + #if defined (__stub_shmat) || defined (__stub___shmat) + choke me + #else + shmat(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4852: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_shmat=no" + fi +@@ -4965,39 +4864,39 @@ + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + fi + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +-echo "configure:4974: checking for shmat in -lipc" >&5 ++echo "configure:4873: 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 + else + 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:4895: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -5020,39 +4919,39 @@ + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # These have to be linked with before -lX11, unlike the other + # 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:5029: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4928: 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 + else + 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:4950: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -5480,41 +5379,41 @@ + fi + + MKSHLIB_FORCE_ALL= + MKSHLIB_UNFORCE_ALL= + + 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:5489: checking whether ld has archive extraction flags" >&5 ++echo "configure:5388: 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 + _SAVE_LDFLAGS=$LDFLAGS; _SAVE_LIBS=$LIBS + ac_cv_mkshlib_force_and_unforce="no" + exec 3<&0 < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5412: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + done +@@ -5537,95 +5436,95 @@ + if test "$COMPILE_ENVIRONMENT"; then + configure_static_assert_macros=' + #define CONFIGURE_STATIC_ASSERT(condition) CONFIGURE_STATIC_ASSERT_IMPL(condition, __LINE__) + #define CONFIGURE_STATIC_ASSERT_IMPL(condition, line) CONFIGURE_STATIC_ASSERT_IMPL2(condition, line) + #define CONFIGURE_STATIC_ASSERT_IMPL2(condition, line) typedef int static_assert_line_##line[(condition) ? 1 : -1] + ' + + echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 +-echo "configure:5546: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:5445: checking that static assertion macros used in autoconf tests work" >&5 + if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + ac_cv_static_assertion_macros_work="yes" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5466: \"$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* + ac_cv_static_assertion_macros_work="no" + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5506: \"$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* + ac_cv_static_assertion_macros_work="no" + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + ac_ext=C +@@ -5650,26 +5549,26 @@ + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5659: checking for 64-bit OS" >&5 ++echo "configure:5558: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + result="no" + fi +@@ -5817,28 +5716,28 @@ + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + 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:5826: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5725: 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:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _BAD_COMPILER=1 + fi +@@ -5866,27 +5765,27 @@ + DLL_SUFFIX='_shr.a' + ;; + esac + if test "$COMPILE_ENVIRONMENT"; then + for ac_hdr in sys/inttypes.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5875: checking for $ac_hdr" >&5 ++echo "configure:5774: 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:5885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5784: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -5918,32 +5817,32 @@ + no_x=yes + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' + _PLATFORM_DEFAULT_TOOLKIT="beos" + DSO_LDOPTS='-nostart' + TK_LIBS='-lbe -lroot' + LIBS="$LIBS -lbe" + if test "$COMPILE_ENVIRONMENT"; then + echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 +-echo "configure:5927: checking for main in -lbind" >&5 ++echo "configure:5826: 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 + else + 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:5841: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -5954,32 +5853,32 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lbind" + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:5963: checking for main in -lzeta" >&5 ++echo "configure:5862: 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 + else + 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:5877: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -6037,28 +5936,28 @@ + STRIP="$STRIP -x -S" + _PLATFORM_DEFAULT_TOOLKIT='mac' + MOZ_ENABLE_POSTSCRIPT= + TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' + # set MACOSX to generate lib/mac/MoreFiles/Makefile + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:6046: checking for -dead_strip option to ld" >&5 ++echo "configure:5945: 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:5956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _HAVE_DEAD_STRIP= + fi +@@ -6916,24 +6815,24 @@ + + CFLAGS="$CFLAGS -xstrconst -xbuiltin=%all" + CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife" + LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS" + if test -z "$CROSS_COMPILE" && test -f /usr/lib/ld/map.noexstk; then + _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:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LDFLAGS=$_SAVE_LDFLAGS + fi + rm -f conftest* +@@ -6951,36 +6850,36 @@ + AR_FLAGS='-o $@' + AS='/usr/ccs/bin/as' + ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0" + AS_DASH_C_FLAG='' + TARGET_COMPILER_ABI="sunc" + 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:6960: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6859: 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. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _BAD_COMPILER=1 + fi +@@ -7120,47 +7019,47 @@ + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:7129: checking for ANSI C header files" >&5 ++echo "configure:7028: 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 + #include + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7041: \"$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* + ac_cv_header_stdc=yes + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* + + 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 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then + : + else + rm -rf conftest* +@@ -7168,17 +7067,17 @@ + fi + rm -f conftest* + + fi + + 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 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : + else + rm -rf conftest* +@@ -7189,28 +7088,28 @@ + fi + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int main () { int i; for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); + exit (0); } + + EOF +-if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_header_stdc=no + fi +@@ -7224,22 +7123,22 @@ + if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF + #define STDC_HEADERS 1 + EOF + + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7233: checking for working const" >&5 ++echo "configure:7132: 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 <j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } + + ; return 0; } + EOF +-if { (eval echo configure:7287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_const=no + fi +@@ -7299,22 +7198,22 @@ + if test $ac_cv_c_const = no; then + cat >> confdefs.h <<\EOF + #define const + EOF + + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7308: checking for mode_t" >&5 ++echo "configure:7207: 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 + #include + #include + #endif + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -7332,22 +7231,22 @@ + if test $ac_cv_type_mode_t = no; then + cat >> confdefs.h <<\EOF + #define mode_t int + EOF + + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7341: checking for off_t" >&5 ++echo "configure:7240: 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 + #include + #include + #endif + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -7365,22 +7264,22 @@ + if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF + #define off_t long + EOF + + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7374: checking for pid_t" >&5 ++echo "configure:7273: 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 + #include + #include + #endif + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -7398,22 +7297,22 @@ + if test $ac_cv_type_pid_t = no; then + cat >> confdefs.h <<\EOF + #define pid_t int + EOF + + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7407: checking for size_t" >&5 ++echo "configure:7306: 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 + #include + #include + #endif + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -7431,30 +7330,30 @@ + if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF + #define size_t unsigned + EOF + + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7440: checking for st_blksize in struct stat" >&5 ++echo "configure:7339: 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 + int main() { + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_struct_st_blksize=no + fi +@@ -7465,30 +7364,30 @@ + if test $ac_cv_struct_st_blksize = yes; then + cat >> confdefs.h <<\EOF + #define HAVE_ST_BLKSIZE 1 + EOF + + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7474: checking for siginfo_t" >&5 ++echo "configure:7373: 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 < + int main() { + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_siginfo_t=false + fi +@@ -7512,30 +7411,30 @@ + + cat >> confdefs.h <<\EOF + #define __off_t 1 + EOF + + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7521: checking for int16_t" >&5 ++echo "configure:7420: 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 + int main() { + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int16_t=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_int16_t=false + fi +@@ -7547,30 +7446,30 @@ + #define HAVE_INT16_T 1 + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7556: checking for int32_t" >&5 ++echo "configure:7455: 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 + int main() { + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_int32_t=false + fi +@@ -7582,30 +7481,30 @@ + #define HAVE_INT32_T 1 + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7591: checking for int64_t" >&5 ++echo "configure:7490: 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 + int main() { + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_int64_t=false + fi +@@ -7617,30 +7516,30 @@ + #define HAVE_INT64_T 1 + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7626: checking for int64" >&5 ++echo "configure:7525: 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 + int main() { + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_int64=false + fi +@@ -7652,30 +7551,30 @@ + #define HAVE_INT64 1 + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7661: checking for uint" >&5 ++echo "configure:7560: 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 + int main() { + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_uint=false + fi +@@ -7687,30 +7586,30 @@ + #define HAVE_UINT 1 + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7696: checking for uint_t" >&5 ++echo "configure:7595: 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 + int main() { + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_uint_t=false + fi +@@ -7722,30 +7621,30 @@ + #define HAVE_UINT_T 1 + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7731: checking for uint16_t" >&5 ++echo "configure:7630: 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 + int main() { + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_uint16_t=false + fi +@@ -7766,30 +7665,30 @@ + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7775: checking for uname.domainname" >&5 ++echo "configure:7674: 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() { + struct utsname *res; char *domain; + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_have_uname_domainname_field=false + fi +@@ -7803,30 +7702,30 @@ + EOF + + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:7812: checking for uname.__domainname" >&5 ++echo "configure:7711: 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() { + struct utsname *res; char *domain; + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=false + fi +@@ -7849,31 +7748,31 @@ + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:7858: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7757: checking for usable wchar_t (2 bytes, unsigned)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_v2="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_have_usable_wchar_v2="no" + fi +@@ -7896,31 +7795,31 @@ + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:7905: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7804: checking for compiler -fshort-wchar option" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="no" + fi +@@ -7944,17 +7843,17 @@ + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + fi + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:7953: checking for visibility(hidden) attribute" >&5 ++echo "configure:7852: 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 + cat > conftest.c </dev/null 2>&1; then +@@ -7969,17 +7868,17 @@ + echo "$ac_t""$ac_cv_visibility_hidden" 1>&6 + if test "$ac_cv_visibility_hidden" = "yes"; then + cat >> confdefs.h <<\EOF + #define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1 + EOF + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:7978: checking for visibility(default) attribute" >&5 ++echo "configure:7877: 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 + cat > conftest.c </dev/null 2>&1; then +@@ -7994,17 +7893,17 @@ + echo "$ac_t""$ac_cv_visibility_default" 1>&6 + if test "$ac_cv_visibility_default" = "yes"; then + cat >> confdefs.h <<\EOF + #define HAVE_VISIBILITY_ATTRIBUTE 1 + EOF + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:8003: checking for visibility pragma support" >&5 ++echo "configure:7902: 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 + cat > conftest.c <&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 +-echo "configure:8028: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:7927: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.c <&6 + + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:8056: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7955: 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 + cat > conftest.c < + #pragma GCC visibility pop +@@ -8077,48 +7976,47 @@ + fi + rm -f conftest.{c,S} + + fi + + echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 + if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ + "$ac_cv_have_visibility_class_bug" = "no"; then +- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' +- WRAP_SYSTEM_INCLUDES=1 ++ VISIBILITY_FLAGS='-fvisibility=hidden' + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug + fi # have visibility pragma + fi # have visibility(default) attribute + fi # have visibility(hidden) attribute + fi # GNU_CC + + + + + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h + 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:8104: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:8002: 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> + int main() { + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:8117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=no" + fi +@@ -8133,36 +8031,36 @@ + ac_header_dirent=$ac_hdr; break + else + echo "$ac_t""no" 1>&6 + fi + done + # 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:8142: checking for opendir in -ldir" >&5 ++echo "configure:8040: 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 + else + 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:8059: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8174,36 +8072,36 @@ + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -ldir" + else + echo "$ac_t""no" 1>&6 + fi + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:8183: checking for opendir in -lx" >&5 ++echo "configure:8081: 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 + else + 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:8100: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8225,27 +8123,27 @@ + # for stuff like -lXshm + CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" + ;; + esac + for ac_hdr in sys/byteorder.h compat.h getopt.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8234: checking for $ac_hdr" >&5 ++echo "configure:8132: 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:8244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8142: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8265,27 +8163,27 @@ + echo "$ac_t""no" 1>&6 + fi + done + + for ac_hdr in sys/bitypes.h memory.h unistd.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8274: checking for $ac_hdr" >&5 ++echo "configure:8172: 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:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8182: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8305,27 +8203,27 @@ + echo "$ac_t""no" 1>&6 + fi + done + + for ac_hdr in gnu/libc-version.h nl_types.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8314: checking for $ac_hdr" >&5 ++echo "configure:8212: 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:8324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8222: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8345,27 +8243,27 @@ + echo "$ac_t""no" 1>&6 + fi + done + + for ac_hdr in malloc.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8354: checking for $ac_hdr" >&5 ++echo "configure:8252: 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:8364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8262: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8385,27 +8283,27 @@ + echo "$ac_t""no" 1>&6 + fi + done + + for ac_hdr in X11/XKBlib.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8394: checking for $ac_hdr" >&5 ++echo "configure:8292: 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:8404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8302: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8426,27 +8324,27 @@ + fi + done + + + for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8435: checking for $ac_hdr" >&5 ++echo "configure:8333: 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:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8343: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8467,27 +8365,27 @@ + fi + done + + + for ac_hdr in mmintrin.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8476: checking for $ac_hdr" >&5 ++echo "configure:8374: 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:8486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8384: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8514,27 +8412,27 @@ + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8523: checking for new" >&5 ++echo "configure:8421: 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:8533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8431: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8565,27 +8463,27 @@ + case $target in + *-aix4.3*|*-aix5*) + ;; + *) + for ac_hdr in sys/cdefs.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8574: checking for $ac_hdr" >&5 ++echo "configure:8472: 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:8584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8482: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8609,36 +8507,36 @@ + ;; + esac + + case $target in + *-hpux11.*) + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8618: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8516: 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 + else + 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:8535: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8658,36 +8556,36 @@ + + else + echo "$ac_t""no" 1>&6 + fi + + ;; + esac + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8667: checking for atan in -lm" >&5 ++echo "configure:8565: 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 + else + 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:8584: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8711,63 +8609,63 @@ + + + + case $target in + *-darwin*) + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8720: checking for dlopen in -ldl" >&5 ++echo "configure:8618: 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 + else + 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:8637: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi + rm -f conftest* + LIBS="$ac_save_LIBS" + + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + 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:8756: checking for dlfcn.h" >&5 ++echo "configure:8654: 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:8766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8664: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8793,36 +8691,36 @@ + + ;; + esac + if test ! "$GNU_CXX"; then + + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:8802: checking for demangle in -lC_r" >&5 ++echo "configure:8700: 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 + else + 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:8719: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8842,36 +8740,36 @@ + + else + echo "$ac_t""no" 1>&6 + fi + + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:8851: checking for demangle in -lC" >&5 ++echo "configure:8749: 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 + else + 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:8768: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8892,36 +8790,36 @@ + else + echo "$ac_t""no" 1>&6 + fi + + ;; + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:8901: checking for socket in -lsocket" >&5 ++echo "configure:8799: 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 + else + 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:8818: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8956,36 +8854,36 @@ + cat >> confdefs.h <&6 +-echo "configure:8965: checking for XDrawLines in -lX11" >&5 ++echo "configure:8863: 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 + else + 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:8882: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -8997,36 +8895,36 @@ + echo "$ac_t""yes" 1>&6 + X11_LIBS="-lX11" + else + echo "$ac_t""no" 1>&6 + MISSING_X="$MISSING_X -lX11" + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:9006: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8904: 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 + else + 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:8923: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9040,36 +8938,36 @@ + else + echo "$ac_t""no" 1>&6 + MISSING_X="$MISSING_X -lXext" + fi + + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9049: checking for XtFree in -lXt" >&5 ++echo "configure:8947: 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 + else + 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:8966: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9080,36 +8978,36 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + XT_LIBS="-lXt" + else + echo "$ac_t""no" 1>&6 + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:9089: checking for IceFlush in -lICE" >&5 ++echo "configure:8987: 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 + else + 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:9006: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9120,36 +9018,36 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + XT_LIBS="-lICE $XT_LIBS" + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:9129: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:9027: 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 + else + 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:9046: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9160,36 +9058,36 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + XT_LIBS="-lSM $XT_LIBS" + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9169: checking for XtFree in -lXt" >&5 ++echo "configure:9067: 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 + else + 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:9086: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9213,36 +9111,36 @@ + # crashes in plugins linked against Motif - Bug #98892 + case "${target_os}" in + aix*) + XT_LIBS="-lXm $XT_LIBS" + ;; + esac + + echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +-echo "configure:9222: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9120: 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 + else + 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:9139: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9254,27 +9152,27 @@ + echo "$ac_t""yes" 1>&6 + MOZ_XINERAMA_LIBS="-lXinerama" + else + echo "$ac_t""no" 1>&6 + fi + + 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:9263: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9161: 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:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9171: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -9287,36 +9185,36 @@ + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9296: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9194: 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 + else + 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:9213: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9328,27 +9226,27 @@ + echo "$ac_t""yes" 1>&6 + _HAVE_XSHM_XEXT=1 + else + echo "$ac_t""no" 1>&6 + fi + + 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:9337: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9235: 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:9347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9245: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -9368,36 +9266,36 @@ + test -n "$_HAVE_XSHM_XEXT"; then + cat >> confdefs.h <<\EOF + #define HAVE_XSHM 1 + EOF + + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9377: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9275: 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 + else + 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:9294: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -9409,27 +9307,27 @@ + echo "$ac_t""yes" 1>&6 + MOZ_XIE_LIBS="-lXIE" + else + echo "$ac_t""no" 1>&6 + fi + + 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:9418: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9316: 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:9428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9326: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -9493,17 +9391,17 @@ + ft_config_args="$ft_config_args --prefix=$ft_config_prefix" + if test x${FT2_CONFIG+set} != xset ; then + FT2_CONFIG=$ft_config_prefix/bin/freetype-config + fi + fi + # 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:9502: checking for $ac_word" >&5 ++echo "configure:9400: 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 + case "$FT2_CONFIG" in + /*) + ac_cv_path_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -9529,17 +9427,17 @@ + echo "$ac_t""$FT2_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9538: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9436: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes + else + FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` + FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` + ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -9577,17 +9475,17 @@ + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $FT2_CFLAGS" + LIBS="$FT2_LIBS $LIBS" + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include FT_FREETYPE_H + #include + #include + + int +@@ -9603,17 +9501,17 @@ + else + { + FT_Done_FreeType(library); + return 0; + } + } + + EOF +-if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_ft=yes + fi +@@ -9655,17 +9553,17 @@ + + + + + + + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:9664: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9562: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -9677,17 +9575,17 @@ + rm -f dummy.c dummy${ac_exeext} ; + if test "$_res" = "0"; then + echo "$ac_t""yes" 1>&6 + USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads" + else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:9686: checking for pthread_create in -lpthread" >&5 ++echo "configure:9584: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -9699,17 +9597,17 @@ + rm -f dummy.c dummy${ac_exeext} ; + if test "$_res" = "0"; then + echo "$ac_t""yes" 1>&6 + USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" + else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:9708: checking for pthread_create in -lc_r" >&5 ++echo "configure:9606: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -9721,17 +9619,17 @@ + rm -f dummy.c dummy${ac_exeext} ; + if test "$_res" = "0"; then + echo "$ac_t""yes" 1>&6 + USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r" + else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:9730: checking for pthread_create in -lc" >&5 ++echo "configure:9628: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -9777,17 +9675,17 @@ + fi + + + if test "$USE_PTHREADS"x != x + then + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:9786: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9684: 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 + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthread=yes + case "$target_os" in + freebsd*) + # Freebsd doesn't use -pthread for compiles, it uses them for linking +@@ -9800,17 +9698,17 @@ + fi + fi + rm -f conftest* + echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6 + + 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:9809: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9707: 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 + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthreads=yes + CFLAGS="$CFLAGS -pthreads" + CXXFLAGS="$CXXFLAGS -pthreads" + fi +@@ -9895,17 +9793,17 @@ + CFLAGS="$CFLAGS -mt" + CXXFLAGS="$CXXFLAGS -mt" + fi + ;; + esac + fi + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:9904: checking whether mmap() sees write()s" >&5 ++echo "configure:9802: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' + #include + #include + #include + #include + #include +@@ -9934,21 +9832,21 @@ + } + ' + + + if test "$cross_compiling" = yes; then + 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:9845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + result="no" + fi +@@ -9963,23 +9861,23 @@ + #define MMAP_MISSES_WRITES 1 + EOF + + fi + + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:9972: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9870: 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 + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +@@ -9987,17 +9885,17 @@ + rm -rf conftest* + ac_cv_prog_gcc_traditional=no + fi + rm -f conftest* + + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +@@ -10009,35 +9907,35 @@ + + echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:10018: checking for 8-bit clean memcmp" >&5 ++echo "configure:9916: 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 + if test "$cross_compiling" = yes; then + 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:9934: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_memcmp_clean=no + fi +@@ -10047,22 +9945,22 @@ + fi + + echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 + test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" + + 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:10056: checking for $ac_func" >&5 ++echo "configure:9954: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func(); +@@ -10075,17 +9973,17 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9982: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -10102,22 +10000,22 @@ + else + echo "$ac_t""no" 1>&6 + fi + done + + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10111: checking for $ac_func" >&5 ++echo "configure:10009: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func(); +@@ -10130,17 +10028,17 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:10139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10037: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -10159,22 +10057,22 @@ + fi + done + + + if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100200"; then + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10168: checking for $ac_func" >&5 ++echo "configure:10066: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func(); +@@ -10187,17 +10085,17 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:10196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10094: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -10223,29 +10121,29 @@ + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10232: checking for wcrtomb" >&5 ++echo "configure:10130: 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:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_have_wcrtomb="no" + fi +@@ -10255,29 +10153,29 @@ + echo "$ac_t""$ac_cv_have_wcrtomb" 1>&6 + if test "$ac_cv_have_wcrtomb" = "yes"; then + cat >> confdefs.h <<\EOF + #define HAVE_WCRTOMB 1 + EOF + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10264: checking for mbrtowc" >&5 ++echo "configure:10162: 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:10276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_have_mbrtowc="no" + fi +@@ -10296,34 +10194,34 @@ + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10305: checking for res_ninit()" >&5 ++echo "configure:10203: 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 < + + int main() { + int foo = res_ninit(&_res); + ; return 0; } + EOF +-if { (eval echo configure:10322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10220: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_res_ninit=no + fi +@@ -10343,33 +10241,33 @@ + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10352: checking for gnu_get_libc_version()" >&5 ++echo "configure:10250: 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 < + #endif + + int main() { + const char *glibc_version = gnu_get_libc_version(); + ; return 0; } + EOF +-if { (eval echo configure:10368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10266: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=no + +@@ -10388,39 +10286,39 @@ + fi + + case $target_os in + os2*|msvc*|mks*|cygwin*|mingw*|darwin*|wince*) + ;; + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10397: checking for iconv in -lc" >&5 ++echo "configure:10295: 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 + else + 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:10317: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -10429,39 +10327,39 @@ + + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + _ICONV_LIBS="$_ICONV_LIBS" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10438: checking for iconv in -liconv" >&5 ++echo "configure:10336: 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 + else + 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:10358: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -10470,39 +10368,39 @@ + + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + _ICONV_LIBS="$_ICONV_LIBS -liconv" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10479: checking for libiconv in -liconv" >&5 ++echo "configure:10377: 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 + else + 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:10399: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -10519,36 +10417,36 @@ + + fi + + fi + + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10528: checking for iconv()" >&5 ++echo "configure:10426: 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 < + #include + + int main() { + + iconv_t h = iconv_open("", ""); + iconv(h, NULL, NULL, NULL, NULL); + iconv_close(h); + + ; return 0; } + EOF +-if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_iconv=no + +@@ -10562,37 +10460,37 @@ + cat >> confdefs.h <<\EOF + #define HAVE_ICONV 1 + EOF + + DYNAMIC_XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS $_ICONV_LIBS" + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10571: checking for iconv() with const input" >&5 ++echo "configure:10469: 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 < + #include + + int main() { + + const char *input = "testing"; + iconv_t h = iconv_open("", ""); + iconv(h, &input, NULL, NULL, NULL); + iconv_close(h); + + ; return 0; } + EOF +-if { (eval echo configure:10591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_const_iconv=no + +@@ -10611,29 +10509,29 @@ + fi + LIBS=$_SAVE_LIBS + + ;; + esac + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10620: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10518: 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:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_langinfo_codeset=no + fi +@@ -10655,123 +10553,123 @@ + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:10664: checking for an implementation of va_copy()" >&5 ++echo "configure:10562: 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 + + if test "$cross_compiling" = yes; then + ac_cv_va_copy=no + + else + cat > conftest.$ac_ext < + void f (int i, ...) { + va_list args1, args2; + va_start (args1, i); + va_copy (args2, args1); + if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) + exit (1); + va_end (args1); va_end (args2); + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10586: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_va_copy=no + fi + rm -fr conftest* + fi + + + fi + + 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:10705: checking for an implementation of __va_copy()" >&5 ++echo "configure:10603: 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 + + if test "$cross_compiling" = yes; then + ac_cv___va_copy=no + + else + cat > conftest.$ac_ext < + void f (int i, ...) { + va_list args1, args2; + va_start (args1, i); + __va_copy (args2, args1); + if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) + exit (1); + va_end (args1); va_end (args2); + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10627: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv___va_copy=no + fi + rm -fr conftest* + fi + + + fi + + 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:10746: checking whether va_lists can be copied by value" >&5 ++echo "configure:10644: 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 + + if test "$cross_compiling" = yes; then + ac_cv_va_val_copy=yes + + else + cat > conftest.$ac_ext < + void f (int i, ...) { + va_list args1, args2; + va_start (args1, i); + args2 = args1; + if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) + exit (1); + va_end (args1); va_end (args2); + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10668: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_va_val_copy=no + fi +@@ -10860,17 +10758,17 @@ + cd ${_curdir} + rm -rf conftest* _conftest + ;; + esac + + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:10869: checking for C++ exceptions flag" >&5 ++echo "configure:10767: 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 + else + echo "int main() { return 0; }" | cat > conftest.C + + ${CXX-g++} ${CXXFLAGS} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1 + +@@ -10895,35 +10793,35 @@ + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:10904: checking for gcc 3.0 ABI" >&5 ++echo "configure:10802: 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 <= 100 /* G++ V3 ABI */ + return 0; + #else + #error Not gcc3. + #endif + + ; return 0; } + EOF +-if { (eval echo configure:10922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_gcc_three_abi="no" + fi +@@ -10937,32 +10835,32 @@ + else + TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-gcc2}" + fi + fi + + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:10946: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10844: 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:10859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_explicit=no + fi +@@ -10973,22 +10871,22 @@ + if test "$ac_cv_cpp_explicit" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_EXPLICIT 1 + EOF + + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:10982: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10880: 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 < class tplt { + public: +@@ -10997,17 +10895,17 @@ + return num; + } + }; + int main() { + tplt A; + A.foo(0); + ; return 0; } + EOF +-if { (eval echo configure:11006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_typename=no + fi +@@ -11018,32 +10916,32 @@ + if test "$ac_cv_cpp_typename" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_TYPENAME 1 + EOF + + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:11027: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10925: 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 {}; + template <> struct X { double a; }; + int main() { + X int_x; + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:11042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=no + fi +@@ -11055,30 +10953,30 @@ + cat >> confdefs.h <<\EOF + #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX 1 + EOF + + fi + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:11064: checking whether partial template specialization works" >&5 ++echo "configure:10962: 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 {}; + int main() { + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_partial_specialization=no + fi +@@ -11089,34 +10987,34 @@ + if test "$ac_cv_cpp_partial_specialization" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_PARTIAL_SPECIALIZATION 1 + EOF + + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:11098: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10996: 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 + Base operator+(const Base& lhs, const Base& rhs) { return lhs; } + template class Derived : public Base { }; + int main() { + Derived a, b; + Base c = a + b; + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_need_derived_template_operators=yes + fi +@@ -11128,31 +11026,31 @@ + cat >> confdefs.h <<\EOF + #define NEED_CPP_DERIVED_TEMPLATE_OPERATORS 1 + EOF + + fi + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:11137: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11035: 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 { }; + template int foo(const Base&) { return 0; } + int main() { + Derived bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:11151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=yes + fi +@@ -11163,22 +11061,22 @@ + if test "$ac_cv_need_cpp_template_cast_to_base" = yes ; then + cat >> confdefs.h <<\EOF + #define NEED_CPP_TEMPLATE_CAST_TO_BASE 1 + EOF + + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11172: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11070: 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 { + public: T* ptr; + }; + + template T* a(ptrClass *arg) { + return arg->ptr; +@@ -11189,17 +11087,17 @@ + return arg->ptr; + } + + int main() { + ptrClass i; + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11198: \"$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_can_resolve_const_ambiguity=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=no + fi +@@ -11211,41 +11109,41 @@ + cat >> confdefs.h <<\EOF + #define CANT_RESOLVE_CPP_CONST_AMBIGUITY 1 + EOF + + fi + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11220: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11118: 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:11131: \"$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:11142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_access_changing_using2=yes + fi +@@ -11263,38 +11161,38 @@ + if test "$ac_cv_cpp_access_changing_using2" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_ACCESS_CHANGING_USING 1 + EOF + + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11272: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11170: 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:11191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=no + fi +@@ -11305,29 +11203,29 @@ + if test "$ac_cv_cpp_ambiguity_resolving_using" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1 + EOF + + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11314: checking for \"std::\" namespace" >&5 ++echo "configure:11212: 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:11326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_namespace_std=no + fi +@@ -11338,32 +11236,32 @@ + if test "$ac_cv_cpp_namespace_std" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_NAMESPACE_STD 1 + EOF + + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11347: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11245: 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 {}; + int operator==(const T1&, const T1&) { return 0; } + int operator!=(const T1&, const T1&) { return 0; } + int main() { + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=ambiguous + fi +@@ -11375,30 +11273,30 @@ + cat >> confdefs.h <<\EOF + #define HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL 1 + EOF + + fi + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11384: checking for C++ reinterpret_cast" >&5 ++echo "configure:11282: 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:11397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=no + fi +@@ -11409,41 +11307,44 @@ + if test "$ac_cv_cpp_reinterpret_cast" = yes ; then + cat >> confdefs.h <<\EOF + #define HAVE_CPP_NEW_CASTS 1 + EOF + + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11418: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11316: 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 + if test "$cross_compiling" = yes; then + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(subx))) || + (((void*)&mdo != (void*)suby) && + ((void*)&mdo == dynamic_cast(suby)))); + } + EOF +-if { (eval echo configure:11442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11343: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_cpp_dynamic_cast_void_ptr=no + fi +@@ -11457,29 +11358,29 @@ + cat >> confdefs.h <<\EOF + #define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1 + EOF + + fi + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11466: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11367: 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:11379: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_unused_required=yes + fi +@@ -11492,33 +11393,33 @@ + #define NEED_CPP_UNUSED_IMPLEMENTATIONS 1 + EOF + + fi + + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11501: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11402: 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 {}; + class T2; + template int operator==(const T2*, const T&) { return 0; } + template int operator!=(const T2*, const T&) { return 0; } + int main() { + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=yes + fi +@@ -11540,29 +11441,29 @@ + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11549: checking for LC_MESSAGES" >&5 ++echo "configure:11450: 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:11561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_i18n_lc_messages=no + fi +@@ -11633,17 +11534,17 @@ + NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config + fi + fi + + unset ac_cv_path_NSPR_CONFIG + # 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:11642: checking for $ac_word" >&5 ++echo "configure:11543: 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 + case "$NSPR_CONFIG" in + /*) + ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -11668,17 +11569,17 @@ + if test -n "$NSPR_CONFIG"; then + echo "$ac_t""$NSPR_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11677: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11578: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then + no_nspr="yes" + else + NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` + NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` + +@@ -11770,17 +11671,17 @@ + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + # 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:11779: checking for $ac_word" >&5 ++echo "configure:11680: 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 + case "$NSS_CONFIG" in + /*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -11805,17 +11706,17 @@ + if test -n "$NSS_CONFIG"; then + echo "$ac_t""$NSS_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11814: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11715: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + +@@ -11878,36 +11779,36 @@ + if test -n "${JPEG_DIR}" -a "${JPEG_DIR}" != "yes"; then + CFLAGS="-I${JPEG_DIR}/include $CFLAGS" + LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS" + fi + if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:11887: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11788: 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 + else + 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:11807: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -11926,31 +11827,31 @@ + fi + + if test "$SYSTEM_JPEG" = 1; then + LIBS="$JPEG_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_JPEG= + else + cat > conftest.$ac_ext < + #include + #include + int main () { + #if JPEG_LIB_VERSION >= $MOZJPEG + exit(0); + #else + exit(1); + #endif + } + + EOF +-if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_JPEG=1 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS= + fi +@@ -11981,36 +11882,36 @@ + if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then + CFLAGS="-I${ZLIB_DIR}/include $CFLAGS" + LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS" + fi + if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:11990: checking for gzread in -lz" >&5 ++echo "configure:11891: 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 + else + 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:11910: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -12028,17 +11929,17 @@ + + fi + if test "$SYSTEM_ZLIB" = 1; then + LIBS="$ZLIB_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_ZLIB= + else + cat > conftest.$ac_ext < + #include + #include + int parse_version(const char *str, int *ver) { + return (sscanf(str, "%d.%d.%d", ver, ver+1, ver+2)==3?0:1); + } +@@ -12049,17 +11950,17 @@ + if ((sys[0] == req[0]) && + ((sys[1] > req[1]) || ((sys[1] == req[1]) && (sys[2] >= req[2])))) + exit(0); + else + exit(1); + } + + EOF +-if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_ZLIB=1 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS= + fi +@@ -12092,36 +11993,36 @@ + if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then + CFLAGS="-I${PNG_DIR}/include $CFLAGS" + LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS" + fi + if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then + SYSTEM_PNG= + else + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:12101: checking for png_get_valid in -lpng" >&5 ++echo "configure:12002: 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 + else + 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:12021: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -12139,31 +12040,31 @@ + + fi + if test "$SYSTEM_PNG" = 1; then + LIBS="$PNG_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_PNG= + else + cat > conftest.$ac_ext < + #include + #include + int main () { + #if PNG_LIBPNG_VER >= $MOZPNG + exit(0); + #else + exit(1); + #endif + } + + EOF +-if { (eval echo configure:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_PNG=1 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + SYSTEM_PNG= PNG_CFLAGS= PNG_LIBS= + fi +@@ -12178,16 +12079,38 @@ + + if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then + PNG_CFLAGS="-I${PNG_DIR}/include" + PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" + fi + + fi # SKIP_LIBRARY_CHECKS + ++# Check whether --enable-system-myspell or --disable-system-myspell was given. ++if test "${enable_system_myspell+set}" = set; then ++ enableval="$enable_system_myspell" ++ if test "$enableval" = "yes"; then ++ SYSTEM_MYSPELL=1 ++ elif test "$enableval" = "no"; then ++ : ++ else ++ { echo "configure: error: Option, system-myspell, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++if test -n "$SYSTEM_MYSPELL"; then ++ MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell" ++ MOZ_MYSPELL_LIBS="-lhunspell" ++fi ++ ++ ++ ++ ++ + JAVA_INCLUDE_PATH= + # Check whether --with-java-include-path or --without-java-include-path was given. + if test "${with_java_include_path+set}" = set; then + withval="$with_java_include_path" + JAVA_INCLUDE_PATH=$withval + fi + + +@@ -12403,17 +12326,17 @@ + fi + fi + + unset ac_cv_path_GTK_CONFIG + + # 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:12412: checking for $ac_word" >&5 ++echo "configure:12335: 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 + case "$GTK_CONFIG" in + /*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -12438,17 +12361,17 @@ + if test -n "$GTK_CONFIG"; then + echo "$ac_t""$GTK_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_gtk_version=$GTK_VERSION + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:12447: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12370: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -12461,17 +12384,17 @@ + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + rm -f conf.gtktest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include + #include + + int + main () +@@ -12539,17 +12462,17 @@ + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + + EOF +-if { (eval echo configure:12548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_gtk=yes + fi +@@ -12574,27 +12497,27 @@ + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < + #include + + int main() { + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:12593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12516: \"$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" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" +@@ -12636,17 +12559,17 @@ + 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:12645: checking for $ac_word" >&5 ++echo "configure:12568: 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. + ;; + ?:/*) +@@ -12680,29 +12603,29 @@ + 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 gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:12689: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12612: 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:12696: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12619: 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:12701: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12624: 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\"`" + echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 + else + MOZ_GTK2_CFLAGS="" + MOZ_GTK2_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -12757,17 +12680,17 @@ + if test -x "$QTDIR/bin/moc"; then + HOST_MOC="$QTDIR/bin/moc" + else + for ac_prog in moc + 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:12766: checking for $ac_word" >&5 ++echo "configure:12689: 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 + if test -n "$HOST_MOC"; then + ac_cv_prog_HOST_MOC="$HOST_MOC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -12809,32 +12732,32 @@ + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +-echo "configure:12818: checking for main in -lqt" >&5 ++echo "configure:12741: 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 + else + 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:12756: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -12843,32 +12766,32 @@ + + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + QT_LIB=-lqt + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +-echo "configure:12852: checking for main in -lqt-mt" >&5 ++echo "configure:12775: 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 + else + 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:12790: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -12894,30 +12817,30 @@ + + _SAVE_CXXFLAGS=$CXXFLAGS + _SAVE_LIBS=$LIBS + + CXXFLAGS="$CXXFLAGS $QT_CFLAGS" + LIBS="$LIBS $QT_LIBS" + + echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +-echo "configure:12903: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12826: checking Qt - version >= $QT_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { + + #if (QT_VERSION < $QT_VERSION_NUM) + #error "QT_VERSION too old" + #endif + + ; return 0; } + EOF +-if { (eval echo configure:12916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + result="no" + fi +@@ -13082,17 +13005,17 @@ + MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" + cat >> confdefs.h <<\EOF + #define MOZ_SUITE 1 + EOF + + ;; + + browser) +- MOZ_APP_NAME=firefox ++ MOZ_APP_NAME=firefox-2 + MOZ_APP_DISPLAYNAME=BonEcho + MOZ_XUL_APP=1 + MOZ_PHOENIX=1 + MOZ_SAFE_BROWSING=1 + MOZ_APP_VERSION=$FIREFOX_VERSION + MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" + cat >> confdefs.h <<\EOF + #define MOZ_PHOENIX 1 +@@ -13503,17 +13426,17 @@ + + + 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:13512: checking for $ac_word" >&5 ++echo "configure:13435: 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. + ;; + ?:/*) +@@ -13547,29 +13470,29 @@ + 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 xft""... $ac_c" 1>&6 +-echo "configure:13556: checking for xft" >&5 ++echo "configure:13479: 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:13563: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13486: 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:13568: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13491: 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\"`" + echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 + else + MOZ_XFT_CFLAGS="" + MOZ_XFT_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -13594,17 +13517,17 @@ + + + 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:13603: checking for $ac_word" >&5 ++echo "configure:13526: 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. + ;; + ?:/*) +@@ -13638,29 +13561,29 @@ + 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 pango >= 1.1.0""... $ac_c" 1>&6 +-echo "configure:13647: checking for pango >= 1.1.0" >&5 ++echo "configure:13570: checking for pango >= 1.1.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.1.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13654: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13577: checking _PANGOCHK_CFLAGS" >&5 + _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` + echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 + + echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13659: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13582: checking _PANGOCHK_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 + else + _PANGOCHK_CFLAGS="" + _PANGOCHK_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -13710,17 +13633,17 @@ + + + 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:13719: checking for $ac_word" >&5 ++echo "configure:13642: 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. + ;; + ?:/*) +@@ -13754,29 +13677,29 @@ + 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 pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 +-echo "configure:13763: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 ++echo "configure:13686: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 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:13770: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13693: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:13775: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13698: 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 \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" + echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 + else + MOZ_PANGO_CFLAGS="" + MOZ_PANGO_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -13834,36 +13757,36 @@ + fi + + + if test "$MOZ_X11" + then + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +-echo "configure:13843: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13766: 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 + else + 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:13785: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -13926,17 +13849,17 @@ + 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:13935: checking for $ac_word" >&5 ++echo "configure:13858: 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. + ;; + ?:/*) +@@ -13970,29 +13893,29 @@ + 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 gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:13979: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:13902: 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:13986: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:13909: 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:13991: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:13914: 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\"`" + echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 + else + MOZ_GNOMEVFS_CFLAGS="" + MOZ_GNOMEVFS_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -14033,17 +13956,17 @@ + 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:14042: checking for $ac_word" >&5 ++echo "configure:13965: 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. + ;; + ?:/*) +@@ -14077,29 +14000,29 @@ + 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 gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:14086: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14009: 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:14093: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14016: 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:14098: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14021: 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\"`" + echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 + else + MOZ_GCONF_CFLAGS="" + MOZ_GCONF_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -14136,17 +14059,17 @@ + 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:14145: checking for $ac_word" >&5 ++echo "configure:14068: 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. + ;; + ?:/*) +@@ -14180,29 +14103,29 @@ + 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 libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14189: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14112: 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:14196: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14119: 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:14201: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14124: 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\"`" + echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6 + else + MOZ_LIBGNOME_CFLAGS="" + MOZ_LIBGNOME_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -14270,17 +14193,17 @@ + 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:14279: checking for $ac_word" >&5 ++echo "configure:14202: 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. + ;; + ?:/*) +@@ -14314,29 +14237,29 @@ + 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 libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14323: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14246: 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:14330: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14253: 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:14335: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14258: 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\"`" + echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 + else + MOZ_GNOMEUI_CFLAGS="" + MOZ_GNOMEUI_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -14500,16 +14423,127 @@ + elif test "$enableval" = "no"; then + SUNCTL= + else + { echo "configure: error: Option, ctl, does not take an argument ($enableval)." 1>&2; exit 1; } + fi + fi + + ++MOZ_ENABLE_LIBTHAI_COMPONENT= ++# Check whether --enable-libthai or --disable-libthai was given. ++if test "${enable_libthai+set}" = set; then ++ enableval="$enable_libthai" ++ if test "$enableval" = "no"; then ++ MOZ_ENABLE_LIBTHAI_COMPONENT= ++ elif test "$enableval" = "yes"; then ++ MOZ_ENABLE_LIBTHAI_COMPONENT=1 ++ else ++ { echo "configure: error: Option, libthai, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; 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:14453: 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 libthai""... $ac_c" 1>&6 ++echo "configure:14497: checking for libthai" >&5 ++ ++ if $PKG_CONFIG --exists "libthai" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_LIBTHAI_CFLAGS""... $ac_c" 1>&6 ++echo "configure:14504: checking MOZ_LIBTHAI_CFLAGS" >&5 ++ MOZ_LIBTHAI_CFLAGS=`$PKG_CONFIG --cflags "libthai"` ++ echo "$ac_t""$MOZ_LIBTHAI_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_LIBTHAI_LIBS""... $ac_c" 1>&6 ++echo "configure:14509: checking MOZ_LIBTHAI_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_LIBTHAI_LIBS="`$PKG_CONFIG --libs-only-L \"libthai\"` `$PKG_CONFIG --libs-only-l \"libthai\"`" ++ echo "$ac_t""$MOZ_LIBTHAI_LIBS" 1>&6 ++ else ++ MOZ_LIBTHAI_CFLAGS="" ++ MOZ_LIBTHAI_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ MOZ_LIBTHAI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libthai"` ++ ++ 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_LIBTHAI_COMPONENT=1 ++ ++ else ++ ++ MOZ_ENABLE_LIBTHAI_COMPONENT= ++ ++ fi ++ ++fi ++ + # Check whether --enable-view-source or --disable-view-source was given. + if test "${enable_view_source+set}" = set; then + enableval="$enable_view_source" + if test "$enableval" = "no"; then + MOZ_VIEW_SOURCE= + elif test "$enableval" = "yes"; then + MOZ_VIEW_SOURCE=1 + else +@@ -14812,17 +14846,17 @@ + JAVA_PATH="$JAVA_BIN_PATH" + else + JAVA_PATH="$JAVA_HOME/bin:$PATH" + fi + + # 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:14821: checking for $ac_word" >&5 ++echo "configure:14855: 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 + case "$JAVAC" in + /*) + ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path. + ;; + ?:/*) +@@ -14848,17 +14882,17 @@ + echo "$ac_t""$JAVAC" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # 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:14857: checking for $ac_word" >&5 ++echo "configure:14891: 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 + case "$JAR" in + /*) + ac_cv_path_JAR="$JAR" # Let the user override the test with a path. + ;; + ?:/*) +@@ -15095,36 +15129,36 @@ + SVG_RENDERER=$SVG_DEFAULT_RENDERER + fi + + + case "$SVG_RENDERER" in + gdiplus) + MOZ_SVG_RENDERER_GDIPLUS=1 + echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +-echo "configure:15104: checking for Gdiplus.h" >&5 ++echo "configure:15138: checking for Gdiplus.h" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include + #include + int main() { + + ; return 0; } + EOF +-if { (eval echo configure:15123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: Building the SVG GDI+ renderer requires an appropriate Microsoft SDK." 1>&2; exit 1; } + fi +@@ -15194,17 +15228,17 @@ + if test -n "$MOZ_INSTALLER" -a -n "$MOZ_XUL_APP" -a "$OS_ARCH" = "WINNT"; then + # Disable installer for Windows builds that use the new toolkit if NSIS + # isn't in the path. + for ac_prog in makensis + 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:15203: checking for $ac_word" >&5 ++echo "configure:15237: 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 + case "$MAKENSIS" in + /*) + ac_cv_path_MAKENSIS="$MAKENSIS" # Let the user override the test with a path. + ;; + ?:/*) +@@ -15239,17 +15273,17 @@ + fi + # The Windows build for NSIS requires the iconv command line utility to + # convert the charset of the locale files. + 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:15248: checking for $ac_word" >&5 ++echo "configure:15282: 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 + case "$HOST_ICONV" in + /*) + ac_cv_path_HOST_ICONV="$HOST_ICONV" # Let the user override the test with a path. + ;; + ?:/*) +@@ -15308,23 +15342,23 @@ + fi + + # The Windows build requires the iconv command line utility + # in order to build the updater. + case "$target_os" in + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15317: checking for iconv" >&5 ++echo "configure:15351: 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:15323: checking for $ac_word" >&5 ++echo "configure:15357: 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 + if test -n "$HOST_ICONV"; then + ac_cv_prog_HOST_ICONV="$HOST_ICONV" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -15660,28 +15694,28 @@ + ;; + esac + MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DTRACING" + + MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:15669: checking for valid debug flags" >&5 ++echo "configure:15703: 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:15680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _results=no + fi +@@ -15712,28 +15746,28 @@ + else + MOZ_OPTIMIZE=1 + fi + + + 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:15721: checking for valid optimization flags" >&5 ++echo "configure:15755: 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:15732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _results=no + fi +@@ -15940,36 +15974,36 @@ + _ENABLE_EFENCE= + else + { echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; } + fi + fi + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:15949: checking for malloc in -lefence" >&5 ++echo "configure:15983: 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 + else + 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:16002: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -16060,22 +16094,22 @@ + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + 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:16069: checking for $ac_func" >&5 ++echo "configure:16103: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif +@@ -16091,17 +16125,17 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:16100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16134: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -16334,22 +16368,22 @@ + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16343: checking for $ac_func" >&5 ++echo "configure:16377: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif +@@ -16365,17 +16399,17 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:16374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16408: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -16444,16 +16478,23 @@ + + if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && + test "$MOZ_CHROME_FILE_FORMAT" != "flat" && + test "$MOZ_CHROME_FILE_FORMAT" != "symlink" && + test "$MOZ_CHROME_FILE_FORMAT" != "both"; then + { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; } + fi + ++if test "$MOZ_CHROME_FILE_FORMAT" = "jar" || ++ test "$MOZ_CHROME_FILE_FORMAT" = "both"; then ++ if test -z "$ZIP" || test "$ZIP" = ":"; then ++ { echo "configure: error: zip is required for chrome format $MOZ_CHROME_FILE_FORMAT" 1>&2; exit 1; } ++ fi ++fi ++ + # Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given. + if test "${with_default_mozilla_five_home+set}" = set; then + withval="$with_default_mozilla_five_home" + val=`echo $withval` + cat >> confdefs.h <&6 +-echo "configure:16512: checking for gcc -pipe support" >&5 ++echo "configure:16553: 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 + ${CC} -S dummy-hello.c -o dummy-hello.s 2>&5 + cat dummy-hello.s | ${AS_BIN} -o dummy-hello.S - 2>&5 + if test $? = 0; then + _res_as_stdin="yes" + else + _res_as_stdin="no" + fi + if test "$_res_as_stdin" = "yes"; then + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _res_gcc_pipe="no" + fi +@@ -16567,26 +16608,26 @@ + fi + fi + + + if test "$_IGNORE_LONG_LONG_WARNINGS"; then + _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:16576: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16617: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16626: \"$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" + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +@@ -16597,26 +16638,26 @@ + CFLAGS="$_SAVE_CFLAGS" + fi + + + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:16606: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16647: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + result="no" +@@ -16624,26 +16665,26 @@ + rm -f conftest* + echo "$ac_t""$result" 1>&6 + + if test $result = "yes"; then + PROFILE_USE_CFLAGS="-fprofile-use" + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:16633: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16674: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + result="no" +@@ -16679,26 +16720,26 @@ + { echo "configure: error: Option, pedantic, does not take an argument ($enableval)." 1>&2; exit 1; } + fi + fi + + if test "$_PEDANTIC"; then + _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:16688: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16729: checking whether C++ compiler has -pedantic long long bug" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="no" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + result="yes" + fi +@@ -16713,23 +16754,26 @@ + ;; + yes) + { echo "configure: error: Your compiler appears to have a known bug where long long is miscompiled when using -pedantic. Reconfigure using --disable-pedantic. " 1>&2; exit 1; } + ;; + esac + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:16722: checking for correct temporary object destruction order" >&5 ++echo "configure:16763: 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:16791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + result="no" + fi +@@ -16759,22 +16803,22 @@ + + if test "$result" = "no"; then + { echo "configure: error: Your compiler does not follow the C++ specification for temporary object destruction order." 1>&2; exit 1; } + fi + + _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:16768: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16812: 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 < + class Pointer + { + public: + T* myPtr; + }; +@@ -16794,17 +16838,17 @@ + int main() { + + Pointer foo; + const int* bar; + return foo == bar; + + ; return 0; } + EOF +-if { (eval echo configure:16803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="yes" + fi +@@ -17086,17 +17130,17 @@ + if test "$MOZ_ENABLE_GTK2"; 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:17095: checking for $ac_word" >&5 ++echo "configure:17139: 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. + ;; + ?:/*) +@@ -17130,29 +17174,29 @@ + 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 libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:17139: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17183: 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:17146: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17190: 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:17151: checking LIBIDL_LIBS" >&5 ++echo "configure:17195: 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\"`" + echo "$ac_t""$LIBIDL_LIBS" 1>&6 + else + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -17265,17 +17309,17 @@ + esac + done + + unset ac_cv_path_GLIB_CONFIG + + # 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:17274: checking for $ac_word" >&5 ++echo "configure:17318: 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 + case "$GLIB_CONFIG" in + /*) + ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -17300,17 +17344,17 @@ + if test -n "$GLIB_CONFIG"; then + echo "$ac_t""$GLIB_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17309: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17353: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -17323,17 +17367,17 @@ + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" + rm -f conf.glibtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include + #include + + int + main () +@@ -17399,17 +17443,17 @@ + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + + EOF +-if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_glib=yes + fi +@@ -17433,27 +17477,27 @@ + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < + #include + + int main() { + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17496: \"$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" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" +@@ -17487,17 +17531,17 @@ + rm -f conf.glibtest + + + unset ac_cv_path_LIBIDL_CONFIG + + # 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:17496: checking for $ac_word" >&5 ++echo "configure:17540: 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 + case "$LIBIDL_CONFIG" in + /*) + ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -17522,17 +17566,17 @@ + if test -n "$LIBIDL_CONFIG"; then + echo "$ac_t""$LIBIDL_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17531: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17575: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes + else + LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags` + LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs` + # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove + # this after we start requiring libIDL 0.6.8 or anything higher +@@ -17549,17 +17593,17 @@ + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBIDL_LIBS $LIBS" + rm -f conf.libIDLtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include + #include + + int + main () +@@ -17635,17 +17679,17 @@ + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + + EOF +-if { (eval echo configure:17644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_libIDL=yes + fi +@@ -17669,28 +17713,28 @@ + else + if test -f conf.libIDLtest ; then + : + else + echo "*** Could not run libIDL test program, checking why..." + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < + #include + #include + + int main() { + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:17689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17733: \"$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" + echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" +@@ -17808,17 +17852,17 @@ + esac + done + + unset ac_cv_path_GLIB_CONFIG + + # 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:17817: checking for $ac_word" >&5 ++echo "configure:17861: 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 + case "$GLIB_CONFIG" in + /*) + ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -17843,17 +17887,17 @@ + if test -n "$GLIB_CONFIG"; then + echo "$ac_t""$GLIB_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17852: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17896: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -17866,17 +17910,17 @@ + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" + rm -f conf.glibtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include + #include + + int + main () +@@ -17942,17 +17986,17 @@ + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + + EOF +-if { (eval echo configure:17951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_glib=yes + fi +@@ -17976,27 +18020,27 @@ + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < + #include + + int main() { + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18039: \"$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" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" +@@ -18030,17 +18074,17 @@ + rm -f conf.glibtest + + + unset ac_cv_path_LIBIDL_CONFIG + + # 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:18039: checking for $ac_word" >&5 ++echo "configure:18083: 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 + case "$LIBIDL_CONFIG" in + /*) + ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -18065,17 +18109,17 @@ + if test -n "$LIBIDL_CONFIG"; then + echo "$ac_t""$LIBIDL_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:18074: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18118: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes + else + LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags` + LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs` + # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove + # this after we start requiring libIDL 0.6.8 or anything higher +@@ -18092,17 +18136,17 @@ + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBIDL_LIBS $LIBS" + rm -f conf.libIDLtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include + #include + + int + main () +@@ -18178,17 +18222,17 @@ + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + + EOF +-if { (eval echo configure:18187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_libIDL=yes + fi +@@ -18212,28 +18256,28 @@ + else + if test -f conf.libIDLtest ; then + : + else + echo "*** Could not run libIDL test program, checking why..." + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < + #include + #include + + int main() { + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18276: \"$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" + echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" +@@ -18264,17 +18308,17 @@ + if test -z "$_LIBIDL_FOUND"; 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:18273: checking for $ac_word" >&5 ++echo "configure:18317: 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. + ;; + ?:/*) +@@ -18308,29 +18352,29 @@ + 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 libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18317: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18361: 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:18324: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18368: 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:18329: checking LIBIDL_LIBS" >&5 ++echo "configure:18373: 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\"`" + echo "$ac_t""$LIBIDL_LIBS" 1>&6 + else + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -18356,17 +18400,17 @@ + fi + fi + if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then + for ac_prog in $ORBIT_CONFIG orbit-config + 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:18365: checking for $ac_word" >&5 ++echo "configure:18409: 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 + case "$ORBIT_CONFIG" in + /*) + ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -18393,49 +18437,49 @@ + echo "$ac_t""no" 1>&6 + fi + + test -n "$ORBIT_CONFIG" && break + done + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:18402: checking for ORBit libIDL usability" >&5 ++echo "configure:18446: 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}` + _ORBIT_LIB_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-L/); } }' -- ${_ORBIT_LIBS}` + LIBIDL_CFLAGS="$_ORBIT_INC_PATH" + LIBIDL_LIBS="$_ORBIT_LIB_PATH -lIDL -lglib" + LIBIDL_CONFIG= + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LIBS="$LIBS" + CFLAGS="$LIBIDL_CFLAGS $CFLAGS" + LIBS="$LIBIDL_LIBS $LIBS" + if test "$cross_compiling" = yes; then + _LIBIDL_FOUND=1 + result="maybe" + else + cat > conftest.$ac_ext < + #include + int main() { + char *s; + s=strdup(IDL_get_libver_string()); + if(s==NULL) { + exit(1); + } + exit(0); + } + + EOF +-if { (eval echo configure:18434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18478: \"$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" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + LIBIDL_CFLAGS= +@@ -18482,17 +18526,17 @@ + if test "$MOZ_ENABLE_GTK2"; 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:18491: checking for $ac_word" >&5 ++echo "configure:18535: 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. + ;; + ?:/*) +@@ -18526,29 +18570,29 @@ + 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 glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:18535: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18579: 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:18542: checking GLIB_CFLAGS" >&5 ++echo "configure:18586: 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:18547: checking GLIB_LIBS" >&5 ++echo "configure:18591: 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\"`" + echo "$ac_t""$GLIB_LIBS" 1>&6 + else + GLIB_CFLAGS="" + GLIB_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -18622,17 +18666,17 @@ + esac + done + + unset ac_cv_path_GLIB_CONFIG + + # 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:18631: checking for $ac_word" >&5 ++echo "configure:18675: 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 + case "$GLIB_CONFIG" in + /*) + ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) +@@ -18657,17 +18701,17 @@ + if test -n "$GLIB_CONFIG"; then + echo "$ac_t""$GLIB_CONFIG" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18666: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18710: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -18680,17 +18724,17 @@ + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" + rm -f conf.glibtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < + #include + #include + + int + main () +@@ -18756,17 +18800,17 @@ + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + + EOF +-if { (eval echo configure:18765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_glib=yes + fi +@@ -18790,27 +18834,27 @@ + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < + #include + + int main() { + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18853: \"$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" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" +@@ -18880,29 +18924,29 @@ + ;; + *) + MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm' + ;; + esac + # 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:18889: checking for working alloca.h" >&5 ++echo "configure:18933: 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:18901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18945: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_alloca_h=no + fi +@@ -18913,22 +18957,22 @@ + if test $ac_cv_header_alloca_h = yes; then + cat >> confdefs.h <<\EOF + #define HAVE_ALLOCA_H 1 + EOF + + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:18922: checking for alloca" >&5 ++echo "configure:18966: 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 < + # define alloca _alloca +@@ -18946,17 +18990,17 @@ + # endif + # endif + #endif + + int main() { + char *p = (char *) alloca(1); + ; return 0; } + EOF +-if { (eval echo configure:18955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18999: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_alloca_works=no + fi +@@ -18978,22 +19022,22 @@ + # use ar to extract alloca.o from them instead of compiling alloca.c. + ALLOCA=alloca.${ac_objext} + cat >> confdefs.h <<\EOF + #define C_ALLOCA 1 + EOF + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:18987: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19031: 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 + if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:19017: checking for $ac_func" >&5 ++echo "configure:19061: 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 < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func(); +@@ -19036,17 +19080,17 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:19045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19089: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -19063,25 +19107,25 @@ + else + echo "$ac_t""no" 1>&6 + fi + + done + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:19072: checking stack direction for C alloca" >&5 ++echo "configure:19116: 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 + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext < addr) ? 1 : -1; + } + main () + { + exit (find_stack_direction() < 0); + } + EOF +-if { (eval echo configure:19099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19143: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_stack_direction=-1 + fi +@@ -19139,27 +19183,27 @@ + + + if test "$MOZ_TREE_CAIRO"; then + # Check for headers defining standard int types. + for ac_hdr in stdint.h inttypes.h sys/int_types.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:19148: checking for $ac_hdr" >&5 ++echo "configure:19192: 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:19158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19202: \"$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* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -19240,17 +19284,17 @@ + else + + 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:19249: checking for $ac_word" >&5 ++echo "configure:19293: 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. + ;; + ?:/*) +@@ -19284,29 +19328,29 @@ + 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 cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19293: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19337: 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:19300: checking CAIRO_CFLAGS" >&5 ++echo "configure:19344: 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:19305: checking CAIRO_LIBS" >&5 ++echo "configure:19349: 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\"`" + echo "$ac_t""$CAIRO_LIBS" 1>&6 + else + CAIRO_CFLAGS="" + CAIRO_LIBS="" + ## If we have a custom action on failure, don't print errors, but +@@ -19326,23 +19370,220 @@ + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (cairo >= $CAIRO_VERSION) 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 + + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; 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:19389: 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 cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6 ++echo "configure:19433: checking for cairo-xlib >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6 ++echo "configure:19440: checking CAIRO_XLIB_CFLAGS" >&5 ++ CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6 ++echo "configure:19445: checking CAIRO_XLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`" ++ echo "$ac_t""$CAIRO_XLIB_LIBS" 1>&6 ++ else ++ CAIRO_XLIB_CFLAGS="" ++ CAIRO_XLIB_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_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 ++ : ++ else ++ : ++ fi ++ ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; 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:19484: 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 cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 ++echo "configure:19528: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 ++echo "configure:19535: checking CAIRO_XRENDER_CFLAGS" >&5 ++ CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 ++echo "configure:19540: checking CAIRO_XRENDER_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`" ++ echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 ++ else ++ CAIRO_XRENDER_CFLAGS="" ++ CAIRO_XRENDER_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_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 ++ : ++ else ++ : ++ fi ++ ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + + + + + ++ ++ ++ ++ + # Check whether --enable-xul or --disable-xul was given. + if test "${enable_xul+set}" = set; then + enableval="$enable_xul" + if test "$enableval" = "no"; then + MOZ_XUL= + elif test "$enableval" = "yes"; then + : + else +@@ -19361,17 +19602,17 @@ + + + + if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then + if test -z "$PYTHON"; then + # 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:19370: checking for $ac_word" >&5 ++echo "configure:19611: 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 + case "$PYTHON" in + /*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + ?:/*) +@@ -19637,24 +19878,24 @@ + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:19653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19894: \"$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* + { echo "configure: error: Cannot build ctl without gmodule support in glib." 1>&2; exit 1; } + fi + rm -f conftest* +@@ -19828,16 +20069,17 @@ + + + + + + + + ++ + CFLAGS=`echo \ + $_WARNINGS_CFLAGS \ + $CFLAGS` + + CXXFLAGS=`echo \ + $_MOZ_RTTI_FLAGS \ + $_MOZ_EXCEPTIONS_FLAGS \ + $_WARNINGS_CXXFLAGS \ +@@ -19951,33 +20193,33 @@ + + fi + + if test "$COMPILE_ENVIRONMENT"; then + if test "$MOZ_X11"; then + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $XCFLAGS" + cat > conftest.$ac_ext < + #include + + int main() { + + Display *dpy = 0; + if ((dpy = XOpenDisplay(NULL)) == NULL) { + fprintf(stderr, ": can't open %s\n", XDisplayName(NULL)); + exit(1); + } + + ; return 0; } + EOF +-if { (eval echo configure:19976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20218: \"$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* + { echo "configure: error: Could not compile basic X program." 1>&2; exit 1; } + fi + rm -f conftest* +@@ -20185,44 +20427,25 @@ + fi + + rm -f confdefs.h.save + mv confdefs.h confdefs.h.save + egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h + # 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 + + rm -f confdefs.h + mv confdefs.h.save confdefs.h + + . ${srcdir}/allmakefiles.sh + if test -z "${AS_PERL}"; then +@@ -20452,16 +20675,19 @@ + s%@LIBOBJS@%$LIBOBJS%g + s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g + s%@NSPR_CONFIG@%$NSPR_CONFIG%g + s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g + s%@NSPR_LIBS@%$NSPR_LIBS%g + s%@NSS_CONFIG@%$NSS_CONFIG%g + s%@NSS_CFLAGS@%$NSS_CFLAGS%g + s%@NSS_LIBS@%$NSS_LIBS%g ++s%@SYSTEM_MYSPELL@%$SYSTEM_MYSPELL%g ++s%@MOZ_MYSPELL_LIBS@%$MOZ_MYSPELL_LIBS%g ++s%@MOZ_MYSPELL_CFLAGS@%$MOZ_MYSPELL_CFLAGS%g + s%@GTK_CONFIG@%$GTK_CONFIG%g + s%@GTK_CFLAGS@%$GTK_CFLAGS%g + s%@GTK_LIBS@%$GTK_LIBS%g + s%@PKG_CONFIG@%$PKG_CONFIG%g + s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g + s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g + s%@HOST_MOC@%$HOST_MOC%g + s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g +@@ -20514,16 +20740,18 @@ + s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%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_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g ++s%@MOZ_LIBTHAI_CFLAGS@%$MOZ_LIBTHAI_CFLAGS%g ++s%@MOZ_LIBTHAI_LIBS@%$MOZ_LIBTHAI_LIBS%g + s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g + s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g + s%@MOZ_NO_FAST_LOAD@%$MOZ_NO_FAST_LOAD%g + s%@JAVAC@%$JAVAC%g + s%@JAR@%$JAR%g + s%@MAKENSIS@%$MAKENSIS%g + s%@HOST_ICONV@%$HOST_ICONV%g + s%@MOZ_INSTALLER@%$MOZ_INSTALLER%g +@@ -20576,19 +20804,27 @@ + s%@OS2_SURFACE_FEATURE@%$OS2_SURFACE_FEATURE%g + s%@GLITZ_SURFACE_FEATURE@%$GLITZ_SURFACE_FEATURE%g + s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g + s%@WIN32_FONT_FEATURE@%$WIN32_FONT_FEATURE%g + s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g + s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g + s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g + s%@CAIRO_LIBS@%$CAIRO_LIBS%g ++s%@CAIRO_XLIB_CFLAGS@%$CAIRO_XLIB_CFLAGS%g ++s%@CAIRO_XLIB_LIBS@%$CAIRO_XLIB_LIBS%g ++s%@CAIRO_XRENDER_CFLAGS@%$CAIRO_XRENDER_CFLAGS%g ++s%@CAIRO_XRENDER_LIBS@%$CAIRO_XRENDER_LIBS%g + s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g + s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g + s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g ++s%@MOZ_CAIRO_XLIB_CFLAGS@%$MOZ_CAIRO_XLIB_CFLAGS%g ++s%@MOZ_CAIRO_XLIB_LIBS@%$MOZ_CAIRO_XLIB_LIBS%g ++s%@MOZ_CAIRO_XRENDER_CFLAGS@%$MOZ_CAIRO_XRENDER_CFLAGS%g ++s%@MOZ_CAIRO_XRENDER_LIBS@%$MOZ_CAIRO_XRENDER_LIBS%g + s%@MOZ_XUL@%$MOZ_XUL%g + s%@MOZ_PYTHON@%$MOZ_PYTHON%g + s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g + s%@MOZ_PYTHON_INCLUDES@%$MOZ_PYTHON_INCLUDES%g + s%@MOZ_PYTHON_LIBS@%$MOZ_PYTHON_LIBS%g + s%@MOZ_PYTHON_VER@%$MOZ_PYTHON_VER%g + s%@MOZ_PYTHON_VER_DOTTED@%$MOZ_PYTHON_VER_DOTTED%g + s%@MOZ_PYTHON_DEBUG_SUFFIX@%$MOZ_PYTHON_DEBUG_SUFFIX%g +@@ -20689,16 +20925,17 @@ + s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g + s%@BUILD_SHARED_LIBS@%$BUILD_SHARED_LIBS%g + s%@BUILD_STATIC_LIBS@%$BUILD_STATIC_LIBS%g + s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g + s%@MOZ_ENABLE_LIBXUL@%$MOZ_ENABLE_LIBXUL%g + s%@ENABLE_TESTS@%$ENABLE_TESTS%g + s%@IBMBIDI@%$IBMBIDI%g + s%@SUNCTL@%$SUNCTL%g ++s%@MOZ_ENABLE_LIBTHAI_COMPONENT@%$MOZ_ENABLE_LIBTHAI_COMPONENT%g + s%@ACCESSIBILITY@%$ACCESSIBILITY%g + s%@MOZ_XPINSTALL@%$MOZ_XPINSTALL%g + s%@MOZ_VIEW_SOURCE@%$MOZ_VIEW_SOURCE%g + s%@MOZ_SINGLE_PROFILE@%$MOZ_SINGLE_PROFILE%g + s%@MOZ_XPFE_COMPONENTS@%$MOZ_XPFE_COMPONENTS%g + s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g + s%@ENABLE_STRIP@%$ENABLE_STRIP%g + s%@USE_ELF_DYNSTR_GC@%$USE_ELF_DYNSTR_GC%g +@@ -21151,17 +21388,17 @@ + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + + ac_configure_args="$_SUBDIR_CONFIG_ARGS" + fi + + if test -z "$MOZ_NATIVE_NSPR"; then + # Hack to deal with the fact that we use NSPR_CFLAGS everywhere +@@ -21294,15 +21531,15 @@ + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + + ac_configure_args="$_SUBDIR_CONFIG_ARGS" + fi + fi # COMPILE_ENVIRONMENT --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch @@ -0,0 +1,35 @@ +From d2482fd280b631b9831d5c636a6006533bfdacb9 Mon Sep 17 00:00:00 2001 +From: asac +Date: Sat, 24 Feb 2007 21:21:30 +0100 +Subject: [PATCH] bzXXX-wl-no-as-needed-for-libxpcom-lp85112 + + + use -Wl,--no-as-needed for libxpcom.so (Closes: LP#85112) to reduce + lib dependencies of plugins. +--- + browser/app/Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +Index: mozilla/browser/app/Makefile.in +=================================================================== +--- mozilla.orig/browser/app/Makefile.in 2006-08-29 04:03:07.000000000 +0200 ++++ mozilla/browser/app/Makefile.in 2007-04-04 18:49:39.000000000 +0200 +@@ -83,17 +83,19 @@ + TK_LIBS := -framework Cocoa $(TK_LIBS) + endif + + LIBS = \ + $(STATIC_COMPONENTS_LINKER_PATH) \ + $(EXTRA_DSO_LIBS) \ + $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \ + $(MOZ_JS_LIBS) \ ++ -Wl,--no-as-needed \ + $(XPCOM_LIBS) \ ++ -Wl,--as-needed \ + $(NSPR_LIBS) \ + $(TK_LIBS) \ + $(NULL) + + # Add explicit X11 dependency when building against X11 toolkits + ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT))) + LIBS += $(XLDFLAGS) $(XLIBS) + endif --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch @@ -0,0 +1,64 @@ +--- + security/manager/ssl/src/nsKeygenHandler.cpp | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +# Fix a FTBFS with new system libnss. See Mozilla bug 399589 +# by Fabien Tassin + +Index: seamonkey-1.1.4/security/manager/ssl/src/nsKeygenHandler.cpp +=================================================================== +--- seamonkey-1.1.4.orig/security/manager/ssl/src/nsKeygenHandler.cpp ++++ seamonkey-1.1.4/security/manager/ssl/src/nsKeygenHandler.cpp +@@ -70,16 +70,25 @@ + + //All possible key size choices. + static SECKeySizeChoiceInfo SECKeySizeChoiceList[] = { + { nsnull, 2048 }, + { nsnull, 1024 }, + { nsnull, 0 }, + }; + ++DERTemplate SECAlgorithmIDTemplate[] = { ++ { DER_SEQUENCE, ++ 0, NULL, sizeof(SECAlgorithmID) }, ++ { DER_OBJECT_ID, ++ offsetof(SECAlgorithmID,algorithm), }, ++ { DER_OPTIONAL | DER_ANY, ++ offsetof(SECAlgorithmID,parameters), }, ++ { 0, } ++}; + + DERTemplate CERTSubjectPublicKeyInfoTemplate[] = { + { DER_SEQUENCE, + 0, nsnull, sizeof(CERTSubjectPublicKeyInfo) }, + { DER_INLINE, + offsetof(CERTSubjectPublicKeyInfo,algorithm), + SECAlgorithmIDTemplate, }, + { DER_BIT_STRING, +@@ -90,26 +99,16 @@ + DERTemplate CERTPublicKeyAndChallengeTemplate[] = + { + { DER_SEQUENCE, 0, nsnull, sizeof(CERTPublicKeyAndChallenge) }, + { DER_ANY, offsetof(CERTPublicKeyAndChallenge,spki), }, + { DER_IA5_STRING, offsetof(CERTPublicKeyAndChallenge,challenge), }, + { 0, } + }; + +-DERTemplate SECAlgorithmIDTemplate[] = { +- { DER_SEQUENCE, +- 0, NULL, sizeof(SECAlgorithmID) }, +- { DER_OBJECT_ID, +- offsetof(SECAlgorithmID,algorithm), }, +- { DER_OPTIONAL | DER_ANY, +- offsetof(SECAlgorithmID,parameters), }, +- { 0, } +-}; +- + const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { + { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,subPrime) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,base) }, + { 0, } + }; + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz273524-gnome-mime-registry-ubuntu.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz273524-gnome-mime-registry-ubuntu.patch @@ -0,0 +1,380 @@ +=== uriloader/exthandler/Makefile.in +================================================================== +--- xulrunner/uriloader/exthandler/Makefile.in (revision 116) ++++ xulrunner/uriloader/exthandler/Makefile.in (local) +@@ -102,7 +102,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 +--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp (local) +@@ -42,7 +42,6 @@ + #include "nsString.h" + #include "nsIComponentManager.h" + #include "nsILocalFile.h" +-#include "nsMIMEInfoImpl.h" + #include "nsAutoPtr.h" + + #include +@@ -56,12 +55,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 +263,7 @@ + } + + +-/* static */ already_AddRefed ++/* static */ already_AddRefed + nsGNOMERegistry::GetFromExtension(const char *aFileExt) + { + if (!gconfLib) +@@ -286,7 +285,7 @@ + return GetFromType(mimeType); + } + +-/* static */ already_AddRefed ++/* static */ already_AddRefed + nsGNOMERegistry::GetFromType(const char *aMIMEType) + { + if (!gconfLib) +@@ -296,7 +295,7 @@ + if (!handlerApp) + return nsnull; + +- nsRefPtr mimeInfo = new nsMIMEInfoImpl(aMIMEType); ++ nsRefPtr mimeInfo = new nsMIMEInfoUnix(aMIMEType); + NS_ENSURE_TRUE(mimeInfo, nsnull); + + // Get the list of extensions and append then to the mimeInfo. +@@ -320,11 +319,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 +351,7 @@ + + _gnome_vfs_mime_application_free(handlerApp); + +- nsMIMEInfoBase* retval; ++ nsMIMEInfoUnix* retval; + NS_ADDREF((retval = mimeInfo)); + return retval; + } +=== uriloader/exthandler/unix/nsGNOMERegistry.h +--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h (local) +@@ -35,10 +35,13 @@ + * + * ***** END LICENSE BLOCK ***** */ + ++#ifndef nsGNOMERegistry_h__ ++#define nsGNOMERegistry_h__ ++ + #include "nsIURI.h" + #include "nsCOMPtr.h" + +-class nsMIMEInfoBase; ++#include "nsMIMEInfoUnix.h" + + 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 +--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp (local) +@@ -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 +--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h (local) +@@ -0,0 +1,48 @@ ++/* ***** 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) {} ++ virtual ~nsMIMEInfoUnix(); ++ ++ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); ++ ++protected: ++ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); ++ ++ GnomeVFSMimeApplication *mDefaultVFSApplication; ++}; ++ ++#endif // nsMimeInfoUnix_h__ --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/ubuntu-look-and-feel-home-folder.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/ubuntu-look-and-feel-home-folder.patch @@ -0,0 +1,67 @@ +From a7cd308f5185d050a02141ae0575d7fea2529850 Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:15 +0100 +Subject: [PATCH] ubuntu-look-and-feel-home-folder + + + use desktop folder instead of home +--- + browser/components/preferences/main.js | 4 ++++ + toolkit/mozapps/downloads/content/downloads.js | 4 ++++ + 2 files changed, 8 insertions(+) + +Index: mozilla/browser/components/preferences/main.js +=================================================================== +--- mozilla.orig/browser/components/preferences/main.js 2007-04-04 18:47:53.000000000 +0200 ++++ mozilla/browser/components/preferences/main.js 2007-04-04 18:48:08.000000000 +0200 +@@ -350,19 +350,23 @@ + + if (aFolderType == "Downloads") + #ifdef XP_WIN + return "Pers"; + #else + #ifdef XP_MACOSX + return "UsrDocs"; + #else ++#ifdef XP_UNIX ++ return aFolderType == "Desktop" ? "Desk" : "Home"; ++#else + return "Home"; + #endif + #endif ++#endif + + throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'"; + }, + + /** + * Returns the textual path of a folder in readable form. + */ + _getDisplayNameOfFile: function (aFolder) +Index: mozilla/toolkit/mozapps/downloads/content/downloads.js +=================================================================== +--- mozilla.orig/toolkit/mozapps/downloads/content/downloads.js 2007-04-04 18:47:53.000000000 +0200 ++++ mozilla/toolkit/mozapps/downloads/content/downloads.js 2007-04-04 18:48:08.000000000 +0200 +@@ -785,19 +785,23 @@ + throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'"; + + #ifdef XP_WIN + return "Pers"; + #else + #ifdef XP_MACOSX + return "UsrDocs"; + #else ++#ifdef XP_UNIX ++ return aFolderType == "Desktop" ? "Desk" : "Home"; ++#else + return "Home"; + #endif + #endif ++#endif + } + + function getDownloadsFolder(aFolder) + { + var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"] + .getService(Components.interfaces.nsIProperties); + var dir = fileLocator.get(getSpecialFolderKey(aFolder), Components.interfaces.nsILocalFile); + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz335810-pango-cursor-up-down-fix.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz335810-pango-cursor-up-down-fix.patch @@ -0,0 +1,70 @@ +From 7e5f042887d5def556944aa82e4eb74df4acc54b Mon Sep 17 00:00:00 2001 +From: Alexander Sack +Date: Tue, 3 Apr 2007 12:33:47 +0200 +Subject: [PATCH] bz335810-pango-cursor-up-down-fix +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + * Bug 335810 – cursor up/down keypresses do not preserve horizontal + position when using pango +--- + gfx/src/gtk/nsFontMetricsPango.cpp | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp +=================================================================== +--- mozilla.orig/gfx/src/gtk/nsFontMetricsPango.cpp 2006-09-26 08:42:55.000000000 +0200 ++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2007-04-04 18:52:39.000000000 +0200 +@@ -946,17 +946,16 @@ + } + + PRInt32 + nsFontMetricsPango::GetPosition(const PRUnichar *aText, PRUint32 aLength, + nsPoint aPt) + { + int trailing = 0; + int inx = 0; +- gboolean found = FALSE; + const gchar *curChar; + PRInt32 retval = 0; + + float f = mDeviceContext->AppUnitsToDevUnits(); + + PangoLayout *layout = pango_layout_new(mPangoContext); + PRUint32 localX = (PRUint32)(aPt.x * PANGO_SCALE * f); + PRUint32 localY = (PRUint32)(aPt.y * PANGO_SCALE * f); +@@ -972,32 +971,22 @@ + retval = -1; + goto loser; + } + + // Set up the pango layout + pango_layout_set_text(layout, text, strlen(text)); + FixupSpaceWidths(layout, text); + +- found = pango_layout_xy_to_index(layout, localX, localY, +- &inx, &trailing); ++ pango_layout_xy_to_index(layout, localX, localY, ++ &inx, &trailing); + + // Convert the index back to the utf-16 index + curChar = text; + +- // Jump to the end if it's not found. +- if (!found) { +- if (inx == 0) +- retval = 0; +- else if (trailing) +- retval = aLength; +- +- goto loser; +- } +- + for (PRUint32 curOffset=0; curOffset < aLength; + curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) { + + // Check for a match before checking for a surrogate pair + if (curChar - text == inx) { + retval = curOffset; + break; + } --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz51429-anti-netstat-zombie-linux.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz51429-anti-netstat-zombie-linux.patch @@ -0,0 +1,35 @@ +From e3b39210f0218658fd93526ee3f920ca65ff7205 Mon Sep 17 00:00:00 2001 +From: asac +Date: Tue, 13 Mar 2007 20:10:10 +0100 +Subject: [PATCH] bz51429-anti-netstat-zombie-linux + +--- + security/nss/lib/freebl/unix_rand.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: mozilla/security/nss/lib/freebl/unix_rand.c +=================================================================== +--- mozilla.orig/security/nss/lib/freebl/unix_rand.c 2006-10-13 00:50:48.000000000 +0200 ++++ mozilla/security/nss/lib/freebl/unix_rand.c 2007-04-04 18:49:00.000000000 +0200 +@@ -871,17 +871,21 @@ + + #ifdef DARWIN + #include + #endif + + /* Fork netstat to collect its output by default. Do not unset this unless + * another source of entropy is available + */ ++#ifndef LINUX + #define DO_NETSTAT 1 ++#else ++#define DO_NETSTAT 0 ++#endif + + void RNG_SystemInfoForRNG(void) + { + FILE *fp; + char buf[BUFSIZ]; + size_t bytes; + const char * const *cp; + char *randfile; --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz344818_att264996.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz344818_att264996.patch @@ -0,0 +1,97 @@ +--- mozilla/configure.in.bak 2007-04-27 12:06:53.000000000 -0700 ++++ mozilla/configure.in 2007-04-27 13:51:40.000000000 -0700 +@@ -6731,12 +6731,29 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$M + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; then ++ PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; then ++ PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + + AC_SUBST(MOZ_TREE_CAIRO) + AC_SUBST(MOZ_CAIRO_CFLAGS) + AC_SUBST(MOZ_CAIRO_LIBS) ++AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XLIB_LIBS) ++AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XRENDER_LIBS) + + dnl ======================================================== + dnl disable xul +--- mozilla/layout/build/Makefile.in.bak 2007-04-27 12:13:22.000000000 -0700 ++++ mozilla/layout/build/Makefile.in 2007-04-27 13:53:00.000000000 -0700 +@@ -234,6 +234,17 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) + endif + ++ifdef MOZ_X11 ++ifdef MOZ_SVG_RENDERER_CAIRO ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) \ ++ $(NULL) ++endif ++ifdef MOZ_ENABLE_CANVAS ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) \ ++ $(NULL) ++endif ++endif ++ + ifneq (,$(filter mac cocoa gtk,$(MOZ_WIDGET_TOOLKIT))) + EXTRA_DSO_LDOPTS += \ + $(TK_LIBS) \ +--- mozilla/layout/svg/renderer/src/cairo/Makefile.in.bak 2007-04-27 13:55:51.000000000 -0700 ++++ mozilla/layout/svg/renderer/src/cairo/Makefile.in 2007-04-27 13:49:51.000000000 -0700 +@@ -93,6 +93,11 @@ LOCAL_INCLUDES = \ + -I$(topsrcdir)/gfx/src \ + $(NULL) + ++ifdef MOZ_X11 ++CFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++endif ++ + ifdef MOZ_ENABLE_GTK + LOCAL_INCLUDES += -I$(topsrcdir)/gfx/src/gtk + CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +--- mozilla/config/autoconf.mk.in.bak 2007-04-27 12:12:12.000000000 -0700 ++++ mozilla/config/autoconf.mk.in 2007-04-27 13:47:28.000000000 -0700 +@@ -207,6 +207,8 @@ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDER + MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@ + MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@ + MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ ++MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@ ++MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@ + TX_EXE = @TX_EXE@ + + # Mac's don't like / in a #include, so we include the libart +@@ -218,6 +220,8 @@ endif + endif + MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@ + MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@ ++MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@ ++MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@ + + MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@ + MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ +--- mozilla/content/canvas/src/Makefile.in.bak 2007-04-27 12:25:38.000000000 -0700 ++++ mozilla/content/canvas/src/Makefile.in 2007-04-27 12:25:00.000000000 -0700 +@@ -94,7 +94,7 @@ FORCE_STATIC_LIB = 1 + + include $(topsrcdir)/config/rules.mk + +-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS) + + ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT))) + # needed for nsDrawingSurfaceMac.h --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch @@ -0,0 +1,197 @@ +From 84e750219be86603168a47b17d84bfaf69288606 Mon Sep 17 00:00:00 2001 +From: asac +Date: Wed, 21 Feb 2007 03:34:14 +0100 +Subject: [PATCH] bz161826 nsTextFrame::MeasureText()'s crash on RISC + + + nsTextFrame::MeasureText()'s fast text measuring codepath crashes on +RISC machines +--- + intl/lwbrk/src/nsJISx4501LineBreaker.cpp | 24 ++++++++++++------------ + intl/unicharutil/util/nsUnicharUtils.cpp | 23 +++++++++++++++++++++++ + intl/unicharutil/util/nsUnicharUtils.h | 5 +++++ + layout/generic/nsTextFrame.cpp | 8 ++++---- + 4 files changed, 44 insertions(+), 16 deletions(-) + +Index: mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp +=================================================================== +--- mozilla.orig/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2007-04-04 18:45:09.000000000 +0200 ++++ mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2007-04-04 18:45:40.000000000 +0200 +@@ -482,57 +482,57 @@ + NS_ENSURE_TRUE(oNeedMoreText, NS_ERROR_NULL_POINTER); + NS_ENSURE_TRUE(aPos <= aLen, NS_ERROR_ILLEGAL_VALUE); + + //forward check for CJK characters until a space is found. + //if CJK char is found before space, use 4051, otherwise western + PRUint32 cur; + for (cur = aPos; cur < aLen; ++cur) + { +- if (IS_SPACE(aText[cur])) ++ if (IS_SPACE(GetUnichar(&aText[cur]))) + { + *oNext = cur; + *oNeedMoreText = PR_FALSE; + return NS_OK; + } +- if (IS_CJK_CHAR(aText[cur])) ++ if (IS_CJK_CHAR(GetUnichar(&aText[cur])) || IS_THAI(GetUnichar(&aText[cur]))) + goto ROUTE_CJK_NEXT; + } + *oNext = aLen; + *oNeedMoreText = PR_TRUE; + return NS_OK; + + ROUTE_CJK_NEXT: + PRInt8 c1, c2; + cur = aPos; +- if(NEED_CONTEXTUAL_ANALYSIS(aText[cur])) ++ if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur]))) + { +- c1 = this->ContextualAnalysis((cur>0)?aText[cur-1]:0, +- aText[cur], +- (cur<(aLen-1)) ?aText[cur+1]:0); ++ c1 = this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, ++ GetUnichar(&aText[cur]), ++ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); + } else { +- c1 = this->GetClass(aText[cur]); ++ c1 = this->GetClass(GetUnichar(&aText[cur])); + } + + if(CLASS_THAI == c1) + { + *oNext = PRUint32(TrbFollowing(aText, aLen, aPos)); + *oNeedMoreText = PR_FALSE; + return NS_OK; + } + + for(cur++; cur ContextualAnalysis((cur>0)?aText[cur-1]:0, +- aText[cur], +- (cur<(aLen-1)) ?aText[cur+1]:0); ++ c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, ++ GetUnichar(&aText[cur]), ++ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); + } else { +- c2 = this->GetClass(aText[cur]); ++ c2 = this->GetClass(GetUnichar(&aText[cur])); + } + + if(GetPair(c1, c2)) { + *oNext = cur ; + *oNeedMoreText = PR_FALSE; + return NS_OK; + } + c1 = c2; +Index: mozilla/intl/unicharutil/util/nsUnicharUtils.cpp +=================================================================== +--- mozilla.orig/intl/unicharutil/util/nsUnicharUtils.cpp 2007-04-04 18:45:09.000000000 +0200 ++++ mozilla/intl/unicharutil/util/nsUnicharUtils.cpp 2007-04-04 18:45:40.000000000 +0200 +@@ -343,8 +343,31 @@ + if (aChar < 256) + result = toupper(char(aChar)); + else + result = aChar; + } + return result; + } + ++PRUnichar ++GetUnichar(const void *ptr) ++{ ++ PRUnichar result; ++#if NEED_STRICT_ALIGNMENT ++ *((char *) &result) = *((char *) ptr); ++ *((char *) &result + 1) = *((char *) ptr + 1); ++#else ++ result = *((PRUnichar *) ptr); ++#endif ++ return result; ++} ++ ++void ++SetUnichar(void *ptr, PRUnichar aChar) ++{ ++#if NEED_STRICT_ALIGNMENT ++ *((char *) ptr) = *((char *) &aChar); ++ *((char *) ptr + 1) = *((char *) &aChar + 1); ++#else ++ *((PRUnichar *) ptr) = aChar; ++#endif ++} +Index: mozilla/intl/unicharutil/util/nsUnicharUtils.h +=================================================================== +--- mozilla.orig/intl/unicharutil/util/nsUnicharUtils.h 2007-04-04 18:45:09.000000000 +0200 ++++ mozilla/intl/unicharutil/util/nsUnicharUtils.h 2007-04-04 18:45:40.000000000 +0200 +@@ -77,16 +77,21 @@ + aHay.BeginReading(searchBegin), + aHay.EndReading(searchEnd), + nsCaseInsensitiveStringComparator()); + } + + PRUnichar ToUpperCase(PRUnichar); + PRUnichar ToLowerCase(PRUnichar); + ++#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__) ++ ++PRUnichar GetUnichar(const void *); ++void SetUnichar(void *, PRUnichar); ++ + inline PRBool IsUpperCase(PRUnichar c) { + return ToLowerCase(c) != c; + } + + inline PRBool IsLowerCase(PRUnichar c) { + return ToUpperCase(c) != c; + } + +Index: mozilla/layout/generic/nsTextFrame.cpp +=================================================================== +--- mozilla.orig/layout/generic/nsTextFrame.cpp 2007-04-04 18:45:09.000000000 +0200 ++++ mozilla/layout/generic/nsTextFrame.cpp 2007-04-04 18:45:40.000000000 +0200 +@@ -5124,18 +5124,18 @@ + TransformTextToUnicode(char* aText, PRInt32 aNumChars) + { + // Go backwards over the characters and convert them. + unsigned char* cp1 = (unsigned char*)aText + aNumChars - 1; + PRUnichar* cp2 = (PRUnichar*)aText + (aNumChars - 1); + + while (aNumChars-- > 0) { + // XXX: If you crash here then you may see the issue described +- // in http://bugzilla.mozilla.org/show_bug.cgi?id=36146#c44 +- *cp2-- = PRUnichar(*cp1--); ++ // in http://bugzilla.mozilla.org/show_bug.cgi?id=161826 ++ SetUnichar(cp2--, PRUnichar(*cp1--)); + } + } + + PRUint32 + nsTextFrame::EstimateNumChars(PRUint32 aAvailableWidth, + PRUint32 aAverageCharWidth) + { + // Estimate the number of characters that will fit. Use 105% of the available +@@ -6222,19 +6222,19 @@ + return NS_OK; + } + + static void + RevertSpacesToNBSP(PRUnichar* aBuffer, PRInt32 aWordLen) + { + PRUnichar* end = aBuffer + aWordLen; + for (; aBuffer < end; aBuffer++) { +- PRUnichar ch = *aBuffer; ++ PRUnichar ch = GetUnichar(aBuffer); + if (ch == ' ') { +- *aBuffer = CH_NBSP; ++ SetUnichar(aBuffer, CH_NBSP); + } + } + } + + nsTextDimensions + nsTextFrame::ComputeTotalWordDimensions(nsPresContext* aPresContext, + nsILineBreaker* aLineBreaker, + nsLineLayout& aLineLayout, --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch @@ -0,0 +1,37 @@ +From b6dda891d023ce4251c69adcac8a69d375c298e5 Mon Sep 17 00:00:00 2001 +From: Alexander Sack +Date: Mon, 2 Apr 2007 15:37:15 +0200 +Subject: [PATCH] ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls + +TODO -> migrate bookmarks fix together with original bookmarks fix in look-and-feel patch to distromods + +--- + browser/locales/en-US/profile/bookmarks.html | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: mozilla/browser/locales/en-US/profile/bookmarks.html +=================================================================== +--- mozilla.orig/browser/locales/en-US/profile/bookmarks.html 2007-04-04 18:52:09.000000000 +0200 ++++ mozilla/browser/locales/en-US/profile/bookmarks.html 2007-04-04 18:52:31.000000000 +0200 +@@ -14,19 +14,19 @@ +

+

Getting Started +
Latest BBC Headlines +

+

+

Ubuntu and Free Software links

+
Information and resources about Ubuntu, Debian and Free Software in general +

+-

Ubuntu ++
Ubuntu +
Ubuntu Support Home +-
Ubuntu Wiki (community-edited website) ++
Ubuntu Wiki (community-edited website) +
Make a Support Request to the Ubuntu Community +
Free Software Foundation +
Debian (Ubuntu is based on Debian) +

Mozilla Firefox

+
Help and Tutorials +
Customize Firefox +
Get Involved +
About Us --- firefox-2.0.0.12+2nobinonly+2.orig/debian/patches/bzXXX-fix-build-flat-chrome.patch +++ firefox-2.0.0.12+2nobinonly+2/debian/patches/bzXXX-fix-build-flat-chrome.patch @@ -0,0 +1,181 @@ +From 30242a14c585a41835696856f81e7864d6486a36 Mon Sep 17 00:00:00 2001 +From: asac +Date: Mon, 12 Mar 2007 17:03:03 +0100 +Subject: [PATCH] flat chrome fix + + * do-not-zip-chrome-jars-use-exploded-structure-instead-configure-in-remove-ac_msg_error-in-case-zip-is-not-found-in-path +--- + config/config.mk | 6 +++++- + config/make-jars.pl | 5 ++++- + config/rules.mk | 2 +- + configure.in | 10 +++++++--- + 4 files changed, 17 insertions(+), 6 deletions(-) + +Index: mozilla/config/config.mk +=================================================================== +--- mozilla.orig/config/config.mk 2007-04-04 18:45:06.000000000 +0200 ++++ mozilla/config/config.mk 2007-04-04 18:45:47.000000000 +0200 +@@ -456,20 +456,24 @@ + -D_IMPL_NS_WIDGET \ + $(NULL) + endif + endif + + # Flags passed to make-jars.pl + + MAKE_JARS_FLAGS = \ +- -s $(srcdir) -t $(topsrcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl \ ++ -s $(srcdir) -t $(topsrcdir) -p $(MOZILLA_DIR)/config/preprocessor.pl \ + -f $(MOZ_CHROME_FILE_FORMAT) \ + $(NULL) + ++ifdef ZIP ++MAKE_JARS_FLAGS += -z $(ZIP) ++endif ++ + ifdef NO_JAR_AUTO_REG + MAKE_JARS_FLAGS += -a + endif + + ifdef USE_EXTENSION_MANIFEST + MAKE_JARS_FLAGS += -e + endif + +Index: mozilla/config/make-jars.pl +=================================================================== +--- mozilla.orig/config/make-jars.pl 2007-04-04 18:45:06.000000000 +0200 ++++ mozilla/config/make-jars.pl 2007-04-04 18:45:47.000000000 +0200 +@@ -132,17 +132,17 @@ + $force_x11 = 1; + } + + my $zipprog = $ENV{ZIP}; + if (defined($::opt_z)) { + $zipprog = $::opt_z; + } + +-if ($zipprog eq "") { ++if (($fileformat eq "jar" || $fileformat eq "both") && $zipprog eq "") { + print "A valid zip program must be given via the -z option or the ZIP environment variable. Exiting.\n"; + exit(1); + } + + my $force_os; + if (defined($::opt_o)) { + $force_os = $::opt_o; + } +@@ -509,40 +509,43 @@ + my @manifestLines; + + print "+++ making chrome $cwd => $jarDir/$jarfile.jar\n"; + while (defined($_ = shift @gLines)) { + if (/^\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) { + my $dest = $1; + my $srcPath = defined($2) ? substr($2, 1, -1) : $2; + EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0); ++ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0) if ($fileformat eq "flat"); + $args = "$args$dest "; + if (!foreignPlatformFile($jarfile) && $autoreg && + $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/) + { + my $chrome_type = $1; + my $pkg_name = $2; + RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name); + } + } elsif (/^\+\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) { + my $dest = $1; + my $srcPath = defined($2) ? substr($2, 1, -1) : $2; + EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0); ++ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0) if ($fileformat eq "flat"); + $overrides = "$overrides$dest "; + if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/) + { + my $chrome_type = $1; + my $pkg_name = $2; + RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name); + } + } elsif (/^\*\+?\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) { + # preprocessed (always override) + my $dest = $1; + my $srcPath = defined($2) ? substr($2, 1, -1) : $2; + EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1); ++ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1) if ($fileformat eq "flat"); + $overrides = "$overrides$dest "; + if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/) + { + my $chrome_type = $1; + my $pkg_name = $2; + RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name); + } + } elsif (/^\%\s+(.*)$/) { +Index: mozilla/config/rules.mk +=================================================================== +--- mozilla.orig/config/rules.mk 2007-04-04 18:45:44.000000000 +0200 ++++ mozilla/config/rules.mk 2007-04-04 18:45:47.000000000 +0200 +@@ -1572,17 +1572,17 @@ + ifndef XPI_NAME + @$(EXIT_ON_ERROR) \ + if test -f $(JAR_MANIFEST); then \ + if test ! -d $(DESTDIR)$(mozappdir)/chrome; then $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/chrome; fi; \ + if test ! -d $(MAKE_JARS_TARGET)/chrome; then $(NSINSTALL) -D $(MAKE_JARS_TARGET)/chrome; fi; \ + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \ + $(JAR_MANIFEST) | \ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \ +- -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \ ++ -d $(MAKE_JARS_TARGET)/chrome -j $(DESTDIR)$(mozappdir)/chrome \ + $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \ + $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \ + fi + endif + endif + + ifneq ($(DIST_FILES),) +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in 2007-04-04 18:45:22.000000000 +0200 ++++ mozilla/configure.in 2007-04-04 18:45:47.000000000 +0200 +@@ -555,19 +555,16 @@ + AC_MSG_RESULT([yes]) + fi + + AC_PATH_PROG(DOXYGEN, doxygen, :) + AC_PATH_PROG(WHOAMI, whoami, :) + AC_PATH_PROG(AUTOCONF, autoconf, :) + AC_PATH_PROG(UNZIP, unzip, :) + AC_PATH_PROGS(ZIP, zip) +-if test -z "$ZIP" || test "$ZIP" = ":"; then +- AC_MSG_ERROR([zip not found in \$PATH]) +-fi + AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend) + AC_PATH_PROG(XARGS, xargs) + if test -z "$XARGS" || test "$XARGS" = ":"; then + AC_MSG_ERROR([xargs not found in \$PATH .]) + fi + + if test "$COMPILE_ENVIRONMENT"; then + +@@ -6083,16 +6080,23 @@ + + if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && + test "$MOZ_CHROME_FILE_FORMAT" != "flat" && + test "$MOZ_CHROME_FILE_FORMAT" != "symlink" && + test "$MOZ_CHROME_FILE_FORMAT" != "both"; then + AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, both, or symlink]) + fi + ++if test "$MOZ_CHROME_FILE_FORMAT" = "jar" || ++ test "$MOZ_CHROME_FILE_FORMAT" = "both"; then ++ if test -z "$ZIP" || test "$ZIP" = ":"; then ++ AC_MSG_ERROR([zip is required for chrome format $MOZ_CHROME_FILE_FORMAT]) ++ fi ++fi ++ + dnl ======================================================== + dnl = Define default location for MOZILLA_FIVE_HOME + dnl ======================================================== + MOZ_ARG_WITH_STRING(default-mozilla-five-home, + [ --with-default-mozilla-five-home + Set the default value for MOZILLA_FIVE_HOME], + [ val=`echo $withval` + AC_DEFINE_UNQUOTED(MOZ_DEFAULT_MOZILLA_FIVE_HOME,"$val") ]) --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefoxrc +++ firefox-2.0.0.12+2nobinonly+2/debian/firefoxrc @@ -0,0 +1,5 @@ +# which /dev/dsp wrapper to use +FIREFOX_DSP="none" +# Note that "auto" and "esd" involve the use of esddsp, which +# is known to be buggy and to make Firefox unstable. +# See https://launchpad.net/bugs/29760. --- firefox-2.0.0.12+2nobinonly+2.orig/debian/vendor.js.in +++ firefox-2.0.0.12+2nobinonly+2/debian/vendor.js.in @@ -0,0 +1,4 @@ +#expand pref("general.useragent.vendor","__DISTRIB_ID__"); +#expand pref("general.useragent.vendorSub","__DISTRIB_RELEASE__"); +#expand pref("general.useragent.vendorComment","__DISTRIB_CODENAME__"); +pref("browser.display.use_system_colors", true); --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.png.uu +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.png.uu @@ -0,0 +1,146 @@ +begin 644 firefox-2.png +MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U`8=!!(VV`_# +M[0``&*Y)1$%4>-KMFWF,7==]WS_GW.7M\]ZLG(WD<+B9I$QM=F18LFI;L1"G +M-EHD7H`T5ERT!EH@2(.@@.T4!5H!7=(B0`H42%P;@1T[:9JXDMO85BS9KA?) +MUF)J,2DN0W)(:3B^B_OFWN_W]_TMY]Q[ +MX>\^_W]_Q-_$29]XXNSPA0O+PW'I_=(S+QL:IQO_K,E4UN/3[ZCVJ6W*81&$`*03&`4@@K2]O?"!-] +MZ9VWC28FT7\Z4(@N?>0C]RW_K2+@D4>>S7S^H1>FDCC\M7,KS;O=:.6^>1EC +M!\I$(V6B?)8@"I"A1`0!A"$N##"`;BF2E2W$R@;%S1TF6O6%BE%?S=:;GWS_ +M>T]<^M5?>/;?=^MALPOUS<8[LOA&*I2R#I2SE0H9" +M+B:;B\C$$4$F0D0!+@A0#IJ)H=94U.H)F_46V[46C4:"6MDBN[C&='7GI6/# +M^4_<,E7YD]_^K5^:_[DAX#O?.1L\^O69>T^]M/Z[9[;5+ZZ5^RB.5!CM+S#8 +MEZ4OGR&,0\(H(,C$1$-E@BA$2`D"G`.M#4E3D;0422LA:2J:346UGK!1:[%5 +M;]&L-0F7-IANU*^\=:+PJ0^^Y\2?W'WWB6M_HP0\]/!34__M+Y_[R)6F_MVY +M7([RGG[&!XOT]^7(9B*B."2,>BP3$O7W$10R2"D10F`=&&-I-1*:M29),^F0 +MT6HF)"U%LYFP56NQ64MH-9ID5C:Y4YK9$Z-]O_$'__F#C_^XUQ_\).!_[_>_ +M?-]G'SWWA:?J^CWU_CXF1RM,]A^ +M_>-@D#\N^'_S[Q[^MY]]_.*C3S;,OOQ`D?V#1@_K@3\_??]_H-?>.[*Q]>B.!@L92EF0@_26)SUAK4XEY+0L]^E +M"@@*640;M'`$PA$`<29$2@'&2[X#O+UM/"'.>'*$->1P9'&H*.*;2]437SMU +MZ4L/_L?_O?]U(>"W/_8_'GQRK?'Q:B875O(9,E)@M<4:B[5^="8=M<4)`<4< +M3@BL32\\$R%R&?\/G4.F"@AP"&MQB>X`=MJDBK+^M\;@M.V2D:HB=H[8.4PV +MQPMCXR>^=6GC2W_V9Z\M',+7"OZ__N&C#_ZG[Z]_?./0_K#XTCR!^M_B'YXY.Q1ECB!=6D5(@`TDP/N0;FD3YC"XE,I\E +M.C!.$$FD$`3Y+$%_B;!<0$8A,JV_HJ<.6P=;"QMLSJ^1-!)THM'*8)3"*(U6 +M&J.,M[0RF)9";59Q4M`X/P>;.X1OV$>CD.7*Y@-EQ%VWP"W3<&@26\AZ192+&,!8AW$.`]C` +MM[K&.;3U9JQ#68M*CXM+.:PR6*W!.:SV9=!I@Y""N)('UPX-OU]O5JD^?1ZU +MM(Y9V227)(0"MJ=&^?JV_1>_\]$_O^9S +MV%(.=_(0QCEL7P&#P&SL8#,QC`][\+WF'-I:M&F#MQZ\<2ACT<8B0!L*XP/LO>\VAF\_Z%-'2HHS72(P!A%'A(4LQ5`B!%R>W"-?6&E\ +MYK&O?F_RQ\H!?_!?OCC]J>\N/+!Q9#^DR[-ABM,5JS=O8EEIZ9(1XHT7=X@GBPY$/#F&Z_ +M82QZ91.[4T=&$1E`6D=UN,*W7][YI__A]QZ>^)$(>/*IEVZ;M_)WDH'2KCIL +MM<48B[$6>]=A;#&+*69W@?7;-C4?Y[HC^=32X[=7=UB]LD2CUO03H6:"5J:; +M!+5/?$FM!5(P\*9#9$8JB##`:4-F%:\Y!)XYO?@/3]M(@DMKK@5I<=)ZV4N!*68(?NT>C`!MK"]I +M0B*P""$1.`06G$"XE&OA<$BL!:S]4`8\^^N3^BVO-#S=+^;0=M9TV%).6(&70QG:E[79+7)O4XSTJ:'O> +MJ\#OA383,9SQISF&M(S,VP-#]=Y+9-P(+&X3/OXS< +M:7:O5UNDL03.@A"<:;!G=:/^H=<4`C.7UMYZ;E.-(T77^VU+9V9M$I1.I6XL +MNM%"+:VCM$7MU%&+ZZAZJRO[-.-WR-"6>*R"BT)L(#SX1*7@-3K-`48;"`), +MFENL\U4ES.>P3\Y@S\SYUCN*.M6A?;V!GVNSD[[P`PFX>/%B +M-+]<_?4E&W1!I]U79X+20X#1QA-0K:,OS:&-02^NDERZAII?08]:BS+& +MDZ`MRAH2:[%12.'P&'W']Q&6\UWPJ5D@.SZ([,OWE%6+M0X+V-4=G)2XN]^` +M"V6/P]+2:"S"6%P^9GZK];8K5]:F?F`.J%8;>V<7JF]/XB@%+D`*$!:D`2%` +M:]A>Q0[T8;(QHM%$K&_ZI9U6XK-R*"$(8+,*C19.9G%"8ITA%`+C!(%PF/9Z +M0!A0.#2!BT.2K;I/:OD,4:5`V%?`!;)37:QU?NZ1"7'W'O-S!=TMBV@_9W#: +M=@DPCN<6ZFAC'P`^^JH$+"[N'+ZR7,L3]WDF>X'+M&>]^C+4&[BY"),N;8DX +MA#A$*`.1Q)D`%_IY@EO9Q`6#N$R(=0(K!8$3&`&!$'YF*$"$DMST&#DZZE19S2N`/C +M6.$\"<*O!AGA//AVLR3\S,BE#%@'KD-"VEH;Z\$G&GMM&;NVA5U8P24*F\WB +M#DU[1:C=JE`R8'ZY5E%*98%7$C`S,Y-_^IFK4YO--(:D`)&2(`QLK,/**LA4 +MWD$`@9\1:F/`1/YW48"+0@@DF``7&-BI^V4M*0BMP$B!%*1+8EV>=WU2!;B> +M[&^MP6B+5;XGL?4F=G$%M[F-:R4XO8Z5`6YXCR=`]>2N4')MJ2J!_<#I5Q"@ +ME,JO;]9/$@C_H]HV)`T8GP"1@;5U2!3MSA!C(?`9ND."#E/3G?5^F\O@*B6L +ML81.8(0/@4"`Q!,ATE`0WO=I"+B4!+^8XM+I=Y<`@QWHQRZL8I,U;**P28([ +M?18;7\(5^W`CXS@1>#S6L55-[FTV]?)%X)V]O86@,G(URV",*KN"ZU6$M\T"89A +M.%2K)YAV&+0&*U1+>]K[4G8&$%M[J!VS.( +M/7D8&P9>1&D>\#E`^,[1I6L$/02TYR'.N,YJD]4I"5ICEM>PC49'`58E6*5P +MM67@&R1ZIXAE-+![.RLF)Z>=KL($$),ZG;?KPS$>8AST-CQGI8I +M6-L&'?ACI4SC78*46*W1@<:I`!=VS=::!$V%"ZVO!*GW.WFVAX3=!+15D)*@ +M?2C8I16_?6D6DRA,DG@"$H55J24)Z`2VU\%I3.$7D%(.6&LE8'81X)PK!%)X +M\,I`?0=J6RG@'M"VQ^L=(D2J$.%)$`87R"[X(""0`:ZELQU5KJ>855"28=K?:&U;Z"64T8Y0A#V6^M +M#5Y!`!`5,!N?!XPRE +MK$!*PO9JW(TA4*N4L\JU-,0&ME=!JZZ7G4A#(04I4H^+&PD1:5V3."$QI2+N +M^%%<%&.;"8&4Z>%=`CK-$/B;*ZX]]N8!3X*K-7`OS6&;3;]LIA*LTJGW=4I" +MXG-0"ASGG92-Q'-!()M""'NS1FAM +M$E+@G7UA"`>FL'$&UU3(5/J!%#T$=+._0/B;)VTB;`\!;1+FK^,:#5P'N.YX +MW&B%U0IKE)>]T_[:<1!$#`SDKPO!JI32W*P,OES(9QC*"ZXI#:4Q#Z:QX9DD +M!=_V,%%4<^F-:"B=\`V1%&@(=$GISP&X5M.\J]:J`M75LLXE3 +M"JLU3JMT`55US(-/S?\C!#%3^\H((;8.'CSX2@5(*76QF)&C_='5:]?-%%$` +M?7NA/`&Z#JTZ5.M>^F.#7ATKU_Q)>D&+E(@@@""$,R_"OGTP-.QOATN)$6D[ +M#,BE342MA9@<1.:B3AGL5`/;)<&MK?J;)ZT$IY.4`(TU/@>X=L)SINOYU,*H +MP(ECPTMA&-I7ZP-T'$?-PP>*ET]=69UR[0L(`XC[O-4V(930-P)6@6K"ZG4/ +MVO:`%_X6%RO+?KM>AY-9F+T$(WM@9!0G\$OF:U7$BW.(/>5T%2E-A+TYP#EH +M-'&GGX?:#LYXX.W16NW/Y]HQ[WK`>[QC8Z,,CY1D&(;77XV`[2`(SK_UKK'X +MH<<6:2D!+DC+D?,>'>GSA"0:%F:@NNX9%S>`I_<[OJ+,S\/B`BPMPG$+@R-> +M$:,57#D/VB"T2W^UY'_\YIO8./-57 +MRD?.N1=N2L"A0X?LZ=.GE_?MZW=3>R(N+)IN0^(""%TZ#TCG_9M+/C?T@N\` +MQX^DA%1WX.+9[G,9ERY`L9+^!H@#:&GO./P$J$.\=1[8SK8'JY*TKG?+6Q>\ +MNZD%83]WOW7O7"83KP=!4'O5]0`AQ'?Z^TOO/GFL?&KFY:4[G0U[DE"[#78^ +M#*SR%R1Z8K\-N$-&S[85W8:_5H6F\D2UFJEDT\0:A#W$I^=.$@@R4!Z&0C\L +M78'ME9XR=R-XNDH0DO'Q26X].;H31='9*(H:KTI`%$4KN5SNVKWWC)NO?7/I +MSO6&]MYWSO<`84J$E?Z"U'8/R-3SR*YGVVJ@APCP(*M5F#T#29L`_,1KXB"4 +MAFYHAP44AR`_F.(+86=E=YGK`-_M?1%4>-,=X\\.#Y>C.(Z?/GCPH'O5-<&C +M1X_6,IG,]Z>GA]VM)TI+0FD?[[W6WM!"R%72,F=O2'B])A@$P#+]5J93MN^Z;^&XYRRN!M]*1K"^)'0)N8D:_DB"C0#=A +M9:Y+BE%=XFI;FHD_7_N&!@0O_S+^[X],1Z`;KV2A$1#-`GY(Y`=3Y.1[BE)[6WU +M@U72SN8=)(/LJ\O??HV@/][_KP%.''&93.:AP<'!ZCWW3,V_[6UC7PR"*KCUE(A6-SG59T%O[59`+\B; +M[;,W$F)`9J'O"!2/0/^;(!Q*P=\0`JU>%>R#\#B(@T`&T(!@SYXCUQ]XX-@3 +MX^.C8:%0>.3X\>-+/_+S`<>.'5L^<^;,E\;&QG[]?>^K+Z^NUJX___S%<6OK +MX')@LMYZVLWN0R\]HWN5_>WR*'-0NLW_#U'P;E$V)93=[;#=/3GR5DB?]ID" +MZO3W]YL/?>CVIZ:GQ^/^_OXKV6SVL1_[(:E\/O]8?W__P;U[)][RP`/-K]1J +MS?MG9BY,.%=+8S"7GERE@I(W>0+7W?S)W'86-PW0SGO0:7]\9S9XPWR@W14Z +M#2X!6JDU@2;%8K_^P`>./7S''?N:HZ.C]7P^_\='CARI_T3/"I\_?WZ@6JU^ +M='Y^?N_%BU>;G_C$L_=?OGQFPEJ;DD!ZUUG2?N@-QH!\"GXUE:9Z]";UL3L`P,'%`?_."=7[CKKFF]?_]^ +M/3`P\-]OO?761WZJ3XN?.W?NX-;6UF_-S\\/SIU4`5%*0)BJH`J,`@N=+NV5GWY@/`7=:ZJ'A"X!0F38O_^-BQ_XP.W? +M/'%BK]V[=Z\9'!S\8JE4^LOIZ6G[4W]<_MRY

WM[=_?<5NK]&"CT@`_3"P[24ZZF'A<^1IRI7+]WQW'-/WU:K7<6YY`;OM\.@G2#;TA4]U2/?DS/L +M#R#`$8;#3$W=>OV^^TY\Y\2)L>;X^)@9&QNSI5+I+TZ>//G7/Y,7)LZ?/]_? +M;#8_L+FY^?<6%A;4RLJ*N'IU53_^^.P=%RZ\>.OV]BS.[?2T&VWORY[V0_1T +M<<$-'=V-1,3$\1[&QHXOO.4MQY^X_?;1G>'A`3DZ.AH/#P\O%HO%/SU^_/BI +MG^D;([.SL[)>K]];J]5^975U=6!U=56NKZ_K^?DM?>K4]8,S,U>.+RU='=)Z +M&=CN*8<_Z-2]QV0(@D'*Y0GV[IV>N?WV?=\_&AMS(R(@LE\O? +MBN/X+XX=.[;^-_;.T+ESYX9;K=9[:[7:/>OKZ_'Z^KK8VMJRFYM5O;Q<=^?. +MK>R[?GWMC1L;*R-;6\LH50,46K=2-3BDC-*PR5`L]C,PL&=K:*C_V3>\861] +M__[R5G]_0?;UE:)*I<+@X*"H5"I7LMGLYW.YW/=?2[)[W=\:FYF9$4JI2:74 +M+S4:C;=L;FYFM[:V],[.3E"KU6RKE=AZ/;'-IF)[.REN;R=]]7I"K6;)9`39 +M;$0N%U*I9!:+Q=#F\QF1SV?"7"Y'H5"PY7)95BJ5H%`HS&2SV<>B*'KNZ-&C +M]9^[]P8O7KPHE%)#QIA[6ZW6'8U&XT"M5K/U>MTU&@V3)$FLE$)KG1ACG+56 +M"B&L$((@"&3D/S:?S^M<+A<7BT5;*!3J<1P_%T71M\(PO'STZ-&?VINEK^N; +MHQ%UCK66@=`&`3!"##BG*L`B1!B +KQSEW52FU$X8A412U#A\^;/B[S^O[^;\Z\7.<>GK+0@````!)14Y$KD)@@@`` +` +end --- firefox-2.0.0.12+2nobinonly+2.orig/debian/presubj +++ firefox-2.0.0.12+2nobinonly+2/debian/presubj @@ -0,0 +1,41 @@ +*** Please submit non packaging issue (e.g. feature requests) bugs to +the Debian BTS and the upstream bugzilla +(https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox) and put a +reference to the bugzilla bug in the Debian bug report, to ease bug +triage for the maintainers. Thank you. *** + +Firefox extensions being a big source of problems, please either try to +reproduce your bug with a clean user of with you current user in safe +mode, with the "firefox -safe-mode" command line before filing any bugs. +If your bug disappears with a clean user or in safe mode, you might want +to find which extension is responsible for it and file a bug to the +appropriate package, bug tracking system, or author. + +Also, please try running firefox with MOZ_DISABLE_PANGO=1 set in your +environment to test with Pango rendering disabled, which can cause +problems in some cases. + +If your Firefox installation pre-dates 1.0, you might have had problems +Firefox not really cleanly supporting upgrade from one release to another. +Please try moving around your ~/.mozilla/firefox directory to see if it +helps with your issue. + +Firefox requires the loopback interface (lo) to be up and unfiltered +to accept keyboard input and function correctly. Please make sure this +is the case before filing any bugs. + +If you get crashes and none of the above hints did avoid the crash, please +first try to remove plugins from the /usr/lib/firefox/plugins, +/usr/lib/mozilla-firefox/plugins and ~/.mozilla/plugins directories. + +If Firefox still crashes, please install the firefox-dbg package and run +firefox with gdb with the "firefox -g" command line. On the gdb prompt, type +the following commands: +set pagination off +run +bt full +And attach the resulting backtrace to your bug report. + +If you are seeing XML parsing errors, please make sure you kill all +running Firefoxes and reload before filing any bugs. + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/cdbs-rules/debhelper.mk +++ firefox-2.0.0.12+2nobinonly+2/debian/cdbs-rules/debhelper.mk @@ -0,0 +1,239 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Description: Uses Debhelper to implement the binary package building stage +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +#### +# General variables implemented by this rule file: +# +# DEB_INSTALL_DIRS_ALL +# Subdirectories to create in installation staging directory for every package +# DEB_INSTALL_DIRS_ +# Like the above, but for a particular package . +# DEB_INSTALL_DOCS_ALL +# Files which should go in /usr/share/doc/ for every package +# DEB_INSTALL_DOCS_ +# Files which should go in /usr/share/doc/ for package +# DEB_INSTALL_CHANGELOGS_ALL +# File which should be interpreted as upstream changelog +# DEB_COMPRESS_EXCLUDE +# Regular expressions matching files which should not be compressed. +# DEB_FIXPERMS_EXCLUDE +# Regular expressions matching files which should not have their permissions changed. +# DEB_CLEAN_EXCLUDE +# Regular expressions matching files which should not be cleaned. +# DEB_DH_ALWAYS_EXCLUDE +# Force builddeb to exclude files. See the DH_ALWAYS_EXCLUDE section +# in debhelper(7) for more details. +# DEB_SHLIBDEPS_LIBRARY_package +# The name of the current library package +# DEB_SHLIBDEPS_INCLUDE +# A space-separated list of library paths to search for dependency info +# DEB_SHLIBDEPS_INCLUDE_package +# Like the above, but for a particular package. +# DEB_PERL_INCLUDE +# A space-separated list of paths to search for perl modules +# DEB_PERL_INCLUDE_package +# Like the above, but for a particular package. +# DEB_UPDATE_RCD_PARAMS +# Arguments to pass to update-rc.d in init scripts +#### +# Special variables used by this rule file: +# +# DEB_DH_MAKESHLIBS_ARGS_ALL +# Arguments passed directly to dh_makeshlibs, for all packages +# DEB_DH_MAKESHLIBS_ARGS_ +# Arguments passed directly to dh_makeshlibs, for a particular package +# DEB_DH_MAKESHLIBS_ARGS +# Completely override argument passing to dh_makeshlibs. +# DEB_DH_SHLIBDEPS_ARGS_ALL +# Arguments passed directly to dh_shlibdeps, for all packages +# DEB_DH_SHLIBDEPS_ARGS_ +# Arguments passed directly to dh_shlibdeps, for a particular package +# DEB_DH_SHLIBDEPS_ARGS +# Completely override argument passing to dh_shlibdeps. +# DEB_DH_PERL_ARGS +# Completely override argument passing to dh_perl. +#### + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_debhelper +_cdbs_rules_debhelper = 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +DH_COMPAT ?= $(shell cat debian/compat 2>/dev/null) +ifeq (,$(DH_COMPAT)) +DH_COMPAT = 5 +endif + +ifeq ($(DH_COMPAT),4) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.2.0) +else +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5) +endif + +ifeq ($(DEB_VERBOSE_ALL), yes) +DH_VERBOSE = 1 +endif + +is_debug_package=$(if $(patsubst %-dbg,,$(cdbs_curpkg)),,yes) + +DEB_INSTALL_DIRS_ALL = +DEB_INSTALL_CHANGELOGS_ALL = $(if $(DEB_ISNATIVE),,$(shell for f in ChangeLog Changelog Changes CHANGES changelog; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; break; fi; done)) +DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f -a ! -d $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done)) + +cdbs_add_dashx = $(foreach i,$(1),$(patsubst %,-X %,$(i))) +cdbs_strip_quotes = $(subst ',,$(subst ",,$(1))) +# hello emacs ' + +DEB_DH_MAKESHLIBS_ARGS = $(DEB_DH_MAKESHLIBS_ARGS_ALL) $(DEB_DH_MAKESHLIBS_ARGS_$(cdbs_curpkg)) +DEB_DH_SHLIBDEPS_ARGS = $(if $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg)),-L $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg))) $(if $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg))$(DEB_SHLIBDEPS_INCLUDE),-l $(shell echo $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg)):$(DEB_SHLIBDEPS_INCLUDE) | perl -pe 's/ /:/g;')) $(DEB_DH_SHLIBDEPS_ARGS_ALL) $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg)) + +DEB_DH_BUILDDEB_ENV = $(if $(DEB_DH_ALWAYS_EXCLUDE),DH_ALWAYS_EXCLUDE=$(DEB_DH_ALWAYS_EXCLUDE),) +DEB_DH_PERL_ARGS = $(if $(DEB_PERL_INCLUDE_$(cdbs_curpkg))$(DEB_PERL_INCLUDE),$(shell echo $(DEB_PERL_INCLUDE_$(cdbs_curpkg)) $(DEB_PERL_INCLUDE))) + +ifneq ($(words $(DEB_DBG_PACKAGES)),0) +ifeq ($(words $(DEB_DBG_PACKAGES)),1) +DEB_DBG_PACKAGE_ALL = $(if $(strip $(foreach x,$(DEB_PACKAGES),$(DEB_DBG_PACKAGE_$(x)))),,$(DEB_DBG_PACKAGES)) +else +ifeq (yes,$(if $(findstring no,$(foreach x,$(DEB_DBG_PACKAGES),$(if $(filter $(x:-dbg=),$(DEB_PACKAGES)),yes,no))),no,yes)) +define cdbs_deb_dbg_package_assign +DEB_DBG_PACKAGE_$(1:-dbg=) = $(1) +endef +$(foreach x,$(DEB_DBG_PACKAGES),$(eval $(call cdbs_deb_dbg_package_assign,$(value x)))) +endif +endif +cdbs_dbg_package = $(if $(DEB_DBG_PACKAGE_$(cdbs_curpkg)),$(DEB_DBG_PACKAGE_$(cdbs_curpkg)),$(DEB_DBG_PACKAGE_ALL)) +cdbs_dbg_package_option = $(if $(cdbs_dbg_package),$(shell if [ "$(DH_COMPAT)" -eq 5 ]; then echo "--dbg-package=$(strip $(cdbs_dbg_package))"; fi)) +DEB_DH_STRIP_ARGS = $(cdbs_dbg_package_option) +endif + +pre-build:: debian/compat + +debian/compat: + $(if $(DEB_DH_COMPAT_DISABLE),,echo $(DH_COMPAT) >$@) + +clean:: + dh_clean $(call cdbs_add_dashx,$(DEB_CLEAN_EXCLUDE)) + +common-install-prehook-arch common-install-prehook-indep:: common-install-prehook-impl +common-install-prehook-impl:: + dh_clean -k $(call cdbs_add_dashx,$(DEB_CLEAN_EXCLUDE)) + dh_installdirs -A $(DEB_INSTALL_DIRS_ALL) + +$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%: + dh_installdirs -p$(cdbs_curpkg) $(DEB_INSTALL_DIRS_$(cdbs_curpkg)) + +# Create .debs or .udebs as we see fit +$(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) :: binary/% : binary-makedeb/% + +#### +# General Debian package creation rules. +#### + +# This rule is called once for each package. It does the work +# of installing to debian/; this includes running +# dh_install to split the source from debian/tmp, as well as installing +# ChangeLogs and the like. +$(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%: + dh_installdocs -p$(cdbs_curpkg) $(DEB_INSTALL_DOCS_ALL) $(DEB_INSTALL_DOCS_$(cdbs_curpkg)) + dh_installexamples -p$(cdbs_curpkg) $(DEB_INSTALL_EXAMPLES_$(cdbs_curpkg)) + dh_installman -p$(cdbs_curpkg) $(DEB_INSTALL_MANPAGES_$(cdbs_curpkg)) + dh_installinfo -p$(cdbs_curpkg) $(DEB_INSTALL_INFO_$(cdbs_curpkg)) + dh_installmenu -p$(cdbs_curpkg) $(DEB_DH_INSTALL_MENU_ARGS) + dh_installcron -p$(cdbs_curpkg) $(DEB_DH_INSTALL_CRON_ARGS) + dh_installinit -p$(cdbs_curpkg) $(if $(DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS))",$(if $(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)))")) $(DEB_DH_INSTALLINIT_ARGS) + dh_installdebconf -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEBCONF_ARGS) + dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(DEB_DH_INSTALLEMACSEN_ARGS) + dh_installcatalogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCATALOGS_ARGS) + dh_installpam -p$(cdbs_curpkg) $(DEB_DH_INSTALLPAM_ARGS) + dh_installlogrotate -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGROTATE_ARGS) + dh_installlogcheck -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGCHECK_ARGS) + dh_installmime -p$(cdbs_curpkg) $(DEB_DH_INSTALLMIME_ARGS) + dh_installchangelogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCHANGELOGS_ARGS) $(DEB_INSTALL_CHANGELOGS_ALL) $(DEB_INSTALL_CHANGELOGS_$(cdbs_curpkg)) + $(if $(wildcard /usr/bin/dh_installudev),dh_installudev -p$(cdbs_curpkg) $(DEB_DH_INSTALLUDEV_ARGS)) + dh_install -p$(cdbs_curpkg) $(if $(DEB_DH_INSTALL_SOURCEDIR),--sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) $(DEB_DH_INSTALL_ARGS) $(DEB_DH_INSTALL_ARGS_$(cdbs_curpkg)) + dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) $(DEB_DH_LINK_$(cdbs_curpkg)) + +# This rule is called after all packages have been installed, and their +# post-install hooks have been run. +common-binary-post-install-arch:: $(patsubst %,binary-post-install/%,$(DEB_ARCH_PACKAGES)) +common-binary-post-install-indep:: $(patsubst %,binary-post-install/%,$(DEB_INDEP_PACKAGES)) + +# This rule is called once for each package; it's a general hook +# to do things like remove files, etc. +$(patsubst %,binary-post-install/%,$(DEB_ALL_PACKAGES)) :: binary-post-install/%: binary-install/% + +# This rule is called after installation and the post-install hooks, +# to strip files. +$(patsubst %,binary-strip/%,$(DEB_ARCH_PACKAGES)) :: binary-strip/%: common-binary-post-install-arch binary-strip-IMPL/% +$(patsubst %,binary-strip/%,$(DEB_INDEP_PACKAGES)) :: binary-strip/%: common-binary-post-install-indep binary-strip-IMPL/% +$(patsubst %,binary-strip-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-strip-IMPL/%: + $(if $(is_debug_package),,dh_strip -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_STRIP_EXCLUDE)) $(DEB_DH_STRIP_ARGS)) + +# This rule is called right before generating debs {post,pre}{inst,rm} and controls, deps, are calculated +# for each package, but after the binary-fixup hooks have been run. +# (necessary for dh_shlibdeps to work on our own dh_makeshlibs'ed libs) +common-binary-fixup-arch:: $(patsubst %,binary-fixup/%,$(DEB_ARCH_PACKAGES)) +common-binary-fixup-indep:: $(patsubst %,binary-fixup/%,$(DEB_INDEP_PACKAGES)) + +# This rule is called after stripping; it compresses, fixes permissions, +# and sets up shared library information. +$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/% + dh_compress -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_COMPRESS_EXCLUDE)) $(DEB_DH_COMPRESS_ARGS) + dh_fixperms -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_FIXPERMS_EXCLUDE)) $(DEB_DH_FIXPERMS_ARGS) + $(if $(is_debug_package),,dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS)) + +# This rule is called right before building the binary .deb packages +# for each package, but after the binary-predeb hooks have been run. +common-binary-predeb-arch:: $(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES)) +common-binary-predeb-indep:: $(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES)) + +# This rule is called right before a packages' .deb file is made. +# It is a good place to make programs setuid, change the scripts in DEBIAN/, etc. +$(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES)) :: binary-predeb/%: common-binary-fixup-arch binary-predeb-IMPL/% +$(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES)) :: binary-predeb/%: common-binary-fixup-indep binary-predeb-IMPL/% +$(patsubst %,binary-predeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-predeb-IMPL/%: + dh_installdeb -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEB_ARGS) + dh_perl -p$(cdbs_curpkg) $(DEB_DH_PERL_ARGS) + dh_shlibdeps -p$(cdbs_curpkg) $(DEB_DH_SHLIBDEPS_ARGS) + +# This rule is called to create a package. Generally it's not going to be +# useful to hook things onto this rule. +$(patsubst %,binary-makedeb/%,$(DEB_ARCH_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-arch binary-makedeb-IMPL/% +$(patsubst %,binary-makedeb/%,$(DEB_INDEP_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-indep binary-makedeb-IMPL/% +$(patsubst %,binary-makedeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-makedeb-IMPL/% : + dh_gencontrol -p$(cdbs_curpkg) $(DEB_DH_GENCONTROL_ARGS) + dh_md5sums -p$(cdbs_curpkg) $(DEB_DH_MD5SUMS_ARGS) + $(DEB_DH_BUILDDEB_ENV) dh_builddeb -p$(cdbs_curpkg) $(DEB_DH_BUILDDEB_ARGS) + +## Deprecated +common-binary-post-install:: common-binary-post-install-arch common-binary-post-install-indep +common-binary-predeb:: common-binary-predeb-arch common-binary-predeb-indep + +## Deprecated special handling of .udebs +$(patsubst %,binary/%,$(DEB_UDEB_PACKAGES)) :: binary/% : binary-makeudeb/% +$(patsubst %,binary-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-install-udeb/%: +common-binary-post-install-udeb:: $(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES)) +$(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-post-install-udeb/%: binary-install-udeb/% +$(patsubst %,binary-makeudeb/%,$(DEB_UDEB_PACKAGES)) :: binary-makeudeb/% : common-binary-post-install-udeb + +endif --- firefox-2.0.0.12+2nobinonly+2.orig/debian/compat +++ firefox-2.0.0.12+2nobinonly+2/debian/compat @@ -0,0 +1 @@ +5 --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.manpages +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.manpages @@ -0,0 +1 @@ +debian/firefox-2.1 --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.prerm +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.prerm @@ -0,0 +1,25 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --remove x-www-browser /usr/bin/firefox-2 + update-alternatives --remove mozilla /usr/bin/firefox-2 + rm -f /var/lib/update-notifier/user.d/firefox-2-restart-required +fi + +if [ "$1" = "remove" ]; then + rm -rf /var/lib/firefox/chrome/overlayinfo + rm -f /var/lib/firefox-2/chrome/chrome.rdf + rm -f /var/lib/firefox-2/defaults.ini + rm -f /var/lib/firefox-2/components.ini + rm -f /var/lib/firefox-2/components/xpti.dat + rm -f /var/lib/firefox-2/components/compreg.dat + rm -f /usr/lib/firefox-2/.autoreg + rm -f /var/lib/firefox-2/extensions/installed-extensions.txt + rm -f /var/lib/firefox-2/extensions/Extensions.rdf + rm -f /usr/lib/firefox-2/defaults/profile/extensions/Extensions.rdf + if [ -d /var/lib/firefox-2/ ]; then + find /var/lib/firefox-2/ -depth -type d -empty -exec rmdir {} \; + fi +fi + +#DEBHELPER# --- firefox-2.0.0.12+2nobinonly+2.orig/debian/control +++ firefox-2.0.0.12+2nobinonly+2/debian/control @@ -0,0 +1,99 @@ +Source: firefox +Section: web +Priority: optional +Maintainer: Alexander Sack +Build-Depends: bzip2, + debhelper (>= 5), + quilt, + patchutils (>= 0.2.25), + cdbs (>= 0.4.27-1), + libx11-dev, + libxt-dev, + libgtk2.0-dev (>= 2.8), + zlib1g-dev, + liborbit2-dev, + libidl-dev (>= 0.8.0), + zip, + libxft-dev, + libfreetype6-dev, + libpng12-dev, + libjpeg62-dev, + libxrender-dev, + libxinerama-dev, + libcairo2-dev, + libgnome2-dev, + libgconf2-dev, + libgnomevfs2-dev, + libgnomeui-dev, + sharutils, + m4, + binutils (>= 2.17-1) [mips mipsel], + libhunspell-dev, + libthai-dev, + libnss3-dev, + libnspr4-dev, + imagemagick, + g++-4.2, + gcc-4.2 +Standards-Version: 3.7.2.1 + +Package: firefox-2 +Architecture: any +Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends} +Conflicts: libnss3, firefox (<= 2.0.0.12+2nobinonly+2-0ubuntu2) +Replaces: libnss3, firefox (<= 2.0.0.12+2nobinonly+2-0ubuntu2) +Recommends: ubufox +Suggests: firefox-2-gnome-support (= ${Source-Version}), latex-xft-fonts +Provides: www-browser +Description: lightweight web browser based on Mozilla + Firefox 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 lightweight and cross-platform. + . + This browser was previously known as Firebird and Phoenix. + +Package: firefox-2-dom-inspector +Architecture: all +Depends: firefox-2 (>= ${source:Version}), firefox-2 (<< ${source:Version}.1~) +Description: tool for inspecting the DOM of pages in Mozilla Firefox + This is a tool that allows you to inspect the DOM for web pages in + Firefox. This is of great use to people who are doing Mozilla chrome + development or web page development. + +Package: firefox-2-gnome-support +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, firefox-2 (= ${Source-Version}) +Provides: gnome-www-browser +Description: Support for Gnome in Mozilla Firefox + This is an extension to Firefox that allows it to use protocol + handlers from Gnome-VFS, such as smb or sftp, and other Gnome + integration features. + +Package: firefox-2-libthai +Architecture: any +Depends: firefox-2 (=${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Support for Thai line breaking in Firefox + This is an extension to Firefox that provides Thai line breaker + component based on libthai. + +Package: firefox-2-dbg +Architecture: any +Priority: extra +Section: devel +Depends: firefox-2 (= ${Source-Version}) +Description: debugging symbols for firefox-2 + Firefox 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 lightweight and cross-platform. + . + This package contains the debugging symbols for firefox-2. + +Package: firefox-2-dev +Architecture: any +Section: devel +Depends: firefox-2 (= ${Source-Version}), libnss3-dev +Description: Development files for Mozilla Firefox + This package contains the development headers, idl files and static libraries + needed to develop applications using Mozilla Firefox. + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/docs +++ firefox-2.0.0.12+2nobinonly+2/debian/docs @@ -0,0 +1 @@ +debian/MPL --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.js +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.js @@ -0,0 +1,16 @@ +// This is the Debian specific preferences file for Mozilla Firefox +// You can make any change in here, it is the purpose of this file. +// You can, with this file and all files present in the +// /etc/firefox/pref directory, override any preference that is +// present in /usr/lib/firefox/defaults/pref directory. +// While your changes will be kept on upgrade if you modify files in +// /etc/firefox/pref, please note that they won't be kept if you +// do them in /usr/lib/firefox/defaults/pref. + +pref("extensions.update.enabled", true); + +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.cfg.source +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.cfg.source @@ -0,0 +1,3 @@ +// +lockPref("app.update.enabled", false); +lockPref("app.update.auto", false); --- firefox-2.0.0.12+2nobinonly+2.orig/debian/debsearch.src +++ firefox-2.0.0.12+2nobinonly+2/debian/debsearch.src @@ -0,0 +1,27 @@ +# Firefox plugin file +# +# Debian package lookup +# by Fergus McKenzie-Kay copying code +# by Spencer Wysinger +# ported to Ubuntu by Alex Converse +# +# Last updated: June 5, 2005 + + + + + + + + + + + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-restart-required.update-notifier +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-restart-required.update-notifier @@ -0,0 +1,10 @@ +Name: Firefox restart required +Name-fr: Relancement de Firefox requis +Priority: High +Terminal: False +DontShowAfterReboot: True +DisplayIf: ps -C firefox-bin +Description: Firefox has been upgraded (or reinstalled) and must be restarted. + Please quit and restart your web browser now. +Description-fr: Firefox a été mis à jour (ou réinstallé) et doit être relancé. + Veuillez quitter et redémarrer for navigateur. --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-dom-inspector.install +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-dom-inspector.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/firefox-2/extensions/inspector@mozilla.org usr/lib/firefox/extensions --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-libthai.install +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-libthai.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/firefox-2/components/libmozlibthai.so usr/lib/firefox/components --- firefox-2.0.0.12+2nobinonly+2.orig/debian/rules +++ firefox-2.0.0.12+2nobinonly+2/debian/rules @@ -0,0 +1,138 @@ +#!/usr/bin/make -f + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p') +DEBIAN_REV_CODE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*-\([0-9]*\)[^-]*$$/0\1/ ; s/^.*\(..\)$$/\1/') +DEBIAN_DATE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*cvs\([0-9]*\).*$$/\1/') + +DEBIAN_MOZ_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \([0-9.]*\).*$$/\1/ p') + +DEBIAN_MOZ_SOURCE_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/') +DEBIAN_MOZ_APPLICATION := $(shell dpkg-parsechangelog | sed -n 's/Source: \(.*\)$$/\1/ p') +DEBIAN_MOZ_UPSTREAM_APPLICATION ?= firefox-2 + +DEB_TAR_SRCDIR := mozilla + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPTFLAGS = -O0 +else + OPTFLAGS = -O2 -fno-strict-aliasing +endif + +# we are modern and build with 4.2 everywhere +CXX=g++-4.2 +CC=gcc-4.2 +export CXX CC + +LIB_DIR := /usr/lib/firefox + +OPTFLAGS += -g + +#DEB_AUTO_UPDATE_DEBIAN_CONTROL=1 +#DEB_AUTO_UPDATE_AUTOCONF=2.13 + +DEB_DH_INSTALL_ARGS_firefox-2 := -Xgnome -Ximgicon -Xmozlibthai +DEB_DH_INSTALL_ARGS_firefox-2-dev := + +include /usr/share/cdbs/1/rules/tarball.mk +include $(CURDIR)/debian/cdbs-rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/autotools.mk + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 + + +DEB_CONFIGURE_USER_FLAGS= \ + --disable-debug \ + --with-default-mozilla-five-home=$(LIB_DIR) \ + --with-user-appdir=.mozilla \ + --with-system-png=/usr \ + --with-system-jpeg=/usr \ + --with-system-zlib=/usr \ + --with-system-nspr \ + --with-system-nss \ + --disable-composer \ + --disable-debug \ + --disable-elf-dynstr-gc \ + --disable-gtktest \ + --disable-installer \ + --disable-ldap \ + --disable-mailnews \ + --disable-profilesharing \ + --disable-strip \ + --disable-strip-libs \ + --disable-tests \ + --disable-updater \ + --disable-xprint \ + --enable-application=browser \ + --enable-canvas \ + --enable-default-toolkit=gtk2 \ + --enable-gnomevfs \ + --enable-libthai \ + --enable-optimize="-pipe -w $(OPTFLAGS)" \ + --enable-pango \ + --enable-postscript \ + --enable-svg \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-mathml \ + --enable-xft \ + --enable-xinerama \ + --enable-extensions=default \ + --enable-single-profile \ + --enable-system-myspell \ + --with-distribution-id=com.ubuntu \ + --enable-official-branding + +USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.4.0'; a=$$?; if test $$a != 1; then echo 1; fi) + +# for old cairo versions we cannot use system cairo +ifeq (1, $(USE_SYSTEM_CAIRO)) + DEB_CONFIGURE_USER_FLAGS += \ + --enable-system-cairo +else + DEB_CONFIGURE_USER_FLAGS += \ + --disable-system-cairo +endif + +UUDECODE = \ + debsearch.gif \ + wikipedia.gif \ + $(NULL) + +pre-build:: + set -e; for i in $(UUDECODE); do \ + uudecode -o debian/$$i debian/$$i.uu; \ + done; gcc -o debian/build-tools/obscure-tool debian/build-tools/obscure.c; \ + debian/build-tools/obscure-tool debian/firefox-2.cfg.source debian/firefox-2.cfg + +clean:: + set -e; for i in $(UUDECODE); do \ + rm -f debian/$$i; \ + done; rm -f debian/build-tools/obscure-tool; + rm -f debian/firefox-2.cfg + +common-install-arch:: common-install-impl + set -e; . /etc/lsb-release; export DISTRIB_ID DISTRIB_RELEASE DISTRIB_CODENAME; $(CURDIR)/build-tree/mozilla/config/preprocessor.pl -E < $(CURDIR)/debian/vendor.js.in > $(CURDIR)/debian/tmp/usr/lib/firefox-2/defaults/pref/vendor.js + set -e; /usr/bin/convert -resize 48x48 $(CURDIR)/debian/tmp/usr/lib/firefox-2/icons/mozicon128.png $(CURDIR)/debian/tmp/usr/lib/firefox-2/icons/mozicon50.png + +$(CURDIR)/../$(DEBIAN_MOZ_APPLICATION)_$(DEBIAN_MOZ_SOURCE_VERSION).orig.tar.gz: $(DEBIAN_MOZ_UPSTREAM_APPLICATION)-$(DEBIAN_MOZ_UPSTREAM_VERSION)-source.tar.bz2 + set -e; rm -rf $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION); \ + mkdir $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION); \ + cp $^ $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)/; \ + tar cvzf $@ $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)/$^ ; \ + rm -rf $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION) + +update-orig: $(CURDIR)/../$(DEBIAN_MOZ_APPLICATION)_$(DEBIAN_MOZ_SOURCE_VERSION).orig.tar.gz + +echox: + set -e; echo DEBIAN_MOZ_APPLICATION = $(DEBIAN_MOZ_APPLICATION); \ + echo DEBIAN_MOZ_SOURCE_VERSION = $(DEBIAN_MOZ_SOURCE_VERSION) + + --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.1 +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.1 @@ -0,0 +1,169 @@ +.TH FIREFOX 1 "November 4, 2004" firefox "Linux User's Manual" +.SH NAME +firefox\-2 - a Web browser for X11 derived from the Mozilla browser + +.SH SYNOPSIS +.B firefox\-2 +[\fIOPTIONS\fR] [\fIURL\fR] + +.B /usr/lib/firefox\-2/firefox\-2\-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBFirefox\fR is an open-source web browser, designed for +standards compliance, performance and portability. Note: firefox 2 has +been superseeded by firefox 3 in ubuntu and is not officially supported +anymore. It merely exists for legacy purpose. + +.SH USAGE +\fBfirefox\-2\fR is a simple shell script that will set up the +environment for the actual executable, \fBfirefox\-bin\fR. +If there is a Firefox browser already running, \fBfirefox\-2\fR will +arrange for it to create a new browser window; otherwise it will start +the Firefox application. + +.SH OPTIONS +A summary of the options supported by \fBfirefox\-2\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 "Mozilla options" +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR pixels. +.TP +.B \-h, \-help +Show summary of options. +.TP +.B \-installer +Start with Mozilla 4.x migration window. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR pixels. +.TP +.B \-v, \-version +Print Firefox version. +.TP +.B \-no\-remote +Don't connect to a running firefox instance. +.TP +\fB\-a\fR \fIapplication\-id\fR +Check for a running Firefox started with the specified +\fIapplication\-id\fR. When \fBfirefox\fR is invoked for +the first time with a particular \fIapplication\-id\fR, a new Firefox +application is started; subsequent invocations of \fBfirefox\fR +with the same \fIapplication\-id\fR will cause the already-running +Firefox to bring up a new window. + +The default is \fB\-a firefox\fR. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +Implies \fB\-a firefox\-\-\fR\fIprofile\fR, or \fB\-a default\fR +if \fIprofile\fR is \fBdefault\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +Implies \fB\-a firefox\-\-\fR\fIprofile\fR, or \fB\-a default\fR +if \fIprofile\fR is \fBdefault\fR. +.TP +.B \-ProfileManager +Start with profile manager. +Implies \fB\-a\fR with a fresh unique \fIapplication\-id\fR. +.TP +\fB\-UILocale\fR \fIlocale\fR +Start with \fIlocale\fR resources as User Interface locale. By default, it is +guessed from environment and available locales for Firefox. +.TP +\fB\-contentLocale\fR \fIlocale\fR +Start with \fIlocale\fR resources as content locale. By default, it is +guessed from environment and available locales for Firefox. +.TP +\fB\-new-window\fR \fIURL\fR +Open \fIURL\fR in a new window in an already running Firefox process. +\fB\-new-tab\fR \fIURL\fR +Open \fIURL\fR in a new tab in an already running Firefox process. + +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP +.B \-safe\-mode +Starts Firefox in safe mode, that is disabling all extensions and +showing a bit more debugging messages. + +.SS "Debugger options" +.TP +.B \-g, \-debug +Starts Firefox through a debugger (gdb by default). +.TP +\fB\-\-debugger\fR \fIprogram\fR +Use \fIprogram\fR as a debugger for Firefox. Implies \fB\-debug\fR. + +.SH ENVIRONMENT +\fIFIREFOX_DSP\fR - configures the /dev/dsp wrapper to use. Accepted values +are "auto", "arts", "esd" or "none" (default). Do not use this +feature to select "auto" or "esd" as this will involve using "esddsp" +which is known to be buggy and to make Firefox unstable. + +.SH FILES +\fI/usr/bin/firefox\fR - shell script wrapping +\fBfirefox\-bin\fR +.br + +\fI/usr/lib/firefox/firefox\-bin\fR - \fBfirefox\fR +executable +.br + +\fI/etc/firefox/firefoxrc\fR - file containing environment +variables to be passed to Firefox. +.br + +\fI${HOME}/.mozilla/firefox/rc\fR - file containing environment variables to +be passed to Firefox. Overrides \fI/etc/firefox/firefoxrc\fR + +.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 --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2.desktop +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2.desktop @@ -0,0 +1,75 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Firefox 2 Web Browser +Name[ca]=Navegador web Firefox +Name[cs]=Firefox Webový prohlížeč +Name[es]=Navegador web Firefox +Name[fa]=مرورگر اینترنتی Firefox +Name[fi]=Firefox-selain +Name[fr]=Navigateur Web Firefox +Name[hu]=Firefox webböngésző +Name[it]=Firefox Browser Web +Name[ja]=Firefox ウェブ・ブラウザ +Name[ko]=Firefox 웹 브라우저 +Name[nb]=Firefox Nettleser +Name[nl]=Firefox webbrowser +Name[nn]=Firefox Nettlesar +Name[no]=Firefox Nettleser +Name[pl]=Przeglądarka WWW Firefox +Name[pt]=Firefox Navegador Web +Name[pt_BR]=Navegador Web Firefox +Name[pt_BR]=Navegador Web Firefox +Name[sk]=Internetový prehliadač Firefox +Name[sv]=Webbläsaren Firefox +Comment=Browse the World Wide Web +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +Exec=firefox-2 %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox.png +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png +StartupWMClass=Firefox-bin +StartupNotify=true --- firefox-2.0.0.12+2nobinonly+2.orig/debian/firefox-2-dev.links +++ firefox-2.0.0.12+2nobinonly+2/debian/firefox-2-dev.links @@ -0,0 +1,10 @@ +usr/lib/pkgconfig/nspr.pc usr/lib/pkgconfig/firefox-nspr.pc +usr/lib/pkgconfig/nss.pc usr/lib/pkgconfig/firefox-nss.pc +usr/lib/pkgconfig/nspr.pc usr/lib/pkgconfig/firefox-2-nspr.pc +usr/lib/pkgconfig/nss.pc usr/lib/pkgconfig/firefox-2-nss.pc + +usr/lib/pkgconfig/firefox-2-gtkmozembed.pc usr/lib/pkgconfig/firefox-gtkmozembed.pc +usr/lib/pkgconfig/firefox-2-js.pc usr/lib/pkgconfig/firefox-js.pc +usr/lib/pkgconfig/firefox-2-plugin.pc usr/lib/pkgconfig/firefox-plugin.pc +usr/lib/pkgconfig/firefox-2-xpcom.pc usr/lib/pkgconfig/firefox-xpcom.pc +