--- xulrunner-1.8.1.4.orig/debian/patches/00list +++ xulrunner-1.8.1.4/debian/patches/00list @@ -0,0 +1,77 @@ +# Nomenclature for the file ordering/naming +# First digit: +# 1 -> Has been applied in some branch upstream. +# It will eventually be applied in a release +# 2 -> Has been or will be fixed differently upstream +# 3 -> Pending upstream. Waiting to land on a branch or some review, +# or some asked modifications +# 6 -> Not yet sent upstream +# 8 -> Debian specific. This we don't want to send upstream or that +# upstream don't want to apply. +# +# Second digit: +# 0 -> Build system +# 1 -> Mostly build +# 2 -> Preferences +# 5 -> General code +# 8 -> Fix for some architectures support +# +10_components_no_exec +10_icons +10_no_chromelist +10_toolkit_library +15_jni +15_pango_textarea_position +15_pyxpcom_deadcode +18_arm_xpcom_unused_attribute +20_about:plugins +25_gnome_helpers_with_params +25_xpidl +25_xrender_bug_workaround +30_distclean +30_embedding_tests +30_killAll +31_system_bz2 +32_print_command +35_gtkmozembed_change_toplevel +35_pango_null_char +35_psm_wakeups +35_zip_cache +38_arm_xpcom_optim +38_hppa_xpcom +38_ia64_align +38_kbsd +38_mips_xpcom +38_sparc64_unichar_alignment +60_config_install +60_js_binary +60_pyxpcom +60_xpcomstub +61_javaxpcom +61_python_py_ssize_t_detect +65_mouse_buttons +65_mozjs_abi +65_native_uconv +68_m68k_xpcom +68_mips_performance +68_python25_api_breakage +80_config +80_hunspell +80_install_path +80_javaxpcom +80_libxpcom_hack +80_no_examples +80_no_sys_profile +80_uname +80_xulrunner-config +80_zip +81_sonames +82_locale +82_prefs +85_installer +85_no_register +85_sidebar +85_URI_fixup +85_useragent +85_xpcomglue +99_configure --- xulrunner-1.8.1.4.orig/debian/patches/61_python_py_ssize_t_detect.dpatch +++ xulrunner-1.8.1.4/debian/patches/61_python_py_ssize_t_detect.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 61_python_py_ssize_t_detect.dpatch by Alexander Sack +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: tracked upstream in bugzilla bug 386610 + +@DPATCH@ +diff -urNad xulrunner-1.8.1.4~/configure.in xulrunner-1.8.1.4/configure.in +--- xulrunner-1.8.1.4~/configure.in 2007-07-01 17:38:40.000000000 +0000 ++++ xulrunner-1.8.1.4/configure.in 2007-07-01 17:38:57.000000000 +0000 +@@ -6954,6 +6954,22 @@ + else + MOZ_PYTHON_DEBUG_SUFFIX= + fi ++ ++ _savedcflags=$CFLAGS ++ CFLAGS=$MOZ_PYTHON_INCLUDES ++ AC_MSG_CHECKING([for Py_ssize_t]) ++ AC_TRY_COMPILE([#include ], ++ [Py_ssize_t size = 0;], ++ HAVE_PY_SSIZE_T=1,HAVE_PY_SSIZE_T=0) ++ CFLAGS=$_savedcflags ++ ++ if test $HAVE_PY_SSIZE_T = 1; then ++ AC_DEFINE(HAVE_PY_SSIZE_T) ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ + AC_MSG_RESULT(Building PyXPCOM using Python-$MOZ_PYTHON_VER_DOTTED from $MOZ_PYTHON_PREFIX) + fi + AC_SUBST(MOZ_PYTHON) --- xulrunner-1.8.1.4.orig/debian/patches/10_components_no_exec.dpatch +++ xulrunner-1.8.1.4/debian/patches/10_components_no_exec.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_components_no_exec.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: install extra components without exec premissions. bz#331777 + +@DPATCH@ + +--- xulrunner/config/rules.mk 2005-08-11 18:41:53.000000000 +0200 ++++ xulrunner/config/rules.mk 2005-10-03 10:02:57.000000000 +0200 +@@ -1486,12 +1486,12 @@ + ifdef EXTRA_COMPONENTS + libs:: $(EXTRA_COMPONENTS) + ifndef NO_DIST_INSTALL +- $(INSTALL) $(IFLAGS2) $^ $(FINAL_TARGET)/components ++ $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/components + endif + + install:: $(EXTRA_COMPONENTS) + ifndef NO_INSTALL +- $(SYSINSTALL) $(IFLAGS2) $^ $(DESTDIR)$(mozappdir)/components ++ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/components + endif + endif + --- xulrunner-1.8.1.4.orig/debian/patches/99_configure.dpatch +++ xulrunner-1.8.1.4/debian/patches/99_configure.dpatch @@ -0,0 +1,6412 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_configure.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: autoconf + +@DPATCH@ +diff -urNad xulrunner-1.8.1.4~/configure xulrunner-1.8.1.4/configure +--- xulrunner-1.8.1.4~/configure 2007-04-03 15:40:03.000000000 +0000 ++++ xulrunner-1.8.1.4/configure 2007-07-04 12:28:36.000000000 +0000 +@@ -57,9 +57,14 @@ + --with-system-zlib[=PFX] + Use system libz [installed at prefix PFX]" + ac_help="$ac_help ++ --with-system-bz2[=PFX] ++ Use system libbz2 [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-hunspell Use system hunspell (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)" +@@ -217,6 +222,10 @@ + ac_help="$ac_help + --disable-tests Do not build test libraries & programs" + ac_help="$ac_help ++ --enable-embedding-tests ++ Do build embedding tests libraries & programs, ++ even if tests are disabled" ++ac_help="$ac_help + --enable-xpcom-lea Use Lea malloc in xpcom " + ac_help="$ac_help + --enable-places Enable 'places' bookmark/history implementation" +@@ -231,6 +240,11 @@ + ac_help="$ac_help + --enable-js-ultrasparc Use UltraSPARC optimizations in JS" + ac_help="$ac_help ++ --enable-js-binary Build the standalone JS program" ++ac_help="$ac_help ++ --with-readline[=PFX] ++ Use libreadline [installed at prefix PFX]" ++ac_help="$ac_help + --enable-debug[=DBG] Enable building with developer debug info + (Using compiler flags DBG)" + ac_help="$ac_help +@@ -960,7 +974,7 @@ + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:964: checking host system type" >&5 ++echo "configure:978: checking host system type" >&5 + + host_alias=$host + case "$host_alias" in +@@ -981,7 +995,7 @@ + echo "$ac_t""$host" 1>&6 + + echo $ac_n "checking target system type""... $ac_c" 1>&6 +-echo "configure:985: checking target system type" >&5 ++echo "configure:999: checking target system type" >&5 + + target_alias=$target + case "$target_alias" in +@@ -999,7 +1013,7 @@ + echo "$ac_t""$target" 1>&6 + + echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1003: checking build system type" >&5 ++echo "configure:1017: checking build system type" >&5 + + build_alias=$build + case "$build_alias" in +@@ -1069,12 +1083,12 @@ + 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:1092: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1172,7 +1186,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1176: checking for $ac_word" >&5 ++echo "configure:1190: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1241,13 +1255,13 @@ + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 +-echo "configure:1245: checking for host c compiler" >&5 ++echo "configure:1259: checking for host c compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1251: checking for $ac_word" >&5 ++echo "configure:1265: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1282,13 +1296,13 @@ + fi + echo "$ac_t""$HOST_CC" 1>&6 + echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 +-echo "configure:1286: checking for host c++ compiler" >&5 ++echo "configure:1300: checking for host c++ compiler" >&5 + for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1292: checking for $ac_word" >&5 ++echo "configure:1306: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1337,7 +1351,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1341: checking for $ac_word" >&5 ++echo "configure:1355: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1372,7 +1386,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1376: checking for $ac_word" >&5 ++echo "configure:1390: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1407,16 +1421,16 @@ + LDFLAGS="$HOST_LDFLAGS" + + echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1411: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1425: 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:1434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1431,16 +1445,16 @@ + CFLAGS="$HOST_CXXFLAGS" + + echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1435: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1449: 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:1458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1469,7 +1483,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1473: checking for $ac_word" >&5 ++echo "configure:1487: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1503,7 +1517,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1507: checking for $ac_word" >&5 ++echo "configure: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 +@@ -1533,7 +1547,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1537: checking for $ac_word" >&5 ++echo "configure:1551: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1584,7 +1598,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1588: checking for $ac_word" >&5 ++echo "configure:1602: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1616,7 +1630,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1620: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1634: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1627,12 +1641,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1631 "configure" ++#line 1645 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1658,12 +1672,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1667: checking whether we are using GNU C" >&5 ++echo "configure:1681: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1672,7 +1686,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -1691,7 +1705,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1695: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1709: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1727,7 +1741,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1731: checking for $ac_word" >&5 ++echo "configure:1745: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1763,7 +1777,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1767: checking for $ac_word" >&5 ++echo "configure:1781: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1795,7 +1809,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1799: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1813: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1806,12 +1820,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1810 "configure" ++#line 1824 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1837,12 +1851,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1841: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:1846: checking whether we are using GNU C++" >&5 ++echo "configure:1860: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1851,7 +1865,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -1870,7 +1884,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1874: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1888: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1901,57 +1915,6 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + + case "$build:$target" in + powerpc-apple-darwin8*:i?86-apple-darwin*) +@@ -1965,7 +1928,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1969: checking for $ac_word" >&5 ++echo "configure:1932: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2000,7 +1963,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2004: checking for $ac_word" >&5 ++echo "configure:1967: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2035,7 +1998,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2039: checking for $ac_word" >&5 ++echo "configure:2002: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2076,7 +2039,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2080: checking for $ac_word" >&5 ++echo "configure:2043: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2111,7 +2074,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2115: checking for $ac_word" >&5 ++echo "configure:2078: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2146,7 +2109,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2150: checking for $ac_word" >&5 ++echo "configure:2113: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2184,7 +2147,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2188: checking for $ac_word" >&5 ++echo "configure:2151: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2214,7 +2177,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2218: checking for $ac_word" >&5 ++echo "configure:2181: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2265,7 +2228,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2269: checking for $ac_word" >&5 ++echo "configure:2232: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2297,7 +2260,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2301: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2264: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2308,12 +2271,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2312 "configure" ++#line 2275 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2339,12 +2302,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2343: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2306: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2348: checking whether we are using GNU C" >&5 ++echo "configure:2311: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2353,7 +2316,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -2372,7 +2335,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2376: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2339: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2408,7 +2371,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2412: checking for $ac_word" >&5 ++echo "configure:2375: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2440,7 +2403,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2444: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2407: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2451,12 +2414,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2455 "configure" ++#line 2418 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2482,12 +2445,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2486: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2449: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:2491: checking whether we are using GNU C++" >&5 ++echo "configure:2454: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2496,7 +2459,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -2515,7 +2478,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2519: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2482: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2546,61 +2509,10 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2604: checking for $ac_word" >&5 ++echo "configure:2516: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2632,7 +2544,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2636: checking for $ac_word" >&5 ++echo "configure:2548: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2673,7 +2585,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2677: checking for $ac_word" >&5 ++echo "configure:2589: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2708,7 +2620,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2712: checking for $ac_word" >&5 ++echo "configure:2624: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2743,7 +2655,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2747: checking for $ac_word" >&5 ++echo "configure:2659: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2778,7 +2690,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2782: checking for $ac_word" >&5 ++echo "configure:2694: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2867,7 +2779,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2871: checking for $ac_word" >&5 ++echo "configure:2783: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2909,14 +2821,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2934,14 +2846,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { + unsigned *test = new unsigned(42); + ; return 0; } + EOF +-if { (eval echo configure:2945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2997,7 +2909,7 @@ + _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` + # Add flags if necessary + echo $ac_n "checking for midl flags""... $ac_c" 1>&6 +-echo "configure:3001: checking for midl flags" >&5 ++echo "configure:2913: checking for midl flags" >&5 + if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then + # Starting with MIDL version 6.0.359, the MIDL compiler + # generates /Oicf /robust stubs by default, which is not +@@ -3019,9 +2931,9 @@ + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` + _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` + echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 +-echo "configure:3023: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:2935: checking for w32api version >= $W32API_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -3033,7 +2945,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + res=yes + else +@@ -3049,7 +2961,7 @@ + fi + # Check windres version + echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 +-echo "configure:3053: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:2965: checking for windres version >= $WINDRES_VERSION" >&5 + _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` + echo "$ac_t""$_WINDRES_VERSION" 1>&6 + _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` +@@ -3076,7 +2988,7 @@ + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3080: checking how to run the C preprocessor" >&5 ++echo "configure:2992: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3091,13 +3003,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3108,13 +3020,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3125,13 +3037,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure: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 + : +@@ -3159,17 +3071,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3163: checking for $ac_hdr" >&5 ++echo "configure:3075: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3200,10 +3112,10 @@ + if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then + if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +-echo "configure:3204: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3116: checking whether $CC and cc understand -c and -o together" >&5 + else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +-echo "configure:3207: checking whether cc understands -c and -o together" >&5 ++echo "configure:3119: checking whether cc understands -c and -o together" >&5 + fi + set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +@@ -3215,16 +3127,16 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +-if { (eval echo configure:3219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' +- if { (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : +@@ -3260,7 +3172,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3264: checking how to run the C preprocessor" >&5 ++echo "configure:3176: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3275,13 +3187,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3292,13 +3204,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3309,13 +3221,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure: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 + : +@@ -3340,7 +3252,7 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3344: checking how to run the C++ preprocessor" >&5 ++echo "configure:3256: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3353,12 +3265,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3405,7 +3317,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:3409: checking for a BSD compatible install" >&5 ++echo "configure:3321: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3458,7 +3370,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:3462: checking whether ln -s works" >&5 ++echo "configure:3374: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3483,7 +3395,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3487: checking for $ac_word" >&5 ++echo "configure:3399: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3523,7 +3435,7 @@ + fi + + echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 +-echo "configure:3527: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3439: checking for minimum required perl version >= $PERL_VERSION" >&5 + _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + echo "$ac_t""$_perl_version" 1>&6 +@@ -3533,7 +3445,7 @@ + fi + + echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 +-echo "configure:3537: checking for full perl installation" >&5 ++echo "configure:3449: checking for full perl installation" >&5 + _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + if test "$_perl_res" != 0; then +@@ -3546,7 +3458,7 @@ + # Extract the first word of "doxygen", so it can be a program name with args. + set dummy doxygen; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3550: checking for $ac_word" >&5 ++echo "configure:3462: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3582,7 +3494,7 @@ + # Extract the first word of "whoami", so it can be a program name with args. + set dummy whoami; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3586: checking for $ac_word" >&5 ++echo "configure:3498: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3618,7 +3530,7 @@ + # Extract the first word of "autoconf", so it can be a program name with args. + set dummy autoconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3622: checking for $ac_word" >&5 ++echo "configure:3534: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3654,7 +3566,7 @@ + # Extract the first word of "unzip", so it can be a program name with args. + set dummy unzip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3658: checking for $ac_word" >&5 ++echo "configure:3570: 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 +@@ -3687,53 +3599,10 @@ + 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:3696: 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. +- ;; +- ?:/*) +- ac_cv_path_ZIP="$ZIP" # 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_ZIP="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac +-fi +-ZIP="$ac_cv_path_ZIP" +-if test -n "$ZIP"; then +- 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:3737: checking for $ac_word" >&5 ++echo "configure:3606: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3768,7 +3637,7 @@ + # Extract the first word of "xargs", so it can be a program name with args. + set dummy xargs; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3772: checking for $ac_word" >&5 ++echo "configure:3641: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3831,7 +3700,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3835: checking for $ac_word" >&5 ++echo "configure:3704: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3881,7 +3750,7 @@ + # Extract the first word of "sdp", so it can be a program name with args. + set dummy sdp; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3885: checking for $ac_word" >&5 ++echo "configure:3754: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3977,7 +3846,7 @@ + fi + + echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 +-echo "configure:3981: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3850: checking for valid compiler/Mac OS X SDK combination" >&5 + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -3986,7 +3855,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { return 0; } +@@ -3994,7 +3863,7 @@ + result=yes + ; return 0; } + EOF +-if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result=no + else +@@ -4019,7 +3888,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4023: checking for $ac_word" >&5 ++echo "configure:3892: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4062,7 +3931,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4066: checking for $ac_word" >&5 ++echo "configure:3935: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4130,7 +3999,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. + # --without-x overrides everything else, but does not touch the cache. + echo $ac_n "checking for X""... $ac_c" 1>&6 +-echo "configure:4134: checking for X" >&5 ++echo "configure:4003: checking for X" >&5 + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -4192,12 +4061,12 @@ + + # First, try using that file with no special directory specified. + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4266,14 +4135,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBS="$ac_save_LIBS" + # We can link X programs with no special library path. +@@ -4379,17 +4248,17 @@ + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +-echo "configure:4383: checking whether -R must be followed by a space" >&5 ++echo "configure:4252: 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:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_nospace=yes + else +@@ -4405,14 +4274,14 @@ + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes + else +@@ -4444,7 +4313,7 @@ + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +-echo "configure:4448: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4317: checking for dnet_ntoa in -ldnet" >&5 + ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4452,7 +4321,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4488,7 +4357,7 @@ + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:4492: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4361: checking for dnet_ntoa in -ldnet_stub" >&5 + ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4496,7 +4365,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet_stub $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4539,12 +4408,12 @@ + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +-echo "configure:4543: checking for gethostbyname" >&5 ++echo "configure:4412: checking for gethostbyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" + else +@@ -4591,7 +4460,7 @@ + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:4595: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4464: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4599,7 +4468,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4643,12 +4512,12 @@ + # -lsocket must be given before -lnsl if both are needed. + # We assume that if connect needs -lnsl, so does gethostbyname. + echo $ac_n "checking for connect""... $ac_c" 1>&6 +-echo "configure:4647: checking for connect" >&5 ++echo "configure:4516: checking for connect" >&5 + if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" + else +@@ -4695,7 +4564,7 @@ + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:4699: checking for connect in -lsocket" >&5 ++echo "configure:4568: checking for connect in -lsocket" >&5 + ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4703,7 +4572,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4741,12 +4610,12 @@ + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +-echo "configure:4745: checking for remove" >&5 ++echo "configure:4614: checking for remove" >&5 + if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_remove=yes" + else +@@ -4793,7 +4662,7 @@ + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +-echo "configure:4797: checking for remove in -lposix" >&5 ++echo "configure:4666: checking for remove in -lposix" >&5 + ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4801,7 +4670,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lposix $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4839,12 +4708,12 @@ + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +-echo "configure:4843: checking for shmat" >&5 ++echo "configure:4712: checking for shmat" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shmat=yes" + else +@@ -4891,7 +4760,7 @@ + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +-echo "configure:4895: checking for shmat in -lipc" >&5 ++echo "configure:4764: checking for shmat in -lipc" >&5 + ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4899,7 +4768,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lipc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4946,7 +4815,7 @@ + # libraries we check for below, so use a different variable. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +-echo "configure:4950: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4819: checking for IceConnectionNumber in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4954,7 +4823,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4841: \"$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 +@@ -5027,6 +4896,8 @@ + MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg' + MOZ_ZLIB_CFLAGS= + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++MOZ_BZ2_CFLAGS= ++MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_CFLAGS= + MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng' + +@@ -5036,7 +4907,7 @@ + XPCOM_FROZEN_LDOPTS='-L$(DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom' + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul' + XPCOM_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' +-XPCOM_STANDALONE_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)' ++XPCOM_STANDALONE_GLUE_LDOPTS='-L$(DIST)/lib -lxpcomglue' + + MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' + MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat' +@@ -5058,17 +4929,26 @@ + OS_RELEASE= + OS_TEST="${target_cpu}" + case "${target_os}" in +- linux*) OS_ARCH=Linux ;; ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac + else +- OS_TARGET=`uname -s` +- OS_ARCH=`uname -s | sed -e 's|/|_|g'` ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` + OS_RELEASE=`uname -r` +- OS_TEST=`uname -m` ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac + fi + _COMPILER_PREFIX= + +@@ -5346,8 +5226,8 @@ + OS_CONFIG="${OS_TARGET}${OS_RELEASE}" + + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + DSO_LDOPTS='-shared' + if test "$GCC_USE_GNU_LD"; then + # Don't allow undefined symbols in libraries +@@ -5376,8 +5256,8 @@ + _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT' + _USE_CPP_INCLUDE_FLAG=1 + else +- MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' ++ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' + + DSO_LDOPTS='-shared' + if test "$GNU_LD"; then +@@ -5406,7 +5286,7 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:5410: checking whether ld has archive extraction flags" >&5 ++echo "configure:5290: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5423,14 +5303,14 @@ + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5314: \"$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 +@@ -5463,7 +5343,7 @@ + ' + + echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 +-echo "configure:5467: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:5347: 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 +@@ -5477,14 +5357,14 @@ + + ac_cv_static_assertion_macros_work="yes" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5494,14 +5374,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5517,14 +5397,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5534,14 +5414,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5576,16 +5456,16 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5580: checking for 64-bit OS" >&5 ++echo "configure:5460: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -5664,7 +5544,7 @@ + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" +@@ -5743,9 +5623,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 +-echo "configure:5747: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5627: 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:5638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -5792,17 +5672,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5796: checking for $ac_hdr" >&5 ++echo "configure:5676: 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:5806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5686: \"$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* +@@ -5837,14 +5717,14 @@ + + *-beos*) + no_x=yes +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -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:5848: checking for main in -lbind" >&5 ++echo "configure:5728: 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 +@@ -5852,14 +5732,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5743: \"$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 +@@ -5880,7 +5760,7 @@ + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:5884: checking for main in -lzeta" >&5 ++echo "configure:5764: 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 +@@ -5888,14 +5768,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lzeta $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5779: \"$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 +@@ -5959,18 +5839,18 @@ + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:5963: checking for -dead_strip option to ld" >&5 ++echo "configure:5843: 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:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -6109,8 +5989,6 @@ + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 + ;; + mips*) +- CFLAGS="$CFLAGS -Wa,-xgot" +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" + ;; + esac + ;; +@@ -6169,6 +6047,7 @@ + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib' + MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + OBJ_SUFFIX=obj + RANLIB='echo not_ranlib' + STRIP='echo not_strip' +@@ -6258,6 +6137,7 @@ + RCFLAGS='-O coff --use-temp-file' + MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++ MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_LIBS='-L$(DIST)/lib -lpng' + MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_FIX_LINK_PATHS= +@@ -6297,6 +6177,7 @@ + MOZ_OPTIMIZE_FLAGS='-O1' + MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + MOZ_PNG_LIBS='$(DIST)/lib/png.lib' + MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_FIX_LINK_PATHS= +@@ -6524,8 +6405,8 @@ + if test "$LIBRUNPATH"; then + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" + fi +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + ;; + + *-nto*) +@@ -6740,6 +6621,7 @@ + LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' + MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.$(LIB_SUFFIX)' + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)' + MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)' + MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_GFX_TOOLKIT)' +@@ -6748,8 +6630,8 @@ + + alpha*-*-osf*) + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + + else + MOZ_DEBUG_FLAGS='-g' +@@ -6759,8 +6641,8 @@ + DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations' + DSO_CFLAGS= + DSO_PIC_CFLAGS= +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-all' + MKSHLIB_UNFORCE_ALL='-none' + cat >> confdefs.h <<\EOF +@@ -6838,14 +6720,14 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:6849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -6856,8 +6738,8 @@ + rm -f conftest* + fi + MOZ_OPTIMIZE_FLAGS="-xO4" +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' + MKSHLIB_UNFORCE_ALL='' + DSO_LDOPTS='-G -Qoption ld -z,muldefs' +@@ -6873,7 +6755,7 @@ + CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 +-echo "configure:6877: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6759: 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. +@@ -6883,7 +6765,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -7002,7 +6884,7 @@ + esac + + case "$target" in +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' + ;; + *-solaris*) +@@ -7021,7 +6903,7 @@ + ;; + *-darwin*) + echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 +-echo "configure:7025: checking for -exported_symbols_list option to ld" >&5 ++echo "configure:6907: checking for -exported_symbols_list option to ld" >&5 + if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7061,12 +6943,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:7065: checking for ANSI C header files" >&5 ++echo "configure:6947: 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 +@@ -7074,7 +6956,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6960: \"$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* +@@ -7091,7 +6973,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7109,7 +6991,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7130,7 +7012,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -7141,7 +7023,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:7145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -7165,12 +7047,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7169: checking for working const" >&5 ++echo "configure:7051: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7240,12 +7122,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7244: checking for mode_t" >&5 ++echo "configure:7126: 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 +@@ -7273,12 +7155,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7277: checking for off_t" >&5 ++echo "configure:7159: 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 +@@ -7306,12 +7188,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7310: checking for pid_t" >&5 ++echo "configure:7192: 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 +@@ -7339,12 +7221,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7343: checking for size_t" >&5 ++echo "configure:7225: 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 +@@ -7372,12 +7254,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7376: checking for st_blksize in struct stat" >&5 ++echo "configure:7258: 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 +@@ -7385,7 +7267,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -7406,12 +7288,12 @@ + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7410: checking for siginfo_t" >&5 ++echo "configure:7292: 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 < +@@ -7419,7 +7301,7 @@ + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -7453,12 +7335,12 @@ + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7457: checking for int16_t" >&5 ++echo "configure:7339: 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 +@@ -7466,7 +7348,7 @@ + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7470: \"$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_int16_t=true + else +@@ -7488,12 +7370,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7492: checking for int32_t" >&5 ++echo "configure:7374: 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 +@@ -7501,7 +7383,7 @@ + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else +@@ -7523,12 +7405,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7527: checking for int64_t" >&5 ++echo "configure:7409: 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 +@@ -7536,7 +7418,7 @@ + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else +@@ -7558,12 +7440,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7562: checking for int64" >&5 ++echo "configure:7444: 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 +@@ -7571,7 +7453,7 @@ + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else +@@ -7593,12 +7475,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7597: checking for uint" >&5 ++echo "configure:7479: 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 +@@ -7606,7 +7488,7 @@ + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -7628,12 +7510,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7632: checking for uint_t" >&5 ++echo "configure:7514: 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 +@@ -7641,7 +7523,7 @@ + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -7663,12 +7545,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7667: checking for uint16_t" >&5 ++echo "configure:7549: 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 +@@ -7676,7 +7558,7 @@ + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7707,12 +7589,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7711: checking for uname.domainname" >&5 ++echo "configure:7593: 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() { +@@ -7720,7 +7602,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -7744,12 +7626,12 @@ + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:7748: checking for uname.__domainname" >&5 ++echo "configure:7630: 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() { +@@ -7757,7 +7639,7 @@ + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7761: \"$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_have_uname_us_domainname_field=true + else +@@ -7790,12 +7672,12 @@ + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:7794: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7676: 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 +@@ -7804,7 +7686,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_v2="yes" + else +@@ -7837,12 +7719,12 @@ + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:7841: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7723: 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 +@@ -7851,7 +7733,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="yes" + else +@@ -7885,7 +7767,7 @@ + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:7889: checking for visibility(hidden) attribute" >&5 ++echo "configure:7771: 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 +@@ -7910,7 +7792,7 @@ + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:7914: checking for visibility(default) attribute" >&5 ++echo "configure:7796: 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 +@@ -7935,7 +7817,7 @@ + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:7939: checking for visibility pragma support" >&5 ++echo "configure:7821: 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 +@@ -7960,7 +7842,7 @@ + echo "$ac_t""$ac_cv_visibility_pragma" 1>&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:7964: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:7846: 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 +@@ -7988,7 +7870,7 @@ + echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 + + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:7992: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7874: 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 +@@ -8036,12 +7918,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:8040: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7922: 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> +@@ -8049,7 +7931,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:8053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -8074,7 +7956,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:8078: checking for opendir in -ldir" >&5 ++echo "configure:7960: 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 +@@ -8082,7 +7964,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7979: \"$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 +@@ -8115,7 +7997,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:8119: checking for opendir in -lx" >&5 ++echo "configure:8001: 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 +@@ -8123,7 +8005,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8020: \"$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 +@@ -8166,17 +8048,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8170: checking for $ac_hdr" >&5 ++echo "configure:8052: 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:8180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8062: \"$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* +@@ -8206,17 +8088,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8210: checking for $ac_hdr" >&5 ++echo "configure:8092: 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:8220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8102: \"$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* +@@ -8246,17 +8128,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8250: 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:8260: \"$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* +@@ -8286,17 +8168,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8290: 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:8300: \"$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* +@@ -8326,17 +8208,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8330: 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:8340: \"$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* +@@ -8367,17 +8249,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8371: checking for $ac_hdr" >&5 ++echo "configure:8253: 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:8381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8263: \"$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* +@@ -8408,17 +8290,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8412: checking for $ac_hdr" >&5 ++echo "configure:8294: 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:8422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8304: \"$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* +@@ -8455,17 +8337,17 @@ + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8459: checking for new" >&5 ++echo "configure:8341: 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:8469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8351: \"$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* +@@ -8506,17 +8388,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8510: checking for $ac_hdr" >&5 ++echo "configure:8392: 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:8520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8402: \"$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* +@@ -8550,7 +8432,7 @@ + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8554: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8436: 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 +@@ -8558,7 +8440,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8455: \"$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 +@@ -8599,7 +8481,7 @@ + ;; + esac + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8603: checking for atan in -lm" >&5 ++echo "configure:8485: 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 +@@ -8607,7 +8489,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8504: \"$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 +@@ -8652,7 +8534,7 @@ + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8656: checking for dlopen in -ldl" >&5 ++echo "configure:8538: 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 +@@ -8660,7 +8542,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8557: \"$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 +@@ -8688,17 +8570,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:8692: checking for dlfcn.h" >&5 ++echo "configure:8574: 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:8702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8584: \"$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* +@@ -8734,7 +8616,7 @@ + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:8738: checking for demangle in -lC_r" >&5 ++echo "configure:8620: 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 +@@ -8742,7 +8624,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8639: \"$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 +@@ -8783,7 +8665,7 @@ + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:8787: checking for demangle in -lC" >&5 ++echo "configure:8669: 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 +@@ -8791,7 +8673,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8688: \"$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 +@@ -8833,7 +8715,7 @@ + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:8837: checking for socket in -lsocket" >&5 ++echo "configure:8719: 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 +@@ -8841,7 +8723,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8738: \"$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 +@@ -8897,7 +8779,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +-echo "configure:8901: checking for XDrawLines in -lX11" >&5 ++echo "configure:8783: 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 +@@ -8905,7 +8787,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lX11 $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8802: \"$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 +@@ -8938,7 +8820,7 @@ + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:8942: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8824: 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 +@@ -8946,7 +8828,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8843: \"$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 +@@ -8981,7 +8863,7 @@ + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:8985: checking for XtFree in -lXt" >&5 ++echo "configure:8867: 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 +@@ -8989,7 +8871,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8886: \"$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 +@@ -9021,7 +8903,7 @@ + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:9025: checking for IceFlush in -lICE" >&5 ++echo "configure:8907: 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 +@@ -9029,7 +8911,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8926: \"$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 +@@ -9061,7 +8943,7 @@ + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:9065: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:8947: 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 +@@ -9069,7 +8951,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSM $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure: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 +@@ -9101,7 +8983,7 @@ + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9105: checking for XtFree in -lXt" >&5 ++echo "configure:8987: 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 +@@ -9109,7 +8991,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure: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 +@@ -9154,7 +9036,7 @@ + esac + + echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +-echo "configure:9158: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9040: 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 +@@ -9162,7 +9044,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9059: \"$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 +@@ -9195,17 +9077,17 @@ + + ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 +-echo "configure:9199: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9081: 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:9209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9091: \"$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* +@@ -9228,7 +9110,7 @@ + + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9232: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9114: 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 +@@ -9236,7 +9118,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9133: \"$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 +@@ -9269,17 +9151,17 @@ + + ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +-echo "configure:9273: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9155: 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:9283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9165: \"$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* +@@ -9309,7 +9191,7 @@ + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9313: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9195: 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 +@@ -9317,7 +9199,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9214: \"$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 +@@ -9350,17 +9232,17 @@ + + ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +-echo "configure:9354: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9236: 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:9364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9246: \"$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* +@@ -9434,7 +9316,7 @@ + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9438: checking for $ac_word" >&5 ++echo "configure:9320: 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 +@@ -9470,7 +9352,7 @@ + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9474: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9356: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes +@@ -9518,7 +9400,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -9544,7 +9426,7 @@ + } + + EOF +-if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -9596,7 +9478,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:9600: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9482: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9618,7 +9500,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:9622: checking for pthread_create in -lpthread" >&5 ++echo "configure:9504: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9640,7 +9522,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:9644: checking for pthread_create in -lc_r" >&5 ++echo "configure:9526: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9662,7 +9544,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:9666: checking for pthread_create in -lc" >&5 ++echo "configure:9548: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9718,7 +9600,7 @@ + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:9722: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9604: 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 +@@ -9741,7 +9623,7 @@ + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:9745: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9627: 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 +@@ -9787,7 +9669,7 @@ + fi + ;; + +- *-*-linux*) ++ *-*-linux*|*-*-kfreebsd*-gnu) + cat >> confdefs.h <<\EOF + #define _REENTRANT 1 + EOF +@@ -9863,7 +9745,7 @@ + + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:9867: checking whether mmap() sees write()s" >&5 ++echo "configure:9749: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' +@@ -9902,11 +9784,11 @@ + result="yes" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -9931,13 +9813,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:9935: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9817: 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 +@@ -9955,7 +9837,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA +@@ -9977,7 +9859,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:9981: checking for 8-bit clean memcmp" >&5 ++echo "configure:9863: 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 +@@ -9985,7 +9867,7 @@ + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9881: \"$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 +@@ -10015,12 +9897,12 @@ + for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10019: checking for $ac_func" >&5 ++echo "configure:9901: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9929: \"$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 +@@ -10070,12 +9952,12 @@ + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10074: checking for $ac_func" >&5 ++echo "configure:9956: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9984: \"$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 +@@ -10127,12 +10009,12 @@ + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10131: checking for $ac_func" >&5 ++echo "configure:10013: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10041: \"$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 +@@ -10191,19 +10073,19 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10195: checking for wcrtomb" >&5 ++echo "configure:10077: 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:10207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -10223,19 +10105,19 @@ + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10227: checking for mbrtowc" >&5 ++echo "configure:10109: 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:10239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -10264,12 +10146,12 @@ + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10268: checking for res_ninit()" >&5 ++echo "configure:10150: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10167: \"$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 +@@ -10311,12 +10193,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10315: checking for gnu_get_libc_version()" >&5 ++echo "configure:10197: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10213: \"$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 +@@ -10356,7 +10238,7 @@ + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10360: checking for iconv in -lc" >&5 ++echo "configure:10242: 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 +@@ -10364,7 +10246,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10264: \"$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 +@@ -10397,7 +10279,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10401: checking for iconv in -liconv" >&5 ++echo "configure:10283: 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 +@@ -10405,7 +10287,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10305: \"$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 +@@ -10438,7 +10320,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10442: checking for libiconv in -liconv" >&5 ++echo "configure:10324: 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 +@@ -10446,7 +10328,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10346: \"$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 +@@ -10487,12 +10369,12 @@ + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10491: checking for iconv()" >&5 ++echo "configure:10373: 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 < +@@ -10506,7 +10388,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else +@@ -10530,12 +10412,12 @@ + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10534: checking for iconv() with const input" >&5 ++echo "configure:10416: 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 < +@@ -10550,7 +10432,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else +@@ -10579,19 +10461,19 @@ + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10583: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10465: 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:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else +@@ -10623,7 +10505,7 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:10627: checking for an implementation of va_copy()" >&5 ++echo "configure:10509: 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 +@@ -10633,7 +10515,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10647,7 +10529,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10533: \"$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 +@@ -10664,7 +10546,7 @@ + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:10668: checking for an implementation of __va_copy()" >&5 ++echo "configure:10550: 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 +@@ -10674,7 +10556,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10688,7 +10570,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10574: \"$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 +@@ -10705,7 +10587,7 @@ + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:10709: checking whether va_lists can be copied by value" >&5 ++echo "configure:10591: 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 +@@ -10715,7 +10597,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10729,7 +10611,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10615: \"$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 +@@ -10828,7 +10710,7 @@ + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:10832: checking for C++ exceptions flag" >&5 ++echo "configure:10714: 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 +@@ -10863,12 +10745,12 @@ + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:10867: checking for gcc 3.0 ABI" >&5 ++echo "configure:10749: checking for gcc 3.0 ABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else +@@ -10905,12 +10787,12 @@ + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:10909: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10791: 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:10806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else +@@ -10941,12 +10823,12 @@ + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:10945: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10827: checking for C++ \"typename\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else +@@ -10986,12 +10868,12 @@ + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:10990: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10872: 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 {}; +@@ -11001,7 +10883,7 @@ + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:11005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -11023,12 +10905,12 @@ + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:11027: checking whether partial template specialization works" >&5 ++echo "configure:10909: 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 {}; +@@ -11036,7 +10918,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -11057,12 +10939,12 @@ + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:11061: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10943: 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 +@@ -11074,7 +10956,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else +@@ -11096,12 +10978,12 @@ + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:11100: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:10982: 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 { }; +@@ -11110,7 +10992,7 @@ + Derived bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:11114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else +@@ -11131,12 +11013,12 @@ + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11135: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11017: 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 { +@@ -11157,7 +11039,7 @@ + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=yes + else +@@ -11179,12 +11061,12 @@ + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11183: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11065: 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:11078: \"$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:11089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else +@@ -11231,12 +11113,12 @@ + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11235: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11117: 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:11138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11273,19 +11155,19 @@ + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11277: checking for \"std::\" namespace" >&5 ++echo "configure:11159: 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:11289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else +@@ -11306,12 +11188,12 @@ + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11310: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11192: 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 {}; +@@ -11321,7 +11203,7 @@ + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else +@@ -11343,12 +11225,12 @@ + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11347: checking for C++ reinterpret_cast" >&5 ++echo "configure:11229: 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:11360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else +@@ -11377,7 +11259,7 @@ + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11381: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11263: 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 +@@ -11385,8 +11267,11 @@ + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(suby)))); + } + EOF +-if { (eval echo configure:11405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11290: \"$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 +@@ -11425,19 +11310,19 @@ + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11429: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11314: 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:11326: \"$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 +@@ -11460,12 +11345,12 @@ + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11464: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11349: 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 {}; +@@ -11476,7 +11361,7 @@ + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -11508,19 +11393,19 @@ + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11512: checking for LC_MESSAGES" >&5 ++echo "configure:11397: 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:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -11601,7 +11486,7 @@ + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11605: checking for $ac_word" >&5 ++echo "configure:11490: 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 +@@ -11636,7 +11521,7 @@ + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11640: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11525: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then +@@ -11738,7 +11623,7 @@ + # Extract the first word of "nss-config", so it can be a program name with args. + set dummy nss-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11742: checking for $ac_word" >&5 ++echo "configure:11627: 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 +@@ -11773,7 +11658,7 @@ + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11777: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11662: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then +@@ -11846,7 +11731,7 @@ + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:11850: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11735: 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 +@@ -11854,7 +11739,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ljpeg $JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11754: \"$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 +@@ -11894,7 +11779,7 @@ + SYSTEM_JPEG= + else + cat > conftest.$ac_ext < + #include +@@ -11908,7 +11793,7 @@ + } + + EOF +-if { (eval echo configure:11912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_JPEG=1 + else +@@ -11949,7 +11834,7 @@ + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:11953: checking for gzread in -lz" >&5 ++echo "configure:11838: 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 +@@ -11957,7 +11842,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11996,7 +11881,7 @@ + SYSTEM_ZLIB= + else + cat > conftest.$ac_ext < +@@ -12017,7 +11902,7 @@ + } + + EOF +-if { (eval echo configure:12021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_ZLIB=1 + else +@@ -12040,6 +11925,74 @@ + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi + ++# Check whether --with-system-bz2 or --without-system-bz2 was given. ++if test "${with_system_bz2+set}" = set; then ++ withval="$with_system_bz2" ++ BZ2_DIR=$withval ++fi ++ ++ ++_SAVE_CFLAGS=$CFLAGS ++_SAVE_LDFLAGS=$LDFLAGS ++_SAVE_LIBS=$LIBS ++if test -n "${BZ2_DIR}" -a "${BZ2_DIR}" != "yes"; then ++ CFLAGS="-I${BZ2_DIR}/include $CFLAGS" ++ LDFLAGS="-L${BZ2_DIR}/lib $LDFLAGS" ++fi ++if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then ++ SYSTEM_BZ2= ++else ++ echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 ++echo "configure:11947: checking for BZ2_bzread in -lbz2" >&5 ++ac_lib_var=`echo bz2'_'BZ2_bzread | 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="-lbz2 $MOZ_BZ2_LIBS $LIBS" ++cat > conftest.$ac_ext <&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 ++ SYSTEM_BZ2=1 MOZ_BZ2_LIBS="-lbz2" ++else ++ echo "$ac_t""no" 1>&6 ++SYSTEM_BZ2= MOZ_BZ2_CFLAGS= MOZ_BZ2_LIBS= ++fi ++ ++fi ++CFLAGS=$_SAVE_CFLAGS ++LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS ++ ++if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$SYSTEM_BZ2" = 1; then ++ MOZ_BZ2_CFLAGS="-I${BZ2_DIR}/include" ++ MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}" ++fi ++ + # Check whether --with-system-png or --without-system-png was given. + if test "${with_system_png+set}" = set; then + withval="$with_system_png" +@@ -12060,7 +12013,7 @@ + SYSTEM_PNG= + else + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:12064: checking for png_get_valid in -lpng" >&5 ++echo "configure:12017: 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 +@@ -12068,7 +12021,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $PNG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12036: \"$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 +@@ -12107,7 +12060,7 @@ + SYSTEM_PNG= + else + cat > conftest.$ac_ext < + #include +@@ -12121,7 +12074,7 @@ + } + + EOF +-if { (eval echo configure:12125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_PNG=1 + else +@@ -12146,6 +12099,116 @@ + + fi # SKIP_LIBRARY_CHECKS + ++# Check whether --enable-system-hunspell or --disable-system-hunspell was given. ++if test "${enable_system_hunspell+set}" = set; then ++ enableval="$enable_system_hunspell" ++ if test "$enableval" = "yes"; then ++ SYSTEM_HUNSPELL=1 ++ elif test "$enableval" = "no"; then ++ : ++ else ++ { echo "configure: error: Option, system-hunspell, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++if test -n "$SYSTEM_HUNSPELL"; 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:12124: 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 hunspell""... $ac_c" 1>&6 ++echo "configure:12168: checking for hunspell" >&5 ++ ++ if $PKG_CONFIG --exists "hunspell" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 ++echo "configure:12175: checking MOZ_HUNSPELL_CFLAGS" >&5 ++ MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` ++ echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 ++echo "configure:12180: checking MOZ_HUNSPELL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"hunspell\"` `$PKG_CONFIG --libs-only-l \"hunspell\"`" ++ echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 ++ else ++ MOZ_HUNSPELL_CFLAGS="" ++ MOZ_HUNSPELL_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ MOZ_HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hunspell"` ++ echo $MOZ_HUNSPELL_PKG_ERRORS ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ { echo "configure: error: Library requirements (hunspell) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } ++ fi ++ ++fi ++ ++ ++ ++ + 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 +@@ -12371,7 +12434,7 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. + set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12375: checking for $ac_word" >&5 ++echo "configure:12438: 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 +@@ -12406,7 +12469,7 @@ + + min_gtk_version=$GTK_VERSION + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:12410: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12473: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -12429,7 +12492,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -12507,7 +12570,7 @@ + } + + EOF +-if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -12542,7 +12605,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < +@@ -12552,7 +12615,7 @@ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:12556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12619: \"$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" +@@ -12604,7 +12667,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12608: checking for $ac_word" >&5 ++echo "configure:12671: 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 +@@ -12648,19 +12711,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:12652: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12715: 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:12659: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12722: 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:12664: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12727: 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\"`" +@@ -12725,7 +12788,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12729: checking for $ac_word" >&5 ++echo "configure:12792: 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 +@@ -12777,7 +12840,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +-echo "configure:12781: checking for main in -lqt" >&5 ++echo "configure:12844: 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 +@@ -12785,14 +12848,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12859: \"$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 +@@ -12811,7 +12874,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +-echo "configure:12815: checking for main in -lqt-mt" >&5 ++echo "configure:12878: 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 +@@ -12819,14 +12882,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt-mt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12893: \"$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 +@@ -12862,9 +12925,9 @@ + LIBS="$LIBS $QT_LIBS" + + echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +-echo "configure:12866: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12929: checking Qt - version >= $QT_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -12875,7 +12938,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:12879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -13471,7 +13534,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13475: checking for $ac_word" >&5 ++echo "configure:13538: 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 +@@ -13515,19 +13578,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for xft""... $ac_c" 1>&6 +-echo "configure:13519: checking for xft" >&5 ++echo "configure:13582: 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:13526: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13589: 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:13531: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13594: 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\"`" +@@ -13562,7 +13625,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13566: checking for $ac_word" >&5 ++echo "configure:13629: 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 +@@ -13606,19 +13669,19 @@ + 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:13610: checking for pango >= 1.1.0" >&5 ++echo "configure:13673: 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:13617: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13680: 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:13622: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13685: 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\"`" +@@ -13678,7 +13741,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13682: checking for $ac_word" >&5 ++echo "configure:13745: 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 +@@ -13722,19 +13785,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6 +-echo "configure:13726: checking for pangoxft >= 1.6.0" >&5 ++echo "configure:13789: checking for pangoxft >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13733: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13796: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:13738: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13801: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`" +@@ -13802,7 +13865,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +-echo "configure:13806: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13869: 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 +@@ -13810,7 +13873,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13888: \"$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 +@@ -13894,7 +13957,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13898: checking for $ac_word" >&5 ++echo "configure:13961: 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 +@@ -13938,19 +14001,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:13942: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:14005: 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:13949: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14012: 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:13954: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14017: 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\"`" +@@ -14001,7 +14064,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14005: 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 +@@ -14045,19 +14108,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:14049: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14112: 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:14056: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14119: 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:14061: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14124: 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\"`" +@@ -14104,7 +14167,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14108: checking for $ac_word" >&5 ++echo "configure:14171: 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 +@@ -14148,19 +14211,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14152: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14215: 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:14159: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14222: 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:14164: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14227: 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\"`" +@@ -14238,7 +14301,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14242: checking for $ac_word" >&5 ++echo "configure:14305: 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 +@@ -14282,19 +14345,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14286: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14349: 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:14293: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14356: 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:14298: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14361: 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\"`" +@@ -14780,7 +14843,7 @@ + # Extract the first word of "javac", so it can be a program name with args. + set dummy javac; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14784: checking for $ac_word" >&5 ++echo "configure:14847: 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 +@@ -14816,7 +14879,7 @@ + # Extract the first word of "jar", so it can be a program name with args. + set dummy jar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14820: checking for $ac_word" >&5 ++echo "configure:14883: 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 +@@ -15063,7 +15126,7 @@ + gdiplus) + MOZ_SVG_RENDERER_GDIPLUS=1 + echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +-echo "configure:15067: checking for Gdiplus.h" >&5 ++echo "configure:15130: checking for Gdiplus.h" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -15073,7 +15136,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include +@@ -15082,7 +15145,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:15086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else +@@ -15162,7 +15225,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15166: checking for $ac_word" >&5 ++echo "configure:15229: 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 +@@ -15207,7 +15270,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15211: checking for $ac_word" >&5 ++echo "configure:15274: 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 +@@ -15276,13 +15339,13 @@ + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15280: checking for iconv" >&5 ++echo "configure:15343: 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:15286: checking for $ac_word" >&5 ++echo "configure:15349: 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 +@@ -15425,6 +15488,21 @@ + fi + + ++ ++ENABLE_EMBEDDING_TESTS=$ENABLE_TESTS ++# Check whether --enable-embedding-tests or --disable-embedding-tests was given. ++if test "${enable_embedding_tests+set}" = set; then ++ enableval="$enable_embedding_tests" ++ if test "$enableval" = "yes"; then ++ ENABLE_EMBEDDING_TESTS=1 ++ elif test "$enableval" = "no"; then ++ ENABLE_EMBEDDING_TESTS= ++ else ++ { echo "configure: error: Option, embedding-tests, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ + # Individual module options + + # Check whether --enable-xpcom-lea or --disable-xpcom-lea was given. +@@ -15567,6 +15645,84 @@ + fi + + ++# Check whether --enable-js-binary or --disable-js-binary was given. ++if test "${enable_js_binary+set}" = set; then ++ enableval="$enable_js_binary" ++ if test "$enableval" = "yes"; then ++ ENABLE_JS_BINARY=1 ++ elif test "$enableval" = "no"; then ++ ENABLE_JS_BINARY= ++ else ++ { echo "configure: error: Option, js-binary, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++ ++if test -n "$ENABLE_JS_BINARY"; then ++ READLINE_DIR=no ++ # Check whether --with-readline or --without-readline was given. ++if test "${with_readline+set}" = set; then ++ withval="$with_readline" ++ READLINE_DIR=$withval ++fi ++ ++ ++ if test -n "${READLINE_DIR}" -a "${READLINE_DIR}" != "no"; then ++ _SAVE_LDFLAGS=$LDFLAGS ++ LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" ++ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 ++echo "configure:15676: checking for readline in -lreadline" >&5 ++ac_lib_var=`echo readline'_'readline | 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="-lreadline $LIBS" ++cat > conftest.$ac_ext <&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 ++ HAVE_READLINE=1 READLINE_LIBS="-lreadline" ++else ++ echo "$ac_t""no" 1>&6 ++HAVE_READLINE= READLINE_LIBS= ++fi ++ ++ LDFLAGS=$_SAVE_LDFLAGS ++ fi ++ ++ if test "${READLINE_DIR}" -a -d "${READLINE_DIR}" -a "$HAVE_READLINE" = 1; then ++ READLINE_LIBS="-L${READLINE_DIR}/lib ${READLINE_LIBS}" ++ fi ++fi ++ ++ ++ ++ + + # Debugging and Optimizations + +@@ -15628,18 +15784,18 @@ + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:15632: checking for valid debug flags" >&5 ++echo "configure:15788: 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:15643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15680,18 +15836,18 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:15684: checking for valid optimization flags" >&5 ++echo "configure:15840: 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:15695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15908,7 +16064,7 @@ + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:15912: checking for malloc in -lefence" >&5 ++echo "configure:16068: 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 +@@ -15916,7 +16072,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lefence $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16087: \"$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 +@@ -16028,12 +16184,12 @@ + for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16032: checking for $ac_func" >&5 ++echo "configure:16188: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16219: \"$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 +@@ -16302,12 +16458,12 @@ + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16306: checking for $ac_func" >&5 ++echo "configure:16462: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16493: \"$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 +@@ -16412,6 +16568,53 @@ + { 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 ++ 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:16579: 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. ++ ;; ++ ?:/*) ++ ac_cv_path_ZIP="$ZIP" # 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_ZIP="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ ;; ++esac ++fi ++ZIP="$ac_cv_path_ZIP" ++if test -n "$ZIP"; then ++ 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 ++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" +@@ -16471,7 +16674,7 @@ + # Compiler Options + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:16475: checking for gcc -pipe support" >&5 ++echo "configure:16678: 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 +@@ -16486,14 +16689,14 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else +@@ -16535,16 +16738,16 @@ + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" + echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:16539: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16742: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16751: \"$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" +@@ -16565,16 +16768,16 @@ + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:16569: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16772: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -16592,16 +16795,16 @@ + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:16596: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16799: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" +@@ -16647,16 +16850,16 @@ + _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:16651: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16854: 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:16863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="no" + else +@@ -16681,13 +16884,16 @@ + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:16685: checking for correct temporary object destruction order" >&5 ++echo "configure:16888: 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:16916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -16727,12 +16933,12 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:16731: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16937: 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 < +@@ -16762,7 +16968,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:16766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -17054,7 +17260,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17058: checking for $ac_word" >&5 ++echo "configure:17264: 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 +@@ -17098,19 +17304,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:17102: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17308: 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:17109: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17315: 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:17114: checking LIBIDL_LIBS" >&5 ++echo "configure:17320: 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\"`" +@@ -17233,7 +17439,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17237: checking for $ac_word" >&5 ++echo "configure:17443: 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 +@@ -17268,7 +17474,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17272: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17478: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17291,7 +17497,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17367,7 +17573,7 @@ + } + + EOF +-if { (eval echo configure:17371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17401,7 +17607,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17411,7 +17617,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17621: \"$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" +@@ -17455,7 +17661,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17459: checking for $ac_word" >&5 ++echo "configure:17665: 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 +@@ -17490,7 +17696,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17494: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17700: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17517,7 +17723,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17603,7 +17809,7 @@ + } + + EOF +-if { (eval echo configure:17607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17637,7 +17843,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -17648,7 +17854,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:17652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17858: \"$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" +@@ -17776,7 +17982,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17780: checking for $ac_word" >&5 ++echo "configure:17986: 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 +@@ -17811,7 +18017,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17815: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18021: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17834,7 +18040,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17910,7 +18116,7 @@ + } + + EOF +-if { (eval echo configure:17914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17944,7 +18150,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17954,7 +18160,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18164: \"$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" +@@ -17998,7 +18204,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18002: checking for $ac_word" >&5 ++echo "configure:18208: 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 +@@ -18033,7 +18239,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:18037: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18243: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -18060,7 +18266,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18146,7 +18352,7 @@ + } + + EOF +-if { (eval echo configure:18150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18180,7 +18386,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -18191,7 +18397,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18401: \"$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" +@@ -18232,7 +18438,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18236: checking for $ac_word" >&5 ++echo "configure:18442: 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 +@@ -18276,19 +18482,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18280: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18486: 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:18287: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18493: 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:18292: checking LIBIDL_LIBS" >&5 ++echo "configure:18498: 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\"`" +@@ -18324,7 +18530,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18328: checking for $ac_word" >&5 ++echo "configure:18534: 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 +@@ -18361,7 +18567,7 @@ + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:18365: checking for ORBit libIDL usability" >&5 ++echo "configure:18571: 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}` +@@ -18378,7 +18584,7 @@ + result="maybe" + else + cat > conftest.$ac_ext < +@@ -18393,7 +18599,7 @@ + } + + EOF +-if { (eval echo configure:18397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18603: \"$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" +@@ -18450,7 +18656,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18454: checking for $ac_word" >&5 ++echo "configure:18660: 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 +@@ -18494,19 +18700,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:18498: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18704: 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:18505: checking GLIB_CFLAGS" >&5 ++echo "configure:18711: 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:18510: checking GLIB_LIBS" >&5 ++echo "configure:18716: 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\"`" +@@ -18590,7 +18796,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18594: checking for $ac_word" >&5 ++echo "configure:18800: 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 +@@ -18625,7 +18831,7 @@ + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18629: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18835: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -18648,7 +18854,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18724,7 +18930,7 @@ + } + + EOF +-if { (eval echo configure:18728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18758,7 +18964,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -18768,7 +18974,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18978: \"$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" +@@ -18848,19 +19054,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:18852: checking for working alloca.h" >&5 ++echo "configure:19058: 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:18864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19070: \"$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 +@@ -18881,12 +19087,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:18885: checking for alloca" >&5 ++echo "configure:19091: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19124: \"$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 +@@ -18946,12 +19152,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:18950: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19156: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&6 +-echo "configure:18980: checking for $ac_func" >&5 ++echo "configure:19186: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19214: \"$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 +@@ -19031,7 +19237,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:19035: checking stack direction for C alloca" >&5 ++echo "configure:19241: 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 +@@ -19039,7 +19245,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19268: \"$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 +@@ -19107,17 +19313,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:19111: checking for $ac_hdr" >&5 ++echo "configure:19317: 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:19121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19327: \"$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* +@@ -19208,7 +19414,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19212: checking for $ac_word" >&5 ++echo "configure:19418: 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 +@@ -19252,19 +19458,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19256: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19462: 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:19263: checking CAIRO_CFLAGS" >&5 ++echo "configure:19469: 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:19268: checking CAIRO_LIBS" >&5 ++echo "configure:19474: 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\"`" +@@ -19329,7 +19535,7 @@ + # Extract the first word of "python", so it can be a program name with args. + set dummy python; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19333: checking for $ac_word" >&5 ++echo "configure:19539: 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 +@@ -19393,6 +19599,41 @@ + else + MOZ_PYTHON_DEBUG_SUFFIX= + fi ++ ++ _savedcflags=$CFLAGS ++ CFLAGS=$MOZ_PYTHON_INCLUDES ++ echo $ac_n "checking for Py_ssize_t""... $ac_c" 1>&6 ++echo "configure:19607: checking for Py_ssize_t" >&5 ++ cat > conftest.$ac_ext < ++int main() { ++Py_ssize_t size = 0; ++; return 0; } ++EOF ++if { (eval echo configure:19616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ HAVE_PY_SSIZE_T=1 ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ HAVE_PY_SSIZE_T=0 ++fi ++rm -f conftest* ++ CFLAGS=$_savedcflags ++ ++ if test $HAVE_PY_SSIZE_T = 1; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_PY_SSIZE_T 1 ++EOF ++ ++ echo "$ac_t""yes" 1>&6 ++ else ++ echo "$ac_t""no" 1>&6 ++ fi ++ + echo "$ac_t""Building PyXPCOM using Python-$MOZ_PYTHON_VER_DOTTED from $MOZ_PYTHON_PREFIX" 1>&6 + fi + +@@ -19605,14 +19846,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:19616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -19796,6 +20037,7 @@ + + + ++ + CFLAGS=`echo \ + $_WARNINGS_CFLAGS \ + $CFLAGS` +@@ -19892,6 +20134,9 @@ + + + ++ ++ ++ + cat >> confdefs.h < conftest.$ac_ext < +@@ -19935,7 +20180,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:19939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -20152,34 +20397,15 @@ + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-# +-# If the first sed substitution is executed (which looks for macros that +-# take arguments), then we branch to the quote section. Otherwise, +-# look for a macro that doesn't take arguments. +-cat >confdef2opt.sed <<\_ACEOF +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +-t quote +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +-t quote +-d +-: quote +-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +-s,\[,\\&,g +-s,\],\\&,g +-s,\$,$$,g +-p +-_ACEOF +-# We use echo to avoid assuming a particular line-breaking character. +-# The extra dot is to prevent the shell from consuming trailing +-# line-breaks from the sub-command output. A line-break within +-# single-quotes doesn't work because, if this script is created in a +-# platform that uses two characters for line-breaks (e.g., DOS), tr +-# would break. +-ac_LF_and_DOT=`echo; echo .` +-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +-rm -f confdef2opt.sed ++cat > conftest.defs <<\EOF ++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g ++s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++s%\[%\\&%g ++s%\]%\\&%g ++s%\$%$$%g ++EOF ++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++rm -f conftest.defs + + MOZ_DEFINES=$DEFS + +@@ -20381,7 +20607,6 @@ + s%@WHOAMI@%$WHOAMI%g + s%@AUTOCONF@%$AUTOCONF%g + s%@UNZIP@%$UNZIP%g +-s%@ZIP@%$ZIP%g + s%@SYSTEM_MAKEDEPEND@%$SYSTEM_MAKEDEPEND%g + s%@XARGS@%$XARGS%g + s%@PBBUILD@%$PBBUILD%g +@@ -20418,10 +20643,13 @@ + s%@NSS_CONFIG@%$NSS_CONFIG%g + s%@NSS_CFLAGS@%$NSS_CFLAGS%g + s%@NSS_LIBS@%$NSS_LIBS%g ++s%@PKG_CONFIG@%$PKG_CONFIG%g ++s%@MOZ_HUNSPELL_CFLAGS@%$MOZ_HUNSPELL_CFLAGS%g ++s%@MOZ_HUNSPELL_LIBS@%$MOZ_HUNSPELL_LIBS%g ++s%@SYSTEM_HUNSPELL@%$SYSTEM_HUNSPELL%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 +@@ -20495,6 +20723,9 @@ + s%@MOZ_SAFE_BROWSING@%$MOZ_SAFE_BROWSING%g + s%@MOZ_URL_CLASSIFIER@%$MOZ_URL_CLASSIFIER%g + s%@JS_ULTRASPARC_OPTS@%$JS_ULTRASPARC_OPTS%g ++s%@ENABLE_JS_BINARY@%$ENABLE_JS_BINARY%g ++s%@HAVE_READLINE@%$HAVE_READLINE%g ++s%@READLINE_LIBS@%$READLINE_LIBS%g + s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g + s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g + s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g +@@ -20502,6 +20733,7 @@ + s%@MOZ_REFLOW_PERF@%$MOZ_REFLOW_PERF%g + s%@NS_TRACE_MALLOC@%$NS_TRACE_MALLOC%g + s%@MOZ_DEMANGLE_SYMBOLS@%$MOZ_DEMANGLE_SYMBOLS%g ++s%@ZIP@%$ZIP%g + s%@MOZ_DOC_INPUT_DIRS@%$MOZ_DOC_INPUT_DIRS%g + s%@MOZ_DOC_INCLUDE_DIRS@%$MOZ_DOC_INCLUDE_DIRS%g + s%@MOZ_DOC_OUTPUT_DIR@%$MOZ_DOC_OUTPUT_DIR%g +@@ -20654,6 +20886,7 @@ + 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%@ENABLE_EMBEDDING_TESTS@%$ENABLE_EMBEDDING_TESTS%g + s%@IBMBIDI@%$IBMBIDI%g + s%@SUNCTL@%$SUNCTL%g + s%@ACCESSIBILITY@%$ACCESSIBILITY%g +@@ -20703,6 +20936,7 @@ + s%@SYSTEM_JPEG@%$SYSTEM_JPEG%g + s%@SYSTEM_PNG@%$SYSTEM_PNG%g + s%@SYSTEM_ZLIB@%$SYSTEM_ZLIB%g ++s%@SYSTEM_BZ2@%$SYSTEM_BZ2%g + s%@JPEG_CFLAGS@%$JPEG_CFLAGS%g + s%@JPEG_LIBS@%$JPEG_LIBS%g + s%@ZLIB_CFLAGS@%$ZLIB_CFLAGS%g +@@ -20713,6 +20947,8 @@ + s%@MOZ_JPEG_LIBS@%$MOZ_JPEG_LIBS%g + s%@MOZ_ZLIB_CFLAGS@%$MOZ_ZLIB_CFLAGS%g + s%@MOZ_ZLIB_LIBS@%$MOZ_ZLIB_LIBS%g ++s%@MOZ_BZ2_CFLAGS@%$MOZ_BZ2_CFLAGS%g ++s%@MOZ_BZ2_LIBS@%$MOZ_BZ2_LIBS%g + s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g + s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g + s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g +@@ -21118,7 +21354,7 @@ + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -21261,7 +21497,7 @@ + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + --- xulrunner-1.8.1.4.orig/debian/patches/10_icons.dpatch +++ xulrunner-1.8.1.4/debian/patches/10_icons.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_icons.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Apply patch from bz#314927 to install default.xpm in the right place + +@DPATCH@ + +=== xulrunner/app/Makefile.in +================================================================== +--- xulrunner/xulrunner/app/Makefile.in (revision 72) ++++ xulrunner/xulrunner/app/Makefile.in (local) +@@ -274,7 +274,7 @@ + $(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default + + install:: +- $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons ++ $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default + endif + + # XXX applications would need to supply this file --- xulrunner-1.8.1.4.orig/debian/patches/68_python25_api_breakage.dpatch +++ xulrunner-1.8.1.4/debian/patches/68_python25_api_breakage.dpatch @@ -0,0 +1,103 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 68_python25_api_breakage.dpatch by Alexander Sack +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: adapt code to changed api in python 2.5; tracked upstream in +## DP: bugzilla bug 386610 + +@DPATCH@ +diff -urNad xulrunner-1.8.1.4~/extensions/python/xpcom/src/PyGInputStream.cpp xulrunner-1.8.1.4/extensions/python/xpcom/src/PyGInputStream.cpp +--- xulrunner-1.8.1.4~/extensions/python/xpcom/src/PyGInputStream.cpp 2007-07-01 19:22:39.000000000 +0000 ++++ xulrunner-1.8.1.4/extensions/python/xpcom/src/PyGInputStream.cpp 2007-07-01 19:25:23.000000000 +0000 +@@ -103,18 +103,23 @@ + const char *methodName = "read"; + nsresult nr = InvokeNativeViaPolicy(methodName, &ret, "i", count); + if (NS_SUCCEEDED(nr)) { +- PRUint32 py_size; ++ Py_ssize_t py_size; + const void *py_buf; +- if (PyObject_AsReadBuffer(ret, &py_buf, (int *)&py_size)!=0) { ++ if (PyObject_AsReadBuffer(ret, &py_buf, &py_size)!=0) { + PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", ret->ob_type->tp_name); + nr = HandleNativeGatewayError(methodName); + } else { +- if (py_size > count) { +- PyXPCOM_LogWarning("nsIInputStream::read() was asked for %d bytes, but the string returned is %d bytes - truncating!\n", count, py_size); +- py_size = count; ++ if ( (py_size & 0xFFFFFFFF) != py_size) { ++ PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer"); ++ nr = HandleNativeGatewayError(methodName); ++ } else { ++ if (py_size > count) { ++ PyXPCOM_LogWarning("nsIInputStream::read() was asked for %d bytes, but the string returned is %d bytes - truncating!\n", count, py_size); ++ py_size = count; ++ } ++ memcpy(buf, py_buf, py_size); ++ *_retval = py_size; + } +- memcpy(buf, py_buf, py_size); +- *_retval = py_size; + } + } + return nr; +diff -urNad xulrunner-1.8.1.4~/extensions/python/xpcom/src/PyXPCOM_std.h xulrunner-1.8.1.4/extensions/python/xpcom/src/PyXPCOM_std.h +--- xulrunner-1.8.1.4~/extensions/python/xpcom/src/PyXPCOM_std.h 2005-08-31 13:18:32.000000000 +0000 ++++ xulrunner-1.8.1.4/extensions/python/xpcom/src/PyXPCOM_std.h 2007-07-01 19:24:58.000000000 +0000 +@@ -51,6 +51,12 @@ + + #include + ++// python 2.4 doesn't have Py_ssize_t ++// => fallback to int ++#ifndef HAVE_PY_SSIZE_T ++typedef Py_ssize_t int; ++#endif ++ + #ifdef HAVE_LONG_LONG + // Mozilla also defines this - we undefine it to + // prevent a compiler warning. +diff -urNad xulrunner-1.8.1.4~/extensions/python/xpcom/src/PyIInputStream.cpp xulrunner-1.8.1.4/extensions/python/xpcom/src/PyIInputStream.cpp +--- xulrunner-1.8.1.4~/extensions/python/xpcom/src/PyIInputStream.cpp 2007-07-01 19:22:39.000000000 +0000 ++++ xulrunner-1.8.1.4/extensions/python/xpcom/src/PyIInputStream.cpp 2007-07-01 19:26:29.000000000 +0000 +@@ -65,12 +65,19 @@ + { + PRUint32 nread; + void *buf; +- PRUint32 buf_len; +- if (PyObject_AsWriteBuffer(obBuffer, &buf, (int *)&buf_len) != 0) { ++ Py_ssize_t buf_len; ++ if (PyObject_AsWriteBuffer(obBuffer, &buf, &buf_len) != 0) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "The buffer object does not have a write buffer!"); + return NULL; + } ++ ++ if ( (buf_len & 0xFFFFFFFF) != buf_len) { ++ PyErr_Clear(); ++ PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer"); ++ return NULL; ++ } ++ + if (n==(PRUint32)-1) { + n = buf_len; + } else { +@@ -116,11 +123,17 @@ + rc = PyBuffer_New(nread); + if (rc != NULL) { + void *ob_buf; +- PRUint32 buf_len; +- if (PyObject_AsWriteBuffer(rc, &ob_buf, (int *)&buf_len) != 0) { ++ Py_ssize_t buf_len; ++ if (PyObject_AsWriteBuffer(rc, &ob_buf, &buf_len) != 0) { + // should never fail - we just created it! + return NULL; + } ++ ++ if ( (buf_len & 0xFFFFFFFF) != buf_len) { ++ PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer"); ++ return NULL; ++ } ++ + if (buf_len != nread) { + PyErr_SetString(PyExc_RuntimeError, "New buffer isnt the size we create it!"); + return NULL; --- xulrunner-1.8.1.4.orig/debian/patches/10_no_chromelist.dpatch +++ xulrunner-1.8.1.4/debian/patches/10_no_chromelist.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_no_chromelist.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't build chromelist.txt files. bz#331781 +## DP: Also correctly call make-jars.pl. bz#333543 + +@DPATCH@ + +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 69) ++++ xulrunner/config/rules.mk (local) +@@ -1561,8 +1561,6 @@ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \ + -d $(MAKE_JARS_TARGET)/chrome -j $(FINAL_TARGET)/chrome \ + $(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 + +@@ -1575,10 +1573,8 @@ + $(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 + --- xulrunner-1.8.1.4.orig/debian/patches/10_toolkit_library.dpatch +++ xulrunner-1.8.1.4/debian/patches/10_toolkit_library.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_toolkit_library.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add Freetype library to the list of linked libraries. Stolen from +## DP: bz#340795 + +@DPATCH@ + +--- xulrunner/toolkit/library/Makefile.in ++++ xulrunner/toolkit/library/Makefile.in +@@ -350,6 +350,10 @@ + EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(FT2_LIBS) ++endif ++ + ifdef MOZ_ENABLE_XPRINT + EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS) + endif --- xulrunner-1.8.1.4.orig/debian/patches/15_jni.dpatch +++ xulrunner-1.8.1.4/debian/patches/15_jni.dpatch @@ -0,0 +1,435 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_jni.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from bz#333738 to update java stubs + +@DPATCH@ + +=== sun-java/stubs/include/jni.h +================================================================== +--- xulrunner/sun-java/stubs/include/jni.h (revision 134) ++++ xulrunner/sun-java/stubs/include/jni.h (local) +@@ -114,6 +114,8 @@ + + #endif + ++typedef jobject jweak; ++ + #if 0 /* moved to jri_md.h */ + typedef jobject jref; /* For transition---not meant to be part of public + API anymore.*/ +@@ -148,8 +150,13 @@ + * possible return values for JNI functions. + */ + +-#define JNI_OK 0 +-#define JNI_ERR (-1) ++#define JNI_OK 0 /* success */ ++#define JNI_ERR (-1) /* unknown error */ ++#define JNI_EDETACHED (-2) /* thread detached from the VM */ ++#define JNI_EVERSION (-3) /* JNI version error */ ++#define JNI_ENOMEM (-4) /* not enough memory */ ++#define JNI_EEXIST (-5) /* VM already created */ ++#define JNI_EINVAL (-6) /* invalid arguments */ + + /* + * used in ReleaseScalarArrayElements +@@ -211,16 +218,21 @@ + jclass (JNICALL *FindClass) + (JNIEnv *env, const char *name); + +- void *reserved4; +- void *reserved5; +- void *reserved6; ++ jmethodID (JNICALL *FromReflectedMethod) ++ (JNIEnv *env, jobject method); ++ jfieldID (JNICALL *FromReflectedField) ++ (JNIEnv *env, jobject field); + ++ jobject (JNICALL *ToReflectedMethod) ++ (JNIEnv *env, jclass cls, jmethodID methodID, jboolean isStatic); ++ + jclass (JNICALL *GetSuperclass) + (JNIEnv *env, jclass sub); + jboolean (JNICALL *IsAssignableFrom) + (JNIEnv *env, jclass sub, jclass sup); +- void *reserved7; + ++ jobject (JNICALL *ToReflectedField) ++ (JNIEnv *env, jclass cls, jfieldID fieldID, jboolean isStatic); + + jint (JNICALL *Throw) + (JNIEnv *env, jthrowable obj); +@@ -234,9 +246,12 @@ + (JNIEnv *env); + void (JNICALL *FatalError) + (JNIEnv *env, const char *msg); +- void *reserved8; +- void *reserved9; + ++ jint (JNICALL *PushLocalFrame) ++ (JNIEnv *env, jint capacity); ++ jobject (JNICALL *PopLocalFrame) ++ (JNIEnv *env, jobject result); ++ + jobject (JNICALL *NewGlobalRef) + (JNIEnv *env, jobject lobj); + void (JNICALL *DeleteGlobalRef) +@@ -245,8 +260,10 @@ + (JNIEnv *env, jobject obj); + jboolean (JNICALL *IsSameObject) + (JNIEnv *env, jobject obj1, jobject obj2); +- void *reserved10; +- void *reserved11; ++ jobject (JNICALL *NewLocalRef) ++ (JNIEnv *env, jobject ref); ++ jint (JNICALL *EnsureLocalCapacity) ++ (JNIEnv *env, jint capacity); + + jobject (JNICALL *AllocObject) + (JNIEnv *env, jclass clazz); +@@ -706,6 +723,36 @@ + + jint (JNICALL *GetJavaVM) + (JNIEnv *env, JavaVM **vm); ++ ++ void (JNICALL *GetStringRegion) ++ (JNIEnv *env, jstring str, jsize start, jsize len, jchar *buf); ++ void (JNICALL *GetStringUTFRegion) ++ (JNIEnv *env, jstring str, jsize start, jsize len, char *buf); ++ ++ void * (JNICALL *GetPrimitiveArrayCritical) ++ (JNIEnv *env, jarray array, jboolean *isCopy); ++ void (JNICALL *ReleasePrimitiveArrayCritical) ++ (JNIEnv *env, jarray array, void *carray, jint mode); ++ ++ const jchar * (JNICALL *GetStringCritical) ++ (JNIEnv *env, jstring string, jboolean *isCopy); ++ void (JNICALL *ReleaseStringCritical) ++ (JNIEnv *env, jstring string, const jchar *cstring); ++ ++ jweak (JNICALL *NewWeakGlobalRef) ++ (JNIEnv *env, jobject obj); ++ void (JNICALL *DeleteWeakGlobalRef) ++ (JNIEnv *env, jweak ref); ++ ++ jboolean (JNICALL *ExceptionCheck) ++ (JNIEnv *env); ++ ++ jobject (JNICALL *NewDirectByteBuffer) ++ (JNIEnv* env, void* address, jlong capacity); ++ void* (JNICALL *GetDirectBufferAddress) ++ (JNIEnv* env, jobject buf); ++ jlong (JNICALL *GetDirectBufferCapacity) ++ (JNIEnv* env, jobject buf); + }; + + /* +@@ -722,8 +769,6 @@ + + struct JNIEnv_ { + const struct JNINativeInterface_ *functions; +- void *reserved0; +- void *reserved1[6]; + #ifdef __cplusplus + + jint GetVersion() { +@@ -736,6 +781,17 @@ + jclass FindClass(const char *name) { + return functions->FindClass(this, name); + } ++ jmethodID FromReflectedMethod(jobject method) { ++ return functions->FromReflectedMethod(this,method); ++ } ++ jfieldID FromReflectedField(jobject field) { ++ return functions->FromReflectedField(this,field); ++ } ++ ++ jobject ToReflectedMethod(jclass cls, jmethodID methodID, jboolean isStatic) { ++ return functions->ToReflectedMethod(this, cls, methodID, isStatic); ++ } ++ + jclass GetSuperclass(jclass sub) { + return functions->GetSuperclass(this, sub); + } +@@ -743,6 +799,10 @@ + return functions->IsAssignableFrom(this, sub, sup); + } + ++ jobject ToReflectedField(jclass cls, jfieldID fieldID, jboolean isStatic) { ++ return functions->ToReflectedField(this,cls,fieldID,isStatic); ++ } ++ + jint Throw(jthrowable obj) { + return functions->Throw(this, obj); + } +@@ -762,6 +822,13 @@ + functions->FatalError(this, msg); + } + ++ jint PushLocalFrame(jint capacity) { ++ return functions->PushLocalFrame(this,capacity); ++ } ++ jobject PopLocalFrame(jobject result) { ++ return functions->PopLocalFrame(this,result); ++ } ++ + jobject NewGlobalRef(jobject lobj) { + return functions->NewGlobalRef(this,lobj); + } +@@ -776,6 +843,13 @@ + return functions->IsSameObject(this,obj1,obj2); + } + ++ jobject NewLocalRef(jobject ref) { ++ return functions->NewLocalRef(this,ref); ++ } ++ jint EnsureLocalCapacity(jint capacity) { ++ return functions->EnsureLocalCapacity(this,capacity); ++ } ++ + jobject AllocObject(jclass clazz) { + return functions->AllocObject(this,clazz); + } +@@ -1726,9 +1800,71 @@ + return functions->GetJavaVM(this,vm); + } + ++ void GetStringRegion(jstring str, jsize start, jsize len, jchar *buf) { ++ functions->GetStringRegion(this,str,start,len,buf); ++ } ++ void GetStringUTFRegion(jstring str, jsize start, jsize len, char *buf) { ++ functions->GetStringUTFRegion(this,str,start,len,buf); ++ } ++ ++ void * GetPrimitiveArrayCritical(jarray array, jboolean *isCopy) { ++ return functions->GetPrimitiveArrayCritical(this,array,isCopy); ++ } ++ void ReleasePrimitiveArrayCritical(jarray array, void *carray, jint mode) { ++ functions->ReleasePrimitiveArrayCritical(this,array,carray,mode); ++ } ++ ++ const jchar * GetStringCritical(jstring string, jboolean *isCopy) { ++ return functions->GetStringCritical(this,string,isCopy); ++ } ++ void ReleaseStringCritical(jstring string, const jchar *cstring) { ++ functions->ReleaseStringCritical(this,string,cstring); ++ } ++ ++ jweak NewWeakGlobalRef(jobject obj) { ++ return functions->NewWeakGlobalRef(this,obj); ++ } ++ void DeleteWeakGlobalRef(jweak ref) { ++ functions->DeleteWeakGlobalRef(this,ref); ++ } ++ ++ jboolean ExceptionCheck() { ++ return functions->ExceptionCheck(this); ++ } ++ ++ jobject NewDirectByteBuffer(void* address, jlong capacity) { ++ return functions->NewDirectByteBuffer(this, address, capacity); ++ } ++ void* GetDirectBufferAddress(jobject buf) { ++ return functions->GetDirectBufferAddress(this, buf); ++ } ++ jlong GetDirectBufferCapacity(jobject buf) { ++ return functions->GetDirectBufferCapacity(this, buf); ++ } ++ + #endif /* __cplusplus */ + }; + ++typedef struct JavaVMOption { ++ char *optionString; ++ void *extraInfo; ++} JavaVMOption; ++ ++typedef struct JavaVMInitArgs { ++ jint version; ++ ++ jint nOptions; ++ JavaVMOption *options; ++ jboolean ignoreUnrecognized; ++} JavaVMInitArgs; ++ ++typedef struct JavaVMAttachArgs { ++ jint version; ++ ++ char *name; ++ jobject group; ++} JavaVMAttachArgs; ++ + /* These structures will be VM-specific. */ + + typedef struct JDK1_1InitArgs { +@@ -1745,7 +1881,7 @@ + + jint (JNICALL *vfprintf)(FILE *fp, const char *format, va_list args); + void (JNICALL *exit)(jint code); +- void (JNICALL *abort)(); ++ void (JNICALL *abort)(void); + + jint enableClassGC; + jint enableVerboseGC; +@@ -1759,6 +1895,9 @@ + void * __padding; /* C compilers don't allow empty structures. */ + } JDK1_1AttachArgs; + ++#define JDK1_2 ++#define JDK1_4 ++ + /* End VM-specific. */ + + struct JNIInvokeInterface_ { +@@ -1768,39 +1907,63 @@ + + jint (JNICALL *DestroyJavaVM)(JavaVM *vm); + +- jint (JNICALL *AttachCurrentThread) +- (JavaVM *vm, JNIEnv **penv, void *args); ++ jint (JNICALL *AttachCurrentThread)(JavaVM *vm, void **penv, void *args); + + jint (JNICALL *DetachCurrentThread)(JavaVM *vm); ++ ++ jint (JNICALL *GetEnv)(JavaVM *vm, void **penv, jint version); ++ ++ jint (JNICALL *AttachCurrentThreadAsDaemon)(JavaVM *vm, void **penv, void *args); + }; + + struct JavaVM_ { + const struct JNIInvokeInterface_ *functions; +- void *reserved0; +- void *reserved1; +- void *reserved2; + #ifdef __cplusplus + + jint DestroyJavaVM() { + return functions->DestroyJavaVM(this); + } +- jint AttachCurrentThread(JNIEnv **penv, void *args) { ++ jint AttachCurrentThread(void **penv, void *args) { + return functions->AttachCurrentThread(this, penv, args); + } + jint DetachCurrentThread() { + return functions->DetachCurrentThread(this); + } + ++ jint GetEnv(void **penv, jint version) { ++ return functions->GetEnv(this, penv, version); ++ } ++ jint AttachCurrentThreadAsDaemon(void **penv, void *args) { ++ return functions->AttachCurrentThreadAsDaemon(this, penv, args); ++ } + #endif + }; + +-JNI_PUBLIC_API(void) JNI_GetDefaultJavaVMInitArgs(void *); ++#ifdef _JNI_IMPLEMENTATION_ ++#define _JNI_IMPORT_OR_EXPORT_ JNIEXPORT ++#else ++#define _JNI_IMPORT_OR_EXPORT_ JNIIMPORT ++#endif ++_JNI_IMPORT_OR_EXPORT_ jint JNICALL ++JNI_GetDefaultJavaVMInitArgs(void *args); + +-JNI_PUBLIC_API(jint) JNI_CreateJavaVM(JavaVM **, JNIEnv **, void *); ++_JNI_IMPORT_OR_EXPORT_ jint JNICALL ++JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args); + +-JNI_PUBLIC_API(jint) JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); +-JNI_PUBLIC_API(jref) JNI_MakeLocalRef(JNIEnv *pJNIEnv, void *pHObject); ++_JNI_IMPORT_OR_EXPORT_ jint JNICALL ++JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); + ++/* Defined by native libraries. */ ++JNIEXPORT jint JNICALL ++JNI_OnLoad(JavaVM *vm, void *reserved); ++ ++JNIEXPORT void JNICALL ++JNI_OnUnload(JavaVM *vm, void *reserved); ++ ++#define JNI_VERSION_1_1 0x00010001 ++#define JNI_VERSION_1_2 0x00010002 ++#define JNI_VERSION_1_4 0x00010004 ++ + #ifdef __cplusplus + } /* extern "C" */ + #endif /* __cplusplus */ +=== sun-java/stubs/include/jni_md.h +================================================================== +--- xulrunner/sun-java/stubs/include/jni_md.h (revision 134) ++++ xulrunner/sun-java/stubs/include/jni_md.h (local) +@@ -81,20 +81,8 @@ + ******************************************************************************/ + + /* DLL Entry modifiers... */ +-#if defined(XP_OS2) +-# ifdef XP_OS2_VACPP +-# define JNI_PUBLIC_API(ResultType) ResultType _System +-# define JNI_PUBLIC_VAR(VarType) VarType +-# define JNICALL _Optlink +-# define JNIEXPORT +-# else +-# define JNI_PUBLIC_API(ResultType) ResultType +-# define JNI_PUBLIC_VAR(VarType) VarType +-# define JNICALL +-# define JNIEXPORT +-# endif + /* Win32 */ +-#elif defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) ++#if defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) + # include + # if defined(_MSC_VER) || defined(__GNUC__) + # if defined(WIN32) || defined(_WIN32) +@@ -135,7 +123,33 @@ + # endif + /* This is the stuff inherited from JavaSoft .. */ + # define JNIEXPORT __declspec(dllexport) ++# define JNIIMPORT __declspec(dllimport) + ++/* OS/2 */ ++#elif defined(XP_OS2) ++# ifdef XP_OS2_VACPP ++# define JNI_PUBLIC_API(ResultType) ResultType _System ++# define JNI_PUBLIC_VAR(VarType) VarType ++# define JNICALL _Optlink ++# define JNIEXPORT ++# define JNIIMPORT ++# elif defined(__declspec) ++# define JNI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType ++# define JNI_PUBLIC_VAR(VarType) VarType ++# define JNI_NATIVE_STUB(ResultType) __declspec(dllexport) ResultType ++# define JNICALL ++# define JNIEXPORT ++# define JNIIMPORT ++# else ++# define JNI_PUBLIC_API(ResultType) ResultType ++# define JNI_PUBLIC_VAR(VarType) VarType ++# define JNICALL ++# define JNIEXPORT ++# define JNIIMPORT ++# endif ++# ifndef IS_LITTLE_ENDIAN ++# define IS_LITTLE_ENDIAN ++# endif + + /* Mac */ + #elif macintosh || Macintosh || THINK_C +@@ -161,6 +175,7 @@ + # define JNICALL + /* This is the stuff inherited from JavaSoft .. */ + # define JNIEXPORT ++# define JNIIMPORT + + /* Unix or else */ + #else +@@ -170,6 +185,7 @@ + # define JNICALL + /* This is the stuff inherited from JavaSoft .. */ + # define JNIEXPORT ++# define JNIIMPORT + #endif + + #ifndef FAR /* for non-Win16 */ --- xulrunner-1.8.1.4.orig/debian/patches/15_pango_textarea_position.dpatch +++ xulrunner-1.8.1.4/debian/patches/15_pango_textarea_position.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_pango_textarea_position.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for cursor position when moving in a textarea. bz#366796 + +@DPATCH@ + +--- iceape/gfx/src/gtk/nsFontMetricsPango.cpp ++++ iceape/gfx/src/gtk/nsFontMetricsPango.cpp +@@ -948,7 +948,6 @@ + { + int trailing = 0; + int inx = 0; +- gboolean found = FALSE; + const gchar *curChar; + PRInt32 retval = 0; + +@@ -974,22 +973,12 @@ + 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)) { + --- xulrunner-1.8.1.4.orig/debian/patches/15_pyxpcom_deadcode.dpatch +++ xulrunner-1.8.1.4/debian/patches/15_pyxpcom_deadcode.dpatch @@ -0,0 +1,131 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_pyxpcom_deadcode.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove pyxpcom dead code and fix FTBFS on alpha this way. Closes: +## DP: #381662. bz#347865 + +@DPATCH@ + +=== extensions/python/xpcom/src/PyGBase.cpp +================================================================== +--- xulrunner/extensions/python/xpcom/src/PyGBase.cpp (revision 107) ++++ xulrunner/extensions/python/xpcom/src/PyGBase.cpp (local) +@@ -595,101 +595,6 @@ + return nr == NS_OK ? NS_OK : HandleNativeGatewayError(szMethodName); + } + +-nsresult PyG_Base::InvokeNativeGetViaPolicy( +- const char *szPropertyName, +- PyObject **ppResult /* = NULL */ +- ) +-{ +- PyObject *ob_ret = NULL; +- nsresult ret = NS_OK; +- PyObject *real_ob = NULL; +- if ( m_pPyObject == NULL || szPropertyName == NULL ) +- return NS_ERROR_NULL_POINTER; +- // First see if we have a method of that name. +- char buf[256]; +- strcpy(buf, "get_"); +- strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1); +- buf[sizeof(buf)/sizeof(buf[0])-1] = '\0'; +- ret = InvokeNativeViaPolicyInternal(buf, ppResult, nsnull, nsnull); +- if (ret == NS_PYXPCOM_NO_SUCH_METHOD) { +- // No method of that name - just try a property. +- // Bit to a hack here to maintain the use of a policy. +- // We actually get the policies underlying object +- // to make the call on. +- real_ob = PyObject_GetAttrString(m_pPyObject, "_obj_"); +- if (real_ob == NULL) { +- PyErr_Format(PyExc_AttributeError, "The policy object does not have an '_obj_' attribute."); +- ret = HandleNativeGatewayError(szPropertyName); +- goto done; +- } +- ob_ret = PyObject_GetAttrString(real_ob, (char *)szPropertyName); +- if (ob_ret==NULL) { +- PyErr_Format(PyExc_AttributeError, +- "The object does not have a 'get_%s' function, or a '%s attribute.", +- szPropertyName, szPropertyName); +- } else { +- ret = NS_OK; +- if (ppResult) +- *ppResult = ob_ret; +- else +- Py_XDECREF(ob_ret); +- } +- } +- if (ret != NS_OK) +- ret = HandleNativeGatewayError(szPropertyName); +- +-done: +- Py_XDECREF(real_ob); +- return ret; +-} +- +-nsresult PyG_Base::InvokeNativeSetViaPolicy( +- const char *szPropertyName, +- ... +- ) +-{ +- if ( m_pPyObject == NULL || szPropertyName == NULL ) +- return NS_ERROR_NULL_POINTER; +- nsresult ret = NS_OK; +- PyObject *real_ob = NULL; +- char buf[256]; +- strcpy(buf, "set_"); +- strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1); +- buf[sizeof(buf)/sizeof(buf[0])-1] = '\0'; +- va_list va; +- va_start(va, szPropertyName); +- ret = InvokeNativeViaPolicyInternal(buf, NULL, "O", va); +- va_end(va); +- if (ret == NS_PYXPCOM_NO_SUCH_METHOD) { +- // No method of that name - just try a property. +- // Bit to a hack here to maintain the use of a policy. +- // We actually get the policies underlying object +- // to make the call on. +- real_ob = PyObject_GetAttrString(m_pPyObject, "_obj_"); +- if (real_ob == NULL) { +- PyErr_Format(PyExc_AttributeError, "The policy object does not have an '_obj_' attribute."); +- ret = HandleNativeGatewayError(szPropertyName); +- goto done; +- } +- va_list va2; +- va_start(va2, szPropertyName); +- PyObject *arg = va_arg( va2, PyObject *); +- va_end(va2); +- if (PyObject_SetAttrString(real_ob, (char *)szPropertyName, arg) == 0) +- ret = NS_OK; +- else { +- PyErr_Format(PyExc_AttributeError, +- "The object does not have a 'set_%s' function, or a '%s attribute.", +- szPropertyName, szPropertyName); +- } +- } +- if (ret != NS_OK) +- ret = HandleNativeGatewayError(szPropertyName); +-done: +- Py_XDECREF(real_ob); +- return ret; +-} +- + // Get at the underlying Python object. + PyObject *PyG_Base::UnwrapPythonObject(void) + { +=== extensions/python/xpcom/src/PyXPCOM.h +================================================================== +--- xulrunner/extensions/python/xpcom/src/PyXPCOM.h (revision 107) ++++ xulrunner/extensions/python/xpcom/src/PyXPCOM.h (local) +@@ -416,11 +416,6 @@ + PyObject **ppResult, + const char *szFormat, + va_list va); +- nsresult InvokeNativeGetViaPolicy(const char *szPropertyName, +- PyObject **ppResult = NULL +- ); +- nsresult InvokeNativeSetViaPolicy(const char *szPropertyName, +- ...); + }; + + class PYXPCOM_EXPORT PyXPCOM_XPTStub : public PyG_Base, public nsXPTCStubBase --- xulrunner-1.8.1.4.orig/debian/patches/18_arm_xpcom_unused_attribute.dpatch +++ xulrunner-1.8.1.4/debian/patches/18_arm_xpcom_unused_attribute.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 18_arm_xpcom_unused_attribute.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Steve Langasek to fix unused vs. used gcc attribute on arm. +## DP: bz#307418 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp (local) +@@ -45,7 +45,8 @@ + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); ++static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") ++__attribute__((used)); + + static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) --- xulrunner-1.8.1.4.orig/debian/patches/20_about:plugins.dpatch +++ xulrunner-1.8.1.4/debian/patches/20_about:plugins.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_about:plugins.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Install the files for about:plugins. bz#328678 + +@DPATCH@ + +=== toolkit/content/jar.mn +================================================================== +--- xulrunner/toolkit/content/jar.mn (revision 209) ++++ xulrunner/toolkit/content/jar.mn (local) +@@ -78,4 +78,4 @@ + + content/global/selectDialog.xul (selectDialog.xul) + *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) + #endif +- ++ content/global/plugins.html (../../xpfe/global/resources/content/plugins.html) +=== toolkit/themes/winstripe/global/jar.mn +================================================================== +--- xulrunner/toolkit/themes/winstripe/global/jar.mn (revision 209) ++++ xulrunner/toolkit/themes/winstripe/global/jar.mn (local) +@@ -153,3 +153,4 @@ + skin/classic/global/console/console-error-caret.gif (console/console-error-caret.gif) + skin/classic/global/console/console-error-dash.gif (console/console-error-dash.gif) + #endif ++ skin/classic/global/plugins.css (../../../../themes/classic/global/plugins.css) --- xulrunner-1.8.1.4.orig/debian/patches/25_gnome_helpers_with_params.dpatch +++ xulrunner-1.8.1.4/debian/patches/25_gnome_helpers_with_params.dpatch @@ -0,0 +1,389 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_gnome_helpers_with_params.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make helper applications with parameters work. Adapted patch from +## DP: bz#273524 + +@DPATCH@ + +=== 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__ --- xulrunner-1.8.1.4.orig/debian/patches/25_xpidl.dpatch +++ xulrunner-1.8.1.4/debian/patches/25_xpidl.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_xpidl.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix crash when no file is given on the command line. +## DP: Fix the error message about extra arguments given showing before +## DP: the crash. bz#331818. + +@DPATCH@ + +=== xpcom/typelib/xpidl/xpidl.c +================================================================== +--- xulrunner/xpcom/typelib/xpidl/xpidl.c (revision 62) ++++ xulrunner/xpcom/typelib/xpidl/xpidl.c (local) +@@ -260,7 +260,7 @@ + xpidl_usage(argc, argv); + return 1; + } +- if (argc != i + 1) { ++ if (argc > i + 1) { + fprintf(stderr, "ERROR: extra arguments after input file\n"); + } + +@@ -268,7 +268,9 @@ + * 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) ++ fprintf(stderr, "ERROR: no file to process\n"); ++ else if (xpidl_process_idl(argv[i], inc_head, file_basename, mode)) + return 0; + + return 1; --- xulrunner-1.8.1.4.orig/debian/patches/25_xrender_bug_workaround.dpatch +++ xulrunner-1.8.1.4/debian/patches/25_xrender_bug_workaround.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_xrender_bug_workaround.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to work around a bug in XRender. bz#252033 +## DP: Ultimately, the rendering is going to be done by cairo, so the bug +## DP: will disappear by itself when the gtk gfx engine will stop being used. + +@DPATCH@ + +=== gfx/src/gtk/nsFontMetricsXft.cpp +================================================================== +--- xulrunner/gfx/src/gtk/nsFontMetricsXft.cpp (revision 22) ++++ xulrunner/gfx/src/gtk/nsFontMetricsXft.cpp (local) +@@ -2188,19 +2188,27 @@ + nsAutoDrawSpecBuffer::Flush() + { + if (mSpecPos) { +- // Some Xft libraries will crash if none of the glyphs have any +- // area. So before we draw, we scan through the glyphs. If we +- // find any that have area, we can draw. +- for (PRUint32 i = 0; i < mSpecPos; i++) { +- XftGlyphFontSpec *sp = &mSpecBuffer[i]; +- XGlyphInfo info; +- XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info); +- if (info.width && info.height) { +- // If we get here it means we found a drawable glyph. We will +- // Draw all the remaining glyphs and then break out of the loop +- XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+i, mSpecPos-i); +- break; ++ // There are two Xft problems to work around here: ++ // 1. Some Xft libraries reportedly crash if none of the ++ // glyphs have any area. ++ // 2. Because of an apparent X server bug (see bug 252033), ++ // a glyph with no area may cause all following glyphs to be ++ // dropped under some circumstances. ++ // For this reason, we manually ship out blocks of glyphs with ++ // area and skip blocks of glyphs with no area. ++ PRUint32 start = 0; ++ while (start < mSpecPos) { ++ PRUint32 i; ++ for (i = start; i < mSpecPos; i++) { ++ XftGlyphFontSpec *sp = &mSpecBuffer[i]; ++ XGlyphInfo info; ++ XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info); ++ if (!info.width || !info.height) ++ break; + } ++ if (i > start) ++ XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+start, i-start); ++ start = i + 1; + } + mSpecPos = 0; + } --- xulrunner-1.8.1.4.orig/debian/patches/30_distclean.dpatch +++ xulrunner-1.8.1.4/debian/patches/30_distclean.dpatch @@ -0,0 +1,220 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_distclean.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make distclean cleaner. bz#333308. + +@DPATCH@ + +=== Makefile.in +================================================================== +--- xulrunner/Makefile.in (revision 73) ++++ xulrunner/Makefile.in (local) +@@ -456,6 +456,7 @@ + DIST_GARBAGE = config.cache config.log config.status config-defs.h \ + dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \ + unallmakefiles mozilla-config.h \ ++ gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ + $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out + + # Build pseudo-external modules first when export is explicitly called +=== build/unix/Makefile.in +================================================================== +--- xulrunner/build/unix/Makefile.in (revision 73) ++++ xulrunner/build/unix/Makefile.in (local) +@@ -71,7 +71,7 @@ + $(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 \ +=== extensions/java/xpcom/src/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/src/Makefile.in (revision 73) ++++ xulrunner/extensions/java/xpcom/src/Makefile.in (local) +@@ -92,7 +92,7 @@ + $(MOZ_COMPONENT_LIBS) \ + $(NULL) + +-GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files ++GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files .done + GARBAGE_DIRS += _javagen org + + include $(topsrcdir)/config/rules.mk +=== extensions/pref/system-pref/src/gconf/Makefile.in +================================================================== +--- xulrunner/extensions/pref/system-pref/src/gconf/Makefile.in (revision 73) ++++ xulrunner/extensions/pref/system-pref/src/gconf/Makefile.in (local) +@@ -84,3 +84,5 @@ + + export:: + $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . ++ ++GARBAGE += nsSystemPrefFactory.cpp +=== profile/dirserviceprovider/standalone/Makefile.in +================================================================== +--- xulrunner/profile/dirserviceprovider/standalone/Makefile.in (revision 73) ++++ xulrunner/profile/dirserviceprovider/standalone/Makefile.in (local) +@@ -65,3 +65,5 @@ + + export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS) + $(INSTALL) $^ . ++ ++GARBAGE = $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)) +=== security/manager/Makefile.in +================================================================== +--- xulrunner/security/manager/Makefile.in (revision 73) ++++ xulrunner/security/manager/Makefile.in (local) +@@ -158,6 +158,8 @@ + endif + touch $@ + ++GARBAGE += .nss.cleaned ++ + .nss.checkout: + touch $(srcdir)/$@ + +=== toolkit/library/Makefile.in +================================================================== +--- xulrunner/toolkit/library/Makefile.in (revision 73) ++++ xulrunner/toolkit/library/Makefile.in (local) +@@ -369,9 +369,13 @@ + 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 +=== toolkit/mozapps/downloads/src/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/downloads/src/Makefile.in (revision 73) ++++ xulrunner/toolkit/mozapps/downloads/src/Makefile.in (local) +@@ -45,6 +45,7 @@ + MODULE = helperAppDlg + + EXTRA_COMPONENTS = nsHelperAppDlg.js ++GARBAGE += nsHelperAppDlg.js + + include $(topsrcdir)/config/rules.mk + +=== toolkit/mozapps/extensions/src/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/extensions/src/Makefile.in (revision 73) ++++ xulrunner/toolkit/mozapps/extensions/src/Makefile.in (local) +@@ -45,6 +45,7 @@ + MODULE = extensions + + EXTRA_COMPONENTS = nsExtensionManager.js ++GARBAGE += nsExtensionManager.js + + include $(topsrcdir)/config/rules.mk + +=== toolkit/mozapps/update/src/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/update/src/Makefile.in (revision 73) ++++ xulrunner/toolkit/mozapps/update/src/Makefile.in (local) +@@ -49,6 +49,7 @@ + endif + + EXTRA_COMPONENTS = nsUpdateService.js ++GARBAGE += nsUpdateService.js + + ifeq ($(OS_ARCH),WINNT) + EXTRA_COMPONENTS += nsPostUpdateWin.js +=== toolkit/xre/Makefile.in +================================================================== +--- xulrunner/toolkit/xre/Makefile.in (revision 73) ++++ xulrunner/toolkit/xre/Makefile.in (local) +@@ -156,16 +156,14 @@ + 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) + +=== xpcom/build/Makefile.in +================================================================== +--- xulrunner/xpcom/build/Makefile.in (revision 73) ++++ xulrunner/xpcom/build/Makefile.in (local) +@@ -149,7 +149,7 @@ + # 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 + +=== xpcom/glue/standalone/Makefile.in +================================================================== +--- xulrunner/xpcom/glue/standalone/Makefile.in (revision 73) ++++ xulrunner/xpcom/glue/standalone/Makefile.in (local) +@@ -96,7 +96,7 @@ + # 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 + +=== xpfe/components/filepicker/src/Makefile.in +================================================================== +--- xulrunner/xpfe/components/filepicker/src/Makefile.in (revision 73) ++++ xulrunner/xpfe/components/filepicker/src/Makefile.in (local) +@@ -68,6 +68,7 @@ + $(NULL) + + EXTRA_COMPONENTS = nsFilePicker.js ++GARBAGE += nsFilePicker.js + + include $(topsrcdir)/config/rules.mk + +=== config/static-rules.mk +================================================================== +--- xulrunner/config/static-rules.mk ++++ xulrunner/config/static-rules.mk +@@ -14,6 +14,8 @@ + 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 +=== config/Makefile.in +================================================================== +--- xulrunner/config/Makefile.in (revision 167) ++++ xulrunner/config/Makefile.in (local) +@@ -144,6 +144,8 @@ + -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 --- xulrunner-1.8.1.4.orig/debian/patches/30_embedding_tests.dpatch +++ xulrunner-1.8.1.4/debian/patches/30_embedding_tests.dpatch @@ -0,0 +1,93 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_embedding_tests.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: embedding tests. bz#93213 + +@DPATCH@ + +Index: configure.in +=================================================================== +RCS file: /cvsroot/mozilla/configure.in,v +retrieving revision 1.1503 +diff -u -r1.1503 configure.in +--- xulrunner/configure.in 9 Aug 2005 07:41:30 -0000 1.1503 ++++ xulrunner/configure.in 30 Aug 2005 08:09:43 -0000 +@@ -5152,6 +5152,19 @@ + ENABLE_TESTS=, + ENABLE_TESTS=1 ) + ++ ++dnl ======================================================== ++dnl you can enable some tests even if tests are disabled by ++dnl previous option ++dnl ======================================================== ++ENABLE_EMBEDDING_TESTS=$ENABLE_TESTS ++MOZ_ARG_ENABLE_BOOL(embedding-tests, ++[ --enable-embedding-tests ++ Do build embedding tests libraries & programs, ++ even if tests are disabled], ++ ENABLE_EMBEDDING_TESTS=1, ++ ENABLE_EMBEDDING_TESTS= ) ++ + dnl ======================================================== + dnl = + dnl = Module specific options +@@ -6703,6 +6716,7 @@ + AC_SUBST(MOZ_STATIC_COMPONENT_LIBS) + AC_SUBST(MOZ_ENABLE_LIBXUL) + AC_SUBST(ENABLE_TESTS) ++AC_SUBST(ENABLE_EMBEDDING_TESTS) + AC_SUBST(IBMBIDI) + AC_SUBST(SUNCTL) + AC_SUBST(ACCESSIBILITY) +Index: config/autoconf.mk.in +=================================================================== +RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v +retrieving revision 3.363 +diff -u -r3.363 autoconf.mk.in +--- xulrunner/config/autoconf.mk.in 5 Aug 2005 17:09:41 -0000 3.363 ++++ xulrunner/config/autoconf.mk.in 30 Aug 2005 08:09:44 -0000 +@@ -106,6 +106,7 @@ + MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@ + MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@ + ENABLE_TESTS = @ENABLE_TESTS@ ++ENABLE_EMBEDDING_TESTS = @ENABLE_EMBEDDING_TESTS@ + IBMBIDI = @IBMBIDI@ + SUNCTL = @SUNCTL@ + ACCESSIBILITY = @ACCESSIBILITY@ +Index: embedding/browser/gtk/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/embedding/browser/gtk/Makefile.in,v +retrieving revision 1.8 +diff -u -r1.8 Makefile.in +--- xulrunner/embedding/browser/gtk/Makefile.in 18 Apr 2004 22:00:31 -0000 1.8 ++++ xulrunner/embedding/browser/gtk/Makefile.in 30 Aug 2005 08:09:50 -0000 +@@ -44,7 +44,10 @@ + include $(DEPTH)/config/autoconf.mk + + MODULE = gtkembedmoz +-DIRS=src tests ++DIRS = src ++ifdef ENABLE_EMBEDDING_TESTS ++DIRS += tests ++endif + + PACKAGE_FILE = gtkembed.pkg + +Index: embedding/browser/gtk/gtkembed.pkg +=================================================================== +RCS file: /cvsroot/mozilla/embedding/browser/gtk/gtkembed.pkg,v +retrieving revision 1.2 +diff -u -r1.2 gtkembed.pkg +--- xulrunner/embedding/browser/gtk/gtkembed.pkg 7 Jan 2004 01:21:23 -0000 1.2 ++++ xulrunner/embedding/browser/gtk/gtkembed.pkg 30 Aug 2005 08:09:50 -0000 +@@ -1,6 +1,8 @@ + [gtkembed] + dist/bin/@DLLP@gtkembedmoz@DLLS@ ++#if ENABLE_EMBEDDING_TESTS + dist/bin/TestGtkEmbed ++#endif + + #if ENABLE_TESTS + dist/bin/TestGtkEmbedNotebook@BINS@ --- xulrunner-1.8.1.4.orig/debian/patches/30_killAll.dpatch +++ xulrunner-1.8.1.4/debian/patches/30_killAll.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_killAll.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correctly install the killAll component. bz#333289. + +@DPATCH@ + +=== xpfe/components/killAll/Makefile.in +================================================================== +--- xulrunner/xpfe/components/killAll/Makefile.in (revision 69) ++++ xulrunner/xpfe/components/killAll/Makefile.in (local) +@@ -42,11 +42,10 @@ + + include $(DEPTH)/config/autoconf.mk + ++EXTRA_COMPONENTS = nsKillAll.js ++ + include $(topsrcdir)/config/rules.mk + +-libs:: +- $(INSTALL) $(srcdir)/nsKillAll.js $(DIST)/bin/components +- + clean:: + rm -f $(DIST)/bin/components/nsKillAll.js + --- xulrunner-1.8.1.4.orig/debian/patches/31_system_bz2.dpatch +++ xulrunner-1.8.1.4/debian/patches/31_system_bz2.dpatch @@ -0,0 +1,193 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 31_system_bz2.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use system bz2. bz#305782. + +@DPATCH@ + +=== Makefile.in +================================================================== +--- xulrunner/Makefile.in (revision 10) ++++ xulrunner/Makefile.in (local) +@@ -126,7 +126,9 @@ + endif + + ifdef MOZ_UPDATER ++ifndef MOZ_NATIVE_BZ2 + tier_1_dirs += modules/libbz2 ++endif + tier_1_dirs += modules/libmar + endif + +=== config/autoconf.mk.in +================================================================== +--- xulrunner/config/autoconf.mk.in (revision 10) ++++ xulrunner/config/autoconf.mk.in (local) +@@ -181,6 +181,7 @@ + NECKO_COOKIES = @NECKO_COOKIES@ + + MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@ ++MOZ_NATIVE_BZ2 = @SYSTEM_BZ2@ + MOZ_NATIVE_JPEG = @SYSTEM_JPEG@ + MOZ_NATIVE_PNG = @SYSTEM_PNG@ + MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@ +@@ -370,6 +371,14 @@ + ZLIB_REQUIRES = zlib + endif + ++MOZ_BZ2_CFLAGS = @MOZ_BZ2_CFLAGS@ ++MOZ_BZ2_LIBS = @MOZ_BZ2_LIBS@ ++ifdef MOZ_NATIVE_BZ2 ++BZ2_REQUIRES = ++else ++BZ2_REQUIRES = libbz2 ++endif ++ + ifdef MOZ_NATIVE_PNG + PNG_CFLAGS = @PNG_CFLAGS@ + PNG_LIBS = @PNG_LIBS@ +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 10) ++++ xulrunner/configure.in (local) +@@ -732,6 +732,8 @@ + MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg' + MOZ_ZLIB_CFLAGS= + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++MOZ_BZ2_CFLAGS= ++MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_CFLAGS= + MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng' + +@@ -1524,6 +1526,7 @@ + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib' + MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + OBJ_SUFFIX=obj + RANLIB='echo not_ranlib' + STRIP='echo not_strip' +@@ -1579,6 +1582,7 @@ + RCFLAGS='-O coff --use-temp-file' + MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++ MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_LIBS='-L$(DIST)/lib -lpng' + MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_FIX_LINK_PATHS= +@@ -1618,6 +1622,7 @@ + MOZ_OPTIMIZE_FLAGS='-O1' + MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + MOZ_PNG_LIBS='$(DIST)/lib/png.lib' + MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_FIX_LINK_PATHS= +@@ -1923,6 +1928,7 @@ + LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' + MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.$(LIB_SUFFIX)' + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)' + MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)' + MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_GFX_TOOLKIT)' +@@ -3569,6 +3575,35 @@ + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi + ++dnl system BZIP2 Support ++dnl ======================================================== ++MOZ_ARG_WITH_STRING(system-bz2, ++[ --with-system-bz2[=PFX] ++ Use system libbz2 [installed at prefix PFX]], ++ BZ2_DIR=$withval) ++ ++_SAVE_CFLAGS=$CFLAGS ++_SAVE_LDFLAGS=$LDFLAGS ++_SAVE_LIBS=$LIBS ++if test -n "${BZ2_DIR}" -a "${BZ2_DIR}" != "yes"; then ++ CFLAGS="-I${BZ2_DIR}/include $CFLAGS" ++ LDFLAGS="-L${BZ2_DIR}/lib $LDFLAGS" ++fi ++if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then ++ SYSTEM_BZ2= ++else ++ AC_CHECK_LIB(bz2, BZ2_bzread, [SYSTEM_BZ2=1 MOZ_BZ2_LIBS="-lbz2"], ++ [SYSTEM_BZ2= MOZ_BZ2_CFLAGS= MOZ_BZ2_LIBS=], $MOZ_BZ2_LIBS) ++fi ++CFLAGS=$_SAVE_CFLAGS ++LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS ++ ++if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$SYSTEM_BZ2" = 1; then ++ MOZ_BZ2_CFLAGS="-I${BZ2_DIR}/include" ++ MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}" ++fi ++ + dnl system PNG Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-png, +@@ -6679,6 +6714,7 @@ + AC_SUBST(SYSTEM_JPEG) + AC_SUBST(SYSTEM_PNG) + AC_SUBST(SYSTEM_ZLIB) ++AC_SUBST(SYSTEM_BZ2) + + AC_SUBST(JPEG_CFLAGS) + AC_SUBST(JPEG_LIBS) +@@ -6691,6 +6727,8 @@ + AC_SUBST(MOZ_JPEG_LIBS) + AC_SUBST(MOZ_ZLIB_CFLAGS) + AC_SUBST(MOZ_ZLIB_LIBS) ++AC_SUBST(MOZ_BZ2_CFLAGS) ++AC_SUBST(MOZ_BZ2_LIBS) + AC_SUBST(MOZ_PNG_CFLAGS) + AC_SUBST(MOZ_PNG_LIBS) + +=== toolkit/mozapps/update/src/updater/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/update/src/updater/Makefile.in (revision 10) ++++ xulrunner/toolkit/mozapps/update/src/updater/Makefile.in (local) +@@ -52,11 +52,11 @@ + + PROGRAM = updater$(BIN_SUFFIX) + +-REQUIRES = libmar libbz2 ++REQUIRES = libmar \ ++ $(BZ2_REQUIRES) + + LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ + $(NULL) + + ifeq ($(OS_ARCH),WINNT) +@@ -118,3 +118,6 @@ + # Pick up nsWindowsRestart.cpp + LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + endif ++ ++CXXFLAGS += $(MOZ_BZ2_CFLAGS) ++EXTRA_LIBS += $(MOZ_BZ2_LIBS) +=== toolkit/mozapps/update/src/updater/updater.cpp +================================================================== +--- xulrunner/toolkit/mozapps/update/src/updater/updater.cpp (revision 10) ++++ xulrunner/toolkit/mozapps/update/src/updater/updater.cpp (local) +@@ -52,6 +52,7 @@ + #include "archivereader.h" + #include "errors.h" + #include "bzlib.h" ++#include "nscore.h" + + #include + #include +@@ -121,7 +122,7 @@ + + // This variable lives in libbz2. It's declared in bzlib_private.h, so we just + // declare it here to avoid including that entire header file. +-extern "C" unsigned int BZ2_crc32Table[256]; ++extern "C" NS_IMPORT_(unsigned int) BZ2_crc32Table[256]; + + static unsigned int + crc32(const unsigned char *buf, unsigned int len) --- xulrunner-1.8.1.4.orig/debian/patches/32_print_command.dpatch +++ xulrunner-1.8.1.4/debian/patches/32_print_command.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 32_print_command.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix printer configurations. bz#326245. + +@DPATCH@ + +=== modules/libpref/src/init/all.js +================================================================== +--- xulrunner/modules/libpref/src/init/all.js (revision 67) ++++ xulrunner/modules/libpref/src/init/all.js (local) +@@ -1827,7 +1827,7 @@ + pref("applications.tn3270", "xterm -e tn3270 %h"); + pref("applications.rlogin", "xterm -e rlogin %h"); + pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u"); +-pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}"); ++pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}"); + pref("print.printer_list", ""); // list of printers, separated by spaces + pref("print.print_reversed", false); + pref("print.print_color", true); +@@ -2164,7 +2164,7 @@ + // pref("print.postscript.enabled", true); + pref("print.postscript.paper_size", "letter"); + pref("print.postscript.orientation", "portrait"); +-pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}"); ++pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}"); + + /* PostScript print module font config + * this list is used by the postscript font --- xulrunner-1.8.1.4.orig/debian/patches/35_gtkmozembed_change_toplevel.dpatch +++ xulrunner-1.8.1.4/debian/patches/35_gtkmozembed_change_toplevel.dpatch @@ -0,0 +1,137 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_gtkmozembed_change_toplevel.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix drop-down menus when gtkmozembed is moved from different toplevel. +## DP: Patch from bz#296002 + +@DPATCH@ + +=== widget/src/gtk2/nsWindow.cpp +================================================================== +--- xulrunner/widget/src/gtk2/nsWindow.cpp (revision 118) ++++ xulrunner/widget/src/gtk2/nsWindow.cpp (local) +@@ -116,6 +116,9 @@ + static int is_parent_grab_leave(GdkEventCrossing *aEvent); + + /* callbacks from widgets */ ++static void hierarchy_changed_cb (GtkWidget *container, ++ GtkWidget *previous_toplevel, ++ nsWindow *window); + static gboolean expose_event_cb (GtkWidget *widget, + GdkEventExpose *event); + static gboolean configure_event_cb (GtkWidget *widget, +@@ -261,6 +264,7 @@ + nsWindow::nsWindow() + { + mContainer = nsnull; ++ mParentContainer = nsnull; + mDrawingarea = nsnull; + mShell = nsnull; + mWindowGroup = nsnull; +@@ -432,6 +436,15 @@ + mDrawingarea = nsnull; + } + ++ if (mParentContainer) { ++ g_object_remove_weak_pointer(G_OBJECT (mParentContainer), ++ (void**) &mParentContainer); ++ g_signal_handlers_disconnect_by_func ++ (mParentContainer, (void*)hierarchy_changed_cb, this); ++ ++ mParentContainer = nsnull; ++ } ++ + OnDestroy(); + + #ifdef ACCESSIBILITY +@@ -2341,18 +2354,14 @@ + } + else if (mWindowType == eWindowType_popup) { + mShell = gtk_window_new(GTK_WINDOW_POPUP); +- if (topLevelParent) { +- gtk_window_set_transient_for(GTK_WINDOW(mShell), +- topLevelParent); +- mTransientParent = topLevelParent; ++ SetTransientParent(topLevelParent); + +- if (topLevelParent->group) { +- gtk_window_group_add_window(topLevelParent->group, +- GTK_WINDOW(mShell)); +- mWindowGroup = topLevelParent->group; +- } +- } +- } ++ mParentContainer = parentMozContainer; ++ g_object_add_weak_pointer(G_OBJECT(mParentContainer), ++ (void**)&mParentContainer); ++ g_signal_connect(parentMozContainer, "hierarchy-changed", ++ G_CALLBACK(hierarchy_changed_cb), this); ++ } + else { // must be eWindowType_toplevel + mShell = gtk_window_new(GTK_WINDOW_TOPLEVEL); + SetDefaultIcon(); +@@ -3236,6 +3245,25 @@ + return w; + } + ++void ++nsWindow::SetTransientParent(GtkWindow *aParent) ++{ ++ if (mTransientParent && mTransientParent->group) { ++ gtk_window_group_remove_window(mTransientParent->group, ++ GTK_WINDOW(mShell)); ++ mWindowGroup = nsnull; ++ } ++ ++ mTransientParent = aParent; ++ gtk_window_set_transient_for(GTK_WINDOW(mShell), aParent); ++ ++ if (aParent && aParent->group) { ++ gtk_window_group_add_window(aParent->group, ++ GTK_WINDOW(mShell)); ++ mWindowGroup = aParent->group; ++ } ++} ++ + NS_IMETHODIMP + nsWindow::MakeFullScreen(PRBool aFullScreen) + { +@@ -3605,6 +3633,16 @@ + // gtk callbacks + + /* static */ ++void ++hierarchy_changed_cb(GtkWidget *container, GtkWidget *previous_toplevel, nsWindow *window) ++{ ++ GtkWidget *toplevelCandidate = gtk_widget_get_toplevel (container); ++ GtkWidget *toplevel = GTK_WIDGET_TOPLEVEL (toplevelCandidate) ? toplevelCandidate : nsnull; ++ ++ window->SetTransientParent (GTK_WINDOW (toplevel)); ++} ++ ++/* static */ + gboolean + expose_event_cb(GtkWidget *widget, GdkEventExpose *event) + { +=== widget/src/gtk2/nsWindow.h +================================================================== +--- xulrunner/widget/src/gtk2/nsWindow.h (revision 118) ++++ xulrunner/widget/src/gtk2/nsWindow.h (local) +@@ -154,6 +154,8 @@ + void LoseFocus(); + gint ConvertBorderStyles(nsBorderStyle aStyle); + ++ void SetTransientParent(GtkWindow *aParent); ++ + // event callbacks + gboolean OnExposeEvent(GtkWidget *aWidget, + GdkEventExpose *aEvent); +@@ -294,6 +296,7 @@ + + GtkWidget *mShell; + MozContainer *mContainer; ++ MozContainer *mParentContainer; + MozDrawingarea *mDrawingarea; + + GtkWindowGroup *mWindowGroup; --- xulrunner-1.8.1.4.orig/debian/patches/35_pango_null_char.dpatch +++ xulrunner-1.8.1.4/debian/patches/35_pango_null_char.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_pango_null_char.dpatch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid freeze/crash when null characters are present in justified text +## DP: by discarding NULL characters before displaying. bz#366902 +## DP: I don't like to have the two backends do different things, so we +## DP: just unconditionally apply the workaround. + +@DPATCH@ + +=== layout/generic/nsTextTransformer.h +================================================================== +--- xulrunner/layout/generic/nsTextTransformer.h (revision 161) ++++ xulrunner/layout/generic/nsTextTransformer.h (local) +@@ -80,10 +80,10 @@ + #ifdef IBMBIDI + // added BIDI formatting codes + #define IS_DISCARDED(_ch) \ +- (((_ch) == CH_SHY) || ((_ch) == '\r') || IS_BIDI_CONTROL(_ch)) ++ (((_ch) == CH_SHY) || ((_ch) == '\r') || IS_BIDI_CONTROL(_ch) || ((_ch) == '\0')) + #else + #define IS_DISCARDED(_ch) \ +- (((_ch) == CH_SHY) || ((_ch) == '\r')) ++ (((_ch) == CH_SHY) || ((_ch) == '\r') || ((_ch) == '\0')) + #endif + + #define IS_ASCII_CHAR(ch) ((ch&0xff80) == 0) --- xulrunner-1.8.1.4.orig/debian/patches/35_psm_wakeups.dpatch +++ xulrunner-1.8.1.4/debian/patches/35_psm_wakeups.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_psm_wakeups.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid some cpu wake ups in PSM. bz#380558 + +@DPATCH@ + +--- xulrunner/security/manager/ssl/src/nsCertVerificationThread.cpp (revision 228) ++++ xulrunner/security/manager/ssl/src/nsCertVerificationThread.cpp (local) +@@ -123,12 +123,8 @@ + return NS_OK; + } + +-#define CONDITION_WAIT_TIME PR_TicksPerSecond() / 4 +- + void nsCertVerificationThread::Run(void) + { +- const PRIntervalTime wait_time = CONDITION_WAIT_TIME; +- + while (PR_TRUE) { + + nsBaseVerificationJob *job = nsnull; +@@ -139,7 +135,7 @@ + while (!mExitRequested && (0 == verification_thread_singleton->mJobQ.GetSize())) { + // no work to do ? let's wait a moment + +- PR_WaitCondVar(mCond, wait_time); ++ PR_WaitCondVar(mCond, PR_INTERVAL_NO_TIMEOUT); + } + + if (mExitRequested) +--- xulrunner/security/manager/ssl/src/nsSSLThread.cpp (revision 228) ++++ xulrunner/security/manager/ssl/src/nsSSLThread.cpp (local) +@@ -386,6 +386,8 @@ + + close_later = PR_TRUE; + ssl_thread_singleton->mSocketScheduledToBeDestroyed = si; ++ ++ PR_NotifyAllCondVar(ssl_thread_singleton->mCond); + } + } + +@@ -875,8 +877,7 @@ + { + // no work to do ? let's wait a moment + +- PRIntervalTime wait_time = PR_TicksPerSecond() / 4; +- PR_WaitCondVar(mCond, wait_time); ++ PR_WaitCondVar(mCond, PR_INTERVAL_NO_TIMEOUT); + } + + } while (!pending_work && !mExitRequested && !mSocketScheduledToBeDestroyed); --- xulrunner-1.8.1.4.orig/debian/patches/35_zip_cache.dpatch +++ xulrunner-1.8.1.4/debian/patches/35_zip_cache.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_zip_cache.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Invalidate cache for a zip file that got modified. It will prevent +## DP: corruption of the XUL FastLoad cache when upgrade is performed +## DP: while an instance of the application is running. bz#368428. + +@DPATCH@ + +--- iceape/modules/libjar/nsJAR.h ++++ iceape/modules/libjar/nsJAR.h +@@ -117,6 +117,10 @@ + mCache = cache; + } + ++ PRInt64 GetMtime() { ++ return mMtime; ++ } ++ + PRFileDesc* OpenFile(); + protected: + //-- Private data members +@@ -131,6 +135,7 @@ + PRLock* mLock; + PRInt32 mTotalItemsInManifest; + PRFileDesc* mFd; ++ PRInt64 mMtime; + + //-- Private functions + nsresult ParseManifest(nsISignatureVerifier* verifier); +--- iceape/modules/libjar/nsJAR.cpp ++++ iceape/modules/libjar/nsJAR.cpp +@@ -214,6 +214,7 @@ + nsJAR::Init(nsIFile* zipFile) + { + mZipFile = zipFile; ++ zipFile->GetLastModifiedTime(&mMtime); + mLock = PR_NewLock(); + return mLock ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + } +@@ -1216,15 +1217,24 @@ + rv = zipFile->GetNativePath(path); + if (NS_FAILED(rv)) return rv; + ++ PRInt64 Mtime; ++ rv = zipFile->GetLastModifiedTime(&Mtime); ++ if (NS_FAILED(rv)) return rv; ++ + nsCStringKey key(path); + nsJAR* zip = NS_STATIC_CAST(nsJAR*, NS_STATIC_CAST(nsIZipReader*,mZips.Get(&key))); // AddRefs +- if (zip) { ++ if (zip && LL_EQ(Mtime, zip->GetMtime())) { + #ifdef ZIP_CACHE_HIT_RATE + mZipCacheHits++; + #endif + zip->ClearReleaseTime(); + } + else { ++ if (zip) { ++ lock.unlock(); ++ mZips.Remove(&key); ++ lock.lock(); ++ } + zip = new nsJAR(); + if (zip == nsnull) + return NS_ERROR_OUT_OF_MEMORY; --- xulrunner-1.8.1.4.orig/debian/patches/38_arm_xpcom_optim.dpatch +++ xulrunner-1.8.1.4/debian/patches/38_arm_xpcom_optim.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_arm_xpcom_optim.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Antti P Miettinen to fix small optimization problem with +## DP: newer gcc's on arm. bz#322806 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp (local) +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + --- xulrunner-1.8.1.4.orig/debian/patches/38_hppa_xpcom.dpatch +++ xulrunner-1.8.1.4/debian/patches/38_hppa_xpcom.dpatch @@ -0,0 +1,245 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_hppa_xpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: patch from Ivar (Contributed by Randolph Chung) to fix Firefox on hppa. +## DP: bz#287150 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/Makefile.in +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (local) +@@ -184,6 +184,20 @@ + endif + endif + ++# ++# Linux/HPPA/GCC ++# ++ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter hppa,$(OS_TEST))) ++ifeq ($(CC),gcc) ++CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp ++ASFILES := xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s ++CXXFLAGS += -O0 ++endif ++endif ++endif ++ ++ + ###################################################################### + # M68k + ###################################################################### +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s (local) +@@ -0,0 +1,128 @@ ++ ++ .LEVEL 1.1 ++ .text ++ .align 4 ++ ++framesz: ++ .equ 128 ++ ++; XPTC_InvokeByIndex(nsISuppots* that, PRUint32 methodIndex, ++; PRUint32 paramCount, nsXPTCVariant* params); ++ ++.globl XPTC_InvokeByIndex ++ .type XPTC_InvokeByIndex, @function ++ ++ ++XPTC_InvokeByIndex: ++ .PROC ++ .CALLINFO FRAME=72, CALLER,SAVE_RP, SAVE_SP, ENTRY_GR=3 ++ .ENTRY ++ ++ ; frame marker takes 48 bytes, ++ ; register spill area takes 8 bytes, ++ ; local stack area takes 72 bytes result in 128 bytes total ++ ++ STW %rp,-20(%sp) ++ STW,MA %r3,128(%sp) ++ ++ LDO -framesz(%r30),%r28 ++ STW %r28,-4(%r30) ; save previous sp ++ STW %r19,-32(%r30) ++ ++ STW %r26,-36-framesz(%r30) ; save argument registers in ++ STW %r25,-40-framesz(%r30) ; in PREVIOUS frame ++ STW %r24,-44-framesz(%r30) ; ++ STW %r23,-48-framesz(%r30) ; ++ ++; B,L .+8,%r2 ++; ADDIL L'invoke_count_bytes-$PIC_pcrel$1+4,%r2,%r1 ++; ; LDO R'invoke_count_bytes-$PIC_pcrel$2+8(%r1),%r1 ++;$PIC_pcrel$1 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$2 ++; MTSP %r31,%sr0 ++ ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28 ++ BL invoke_count_bytes,%r31 ++ COPY %r31,%r2 ++ ++ CMPIB,>= 0,%r28, .+76 ++ COPY %r30,%r3 ; copy stack ptr to saved stack ptr ++ ADD %r30,%r28,%r30 ; extend stack frame ++ LDW -4(%r3),%r28 ; move frame ++ STW %r28,-4(%r30) ++ LDW -8(%r3),%r28 ++ STW %r28,-8(%r30) ++ LDW -12(%r3),%r28 ++ STW %r28,-12(%r30) ++ LDW -16(%r3),%r28 ++ STW %r28,-16(%r30) ++ LDW -20(%r3),%r28 ++ STW %r28,-20(%r30) ++ LDW -24(%r3),%r28 ++ STW %r28,-24(%r30) ++ LDW -28(%r3),%r28 ++ STW %r28,-28(%r30) ++ LDW -32(%r3),%r28 ++ STW %r28,-32(%r30) ++ ++ LDO -40(%r30),%r26 ; load copy address ++ LDW -44-framesz(%r3),%r25 ; load rest of 2 arguments ++ LDW -48-framesz(%r3),%r24 ; ++ ++ LDW -32(%r30),%r19 ; shared lib call destroys r19; reload ++; B,L .+8,%r2 ++; ADDIL L'invoke_copy_to_stack-$PIC_pcrel$3+4,%r2,%r1 ++; LDO R'invoke_copy_to_stack-$PIC_pcrel$4+8(%r1),%r1 ++;$PIC_pcrel$3 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$4 ++; MTSP %r31,%sr0 ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26 ++ BL invoke_copy_to_stack,%r31 ++ COPY %r31,%r2 ++ ++ LDO -48(%r30),%r20 ++ EXTRW,U,= %r28,31,1,%r22 ++ FLDD 0(%r20),%fr7 ; load double arg 1 ++ EXTRW,U,= %r28,30,1,%r22 ++ FLDW 8(%r20),%fr5L ; load float arg 1 ++ EXTRW,U,= %r28,29,1,%r22 ++ FLDW 4(%r20),%fr6L ; load float arg 2 ++ EXTRW,U,= %r28,28,1,%r22 ++ FLDW 0(%r20),%fr7L ; load float arg 3 ++ ++ LDW -36-framesz(%r3),%r26 ; load ptr to 'that' ++ LDW -40(%r30),%r25 ; load the rest of dispatch argument registers ++ LDW -44(%r30),%r24 ++ LDW -48(%r30),%r23 ++ ++ LDW -36-framesz(%r3),%r20 ; load vtable addr ++ LDW -40-framesz(%r3),%r28 ; load index ++ LDW 0(%r20),%r20 ; follow vtable ++; LDO 0(%r20),%r20 ; offset vtable by 16 bytes (g++: 8, aCC: 16) ++ SH2ADDL %r28,%r20,%r28 ; add 4*index to vtable entry ++ LDW 0(%r28),%r22 ; load vtable entry ++ ++; B,L .+8,%r2 ++; ADDIL L'$$dyncall_external-$PIC_pcrel$5+4,%r2,%r1 ++; LDO R'$$dyncall_external-$PIC_pcrel$6+8(%r1),%r1 ++;$PIC_pcrel$5 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$6 ++; MTSP %r31,%sr0 ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28; ++ BL $$dyncall,%r31 ++ COPY %r31,%r2 ++ ++ LDW -32(%r30),%r19 ++ COPY %r3,%r30 ; restore saved stack ptr ++ ++ LDW -148(%sp),%rp ++ LDWM -128(%sp),%r3 ++ BV,N (%rp) ++ NOP ++ .EXIT ++ .PROCEND ;in=23,24,25,26; ++ .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ++ +=== xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s (local) +@@ -0,0 +1,73 @@ ++ .LEVEL 1.1 ++ .TEXT ++ .ALIGN 4 ++ ++curframesz: ++ .EQU 128 ++ ++ ++; SharedStub has stack size of 128 bytes ++ ++lastframesz: ++ .EQU 64 ++ ++; the StubN C++ function has a small stack size of 64 bytes ++ ++ ++.globl SharedStub ++ .type SharedStub, @function ++ ++SharedStub: ++ .PROC ++ .CALLINFO CALLER,FRAME=80,SAVE_RP ++ ++ .ENTRY ++ STW %rp,-20(%sp) ++ LDO 128(%sp),%sp ++ ++ STW %r19,-32(%r30) ++ STW %r26,-36-curframesz(%r30) ; save arg0 in previous frame ++ ++ LDO -80(%r30),%r28 ++ FSTD,MA %fr5,8(%r28) ; save darg0 ++ FSTD,MA %fr7,8(%r28) ; save darg1 ++ FSTW,MA %fr4L,4(%r28) ; save farg0 ++ FSTW,MA %fr5L,4(%r28) ; save farg1 ++ FSTW,MA %fr6L,4(%r28) ; save farg2 ++ FSTW,MA %fr7L,4(%r28) ; save farg3 ++ ++ ; Former value of register 26 is already properly saved by StubN, ++ ; but register 25-23 are not because of the arguments mismatch ++ STW %r25,-40-curframesz-lastframesz(%r30) ; save r25 ++ STW %r24,-44-curframesz-lastframesz(%r30) ; save r24 ++ STW %r23,-48-curframesz-lastframesz(%r30) ; save r23 ++ COPY %r26,%r25 ; method index is arg1 ++ LDW -36-curframesz-lastframesz(%r30),%r26 ; self is arg0 ++ LDO -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2 ++ LDO -80(%r30),%r23 ; floating args is arg3 ++ ++; BL .+8,%r2 ++; ADDIL L'PrepareAndDispatch-$PIC_pcrel$0+4,%r2 ++; LDO R'PrepareAndDispatch-$PIC_pcrel$1+8(%r1),%r1 ++;$PIC_pcrel$0 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$1 ++; MTSP %r31,%sr0 ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28; ++ BL PrepareAndDispatch, %r31 ++ COPY %r31,%r2 ++ ++ LDW -32(%r30),%r19 ++ ++ LDW -148(%sp),%rp ++ LDO -128(%sp),%sp ++ ++ ++ BV,N (%rp) ++ NOP ++ NOP ++ ++ .EXIT ++ .PROCEND ;in=26;out=28; ++ ++ .SIZE SharedStub, .-SharedStub --- xulrunner-1.8.1.4.orig/debian/patches/38_ia64_align.dpatch +++ xulrunner-1.8.1.4/debian/patches/38_ia64_align.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_ia64_align.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from David Mosberger-Tang (fixed up by Eric Dorland) to fix +## DP: unaligned access on ia64 (and perhaps other platforms). bz#289394. + +@DPATCH@ + +=== extensions/transformiix/source/base/Double.cpp +================================================================== +--- xulrunner/extensions/transformiix/source/base/Double.cpp (revision 22) ++++ xulrunner/extensions/transformiix/source/base/Double.cpp (local) +@@ -75,14 +75,7 @@ + #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; +@@ -90,8 +83,14 @@ + 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; })) + +@@ -117,20 +116,20 @@ + + //-- 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 --- xulrunner-1.8.1.4.orig/debian/patches/38_kbsd.dpatch +++ xulrunner-1.8.1.4/debian/patches/38_kbsd.dpatch @@ -0,0 +1,325 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_kbsd.dpatch by Petr Salinger +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: GNU/kFreeBSD support. bz#356011 + +@DPATCH@ + +diff -ur mozilla/directory/c-sdk/config/nsinstall.c mozilla/directory/c-sdk/config/nsinstall.c +--- mozilla/directory/c-sdk/config/nsinstall.c 2002-03-27 11:06:18.000000000 +0100 ++++ mozilla/directory/c-sdk/config/nsinstall.c 2006-11-20 23:14:53.000000000 +0100 +@@ -106,7 +106,7 @@ + } + #endif /* NEXTSTEP */ + +-#ifdef LINUX ++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__) + #include + #endif + +diff -ur mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client +--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2002-03-26 22:53:26.000000000 +0100 ++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2006-11-20 23:00:17.000000000 +0100 +@@ -161,7 +161,7 @@ + EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib + endif + +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME) + EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib + endif +@@ -237,7 +237,7 @@ + ifeq ($(OS_ARCH), AIX) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else + $(LINK_LIB) $(EXTRA_LIBS) +diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in +--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100 ++++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100 +@@ -560,6 +560,7 @@ + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + darwin*) OS_ARCH=Darwin ;; +@@ -1260,7 +1261,7 @@ + esac + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH +@@ -1271,8 +1272,12 @@ + AC_DEFINE(_SVID_SOURCE) + AC_DEFINE(_LARGEFILE64_SOURCE) + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) +- AC_DEFINE(LINUX) +- AC_DEFINE(linux) ++ case "${target_os}" in ++ linux*) ++ AC_DEFINE(LINUX) ++ AC_DEFINE(linux) ++ ;; ++ esac + LD='$(CC)' + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +@@ -2186,7 +2191,7 @@ + _PTHREAD_LDFLAGS= + fi + ;; +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + AC_DEFINE(_REENTRANT) + ;; + esac +@@ -2262,7 +2267,7 @@ + fi + fi + ;; +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -n "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi +diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure +--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100 ++++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100 +@@ -2753,6 +2753,7 @@ + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + darwin*) OS_ARCH=Darwin ;; +@@ -3766,7 +3767,7 @@ + esac + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH +@@ -3795,14 +3796,18 @@ + #define HAVE_FCNTL_FILE_LOCKING 1 + EOF + +- cat >> confdefs.h <<\EOF ++ case "${target_os}" in ++ linux*) ++ cat >> confdefs.h <<\EOF + #define LINUX 1 + EOF + +- cat >> confdefs.h <<\EOF ++ cat >> confdefs.h <<\EOF + #define linux 1 + EOF + ++ ;; ++ esac + LD='$(CC)' + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +@@ -5281,7 +5286,7 @@ + _PTHREAD_LDFLAGS= + fi + ;; +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + cat >> confdefs.h <<\EOF + #define _REENTRANT 1 + EOF +@@ -5404,7 +5409,7 @@ + fi + fi + ;; +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -n "$USE_NSPR_THREADS"; then + cat >> confdefs.h <<\EOF + #define _PR_LOCAL_THREADS_ONLY 1 +diff -urN mozilla/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h +--- mozilla/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200 ++++ mozilla/directory/c-sdk/ldap/include/portable.h 2006-11-20 22:10:27.000000000 +0100 +@@ -116,7 +116,7 @@ + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi) + #define NEED_BSDREGEX + #endif + #endif +@@ -145,7 +145,7 @@ + * Is snprintf() part of the standard C runtime library? + */ + #if !defined(HAVE_SNPRINTF) +-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX) ++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX) + #define HAVE_SNPRINTF + #endif + #endif +@@ -165,7 +165,7 @@ + * for select() + */ + #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2) +-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS) ++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS) + #include + #else + #include +@@ -252,15 +252,14 @@ + #define HAVE_GETGRNAM_R + #endif + +-#if defined(SNI) || defined(LINUX1_2) ++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__) + int strcasecmp(const char *, const char *); + #ifdef SNI + int strncasecmp(const char *, const char *, int); +-#endif /* SNI */ +-#ifdef LINUX1_2 ++#else /* SNI */ + int strncasecmp(const char *, const char *, size_t); +-#endif /* LINUX1_2 */ +-#endif /* SNI || LINUX1_2 */ ++#endif ++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */ + + #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) +@@ -276,7 +275,7 @@ + defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \ + defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \ + ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \ +- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \ ++ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \ + defined(FREEBSD) || defined(OPENBSD) || \ + (defined(AIX) && !defined(USE_REENTRANT_LIBC)) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) +@@ -300,7 +299,7 @@ + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e ) + #endif + #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \ +- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \ ++ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \ + defined(SCOOS) || defined(BSDI) || defined(NCR) || \ + defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \ + (defined(AIX) && !defined(USE_REENTRANT_LIBC)) +@@ -320,7 +319,7 @@ + #endif + #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \ + defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \ +- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) ++ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) + #define STRTOK( s1, s2, l ) strtok( s1, s2 ) + #else + #define HAVE_STRTOK_R +diff -urN mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in +--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200 ++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2006-11-20 22:10:27.000000000 +0100 +@@ -168,7 +168,7 @@ + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc + endif + +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif + +@@ -286,7 +286,7 @@ + ifdef SO_FILES_TO_REMOVE + -$(RM) $(SO_FILES_TO_REMOVE) + endif +-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) ++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else + ifeq ($(OS_ARCH),OS2) +diff -urN mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c +--- mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100 ++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2006-11-20 22:10:27.000000000 +0100 +@@ -218,7 +218,7 @@ + + #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \ + defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \ +- defined(OPENBSD) || defined(NETBSD) ++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__) + #define EDEADLOCK -1 + #endif + +diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:20:44.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:10:27.000000000 +0100 +@@ -70,7 +70,7 @@ + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 20:37:11.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-11-20 22:10:27.000000000 +0100 +@@ -67,7 +67,7 @@ + * + */ + +-#if defined(LINUX) ++#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__)) + + #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7) + /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */ +diff -urN mozilla/configure.in mozilla/configure.in +--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100 ++++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100 +@@ -812,6 +812,7 @@ + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; +@@ -1261,7 +1262,7 @@ + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" +@@ -2169,7 +2170,7 @@ + dnl = Flags to strip unused symbols from .so components + dnl ======================================================== + case "$target" in +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' + ;; + *-solaris*) +@@ -2735,7 +2736,7 @@ + fi + ;; + +- *-*-linux*) ++ *-*-linux*|*-*-kfreebsd*-gnu) + AC_DEFINE(_REENTRANT) + ;; + --- xulrunner-1.8.1.4.orig/debian/patches/38_mips_xpcom.dpatch +++ xulrunner-1.8.1.4/debian/patches/38_mips_xpcom.dpatch @@ -0,0 +1,492 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_mips_xpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Thiemo Seufer to fix mips. bz#258429 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/Makefile.in +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (local) +@@ -227,13 +227,9 @@ + ifneq (,$(findstring mips, $(OS_TEST))) + CPPSRCS := xptcinvoke_mips.cpp xptcstubs_mips.cpp + ASFILES := xptcinvoke_asm_mips.s xptcstubs_asm_mips.s +-#xptcstubs_mips.cpp +-# xptcstubs_asm_mips.s +-ifdef GNU_CC +-ASFLAGS += $(INCLUDES) -x assembler-with-cpp -D__GNUC__ ++AS := $(CC) $(CFLAGS) $(INCLUDES) -c -x assembler-with-cpp + endif + endif +-endif + + ###################################################################### + # PowerPC +@@ -378,10 +374,8 @@ + + ifeq ($(OS_ARCH),Linux) + ifneq (,$(findstring mips, $(OS_TEST))) +-xptcstubs_asm_mips.o: xptcstubs_asm_mips.s.m4 $(PUBLIC)/xptcstubsdef.inc +- m4 $(INCLUDES) $< > ./xptcstubs_asm_mips.s && \ +- $(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_mips.s +- $(RM) -f ./xptcstubs_asm_mips.s ++xptcstubs_asm_mips.o: xptcstubs_asm_mips.s $(PUBLIC)/xptcstubsdef.inc ++ $(AS) -o $@ $< + endif + endif + +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s (local) +@@ -21,6 +21,7 @@ + * Contributor(s): + * Brendan Eich + * Stuart Parmenter ++ * Thiemo Seufer + */ + + /* This code is for MIPS using the O32 ABI. */ +@@ -28,139 +29,123 @@ + #include + #include + +-.text +-.globl invoke_count_words +-.globl invoke_copy_to_stack ++# NARGSAVE is the argument space in the callers frame, including extra ++# 'shadowed' space for the argument registers. The minimum of 4 ++# argument slots is sometimes predefined in the header files. ++#ifndef NARGSAVE ++#define NARGSAVE 4 ++#endif + +-# We need a variable number of words allocated from the stack for copies of +-# the params, and this space must come between the high frame (where ra, gp, +-# and s0 are saved) and the low frame (where a0-a3 are saved by the callee +-# functions we invoke). ++#define LOCALSZ 3 /* gp, fp, ra */ ++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK) + +-LOCALSZ=4 # s0, s1, ra, gp +-NARGSAVE=4 # a0, a1, a2, a3 +-HIFRAMESZ=(LOCALSZ*SZREG) +-LOFRAMESZ=(NARGSAVE*SZREG) +-FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK ++#define RAOFF (FRAMESZ - (1*SZREG)) ++#define FPOFF (FRAMESZ - (2*SZREG)) ++#define GPOFF (FRAMESZ - (3*SZREG)) + +-# XXX these 2*SZREG, etc. are very magic -- we *know* that ALSZ&ALMASK cause +-# FRAMESZ to be 0 mod 8, in this case to be 16 and not 12. +-RAOFF=FRAMESZ - (2*SZREG) +-GPOFF=FRAMESZ - (3*SZREG) +-S0OFF=FRAMESZ - (4*SZREG) +-S1OFF=FRAMESZ - (5*SZREG) ++#define A0OFF (FRAMESZ + (0*SZREG)) ++#define A1OFF (FRAMESZ + (1*SZREG)) ++#define A2OFF (FRAMESZ + (2*SZREG)) ++#define A3OFF (FRAMESZ + (3*SZREG)) + +-# These are not magic -- they are just our argsave slots in the caller frame. +-A0OFF=FRAMESZ +-A1OFF=FRAMESZ + (1*SZREG) +-A2OFF=FRAMESZ + (2*SZREG) +-A3OFF=FRAMESZ + (3*SZREG) ++ .text + +- # +- # _XPTC_InvokeByIndex(that, methodIndex, paramCount, params) +- # a0 a1 a2 a3 ++# ++# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params) ++# a0 a1 a2 a3 + +-NESTED(_XPTC_InvokeByIndex, FRAMESZ, ra) +- +- .set noreorder +- .cpload t9 +- .set reorder +- ++ .globl _XPTC_InvokeByIndex ++ .align 2 ++ .type _XPTC_InvokeByIndex,@function ++ .ent _XPTC_InvokeByIndex,0 ++ .frame fp, FRAMESZ, ra ++_XPTC_InvokeByIndex: ++ SETUP_GP + subu sp, FRAMESZ + +- # specify the save register mask -- XXX do we want the a0-a3 here, given +- # our "split" frame where the args are saved below a dynamicly allocated +- # region under the high frame? +- # +- # 10010000000000010000000011110000 +- .mask 0x900100F0, -((NARGSAVE+LOCALSZ)*SZREG) ++ # specify the save register mask for gp, fp, ra, a3 - a0 ++ .mask 0xD00000F0, RAOFF-FRAMESZ + +- # thou shalt not use .cprestore if yer frame has variable size... +- # .cprestore GPOFF ++ sw ra, RAOFF(sp) ++ sw fp, FPOFF(sp) + +- REG_S ra, RAOFF(sp) ++ # we can't use .cprestore in a variable stack frame ++ sw gp, GPOFF(sp) + +- # this happens automatically with .cprestore, but we cannot use that op... +- REG_S gp, GPOFF(sp) +- REG_S s0, S0OFF(sp) +- REG_S s1, S1OFF(sp) ++ sw a0, A0OFF(sp) ++ sw a1, A1OFF(sp) ++ sw a2, A2OFF(sp) ++ sw a3, A3OFF(sp) + +- REG_S a0, A0OFF(sp) +- REG_S a1, A1OFF(sp) +- REG_S a2, A2OFF(sp) +- REG_S a3, A3OFF(sp) ++ # save bottom of fixed frame ++ move fp, sp + +- # invoke_count_words(paramCount, params) ++ # extern "C" uint32 ++ # invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s); ++ la t9, invoke_count_words + move a0, a2 + move a1, a3 ++ jalr t9 ++ lw gp, GPOFF(fp) + +- jal invoke_count_words +- lw gp, GPOFF(sp) ++ # allocate variable stack, with a size of: ++ # wordsize (of 4 bytes) * result (already aligned to dword) ++ # but a minimum of 16 byte ++ sll v0, 2 ++ slt t0, v0, 16 ++ beqz t0, 1f ++ li v0, 16 ++1: subu sp, v0 + +- # save the old sp so we can pop the param area and any "low frame" +- # needed as an argsave area below the param block for callees that +- # we invoke. +- move s0, sp +- +- REG_L a1, A2OFF(sp) # a1 = paramCount +- REG_L a2, A3OFF(sp) # a2 = params +- +- # we define a word as 4 bytes, period end of story! +- sll v0, 2 # 4 bytes * result of invoke_copy_words +- subu v0, LOFRAMESZ # but we take back the argsave area built into +- # our stack frame -- SWEET! +- subu sp, sp, v0 # make room +- move a0, sp # a0 = param stack address +- move s1, a0 # save it for later -- it should be safe here +- +- # the old sp is still saved in s0, but we now need another argsave +- # area ("low frame") for the invoke_copy_to_stack call. +- subu sp, sp, LOFRAMESZ +- +- # copy the param into the stack areas ++ # let a0 point to the bottom of the variable stack, allocate ++ # another fixed stack for: ++ # extern "C" void + # invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, +- # nsXPTCVariant* s) +- jal invoke_copy_to_stack +- lw gp, GPOFF(s0) ++ # nsXPTCVariant* s); ++ la t9, invoke_copy_to_stack ++ move a0, sp ++ lw a1, A2OFF(fp) ++ lw a2, A3OFF(fp) ++ subu sp, 16 ++ jalr t9 ++ lw gp, GPOFF(fp) + +- move sp, s0 # get orig sp back, popping params and argsave ++ # back to the variable stack frame ++ addu sp, 16 + +- REG_L a0, A0OFF(sp) # a0 = set "that" to be "this" +- REG_L a1, A1OFF(sp) # a1 = methodIndex +- +- # t1 = methodIndex * 4 +- # (use shift instead of mult) +- sll t1, a1, 2 +- +- # calculate the function we need to jump to, +- # which must then be saved in t9 ++ # calculate the function we need to jump to, which must then be ++ # stored in t9 ++ lw a0, A0OFF(fp) # a0 = set "that" to be "this" ++ lw t0, A1OFF(fp) # a1 = methodIndex + lw t9, 0(a0) +- addu t9, t9, t1 +- lw t9, 8(t9) ++ # t0 = methodIndex << PTRLOG ++ sll t0, t0, PTRLOG ++ addu t9, t0 ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++ lw t9, (t9) ++#else /* not G++ V3 ABI */ ++ lw t9, 2*PTRSIZE(t9) ++#endif /* G++ V3 ABI */ + +- # a1..a3 and f13..f14 should now be set to what +- # invoke_copy_to_stack told us. skip a0 and f12 +- # because that is the "this" pointer ++ # Set a1-a3 to what invoke_copy_to_stack told us. a0 is already ++ # the "this" pointer. We don't have to care about floating ++ # point arguments, the non-FP "this" pointer as first argument ++ # means they'll never be used. ++ lw a1, 1*SZREG(sp) ++ lw a2, 2*SZREG(sp) ++ lw a3, 3*SZREG(sp) + +- REG_L a1, 1*SZREG(s1) +- REG_L a2, 2*SZREG(s1) +- REG_L a3, 3*SZREG(s1) ++ jalr t9 ++ # Micro-optimization: There's no gp usage below this point, so ++ # we don't reload. ++ # lw gp, GPOFF(fp) + +- l.d $f13, 8(s1) +- l.d $f14, 16(s1) ++ # leave variable stack frame ++ move sp, fp + +- # Create the stack pointer for the function, which must have 4 words +- # of space for callee-saved args. invoke_count_words allocated space +- # for a0 starting at s1, so we just move s1 into sp. +- move sp, s1 ++ lw ra, RAOFF(sp) ++ lw fp, FPOFF(sp) + +- jalr ra, t9 +- lw gp, GPOFF(s0) +- +- move sp, s0 +- +- REG_L ra, RAOFF(sp) +- REG_L s0, S0OFF(sp) +- addu sp, FRAMESZ ++ addiu sp, FRAMESZ + j ra +-.end _XPTC_InvokeByIndex ++END(_XPTC_InvokeByIndex) +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp (local) +@@ -24,6 +24,7 @@ + * Contributor(s): + * Stuart Parmenter + * Brendan Eich ++ * Thiemo Seufer + * + * 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"), +@@ -52,10 +53,8 @@ + // Count a word for a0 even though it's never stored or loaded + // We do this only for alignment of register pairs. + PRUint32 result = 1; +- for (PRUint32 i = 0; i < paramCount; i++, s++) ++ for (PRUint32 i = 0; i < paramCount; i++, result++, s++) + { +- result++; +- + if (s->IsPtrData()) + continue; + +@@ -68,6 +67,9 @@ + result++; + result++; + break; ++ ++ default: ++ break; + } + } + return (result + 1) & ~(PRUint32)1; +@@ -88,8 +90,6 @@ + continue; + } + +- *((void**)d) = s->val.p; +- + switch(s->type) + { + case nsXPTType::T_I64 : +@@ -104,6 +104,9 @@ + if ((PRWord)d & 4) d++; + *((double*) d) = s->val.d; d++; + break; ++ default: ++ *((void**)d) = s->val.p; ++ break; + } + } + } +@@ -118,5 +121,4 @@ + PRUint32 paramCount, nsXPTCVariant* params) + { + return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params); +-} +- ++} +=== xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s (local) +@@ -0,0 +1,142 @@ ++/* -*- Mode: asm; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * 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 ++ * Netscape Communications Corp, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2001 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter ++ * Chris Waterson ++ * Thiemo Seufer ++ */ ++ ++/* This code is for MIPS using the O32 ABI. */ ++ ++#include ++#include ++ ++# NARGSAVE is the argument space in the callers frame, including extra ++# 'shadowed' space for the argument registers. The minimum of 4 ++# argument slots is sometimes predefined in the header files. ++#ifndef NARGSAVE ++#define NARGSAVE 4 ++#endif ++ ++#define LOCALSZ 2 /* gp, ra */ ++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK) ++ ++#define RAOFF (FRAMESZ - (1*SZREG)) ++#define GPOFF (FRAMESZ - (2*SZREG)) ++ ++#define A0OFF (FRAMESZ + (0*SZREG)) ++#define A1OFF (FRAMESZ + (1*SZREG)) ++#define A2OFF (FRAMESZ + (2*SZREG)) ++#define A3OFF (FRAMESZ + (3*SZREG)) ++ ++ .text ++ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++#define STUB_ENTRY(x) \ ++ .if x < 10; \ ++ .globl _ZN14nsXPTCStubBase5Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase5Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase5Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase5Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .elseif x < 100; \ ++ .globl _ZN14nsXPTCStubBase6Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase6Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase6Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase6Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .elseif x < 1000; \ ++ .globl _ZN14nsXPTCStubBase7Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase7Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase7Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase7Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .else; \ ++ .err; \ ++ .endif ++#else /* not G++ V3 ABI */ ++#define STUB_ENTRY(x) \ ++ .globl Stub ##x ##__14nsXPTCStubBase; \ ++ .type Stub ##x ##__14nsXPTCStubBase,@function; \ ++ .aent Stub ##x ##__14nsXPTCStubBase,0; \ ++Stub ##x ##__14nsXPTCStubBase:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub ++#endif /* G++ V3 ABI */ ++ ++# SENTINEL_ENTRY is handled in the cpp file. ++#define SENTINEL_ENTRY(x) ++ ++# ++# open a dummy frame for the function entries ++# ++ .align 2 ++ .type dummy,@function ++ .ent dummy, 0 ++ .frame sp, FRAMESZ, ra ++dummy: ++ SETUP_GP ++ ++#include "xptcstubsdef.inc" ++ ++sharedstub: ++ subu sp, FRAMESZ ++ ++ # specify the save register mask for gp, ra, a0-a3 ++ .mask 0x900000F0, RAOFF-FRAMESZ ++ ++ sw ra, RAOFF(sp) ++ SAVE_GP(GPOFF) ++ ++ # Micro-optimization: a0 is already loaded, and its slot gets ++ # ignored by PrepareAndDispatch, so no need to save it here. ++ # sw a0, A0OFF(sp) ++ sw a1, A1OFF(sp) ++ sw a2, A2OFF(sp) ++ sw a3, A3OFF(sp) ++ ++ la t9, PrepareAndDispatch ++ ++ # t0 is methodIndex ++ move a1, t0 ++ # have a2 point to the begin of the argument space on stack ++ addiu a2, sp, FRAMESZ ++ ++ # PrepareAndDispatch(that, methodIndex, args) ++ jalr t9 ++ ++ # Micro-optimization: Using jalr explicitly has the side-effect ++ # of not triggering .cprestore. This is ok because we have no ++ # gp reference below this point. It also allows better ++ # instruction sscheduling. ++ # lw gp, GPOFF(fp) ++ ++ lw ra, RAOFF(sp) ++ addiu sp, FRAMESZ ++ j ra ++ END(dummy) --- xulrunner-1.8.1.4.orig/debian/patches/38_sparc64_unichar_alignment.dpatch +++ xulrunner-1.8.1.4/debian/patches/38_sparc64_unichar_alignment.dpatch @@ -0,0 +1,181 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_sparc64_unichar_alignment.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from bz#161826 to fix alignment issues on sparc64. + +@DPATCH@ + +=== gfx/src/gtk/nsFontMetricsPango.cpp +================================================================== +--- xulrunner/gfx/src/gtk/nsFontMetricsPango.cpp (revision 101) ++++ xulrunner/gfx/src/gtk/nsFontMetricsPango.cpp (local) +@@ -532,11 +532,23 @@ + nsRenderingContextGTK *aContext) + { + nsresult rv = NS_OK; +- ++ gchar *text = NULL; + PangoLayout *layout = pango_layout_new(mPangoContext); + +- gchar *text = g_utf16_to_utf8(aString, aLength, +- NULL, NULL, NULL); ++ // Just copy the aString to ensure the alignment, ++ // it is not used anywhere else. ++ PRUnichar* dummy = (PRUnichar *) PR_Malloc(aLength*sizeof(PRUnichar)); ++ if(!dummy) { ++#ifdef DEBUG ++ NS_WARNING("nsFontMetricsPango::GetTextDimensions malloc() failed"); ++#endif ++ rv = NS_ERROR_FAILURE; ++ goto out; ++ } ++ memcpy(dummy, aString, aLength*sizeof(PRUnichar)); ++ text = g_utf16_to_utf8(dummy, aLength, ++ NULL, NULL, NULL); ++ PR_Free(dummy); + + if (!text) { + #ifdef DEBUG +@@ -577,6 +589,7 @@ + + loser: + g_free(text); ++ out: + g_object_unref(layout); + + return rv; +=== layout/generic/nsTextFrame.cpp +================================================================== +--- xulrunner/layout/generic/nsTextFrame.cpp (revision 101) ++++ xulrunner/layout/generic/nsTextFrame.cpp (local) +@@ -5101,8 +5101,8 @@ + + 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--)); + } + } + +@@ -6199,9 +6199,9 @@ + { + PRUnichar* end = aBuffer + aWordLen; + for (; aBuffer < end; aBuffer++) { +- PRUnichar ch = *aBuffer; ++ PRUnichar ch = GetUnichar(aBuffer); + if (ch == ' ') { +- *aBuffer = CH_NBSP; ++ SetUnichar(aBuffer, CH_NBSP); + } + } + } +=== intl/lwbrk/src/nsJISx4501LineBreaker.cpp +================================================================== +--- xulrunner/intl/lwbrk/src/nsJISx4501LineBreaker.cpp (revision 101) ++++ xulrunner/intl/lwbrk/src/nsJISx4501LineBreaker.cpp (local) +@@ -487,13 +487,13 @@ + 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]))) + goto ROUTE_CJK_NEXT; + } + *oNext = aLen; +@@ -503,13 +503,13 @@ + 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) +@@ -521,13 +521,13 @@ + + 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)) { +=== intl/unicharutil/util/nsUnicharUtils.cpp +================================================================== +--- xulrunner/intl/unicharutil/util/nsUnicharUtils.cpp (revision 101) ++++ xulrunner/intl/unicharutil/util/nsUnicharUtils.cpp (local) +@@ -340,3 +340,28 @@ + 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 ++} ++ ++ +=== intl/unicharutil/util/nsUnicharUtils.h +================================================================== +--- xulrunner/intl/unicharutil/util/nsUnicharUtils.h (revision 101) ++++ xulrunner/intl/unicharutil/util/nsUnicharUtils.h (local) +@@ -82,6 +82,11 @@ + PRUnichar ToUpperCase(PRUnichar); + PRUnichar ToLowerCase(PRUnichar); + ++#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__) || defined(__ia64) ++ ++PRUnichar GetUnichar(const void *); ++void SetUnichar(void *, PRUnichar); ++ + inline PRBool IsUpperCase(PRUnichar c) { + return ToLowerCase(c) != c; + } --- xulrunner-1.8.1.4.orig/debian/patches/60_config_install.dpatch +++ xulrunner-1.8.1.4/debian/patches/60_config_install.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_config_install.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correct installation of all the headers files from the config/ +## DP: directory. + +@DPATCH@ + +=== config/Makefile.in +================================================================== +--- xulrunner/config/Makefile.in (revision 77) ++++ xulrunner/config/Makefile.in (local) +@@ -157,8 +157,7 @@ + echo "(nsBuildID.h is missing.)"; \ + exit 1; \ + fi; +- $(SYSINSTALL) $(IFLAGS1) nsBuildID.h $(DESTDIR)$(includedir) +- $(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir) ++ $(SYSINSTALL) $(IFLAGS1) $(HEADERS) $(DESTDIR)$(includedir) + + GARBAGE += build_number nsBuildID \ + $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) --- xulrunner-1.8.1.4.orig/debian/patches/60_js_binary.dpatch +++ xulrunner-1.8.1.4/debian/patches/60_js_binary.dpatch @@ -0,0 +1,116 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_js_binary.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - JS binary. bz#331776 +## DP: - Add readline support to xpcshell. + +@DPATCH@ + +=== config/autoconf.mk.in +================================================================== +--- xulrunner/config/autoconf.mk.in (revision 7) ++++ xulrunner/config/autoconf.mk.in (local) +@@ -73,6 +73,9 @@ + MOZ_X11 = @MOZ_X11@ + + MOZ_JS_LIBS = @MOZ_JS_LIBS@ ++ENABLE_JS_BINARY = @ENABLE_JS_BINARY@ ++HAVE_READLINE = @HAVE_READLINE@ ++READLINE_LIBS = @READLINE_LIBS@ + + MOZ_GFX_TOOLKIT_LDFLAGS = @MOZ_GFX_TOOLKIT_LDFLAGS@ + MOZ_WIDGET_TOOLKIT_LDFLAGS = @MOZ_WIDGET_TOOLKIT_LDFLAGS@ +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 7) ++++ xulrunner/config/rules.mk (local) +@@ -898,7 +898,7 @@ + ifeq ($(CPP_PROG_LINK),1) + $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) + else +- $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) ++ $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) $(PROG_LIBS) + endif # CPP_PROG_LINK + endif # WINNT && !GNU_CC + endif # OS/2 VACPP +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 7) ++++ xulrunner/configure.in (local) +@@ -5116,6 +5116,40 @@ + AC_SUBST(JS_ULTRASPARC_OPTS) + + dnl ======================================================== ++dnl = Enable building of the js standalone binary ++dnl ======================================================== ++MOZ_ARG_ENABLE_BOOL(js-binary, ++[ --enable-js-binary Build the standalone JS program], ++ ENABLE_JS_BINARY=1, ++ ENABLE_JS_BINARY= ) ++AC_SUBST(ENABLE_JS_BINARY) ++ ++if test -n "$ENABLE_JS_BINARY"; then ++ dnl readline Support ++ dnl ======================================================== ++ READLINE_DIR=no ++ MOZ_ARG_WITH_STRING(readline, ++ [ --with-readline[=PFX] ++ Use libreadline [installed at prefix PFX]], ++ READLINE_DIR=$withval) ++ ++ if test -n "${READLINE_DIR}" -a "${READLINE_DIR}" != "no"; then ++ _SAVE_LDFLAGS=$LDFLAGS ++ LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" ++ AC_CHECK_LIB(readline, readline, [HAVE_READLINE=1 READLINE_LIBS="-lreadline"], ++ [HAVE_READLINE= READLINE_LIBS=]) ++ LDFLAGS=$_SAVE_LDFLAGS ++ fi ++ ++ if test "${READLINE_DIR}" -a -d "${READLINE_DIR}" -a "$HAVE_READLINE" = 1; then ++ READLINE_LIBS="-L${READLINE_DIR}/lib ${READLINE_LIBS}" ++ fi ++fi ++ ++AC_SUBST(HAVE_READLINE) ++AC_SUBST(READLINE_LIBS) ++ ++dnl ======================================================== + dnl = + dnl = Feature options that require extra sources to be pulled + dnl = +=== js/src/Makefile.in +================================================================== +--- xulrunner/js/src/Makefile.in (revision 7) ++++ xulrunner/js/src/Makefile.in (local) +@@ -54,6 +54,16 @@ + RESFILE = js$(MOZ_BITS)40.res + endif + ++ifdef ENABLE_JS_BINARY ++SIMPLE_PROGRAMS = js ++PROG_LIBS = -L. $(MOZ_JS_LIBS) $(NSPR_LIBS) ++$(SIMPLE_PROGRAMS): $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX) ++ifdef HAVE_READLINE ++PROG_LIBS += $(READLINE_LIBS) ++DEFINES = -DEDITLINE ++endif ++endif ++ + PACKAGE_FILE = js.pkg + + # JavaScript must be built shared, even for static builds, as it is used by +=== js/src/xpconnect/shell/Makefile.in +================================================================== +--- xulrunner/js/src/xpconnect/shell/Makefile.in (revision 69) ++++ xulrunner/js/src/xpconnect/shell/Makefile.in (local) +@@ -74,7 +74,7 @@ + # look at mozilla/js/src/editline, which is license-free (but not part + # of the mozilla build.) + # +-ifdef JS_READLINE ++ifdef HAVE_READLINE + DEFINES += -DEDITLINE +-LIBS += -lreadline $(JS_READLINE_EXTRA_LIBS) ++LIBS += $(READLINE_LIBS) + endif --- xulrunner-1.8.1.4.orig/debian/patches/60_pyxpcom.dpatch +++ xulrunner-1.8.1.4/debian/patches/60_pyxpcom.dpatch @@ -0,0 +1,57 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_pyxpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Fix installation directory for PyXPCOM +## DP: - Use a make variable for PYTHON_SO + +@DPATCH@ + +=== extensions/python/xpcom/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/Makefile.in (revision 85) ++++ xulrunner/extensions/python/xpcom/Makefile.in (local) +@@ -90,9 +90,9 @@ + $(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools + + install:: +- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom +- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client +- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server ++ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom ++ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client ++ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server + + clobber:: + rm -rf $(DIST)/bin/python/xpcom +=== extensions/python/xpcom/src/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/src/Makefile.in (revision 85) ++++ xulrunner/extensions/python/xpcom/src/Makefile.in (local) +@@ -104,9 +104,11 @@ + + install:: + ifneq ($(OS_ARCH),WINNT) +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom +- mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX) ++ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom ++ mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX) + endif ++ rm -f $(DESTDIR)$(mozappdir)/$(SHARED_LIBRARY) ++ rm -f $(DESTDIR)$(mozappdir)/$(IMPORT_LIBRARY) + + clobber:: + rm -f *.ilk *.pdb +=== extensions/python/xpcom/src/loader/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/src/loader/Makefile.in (revision 94) ++++ xulrunner/extensions/python/xpcom/src/loader/Makefile.in (local) +@@ -61,7 +61,7 @@ + include $(topsrcdir)/config/config.mk + + include $(topsrcdir)/config/rules.mk +-CXXFLAGS += -DPYTHON_SO=\"libpython$(PYTHON_VER_DOTTED).so\" ++CXXFLAGS += -DPYTHON_SO=\"$(PYTHON_SO)\" + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + + clobber:: --- xulrunner-1.8.1.4.orig/debian/patches/60_xpcomstub.dpatch +++ xulrunner-1.8.1.4/debian/patches/60_xpcomstub.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_xpcomstub.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correctly install dependentlibs.list + +@DPATCH@ + +=== xpcom/stub/Makefile.in +================================================================== +--- xulrunner/xpcom/stub/Makefile.in (revision 73) ++++ xulrunner/xpcom/stub/Makefile.in (local) +@@ -118,8 +125,14 @@ + + include $(topsrcdir)/config/rules.mk + +-libs:: $(FINAL_TARGET)/dependentlibs.list ++libs:: dependentlibs.list ++ $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET) + +-$(FINAL_TARGET)/dependentlibs.list: Makefile.in ++install:: dependentlibs.list ++ $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) ++ ++dependentlibs.list: Makefile.in + $(EXIT_ON_ERROR) \ + ( $(foreach dlib,$(DEPENDENT_LIBS_LIST),echo $(dlib);) ) > $@ ++ ++GARBAGE += dependentlibs.list --- xulrunner-1.8.1.4.orig/debian/patches/61_javaxpcom.dpatch +++ xulrunner-1.8.1.4/debian/patches/61_javaxpcom.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 61_javaxpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Correctly build java files. This part is fixed on upstream trunk. +## DP: - Install jar file with appropriate permissions. bz#350886 comment #17. + +@DPATCH@ + +=== extensions/java/xpcom/interfaces/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/interfaces/Makefile.in (revision 210) ++++ xulrunner/extensions/java/xpcom/interfaces/Makefile.in (local) +@@ -87,7 +87,7 @@ + @echo Compiling Java classes + find _java -name "*.java" > java.files + find $(JAVA_DIST_DIR)/default -name "*.java" >> java.files +- $(JAVAC) $(JAVAC_FLAGS) -classpath . -d . -sourcepath _java -sourcepath $(JAVA_DIST_DIR)/default @java.files ++ $(JAVAC) $(JAVAC_FLAGS) -classpath . -d . -sourcepath $(JAVA_DIST_DIR)/default @java.files + + $(JARFILE): $(COMPILED_JAVA_CLASSES) + $(JAR) cf $@ org +=== extensions/java/xpcom/src/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/src/Makefile.in (revision 223) ++++ xulrunner/extensions/java/xpcom/src/Makefile.in (local) +@@ -151,5 +151,5 @@ + $(INSTALL) $(IFLAGS1) $(JARFILE) $(FINAL_TARGET) + + jar-install:: $(JARFILE) +- $(SYSINSTALL) $(IFLAGS2) $(JARFILE) $(DESTDIR)$(mozappdir) ++ $(SYSINSTALL) $(IFLAGS1) $(JARFILE) $(DESTDIR)$(mozappdir) + --- xulrunner-1.8.1.4.orig/debian/patches/65_mouse_buttons.dpatch +++ xulrunner-1.8.1.4/debian/patches/65_mouse_buttons.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_mouse_buttons.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Extended mouse buttons support taken from #244305. Thanks Peter Colberg + +@DPATCH@ + +=== widget/src/gtk2/nsWindow.cpp +================================================================== +--- xulrunner/widget/src/gtk2/nsWindow.cpp (revision 72) ++++ xulrunner/widget/src/gtk2/nsWindow.cpp (local) +@@ -1543,6 +1543,9 @@ + return; + + switch (aEvent->button) { ++ case 1: ++ eventType = NS_MOUSE_LEFT_BUTTON_DOWN; ++ break; + case 2: + eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN; + break; +@@ -1550,7 +1553,7 @@ + eventType = NS_MOUSE_RIGHT_BUTTON_DOWN; + break; + default: +- eventType = NS_MOUSE_LEFT_BUTTON_DOWN; ++ return; + break; + } + --- xulrunner-1.8.1.4.orig/debian/patches/65_mozjs_abi.dpatch +++ xulrunner-1.8.1.4/debian/patches/65_mozjs_abi.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_mozjs_abi.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make 1.8.1 ABI compatible with version 1.8.0 + +@DPATCH@ + +--- xulrunner/js/src/jsapi.c (revision 224) ++++ xulrunner/js/src/jsapi.c (local) +@@ -4623,6 +4623,10 @@ + #endif + } + ++/* For backwards compatibility */ ++JS_PUBLIC_API(JSBool) ++JS_StringsAreUTF8() __attribute__((alias("JS_CStringsAreUTF8"))); ++ + /************************************************************************/ + + JS_PUBLIC_API(void) +--- xulrunner/js/src/jsstr.c (revision 224) ++++ xulrunner/js/src/jsstr.c (local) +@@ -2668,6 +2668,13 @@ + return bytes; + } + ++#undef js_ValueToPrintableString ++JS_FRIEND_API(const char *) ++js_ValueToPrintableString(JSContext *cx, jsval v) ++{ ++ return js_ValueToPrintable(cx, v, js_ValueToString); ++} ++ + JS_FRIEND_API(JSString *) + js_ValueToString(JSContext *cx, jsval v) + { --- xulrunner-1.8.1.4.orig/debian/patches/65_native_uconv.dpatch +++ xulrunner-1.8.1.4/debian/patches/65_native_uconv.dpatch @@ -0,0 +1,782 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_native_uconv.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Don't build what is useless when native uconv is enabled. bz#331780. +## DP: - Properly load invalid UTF-8 files. bz#331748 +## DP: - Add the scriptableunicodeconverter component. bz#333261 +## DP: - Correct aliases for gbk and euc-tw. +## DP: - Allow claimed iso-8859-1 actually encoded as windows-1252 to be converted +## DP: flawlessly + +@DPATCH@ + +--- xulrunner/intl/uconv/Makefile.in (revision 158) ++++ xulrunner/intl/uconv/Makefile.in (local) +@@ -57,10 +57,12 @@ + + MODULE = uconv + +-DIRS = idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm ++DIRS = idl public util + + ifdef MOZ_USE_NATIVE_UCONV + DIRS += native ++else ++DIRS += ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm + endif + + DIRS += src +--- xulrunner/intl/uconv/native/nsINativeUConvService.idl (revision 158) ++++ xulrunner/intl/uconv/native/nsINativeUConvService.idl (local) +@@ -45,8 +45,9 @@ + * nsIUnicodeEncoder + * nsICharRepresentable + */ +-[uuid(c60097ba-c79d-461b-9116-80a66404c0b0)] ++[uuid(99e23ae8-c334-44de-a208-a7aa6923f8f5)] + interface nsINativeUConvService : nsISupports + { +- nsISupports getNativeConverter(in string from, in string to); ++ nsISupports getNativeUnicodeDecoder(in string from); ++ nsISupports getNativeUnicodeEncoder(in string to); + }; +--- xulrunner/intl/uconv/native/nsNativeUConvService.cpp (revision 158) ++++ xulrunner/intl/uconv/native/nsNativeUConvService.cpp (local) +@@ -52,8 +52,16 @@ + #include // nl_langinfo + #include // iconv_open, iconv, iconv_close + #include ++#include // memcpy + ++#ifdef IS_LITTLE_ENDIAN ++const char UTF16[] = "UTF-16LE"; ++#else ++const char UTF16[] = "UTF-16BE"; ++#endif + ++#define NS_UCONV_CONTINUATION_BUFFER_LENGTH 8 ++ + class IConvAdaptor : public nsIUnicodeDecoder, + public nsIUnicodeEncoder, + public nsICharRepresentable +@@ -102,21 +110,13 @@ + + + private: +- nsresult ConvertInternal(void * aSrc, +- PRInt32 * aSrcLength, +- PRInt32 aSrcCharSize, +- void * aDest, +- PRInt32 * aDestLength, +- PRInt32 aDestCharSize); +- +- + iconv_t mConverter; + PRBool mReplaceOnError; + PRUnichar mReplaceChar; ++ char mContinuationBuffer[NS_UCONV_CONTINUATION_BUFFER_LENGTH]; ++ PRInt32 mContinuationLength; + +-#ifdef DEBUG +- nsCString mFrom, mTo; +-#endif ++ const char *mFrom, *mTo; + }; + + NS_IMPL_ISUPPORTS3(IConvAdaptor, +@@ -128,6 +128,7 @@ + { + mConverter = 0; + mReplaceOnError = PR_FALSE; ++ mContinuationLength = 0; + } + + IConvAdaptor::~IConvAdaptor() +@@ -139,10 +140,8 @@ + nsresult + IConvAdaptor::Init(const char* from, const char* to) + { +-#ifdef DEBUG + mFrom = from; + mTo = to; +-#endif + + mConverter = iconv_open(to, from); + if (mConverter == (iconv_t) -1 ) +@@ -153,22 +152,129 @@ + mConverter = nsnull; + return NS_ERROR_FAILURE; + } ++ mContinuationLength = 0; ++ + return NS_OK; + } + +-// From some charset to ucs2 ++// From some charset to UTF-16 + nsresult + IConvAdaptor::Convert(const char * aSrc, + PRInt32 * aSrcLength, + PRUnichar * aDest, + PRInt32 * aDestLength) + { +- return ConvertInternal( (void*) aSrc, +- aSrcLength, +- 1, +- (void*) aDest, +- aDestLength, +- 2); ++ nsresult res = NS_OK; ++ size_t inLeft, outLeft; ++ ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } ++ ++ if (mTo != UTF16) { ++ NS_WARNING("Not an UnicodeDecoder"); ++ return NS_ERROR_UNEXPECTED; ++ } ++ ++ inLeft = (size_t) *aSrcLength; ++ outLeft = (size_t) *aDestLength * sizeof(PRUnichar); ++ ++ if (mContinuationLength > 0) { ++ PRInt32 bufLength = NS_UCONV_CONTINUATION_BUFFER_LENGTH - mContinuationLength, ++ oneChar = 2, continuationLength = mContinuationLength; ++ ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Have %d bytes in continuation buffer\n", mContinuationLength); ++#endif ++ ++ bufLength = bufLength > *aSrcLength ? *aSrcLength : bufLength; ++ memcpy(&mContinuationBuffer[mContinuationLength], ++ aSrc, bufLength); ++ bufLength = mContinuationLength + bufLength; ++ ++ mContinuationLength = 0; // We don't want to enter an infinite loop ++ ++ res = Convert(mContinuationBuffer, &bufLength, aDest, &oneChar); ++ switch (res) { ++ case NS_OK_UDEC_MOREINPUT: // Contination buffer ended before filling the 2 ++ // output words, with an incomplete sequence, filling ++ // a new continuation buffer. ++ if (bufLength < continuationLength) { // still not enough data ++ *aSrcLength = 0; ++ *aDestLength = 0; ++ return NS_OK_UDEC_MOREINPUT; ++ } ++ mContinuationLength = 0; ++ case NS_OK: // Continuation buffer ended, unlikely (8 input bytes leading ++ // exactly to 2 output words is quite unlikely) ++ case NS_OK_UDEC_MOREOUTPUT: // Standard case, we continue with the ++ // normal conversion ++ inLeft = (size_t) *aSrcLength - (bufLength - continuationLength); ++ outLeft -= oneChar * sizeof(PRUnichar); ++ aSrc += bufLength - continuationLength; ++ aDest += oneChar; ++ break; ++ case NS_ERROR_UDEC_ILLEGALINPUT: ++ *aSrcLength = 0; // Corner case: replacement won't be done as ++ // if it were in the middle of the buffer, since ++ // we can't tell the caller the bad character is ++ // at -mContinuationLength ++ *aDestLength = 0; ++ return res; ++ } ++ } ++ ++ do { ++ if ( iconv(mConverter, ++ (char **)&aSrc, ++ &inLeft, ++ (char **)&aDest, ++ &outLeft) == (size_t) -1 ) { ++ switch (errno) { ++ case EILSEQ: // Invalid multibyte sequence ++ if (mReplaceOnError) { ++ *(aDest++) = mReplaceChar; ++ outLeft -= sizeof(PRUnichar); ++ aSrc++; ++ inLeft--; ++ res = NS_OK; ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Replacing char in output ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ } else { ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Bad input ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_ERROR_UDEC_ILLEGALINPUT; ++ } ++ break; ++ case EINVAL: // Incomplete multibyte sequence ++ mContinuationLength = inLeft; ++ memmove(mContinuationBuffer, aSrc, inLeft); ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Incomplete multibyte sequence in input ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_OK_UDEC_MOREINPUT; ++ break; ++ case E2BIG: // Output buffer full ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Output buffer full ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_OK_UDEC_MOREOUTPUT; ++ break; ++ } ++ } ++ } while (mReplaceOnError && (res == NS_OK) && (inLeft != 0)); ++ ++ *aSrcLength -= inLeft; ++ *aDestLength -= (outLeft / sizeof(PRUnichar)); ++ ++ return res; + } + + nsresult +@@ -176,12 +282,14 @@ + PRInt32 aSrcLength, + PRInt32 * aDestLength) + { +- if (!mConverter) +- return NS_ERROR_UENC_NOMAPPING; ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } + + *aDestLength = aSrcLength*4; // sick + #ifdef DEBUG +- printf(" * IConvAdaptor - - GetMaxLength %d ( %s -> %s )\n", *aDestLength, mFrom.get(), mTo.get()); ++ printf(" * IConvAdaptor - GetMaxLength %d ( %s -> %s )\n", *aDestLength, mFrom, mTo); + #endif + return NS_OK; + } +@@ -190,19 +298,16 @@ + nsresult + IConvAdaptor::Reset() + { +- const char *zero_char_in_ptr = NULL; +- char *zero_char_out_ptr = NULL; +- size_t zero_size_in = 0, +- zero_size_out = 0; ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } + +- iconv(mConverter, +- (char **)&zero_char_in_ptr, +- &zero_size_in, +- &zero_char_out_ptr, +- &zero_size_out); ++ iconv(mConverter, NULL, NULL, NULL, NULL); ++ mContinuationLength = 0; + + #ifdef DEBUG +- printf(" * IConvAdaptor - - Reset\n"); ++ printf(" * IConvAdaptor - Reset\n"); + #endif + return NS_OK; + } +@@ -215,19 +320,139 @@ + char * aDest, + PRInt32 * aDestLength) + { +- return ConvertInternal( (void*) aSrc, +- aSrcLength, +- 2, +- (void*) aDest, +- aDestLength, +- 1); ++ nsresult res = NS_OK; ++ size_t inLeft, outLeft; ++ ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } ++ ++ if (mFrom != UTF16) { ++ NS_WARNING("Not an UnicodeEncoder"); ++ return NS_ERROR_UNEXPECTED; ++ } ++ ++ inLeft = (size_t) *aSrcLength * sizeof(PRUnichar); ++ outLeft = (size_t) *aDestLength; ++ ++ if (mContinuationLength > 0) { ++ // If we're continuing, that means we have a word in the buffer, and ++ // that we only need one more word, UTF-16 characters being 2 or 4 bytes ++ // long. ++ PRInt32 bufLength = 2, destLength = *aDestLength; ++ ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Have %d bytes in continuation buffer\n", mContinuationLength); ++#endif ++ ++ mContinuationLength = 0; // We don't want to enter an infinite loop ++ ++ ((PRUnichar *) mContinuationBuffer)[1] = *aSrc; ++ ++ int i; ++ for (i = 0; i < 4; i++) { ++ printf("%02x ", mContinuationBuffer[i]); ++ } ++ printf("\n"); ++ ++ res = Convert((PRUnichar *) mContinuationBuffer, &bufLength, aDest, &destLength); ++ switch (res) { ++ case NS_OK_UENC_MOREOUTPUT: ++ case NS_ERROR_UENC_NOMAPPING: ++ *aSrcLength = 0; ++ *aDestLength = 0; ++ return res; ++ case NS_OK: ++ printf("NS_OK %d\n", bufLength); ++ outLeft -= destLength; ++ inLeft -= sizeof(PRUnichar); // We necessarily have consumed 1 word ++ aSrc++; ++ aDest += destLength; ++ } ++ } ++ ++ do { ++ if ( iconv(mConverter, ++ (char **)&aSrc, ++ &inLeft, ++ (char **)&aDest, ++ &outLeft) == (size_t) -1 ) { ++ switch (errno) { ++ case EILSEQ: // Invalid multibyte sequence ; there's no way ++ // to know if it's invalid input or input that ++ // doesn't have mapping in the output charset, ++ // but we'll assume our input UTF-16 is valid. ++ if (mReplaceOnError) { ++ *(aDest++) = (char)mReplaceChar; ++ outLeft--; ++ aSrc++; ++ inLeft -= sizeof(PRUnichar); ++ res = NS_OK; ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Replacing char in output ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ } else { ++#ifdef DEBUG ++ printf(" * IConvAdaptor - No mapping in output charset ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ inLeft -= sizeof(PRUnichar); ++ res = NS_ERROR_UENC_NOMAPPING; ++ } ++ break; ++ case EINVAL: // Incomplete UTF-16 sequence. Happens when dealing with characters ++ // outside BMP split between 2 buffers. ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Incomplete UTF-16 character in input. ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ mContinuationLength = 2; ++ ((PRUnichar *) mContinuationBuffer)[0] = *aSrc; ++ res = NS_OK_UENC_MOREINPUT; ++ break; ++ case E2BIG: // Output buffer full ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Output buffer full ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_OK_UENC_MOREOUTPUT; ++ break; ++ } ++ } ++ } while (mReplaceOnError && (res == NS_OK) && (inLeft != 0)); ++ ++ *aSrcLength -= (inLeft / sizeof(PRUnichar)); ++ *aDestLength -= outLeft; ++ ++ return res; + } + + + nsresult + IConvAdaptor::Finish(char * aDest, PRInt32 * aDestLength) + { ++ PRInt32 length = *aDestLength; ++ ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } ++ ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Finish\n"); ++#endif + *aDestLength = 0; ++ // Flush continuation and send replacement character. ++ if ((mContinuationLength > 0) && (mReplaceOnError)) { ++ if (length > 0 ) { ++ *(aDest++) = (char) mReplaceChar; ++ *aDestLength = 1; ++ } else { ++ return NS_OK_UENC_MOREOUTPUT; ++ } ++ } + return NS_OK; + } + +@@ -236,8 +461,10 @@ + PRInt32 aSrcLength, + PRInt32 * aDestLength) + { +- if (!mConverter) +- return NS_ERROR_UENC_NOMAPPING; ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } + + *aDestLength = aSrcLength*4; // sick + +@@ -251,13 +478,13 @@ + PRUnichar aChar) + { + +- if (aBehavior != kOnError_Replace) { ++ if (aBehavior == kOnError_Replace) { + mReplaceOnError = PR_TRUE; + mReplaceChar = aChar; + return NS_OK; + } + +- NS_WARNING("Uconv Error Behavior not support"); ++ NS_WARNING("Uconv Error: Behavior not supported"); + return NS_ERROR_FAILURE; + } + +@@ -272,103 +499,38 @@ + } + + +-nsresult +-IConvAdaptor::ConvertInternal(void * aSrc, +- PRInt32 * aSrcLength, +- PRInt32 aSrcCharSize, +- void * aDest, +- PRInt32 * aDestLength, +- PRInt32 aDestCharSize) ++NS_IMPL_ISUPPORTS1(NativeUConvService, nsINativeUConvService) ++ ++NS_IMETHODIMP ++NativeUConvService::GetNativeUnicodeDecoder(const char* from, ++ nsISupports** aResult) + { +- if (!mConverter) { +- NS_WARNING("Converter Not Initialize"); +- return NS_ERROR_NOT_INITIALIZED; +- } +- size_t res = 0; +- size_t inLeft = (size_t) *aSrcLength * aSrcCharSize; +- size_t outLeft = (size_t) *aDestLength * aDestCharSize; +- size_t outputAvail = outLeft; ++ *aResult = nsnull; + +- while (true){ ++ IConvAdaptor* ucl = new IConvAdaptor(); ++ if (!ucl) ++ return NS_ERROR_OUT_OF_MEMORY; + +- res = iconv(mConverter, +- (char**)&aSrc, +- &inLeft, +- (char**)&aDest, +- &outLeft); +- +- if (res == (size_t) -1) { +- // on some platforms (e.g., linux) iconv will fail with +- // E2BIG if it cannot convert _all_ of its input. it'll +- // still adjust all of the in/out params correctly, so we +- // can ignore this error. the assumption is that we will +- // be called again to complete the conversion. +- if ((errno == E2BIG) && (outLeft < outputAvail)) { +- res = 0; +- break; +- } +- +- if (errno == EILSEQ) { ++ // Trick to allow conversion of 0x5c into U+005c instead of U+00a5 with glibc's iconv ++ if (strcmp(from, "Shift_JIS") == 0) ++ from = "sjis-open"; + +- if (mReplaceOnError) { +- if (aDestCharSize == 1) { +- (*(char*)aDest) = (char)mReplaceChar; +- aDest = (char*)aDest + sizeof(char); +- } +- else +- { +- (*(PRUnichar*)aDest) = (PRUnichar)mReplaceChar; +- aDest = (PRUnichar*)aDest + sizeof(PRUnichar); +- +- } +- inLeft -= aSrcCharSize; +- outLeft -= aDestCharSize; ++ // Trick to allow claimed iso-8859-1 actually encoded as windows-1252 to be converted flawlessly ++ if (strcmp(from, "ISO-8859-1") == 0) ++ from = "windows-1252"; + +-#ifdef DEBUG +- printf(" * IConvAdaptor - replacing char in output ( %s -> %s )\n", +- mFrom.get(), mTo.get()); ++ nsresult rv = ucl->Init(from, UTF16); + +-#endif +- res = 0; +- } +- } +- +- if (res == -1) { +-#ifdef DEBUG +- printf(" * IConvAdaptor - Bad input ( %s -> %s )\n", mFrom.get(), mTo.get()); +-#endif +- return NS_ERROR_UENC_NOMAPPING; +- } +- } +- +- if (inLeft <= 0 || outLeft <= 0 || res == -1) +- break; ++ if (NS_SUCCEEDED(rv)) { ++ NS_ADDREF(*aResult = (nsISupports*)(nsIUnicodeDecoder*)ucl); + } + +- +- if (res != (size_t) -1) { +- +- // xp_iconv deals with how much is remaining in a given buffer +- // but what uconv wants how much we read/written already. So +- // we fix it up here. +- *aSrcLength -= (inLeft / aSrcCharSize); +- *aDestLength -= (outLeft / aDestCharSize); +- return NS_OK; +- } +- +-#ifdef DEBUG +- printf(" * IConvAdaptor - - xp_iconv error( %s -> %s )\n", mFrom.get(), mTo.get()); +-#endif +- Reset(); +- return NS_ERROR_UENC_NOMAPPING; ++ return rv; + } + +-NS_IMPL_ISUPPORTS1(NativeUConvService, nsINativeUConvService) +- + NS_IMETHODIMP +-NativeUConvService::GetNativeConverter(const char* from, +- const char* to, +- nsISupports** aResult) ++NativeUConvService::GetNativeUnicodeEncoder(const char* to, ++ nsISupports** aResult) + { + *aResult = nsnull; + +@@ -376,10 +538,10 @@ + if (!ucl) + return NS_ERROR_OUT_OF_MEMORY; + +- nsresult rv = ucl->Init(from, to); ++ nsresult rv = ucl->Init(UTF16, to); + + if (NS_SUCCEEDED(rv)) { +- NS_ADDREF(*aResult = (nsISupports*)(nsIUnicharEncoder*)ucl); ++ NS_ADDREF(*aResult = (nsISupports*)(nsIUnicodeEncoder*)ucl); + } + + return rv; +--- xulrunner/intl/uconv/src/Makefile.in (revision 206) ++++ xulrunner/intl/uconv/src/Makefile.in (local) +@@ -82,13 +82,13 @@ + nsUTF8ConverterService.cpp \ + nsUTF8ToUnicode.cpp \ + nsUnicodeToUTF8.cpp \ ++ nsScriptableUConv.cpp \ + $(NULL) + + ifdef MOZ_USE_NATIVE_UCONV + REQUIRES += ucnative + else + CPPSRCS += \ +- nsScriptableUConv.cpp \ + nsUnicodeDecodeHelper.cpp \ + nsUnicodeEncodeHelper.cpp \ + nsMappingCache.cpp \ +--- xulrunner/intl/uconv/src/charsetalias.properties (revision 158) ++++ xulrunner/intl/uconv/src/charsetalias.properties (local) +@@ -120,13 +120,13 @@ + t.61-8bit=T.61-8bit + hz-gb-2312=HZ-GB-2312 + big5-hkscs=Big5-HKSCS +-gbk=x-gbk +-cns11643=x-euc-tw ++gbk=gbk ++cns11643=euc-tw + # + # Netscape private ... + # + x-imap4-modified-utf7=x-imap4-modified-utf7 +-x-euc-tw=x-euc-tw ++x-euc-tw=euc-tw + x-mac-roman=x-mac-roman + x-mac-ce=x-mac-ce + x-mac-turkish=x-mac-turkish +@@ -475,7 +475,7 @@ + # + # Aliases for x-euc-tw + # +-zh_tw-euc=x-euc-tw ++zh_tw-euc=euc-tw + # + # Following names appears in unix nl_langinfo(CODESET) + # They can be compiled as platform specific if necessary +@@ -513,6 +513,6 @@ + x-obsoleted-shift_jis=x-obsoleted-Shift_JIS + x-obsoleted-iso-2022-jp=x-obsoleted-ISO-2022-JP + x-obsoleted-euc-jp=x-obsoleted-EUC-JP +-x-gbk=x-gbk ++x-gbk=gbk + windows-936=windows-936 + ansi-1251=windows-1251 +--- xulrunner/intl/uconv/src/nsCharsetConverterManager.cpp (revision 158) ++++ xulrunner/intl/uconv/src/nsCharsetConverterManager.cpp (local) +@@ -191,9 +191,8 @@ + #ifdef MOZ_USE_NATIVE_UCONV + if (mNativeUC) { + nsCOMPtr supports; +- mNativeUC->GetNativeConverter("UCS-2", +- aDest, +- getter_AddRefs(supports)); ++ mNativeUC->GetNativeUnicodeEncoder(aDest, ++ getter_AddRefs(supports)); + + encoder = do_QueryInterface(supports); + +@@ -202,7 +201,8 @@ + return NS_OK; + } + } +-#endif ++ return NS_ERROR_UCONV_NOCONV; ++#else + nsresult rv = NS_OK; + + nsCAutoString +@@ -220,6 +220,7 @@ + NS_ADDREF(*aResult); + } + return rv; ++#endif + } + + NS_IMETHODIMP +@@ -246,9 +247,8 @@ + #ifdef MOZ_USE_NATIVE_UCONV + if (mNativeUC) { + nsCOMPtr supports; +- mNativeUC->GetNativeConverter(aSrc, +- "UCS-2", +- getter_AddRefs(supports)); ++ mNativeUC->GetNativeUnicodeDecoder(aSrc, ++ getter_AddRefs(supports)); + + decoder = do_QueryInterface(supports); + +@@ -257,7 +257,8 @@ + return NS_OK; + } + } +-#endif ++ return NS_ERROR_UCONV_NOCONV; ++#else + nsresult rv = NS_OK; + + NS_NAMED_LITERAL_CSTRING(kUnicodeDecoderContractIDBase, +@@ -285,6 +286,7 @@ + NS_ADDREF(*aResult); + } + return rv; ++#endif + } + + nsresult +--- xulrunner/intl/uconv/src/nsUConvModule.cpp (revision 158) ++++ xulrunner/intl/uconv/src/nsUConvModule.cpp (local) +@@ -58,6 +58,7 @@ + #include "nsConverterInputStream.h" + #include "nsConverterOutputStream.h" + #include "nsPlatformCharset.h" ++#include "nsScriptableUConv.h" + + #ifndef MOZ_USE_NATIVE_UCONV + #include "nsIUnicodeDecodeHelper.h" +@@ -67,7 +68,6 @@ + + #include "nsUConvDll.h" + #include "nsIFile.h" +-#include "nsIScriptableUConv.h" + + #include "nsCRT.h" + +@@ -82,7 +82,6 @@ + #include "nsUnicodeToCP1252.h" + #include "nsUnicodeToMacRoman.h" + #include "nsUnicodeToUTF8.h" +-#include "nsScriptableUConv.h" + + // ucvlatin + #include "nsUCvLatinCID.h" +@@ -489,7 +488,6 @@ + + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeDecodeHelper) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeEncodeHelper) +-NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableUnicodeConverter) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF8) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF8ToUnicode) + +@@ -720,6 +718,7 @@ + NS_GENERIC_FACTORY_CONSTRUCTOR(nsConverterInputStream) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsConverterOutputStream) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPlatformCharset, Init) ++NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableUnicodeConverter) + + static const nsModuleComponentInfo components[] = + { +@@ -752,6 +751,11 @@ + "@mozilla.org/intl/converter-output-stream;1", + nsConverterOutputStreamConstructor + }, ++ { ++ "Unicode Encoder / Decoder for Script", NS_ISCRIPTABLEUNICODECONVERTER_CID, ++ NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID, ++ nsScriptableUnicodeConverterConstructor ++ }, + #ifdef MOZ_USE_NATIVE_UCONV + { + "Native UConv Service", +@@ -776,11 +780,6 @@ + nsUTF8ConverterServiceConstructor + }, + { +- "Unicode Encoder / Decoder for Script", NS_ISCRIPTABLEUNICODECONVERTER_CID, +- NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID, +- nsScriptableUnicodeConverterConstructor +- }, +- { + "ISO-8859-1 To Unicode Converter", NS_ISO88591TOUNICODE_CID, + NS_ISO88591TOUNICODE_CONTRACTID, + nsISO88591ToUnicodeConstructor, --- xulrunner-1.8.1.4.orig/debian/patches/68_m68k_xpcom.dpatch +++ xulrunner-1.8.1.4/debian/patches/68_m68k_xpcom.dpatch @@ -0,0 +1,86 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 68_m68k_xpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Zack Weinberg to fix FTBFS on m68k. bz#323114 +## DP: Modified by Roman Zippel. #402011 + +@DPATCH@ + +Index: xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp +=================================================================== +--- xulrunner-1.8.0.8.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp 2006-12-04 02:59:30.000000000 +0100 ++++ xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp 2006-12-04 02:59:37.000000000 +0100 +@@ -121,18 +121,8 @@ + #define STUB_ENTRY(n) \ + nsresult nsXPTCStubBase::Stub##n() \ + { \ +- register nsresult result asm("d0"); \ + void *frame = __builtin_frame_address(0); \ +- __asm__ __volatile__( \ +- "pea %2@(12)\n\t" /* args */ \ +- "pea "#n"\n\t" /* method index */ \ +- "movl %1, %/sp@-\n\t" /* this */ \ +- "jbsr PrepareAndDispatch\n\t" \ +- "addw #12, %/sp" \ +- : "=d" (result) /* %0 */ \ +- : "a" (this), "a" (frame) \ +- : "a0", "a1", "d0", "d1", "memory" ); \ +- return result; \ ++ return PrepareAndDispatch(this, n, (uint32*)frame + 3); \ + } + + #define SENTINEL_ENTRY(n) \ +Index: xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp +=================================================================== +--- xulrunner-1.8.0.8.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp 2006-12-04 02:59:30.000000000 +0100 ++++ xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp 2006-12-04 03:01:53.000000000 +0100 +@@ -137,32 +137,28 @@ + n = invoke_count_words(paramCount, params) * 4; + + __asm__ __volatile__( +- "subl %5, %/sp\n\t" /* make room for params */ +- "movl %/sp, %/a0\n\t" +- "movl %4, %/sp@-\n\t" +- "movl %3, %/sp@-\n\t" +- "movl %/a0, %/sp@-\n\t" ++ "subl %5, %%sp\n\t" /* make room for params */ ++ "movel %4, %%sp@-\n\t" ++ "movel %3, %%sp@-\n\t" ++ "pea %%sp@(8)\n\t" + "jbsr invoke_copy_to_stack\n\t" /* copy params */ +- "addl #12, %/sp\n\t" +- "movl %1, %/a0\n\t" +- "movl %/a0, %/sp@-\n\t" +- "movl %/a0@, %/a0\n\t" +- "movl %2, %/d0\n\t" /* function index */ ++ "addw #12, %%sp\n\t" ++ "movel %1, %%sp@-\n\t" ++ "movel %1@, %%a0\n\t" + #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ +- "movl %/a0@(%/d0:l:4), %/a0\n\t" ++ "movel %%a0@(%2:l:4), %%a0\n\t" + #else /* not V3 */ +- "movl %/a0@(8,%/d0:l:4), %/a0\n\t" ++ "movel %%a0@(8,%2:l:4), %%a0\n\t" + #endif +- "jbsr %/a0@\n\t" /* safe to not cleanup sp */ +- "movl %/d0, %0\n\t" +- "addql #4, %/sp\n\t" +- "addl %5, %/sp" +- : "=g" (result) /* %0 */ +- : "g" (that), /* %1 */ +- "g" (methodIndex), /* %2 */ ++ "jbsr %%a0@\n\t" /* safe to not cleanup sp */ ++ "lea %%sp@(4,%5:l), %%sp\n\t" ++ "movel %%d0, %0" ++ : "=d" (result) /* %0 */ ++ : "a" (that), /* %1 */ ++ "d" (methodIndex), /* %2 */ + "g" (paramCount), /* %3 */ + "g" (params), /* %4 */ +- "g" (n) /* %5 */ ++ "d" (n) /* %5 */ + : "a0", "a1", "d0", "d1", "memory" + ); + --- xulrunner-1.8.1.4.orig/debian/patches/68_mips_performance.dpatch +++ xulrunner-1.8.1.4/debian/patches/68_mips_performance.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 68_mips_performance.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Thiemo Seufer to increase stability and performance on mips. + +@DPATCH@ + +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 22) ++++ xulrunner/config/rules.mk (local) +@@ -456,15 +456,6 @@ endif + endif + endif + +-ifeq ($(OS_ARCH),Linux) +-ifneq (,$(filter mips mipsel,$(OS_TEST))) +-ifeq ($(MODULE),layout) +-OS_CFLAGS += -Wa,-xgot +-OS_CXXFLAGS += -Wa,-xgot +-endif +-endif +-endif +- + # + # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag + # which uses internal symbols first +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 22) ++++ xulrunner/configure.in (local) +@@ -1481,8 +1481,6 @@ + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 + ;; + mips*) +- CFLAGS="$CFLAGS -Wa,-xgot" +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" + ;; + esac + ;; --- xulrunner-1.8.1.4.orig/debian/patches/80_config.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_config.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh -e +## 80_config.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use config.guess and config.sub from autotools-dev + +AUTOCONF_DIRS="./build/autoconf/ ./directory/c-sdk/config/autoconf/" + +dpatch_patch () +{ + for dir in $AUTOCONF_DIRS; do + for file in config.guess config.sub; do + sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$file'" "$@"' $dir/$file + done + done +} + +dpatch_unpatch () +{ + for dir in $AUTOCONF_DIRS; do + for file in config.guess config.sub; do + sed -i '2!b;/^exec "/ d' $dir/$file + done + done +} + +DPATCH_LIB_NO_DEFAULT=1 + +. /usr/share/dpatch/dpatch.lib.sh --- xulrunner-1.8.1.4.orig/debian/patches/80_hunspell.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_hunspell.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_hunspell.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use hunspell instead of myspell, and link against system library. + +@DPATCH@ + +--- iceape/config/autoconf.mk.in ++++ iceape/config/autoconf.mk.in +@@ -190,6 +190,10 @@ + NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@ + NECKO_COOKIES = @NECKO_COOKIES@ + ++MOZ_NATIVE_HUNSPELL = @SYSTEM_HUNSPELL@ ++MOZ_HUNSPELL_LIBS = @MOZ_HUNSPELL_LIBS@ ++MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLAGS@ ++ + MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@ + MOZ_NATIVE_JPEG = @SYSTEM_JPEG@ + MOZ_NATIVE_PNG = @SYSTEM_PNG@ +--- iceape/configure.in ++++ iceape/configure.in +@@ -3840,6 +3840,19 @@ + + fi # SKIP_LIBRARY_CHECKS + ++dnl system HunSpell Support ++dnl ======================================================== ++MOZ_ARG_ENABLE_BOOL(system-hunspell, ++[ --enable-system-hunspell Use system hunspell (located with pkgconfig)], ++ SYSTEM_HUNSPELL=1 ) ++ ++if test -n "$SYSTEM_HUNSPELL"; then ++ PKG_CHECK_MODULES(MOZ_HUNSPELL, hunspell) ++fi ++ ++AC_SUBST(SYSTEM_HUNSPELL) ++AC_SUBST(MOZ_HUNSPELL_LIBS) ++ + dnl ======================================================== + dnl Java SDK support + dnl ======================================================== +--- iceape/extensions/spellcheck/myspell/src/Makefile.in ++++ iceape/extensions/spellcheck/myspell/src/Makefile.in +@@ -60,15 +60,19 @@ + xulapp \ + $(NULL) + +-CPPSRCS = affentry.cpp \ ++CPPSRCS = mozMySpell.cpp \ ++ mozMySpellFactory.cpp \ ++ $(NULL) ++ ++ifndef MOZ_NATIVE_HUNSPELL ++CPPSRCS += affentry.cpp \ + affixmgr.cpp \ + hashmgr.cpp \ + suggestmgr.cpp \ + csutil.cpp \ + myspell.cpp \ +- mozMySpell.cpp \ +- mozMySpellFactory.cpp \ + $(NULL) ++endif + + ifdef MOZ_XUL_APP + CPPSRCS += mozMySpellDirProvider.cpp +@@ -79,6 +83,11 @@ + $(XPCOM_LIBS) \ + $(NSPR_LIBS) \ + $(MOZ_UNICHARUTIL_LIBS) \ ++ $(MOZ_HUNSPELL_LIBS) \ + $(NULL) + + include $(topsrcdir)/config/rules.mk ++ ++ifdef MOZ_NATIVE_HUNSPELL ++CXXFLAGS += $(MOZ_HUNSPELL_CFLAGS) -DMOZ_NATIVE_HUNSPELL ++endif +--- iceape/extensions/spellcheck/myspell/src/mozMySpell.h ++++ iceape/extensions/spellcheck/myspell/src/mozMySpell.h +@@ -56,7 +56,12 @@ + #ifndef mozMySpell_h__ + #define mozMySpell_h__ + ++#if MOZ_NATIVE_HUNSPELL ++#include "hunspell.hxx" ++#define MySpell Hunspell ++#else + #include "myspell.hxx" ++#endif + #include "mozISpellCheckingEngine.h" + #include "mozIPersonalDictionary.h" + #include "nsString.h" --- xulrunner-1.8.1.4.orig/debian/patches/80_install_path.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_install_path.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_install_path.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: hook to set application directory name + +@DPATCH@ + +=== config/autoconf.mk.in +================================================================== +--- xulrunner/config/autoconf.mk.in (revision 7) ++++ xulrunner/config/autoconf.mk.in (local) +@@ -54,13 +54,13 @@ + 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) ++mozappdir = $(libdir)/$(MOZ_APP_NAME) + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + --- xulrunner-1.8.1.4.orig/debian/patches/80_javaxpcom.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_javaxpcom.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_javaxpcom.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Force creation of Makefiles in extensions/java, even when javaxpcom is +## DP: disabled. Don't build the jars if DEB_NO_JAR is defined. + +@DPATCH@ + +=== allmakefiles.sh +================================================================== +--- xulrunner/allmakefiles.sh (revision 134) ++++ xulrunner/allmakefiles.sh (local) +@@ -1353,7 +1353,7 @@ + " + fi + +-if [ "$MOZ_JAVAXPCOM" ]; then ++if [ "1" ]; then + MAKEFILES_javaxpcom=" + extensions/java/Makefile + extensions/java/xpcom/Makefile +=== extensions/java/xpcom/interfaces/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/interfaces/Makefile.in (revision 209) ++++ xulrunner/extensions/java/xpcom/interfaces/Makefile.in (local) +@@ -59,7 +59,9 @@ + $(NULL) + + # install jars into SDK ++ifndef DEB_NO_JAR + SDK_LIBRARY = $(JARFILE) $(JARFILE_SRC) ++endif + + GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files + GARBAGE_DIRS += org +=== extensions/java/xpcom/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/Makefile.in (revision 220) ++++ xulrunner/extensions/java/xpcom/Makefile.in (local) +@@ -45,9 +45,11 @@ + + include $(topsrcdir)/config/rules.mk + ++ifndef DEB_NO_JAR + # Build the implementation Java classes + libs:: + make -C src jar-libs + + install:: + make -C src jar-install ++endif --- xulrunner-1.8.1.4.orig/debian/patches/80_libxpcom_hack.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_libxpcom_hack.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_libxpcom_hack.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Force libxpcom to be linked to xulrunner-bin, xpcshell and libgtkmozembed +## DP: so that it is loaded in most of the cases. + +@DPATCH@ + +=== embedding/browser/gtk/src/Makefile.in +================================================================== +--- xulrunner/embedding/browser/gtk/src/Makefile.in (revision 118) ++++ xulrunner/embedding/browser/gtk/src/Makefile.in (local) +@@ -120,7 +120,9 @@ + + ifdef MOZ_ENABLE_GTK2 + EXTRA_DSO_LDOPTS = \ ++ -Wl,--no-as-needed \ + $(MOZ_COMPONENT_LIBS) \ ++ -Wl,--as-needed \ + $(NULL) + endif + +=== js/src/xpconnect/shell/Makefile.in +================================================================== +--- xulrunner/js/src/xpconnect/shell/Makefile.in (revision 118) ++++ xulrunner/js/src/xpconnect/shell/Makefile.in (local) +@@ -57,7 +57,9 @@ + + LIBS = \ + $(MOZ_JS_LIBS) \ ++ -Wl,--no-as-needed \ + $(XPCOM_LIBS) \ ++ -Wl,--as-needed \ + $(NSPR_LIBS) \ + $(NULL) + +=== xulrunner/app/Makefile.in +================================================================== +--- xulrunner/xulrunner/app/Makefile.in (revision 118) ++++ xulrunner/xulrunner/app/Makefile.in (local) +@@ -104,7 +104,9 @@ + $(STATIC_COMPONENTS_LINKER_PATH) \ + $(EXTRA_DSO_LIBS) \ + $(MOZ_JS_LIBS) \ ++ -Wl,--no-as-needed \ + $(XPCOM_LIBS) \ ++ -Wl,--as-needed \ + $(NSPR_LIBS) \ + $(TK_LIBS) \ + $(NULL) --- xulrunner-1.8.1.4.orig/debian/patches/80_no_examples.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_no_examples.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_no_examples.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't build examples + +@DPATCH@ + +=== xulrunner/Makefile.in +================================================================== +--- xulrunner/xulrunner/Makefile.in (revision 62) ++++ xulrunner/xulrunner/Makefile.in (local) +@@ -48,7 +48,6 @@ + stub \ + util \ + app \ +- examples \ + $(NULL) + + ifeq ($(OS_ARCH),WINNT) +=== extensions/python/xpcom/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/Makefile.in (revision 85) ++++ xulrunner/extensions/python/xpcom/Makefile.in (local) +@@ -40,7 +40,6 @@ + + DIRS = \ + src \ +- test/test_component \ + $(NULL) + + topsrcdir = @top_srcdir@ --- xulrunner-1.8.1.4.orig/debian/patches/80_no_sys_profile.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_no_sys_profile.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_no_sys_profile.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't install system profile + +@DPATCH@ + +=== xulrunner/app/Makefile.in +================================================================== +--- xulrunner/xulrunner/app/Makefile.in (revision 61) ++++ xulrunner/xulrunner/app/Makefile.in (local) +@@ -49,8 +49,6 @@ + + MOZILLA_INTERNAL_API = 1 + +-DIRS = profile +- + PREF_JS_EXPORTS = $(srcdir)/xulrunner.js + GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js) + --- xulrunner-1.8.1.4.orig/debian/patches/80_uname.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_uname.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_uname.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use ${host_*} variables instead of uname in configure.in. Closes: +## DP: #377418. +## DP: This is a minimalist patch to solve the particular bad assembler +## DP: choice issue. It would need a much greater work to actually do +## DP: something totally clean, but the current patch should be enough +## DP: for Linux builds. +## DP: Also incorporates fix for bz#363263. + +@DPATCH@ + +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 151) ++++ xulrunner/configure.in (local) +@@ -811,18 +811,26 @@ + OS_RELEASE= + OS_TEST="${target_cpu}" + case "${target_os}" in +- linux*) OS_ARCH=Linux ;; ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; + kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac + else +- OS_TARGET=`uname -s` +- OS_ARCH=`uname -s | sed -e 's|/|_|g'` ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` + OS_RELEASE=`uname -r` +- OS_TEST=`uname -m` ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac + fi + _COMPILER_PREFIX= + +=== xpcom/reflect/xptcall/src/md/unix/Makefile.in +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 123) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (local) +@@ -262,7 +262,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc) ++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp --- xulrunner-1.8.1.4.orig/debian/patches/80_xulrunner-config.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_xulrunner-config.dpatch @@ -0,0 +1,68 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_xulrunner-config.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Give more appropriate cflags and libs + +@DPATCH@ + +--- xulrunner/build/unix/mozilla-config.in ++++ xulrunner/build/unix/mozilla-config.in +@@ -22,7 +22,6 @@ + xpcom + nspr + js +- jsj + gfx + EOF + exit $1 +@@ -60,9 +59,6 @@ + exit 0 + ;; + --cflags) +- if test "%includedir%" != /usr/include ; then +- includes="-I%includedir%" +- fi + echo_cflags=yes + ;; + --defines) +@@ -74,7 +70,7 @@ + --idlflags) + echo_idlflags=yes + ;; +- xpcom|js|nspr|gfx|jsj) ++ xpcom|js|nspr|gfx) + echo_components="$echo_components $1" + echo_libraries="$echo_libraries $1" + ;; +@@ -105,7 +101,17 @@ + if test "$echo_cflags" = "yes"; then + nspr_cflags="%FULL_NSPR_CFLAGS%" + for n in $echo_components; do +- component_includes="$component_includes -I%includedir%/$n" ++ case "$n" in ++ js) ++ component_includes="$component_includes -I/usr/include/mozjs" ++ ;; ++ nspr) ++ ;; ++ *) ++ component_includes="$component_includes -I%includedir% \ ++ -I%includedir%/$n" ++ ;; ++ esac + done + echo $component_includes $includes $nspr_cflags + fi +@@ -133,10 +139,7 @@ + js) + libs="$libs $_js_libs" + ;; +- jsj) +- libs="$libs -ljsj $_js_libs $_xpcom_libs" +- ;; + esac + done +- echo -L%libdir% $libs ++ echo $libs + fi --- xulrunner-1.8.1.4.orig/debian/patches/80_zip.dpatch +++ xulrunner-1.8.1.4/debian/patches/80_zip.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_zip.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid needing zip if not required. bz#331785. + +@DPATCH@ + +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 42) ++++ xulrunner/configure.in (local) +@@ -518,10 +518,6 @@ + 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 +@@ -5660,6 +5656,14 @@ + 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 ++ AC_PATH_PROGS(ZIP, zip) ++ if test -z "$ZIP" || test "$ZIP" = ":"; then ++ AC_MSG_ERROR([zip not found in \$PATH]) ++ fi ++fi ++ + dnl ======================================================== + dnl = Define default location for MOZILLA_FIVE_HOME + dnl ======================================================== +=== config/config.mk +================================================================== +--- xulrunner/config/config.mk (revision 42) ++++ xulrunner/config/config.mk (local) +@@ -475,10 +475,14 @@ + # 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 +=== config/make-jars.pl +================================================================== +--- xulrunner/config/make-jars.pl (revision 42) ++++ xulrunner/config/make-jars.pl (local) +@@ -137,7 +137,7 @@ + $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); + } +@@ -509,6 +509,7 @@ + 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/) +@@ -521,6 +522,7 @@ + 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/) + { +@@ -533,6 +535,7 @@ + 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/) + { --- xulrunner-1.8.1.4.orig/debian/patches/81_sonames.dpatch +++ xulrunner-1.8.1.4/debian/patches/81_sonames.dpatch @@ -0,0 +1,280 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 81_sonames.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add soname support + +@DPATCH@ + +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 206) ++++ xulrunner/config/rules.mk (local) +@@ -132,6 +132,25 @@ + endif + + SHARED_LIBRARY := $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX) ++SONAME := $(notdir $(SHARED_LIBRARY)) ++ ++ifdef SO_VERSION ++ifneq (,$(findstring $(SONAME),$(MKSHLIB))) ++SO_VERSION_MAJOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/') ++SO_VERSION_MINOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/') ++SO_VERSION_MICRO := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/') ++ ++SHARED_LIBRARY_LINKS := $(SONAME) ++ifdef SO_VERSION_MINOR ++SHARED_LIBRARY_LINKS += $(SONAME).$(SO_VERSION_MAJOR) ++endif ++ ++SONAME := $(SONAME).$(SO_VERSION_MAJOR) ++SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) ++ ++MKSHLINKS = (cd $(1) && for link in $(SHARED_LIBRARY_LINKS); do rm -f $$link; ln -s $(notdir $(SHARED_LIBRARY)) $$link; done) ++endif ++endif + + ifeq ($(OS_ARCH),OS2) + DEF_FILE := $(SHARED_LIBRARY:.dll=.def) +@@ -264,7 +283,7 @@ + $(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\ + $(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \ + $(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \ +- $(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(wildcard *.ilk) \ ++ $(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(SHARED_LIBRARY_LINKS) $(wildcard *.ilk) \ + $(PROGRAM:$(BIN_SUFFIX)=.exp) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.exp) \ + $(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \ + $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.$(OBJ_SUFFIX)) \ +@@ -502,6 +521,7 @@ + ifeq ($(OS_ARCH),Linux) + ifdef IS_COMPONENT + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++else + endif + endif + +@@ -658,8 +678,10 @@ + $(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib + else + $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib ++ $(call MKSHLINKS,$(DIST)/lib) + endif + $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) ++ $(call MKSHLINKS,$(FINAL_TARGET)) + ifdef BEOS_ADDON_WORKAROUND + ( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) + endif +@@ -705,45 +727,32 @@ + endif + endif + ++ifdef MRE_DIST ++DESTSUBDIR=$(mredir) ++else ++DESTSUBDIR=$(mozappdir) ++endif ++ + install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) + ifndef NO_INSTALL + #ifdef LIBRARY + #ifndef IS_COMPONENT +-#ifdef MRE_DIST +-# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mredir) +-#else +-# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mozappdir) +-#endif ++# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(DESTSUBDIR) + #endif # !IS_COMPONENT + #endif # LIBRARY + ifdef SHARED_LIBRARY + ifdef IS_COMPONENT +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components ++ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(DESTSUBDIR)/components + else +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components +-endif +-else +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir) +-else +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir) +-endif ++ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(DESTSUBDIR) ++ $(call MKSHLINKS,$(DESTDIR)$(DESTSUBDIR)) + endif + endif # SHARED_LIBRARY + ifdef PROGRAM +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mredir) +-else +- $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir) +-endif ++ $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(DESTSUBDIR) + endif # PROGRAM + ifdef SIMPLE_PROGRAMS +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mredir) +-else +- $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mozappdir) +-endif ++ $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(DESTSUBDIR) + endif # SIMPLE_PROGRAMS + endif # NO_INSTALL + +@@ -975,6 +984,8 @@ + SUB_SHLOBJS = $(SUB_LOBJS) + endif + ++$(SHARED_LIBRARY_LINKS): %: $(SHARED_LIBRARY) ++ + $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) Makefile Makefile.in + ifndef INCREMENTAL_LINKER + rm -f $@ +@@ -1001,6 +1012,7 @@ + endif # SHARED_LIBRARY_LIBS + endif # NO_LD_ARCHIVE_FLAGS + $(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) ++ $(call MKSHLINKS,.) + @rm -f foodummyfilefoo $(SUB_SHLOBJS) $(DELETE_AFTER_LINK) + else # os2 vacpp + $(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) +@@ -1340,11 +1352,7 @@ + + install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt + ifndef NO_INSTALL +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mredir)/components +-else +- $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mozappdir)/components +-endif ++ $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(DESTSUBDIR)/components + endif # NO_INSTALL + endif # NO_GEN_XPT + +=== configure.in +--- xulrunner/configure.in (revision 206) ++++ xulrunner/configure.in (local) +@@ -1118,8 +1125,8 @@ + dnl GNU specific defaults + dnl ======================================================== + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + DSO_LDOPTS='-shared' + if test "$GCC_USE_GNU_LD"; then + # Don't allow undefined symbols in libraries +@@ -1149,8 +1156,8 @@ + _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT' + _USE_CPP_INCLUDE_FLAG=1 + else +- MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' ++ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' + + DSO_LDOPTS='-shared' + if test "$GNU_LD"; then +@@ -1386,7 +1393,7 @@ + + *-beos*) + no_x=yes +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + _PLATFORM_DEFAULT_TOOLKIT="beos" + DSO_LDOPTS='-nostart' + TK_LIBS='-lbe -lroot' +@@ -1896,8 +1904,8 @@ + if test "$LIBRUNPATH"; then + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" + fi +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + ;; + + *-nto*) +@@ -2063,8 +2072,8 @@ + + alpha*-*-osf*) + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + + else + MOZ_DEBUG_FLAGS='-g' +@@ -2074,8 +2083,8 @@ + DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations' + DSO_CFLAGS= + DSO_PIC_CFLAGS= +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-all' + MKSHLIB_UNFORCE_ALL='-none' + dnl Might fix the libxpcom.so breakage on this platform as well.... +@@ -2132,8 +2141,8 @@ + [LDFLAGS=$_SAVE_LDFLAGS]) + fi + MOZ_OPTIMIZE_FLAGS="-xO4" +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' + MKSHLIB_UNFORCE_ALL='' + DSO_LDOPTS='-G -Qoption ld -z,muldefs' +=== embedding/browser/gtk/src/Makefile.in +--- xulrunner/embedding/browser/gtk/src/Makefile.in (revision 8) ++++ xulrunner/embedding/browser/gtk/src/Makefile.in (local) +@@ -46,6 +46,7 @@ + MODULE = gtkembedmoz + LIBRARY_NAME = gtkembedmoz + MOZILLA_INTERNAL_API = 1 ++SO_VERSION = 0d + + REQUIRES = xpcom \ + string \ +=== js/src/Makefile.in +--- xulrunner/js/src/Makefile.in (revision 8) ++++ xulrunner/js/src/Makefile.in (local) +@@ -48,6 +48,7 @@ + LIBRARY_NAME = mozjs + LIB_IS_C_ONLY = 1 + GRE_MODULE = 1 ++SO_VERSION = 0d + + ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) + LIBRARY_NAME = js$(MOZ_BITS)$(VERSION_NUMBER) +=== toolkit/library/Makefile.in +--- xulrunner/toolkit/library/Makefile.in (revision 8) ++++ xulrunner/toolkit/library/Makefile.in (local) +@@ -48,6 +48,7 @@ + FORCE_USE_PIC = 1 + FORCE_SHARED_LIB = 1 + MOZILLA_INTERNAL_API = 1 ++SO_VERSION = 0d + + ifeq ($(OS_ARCH),Darwin) + # This is going to be a framework named "XUL", not an ordinary library named +=== xpcom/stub/Makefile.in +--- xulrunner/xpcom/stub/Makefile.in (revision 8) ++++ xulrunner/xpcom/stub/Makefile.in (local) +@@ -44,6 +44,7 @@ + + MODULE = xpcom + LIBRARY_NAME = xpcom ++SO_VERSION = 0d + + # The XPCOM glue uses realpath() on libxpcom.so to resolve any symlinks. We + # want it to find dist/bin and not xpcom/stub so we copy instead of symlinking. +=== configure.in +================================================================== +--- configure.in (revision 206) ++++ configure.in (local) --- xulrunner-1.8.1.4.orig/debian/patches/82_locale.dpatch +++ xulrunner-1.8.1.4/debian/patches/82_locale.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 82_locale.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use OS locale and display it correctly. bz#331779 + +@DPATCH@ + +=== xulrunner/app/xulrunner.js +================================================================== +--- xulrunner/xulrunner/app/xulrunner.js (revision 17) ++++ xulrunner/xulrunner/app/xulrunner.js (local) +@@ -39,7 +39,8 @@ + // We need to override the default values of these preferences since all.js + // assumes these are in the navigator package, which for us is non-existant. + // XXX(darin): perhaps all.js should not be seamonkey specific +-pref("general.useragent.locale", "@AB_CD@"); ++pref("intl.locale.matchOS", true); ++pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("font.language.group", "chrome://global/locale/intl.properties"); + pref("intl.accept_languages", "chrome://global/locale/intl.properties"); + pref("intl.collationOption", "chrome://global-platform/locale/intl.properties"); --- xulrunner-1.8.1.4.orig/debian/patches/82_prefs.dpatch +++ xulrunner-1.8.1.4/debian/patches/82_prefs.dpatch @@ -0,0 +1,80 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 82_prefs.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Set javascript.options.showInConsole. +## DP: Set DPI to system settings. +## DP: Fix font defaults. + +@DPATCH@ + +=== modules/libpref/src/init/all.js +================================================================== +--- xulrunner/modules/libpref/src/init/all.js (revision 67) ++++ xulrunner/modules/libpref/src/init/all.js (local) +@@ -439,6 +439,7 @@ + pref("javascript.enabled", true); + pref("javascript.allow.mailnews", false); + pref("javascript.options.strict", false); ++pref("javascript.options.showInConsole", true); + + // advanced prefs + pref("security.enable_java", true); +@@ -1844,7 +1844,7 @@ + pref("network.hosts.smtp_server", "localhost"); + pref("network.hosts.pop_server", "pop"); + pref("network.protocol-handler.warn-external.file", false); +-pref("layout.css.dpi", -1); // max(96dpi, System setting) ++pref("layout.css.dpi", 0); // System setting + pref("browser.drag_out_of_frame_style", 1); + pref("editor.singleLine.pasteNewlines", 0); + +@@ -1872,33 +1873,33 @@ + + // th + +-pref("font.name.serif.tr", "Times"); +-pref("font.name.sans-serif.tr", "Helvetica"); +-pref("font.name.monospace.tr", "Courier"); ++pref("font.name.serif.tr", "serif"); ++pref("font.name.sans-serif.tr", "sans-serif"); ++pref("font.name.monospace.tr", "monospace"); + + pref("font.name.serif.x-baltic", "serif"); + pref("font.name.sans-serif.x-baltic", "sans-serif"); + pref("font.name.monospace.x-baltic", "monospace"); + +-pref("font.name.serif.x-central-euro", "Times"); +-pref("font.name.sans-serif.x-central-euro", "Helvetica"); +-pref("font.name.monospace.x-central-euro", "Courier"); ++pref("font.name.serif.x-central-euro", "serif"); ++pref("font.name.sans-serif.x-central-euro", "sans-serif"); ++pref("font.name.monospace.x-central-euro", "monospace"); + + pref("font.name.serif.x-cyrillic", "serif"); + pref("font.name.sans-serif.x-cyrillic", "sans-serif"); + pref("font.name.monospace.x-cyrillic", "monospace"); + +-pref("font.name.serif.x-unicode", "Times"); +-pref("font.name.sans-serif.x-unicode", "Helvetica"); +-pref("font.name.monospace.x-unicode", "Courier"); ++pref("font.name.serif.x-unicode", "serif"); ++pref("font.name.sans-serif.x-unicode", "sans-serif"); ++pref("font.name.monospace.x-unicode", "monospace"); + +-pref("font.name.serif.x-user-def", "Times"); +-pref("font.name.sans-serif.x-user-def", "Helvetica"); +-pref("font.name.monospace.x-user-def", "Courier"); ++pref("font.name.serif.x-user-def", "serif"); ++pref("font.name.sans-serif.x-user-def", "sans-serif"); ++pref("font.name.monospace.x-user-def", "monospace"); + +-pref("font.name.serif.x-western", "Times"); +-pref("font.name.sans-serif.x-western", "Helvetica"); +-pref("font.name.monospace.x-western", "Courier"); ++pref("font.name.serif.x-western", "serif"); ++pref("font.name.sans-serif.x-western", "sans-serif"); ++pref("font.name.monospace.x-western", "monospace"); + + pref("font.name.serif.zh-CN", "serif"); + pref("font.name.sans-serif.zh-CN", "sans-serif"); --- xulrunner-1.8.1.4.orig/debian/patches/85_URI_fixup.dpatch +++ xulrunner-1.8.1.4/debian/patches/85_URI_fixup.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_URI_fixup.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable keyword lookup by default in URI fixup. Temporary until Galeon +## DP: and Kazehakase are fixed + +@DPATCH@ + +--- xulrunner/docshell/base/nsDocShell.cpp ++++ xulrunner/docshell/base/nsDocShell.cpp +@@ -2864,6 +2864,8 @@ + rv = NS_NewURI(getter_AddRefs(uri), uriString); + if (uri) { + aLoadFlags = aLoadFlags & ~LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP; ++ } else { ++ aLoadFlags |= LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP; + } + + if (sURIFixup) { --- xulrunner-1.8.1.4.orig/debian/patches/85_installer.dpatch +++ xulrunner-1.8.1.4/debian/patches/85_installer.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_installer.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Install applications in /usr/local/lib instead of /usr/lib + +@DPATCH@ + +=== xulrunner/setup/nsXULAppInstall.js +================================================================== +--- xulrunner/xulrunner/setup/nsXULAppInstall.js (revision 72) ++++ xulrunner/xulrunner/setup/nsXULAppInstall.js (local) +@@ -246,7 +246,7 @@ + #else + aDirectory = Components.classes["@mozilla.org/file/local;1"]. + createInstance(nsILocalFile); +- aDirectory.initWithPath("/usr/lib"); ++ aDirectory.initWithPath("/usr/local/lib"); + if (vendor) + aDirectory.append(vendor.toLowerCase()); + #endif --- xulrunner-1.8.1.4.orig/debian/patches/85_no_register.dpatch +++ xulrunner-1.8.1.4/debian/patches/85_no_register.dpatch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_no_register.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove (un|)registering system. + +@DPATCH@ + +=== xulrunner/app/nsXULRunnerApp.cpp +================================================================== +--- xulrunner/xulrunner/app/nsXULRunnerApp.cpp (revision 69) ++++ xulrunner/xulrunner/app/nsXULRunnerApp.cpp (local) +@@ -43,7 +43,6 @@ + + #include "nsXULAppAPI.h" + #include "nsXPCOMGlue.h" +-#include "nsRegisterGRE.h" + #include "nsAppRunner.h" + #include "nsINIParser.h" + #include "nsILocalFile.h" +@@ -264,12 +263,6 @@ + " -h, --help show this message\n" + " -v, --version show version\n" + " --gre-version print the GRE version string on stdout\n" +- " --register-global register this GRE in the machine registry\n" +- " --register-user register this GRE in the user registry\n" +- " --unregister-global unregister this GRE formerly registered with\n" +- " --register-global\n" +- " --unregister-user unregister this GRE formely registered with\n" +- " --register-user\n" + " --find-gre Find a GRE with version and print\n" + " the path on stdout\n" + " --install-app [ []]\n" +@@ -373,40 +366,6 @@ + } + + if (argc > 1) { +- PRBool registerGlobal = IsArg(argv[1], "register-global"); +- PRBool registerUser = IsArg(argv[1], "register-user"); +- if (registerGlobal || registerUser) { +- if (argc != 2) { +- Usage(); +- return 1; +- } +- +- nsCOMPtr regDir; +- nsresult rv = GetXULRunnerDir(argv[0], getter_AddRefs(regDir)); +- if (NS_FAILED(rv)) +- return 2; +- +- return RegisterXULRunner(registerGlobal, regDir, +- kGREProperties, +- NS_ARRAY_LENGTH(kGREProperties)) ? 0 : 2; +- } +- +- registerGlobal = IsArg(argv[1], "unregister-global"); +- registerUser = IsArg(argv[1], "unregister-user"); +- if (registerGlobal || registerUser) { +- if (argc != 2) { +- Usage(); +- return 1; +- } +- +- nsCOMPtr regDir; +- nsresult rv = GetXULRunnerDir(argv[0], getter_AddRefs(regDir)); +- if (NS_FAILED(rv)) +- return 2; +- UnregisterXULRunner(registerGlobal, regDir); +- return 0; +- } +- + if (IsArg(argv[1], "find-gre")) { + if (argc != 3) { + Usage(); --- xulrunner-1.8.1.4.orig/debian/patches/85_sidebar.dpatch +++ xulrunner-1.8.1.4/debian/patches/85_sidebar.dpatch @@ -0,0 +1,590 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_sidebar.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add sidebar component + +@DPATCH@ + +=== allmakefiles.sh +================================================================== +--- xulrunner/allmakefiles.sh (revision 4) ++++ xulrunner/allmakefiles.sh (local) +@@ -985,6 +985,9 @@ + toolkit/components/satchel/Makefile + toolkit/components/satchel/public/Makefile + toolkit/components/satchel/src/Makefile ++toolkit/components/sidebar/Makefile ++toolkit/components/sidebar/public/Makefile ++toolkit/components/sidebar/src/Makefile + toolkit/components/startup/Makefile + toolkit/components/startup/public/Makefile + toolkit/components/startup/src/Makefile +=== toolkit/components/Makefile.in +================================================================== +--- xulrunner/toolkit/components/Makefile.in (revision 206) ++++ xulrunner/toolkit/components/Makefile.in (local) +@@ -73,6 +73,7 @@ + history \ + passwordmgr \ + satchel \ ++ sidebar \ + $(NULL) + endif # MOZ_THUNDERBIRD + +=== toolkit/components/sidebar/Makefile.in +================================================================== +--- xulrunner/toolkit/components/sidebar/Makefile.in (revision 4) ++++ xulrunner/toolkit/components/sidebar/Makefile.in (local) +@@ -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) 1999 ++# 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 ++ ++DIRS = public src ++ ++include $(topsrcdir)/config/rules.mk ++ +=== toolkit/components/sidebar/public/Makefile.in +================================================================== +--- xulrunner/toolkit/components/sidebar/public/Makefile.in (revision 4) ++++ xulrunner/toolkit/components/sidebar/public/Makefile.in (local) +@@ -0,0 +1,50 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is mozilla.org Code. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1998 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++DEPTH = ../../../.. ++topsrcdir = @top_srcdir@ ++srcdir = @srcdir@ ++VPATH = @srcdir@ ++ ++include $(DEPTH)/config/autoconf.mk ++ ++MODULE = sidebar ++ ++XPIDLSRCS = nsISidebar.idl ++ ++include $(topsrcdir)/config/rules.mk ++ +=== toolkit/components/sidebar/public/nsISidebar.idl +================================================================== +--- xulrunner/toolkit/components/sidebar/public/nsISidebar.idl (revision 4) ++++ xulrunner/toolkit/components/sidebar/public/nsISidebar.idl (local) +@@ -0,0 +1,70 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * ++ * ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org Code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* ++ ++ The Sidebar API for 3rd parties ++ ++*/ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)] ++interface nsISidebar : nsISupports ++{ ++ void addPanel(in wstring aTitle, in string aContentURL, ++ in string aCustomizeURL); ++ void addPersistentPanel(in wstring aTitle, in string aContentURL, ++ in string aCustomizeURL); ++ void addSearchEngine(in string engineURL, in string iconURL, ++ in wstring suggestedTitle, in wstring suggestedCategory); ++}; ++ ++%{ C++ ++// {577CB744-8CAF-11d3-AAEF-00805F8A4905} ++#define NS_SIDEBAR_CID \ ++{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } } ++ ++#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1" ++%} ++ ++/* ++ var isidebar = Components.interfaces.nsISidebar; ++ var csidebar = Components.classes['@mozilla.org/sidebar;1']; ++ var sidebar = csidebar.createInstance(isidebar); ++*/ +=== toolkit/components/sidebar/src/Makefile.in +================================================================== +--- xulrunner/toolkit/components/sidebar/src/Makefile.in (revision 4) ++++ xulrunner/toolkit/components/sidebar/src/Makefile.in (local) +@@ -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 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 ++ ++EXTRA_COMPONENTS = nsSidebar.js ++ ++include $(topsrcdir)/config/rules.mk ++ +=== toolkit/components/sidebar/src/nsSidebar.js +================================================================== +--- xulrunner/toolkit/components/sidebar/src/nsSidebar.js (revision 4) ++++ xulrunner/toolkit/components/sidebar/src/nsSidebar.js (local) +@@ -0,0 +1,315 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1999 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Stephen Lamm ++ * Robert John Churchill ++ * David Hyatt ++ * Christopher A. Aillon ++ * ++ * 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 ***** */ ++ ++/* ++ * No magic constructor behaviour, as is de rigeur for XPCOM. ++ * If you must perform some initialization, and it could possibly fail (even ++ * due to an out-of-memory condition), you should use an Init method, which ++ * can convey failure appropriately (thrown exception in JS, ++ * NS_FAILED(nsresult) return in C++). ++ * ++ * In JS, you can actually cheat, because a thrown exception will cause the ++ * CreateInstance call to fail in turn, but not all languages are so lucky. ++ * (Though ANSI C++ provides exceptions, they are verboten in Mozilla code ++ * for portability reasons -- and even when you're building completely ++ * platform-specific code, you can't throw across an XPCOM method boundary.) ++ */ ++ ++const DEBUG = false; /* set to false to suppress debug messages */ ++ ++const SIDEBAR_CONTRACTID = "@mozilla.org/sidebar;1"; ++const SIDEBAR_CID = Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}"); ++const NETSEARCH_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=internetsearch" ++const nsISupports = Components.interfaces.nsISupports; ++const nsIFactory = Components.interfaces.nsIFactory; ++const nsISidebar = Components.interfaces.nsISidebar; ++const nsIInternetSearchService = Components.interfaces.nsIInternetSearchService; ++const nsIClassInfo = Components.interfaces.nsIClassInfo; ++ ++function nsSidebar() ++{ ++ const PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; ++ const nsIPromptService = Components.interfaces.nsIPromptService; ++ this.promptService = ++ Components.classes[PROMPTSERVICE_CONTRACTID].getService(nsIPromptService); ++} ++ ++nsSidebar.prototype.nc = "http://home.netscape.com/NC-rdf#"; ++ ++function sidebarURLSecurityCheck(url) ++{ ++ if (url.search(/(^http:|^ftp:|^https:)/) == -1) ++ throw "Script attempted to add sidebar panel from illegal source"; ++} ++ ++/* decorate prototype to provide ``class'' methods and property accessors */ ++nsSidebar.prototype.addPanel = ++function (aTitle, aContentURL, aCustomizeURL) ++{ ++ debug("addPanel(" + aTitle + ", " + aContentURL + ", " + ++ aCustomizeURL + ")"); ++ ++ return this.addPanelInternal(aTitle, aContentURL, aCustomizeURL, false); ++} ++ ++nsSidebar.prototype.addPersistentPanel = ++function(aTitle, aContentURL, aCustomizeURL) ++{ ++ debug("addPersistentPanel(" + aTitle + ", " + aContentURL + ", " + ++ aCustomizeURL + ")\n"); ++ ++ return this.addPanelInternal(aTitle, aContentURL, aCustomizeURL, true); ++} ++ ++nsSidebar.prototype.addPanelInternal = ++function (aTitle, aContentURL, aCustomizeURL, aPersist) ++{ ++ var WINMEDSVC = Components.classes['@mozilla.org/appshell/window-mediator;1'] ++ .getService(Components.interfaces.nsIWindowMediator); ++ var win = WINMEDSVC.getMostRecentWindow( "navigator:browser" ); ++ ++ sidebarURLSecurityCheck(aContentURL); ++ var dialogArgs = { ++ name: aTitle, ++ url: aContentURL, ++ bWebPanel: true ++ } ++ var features; ++ if (!/Mac/.test(win.navigator.platform)) ++ features = "centerscreen,chrome,dialog,resizable,dependent"; ++ else ++ features = "chrome,dialog,resizable,modal"; ++ win.openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "", ++ features, dialogArgs); ++} ++ ++/* decorate prototype to provide ``class'' methods and property accessors */ ++nsSidebar.prototype.addSearchEngine = ++function (engineURL, iconURL, suggestedTitle, suggestedCategory) ++{ ++ debug("addSearchEngine(" + engineURL + ", " + iconURL + ", " + ++ suggestedCategory + ", " + suggestedTitle + ")"); ++ ++ try ++ { ++ // make sure using HTTP (for both engine as well as icon URLs) ++ ++ if (engineURL.search(/^http:\/\//i) == -1) ++ { ++ debug ("must use HTTP to fetch search engine file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ if (iconURL.search(/^http:\/\//i) == -1) ++ { ++ debug ("must use HTTP to fetch search icon file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ // make sure engineURL refers to a .src file ++ if (engineURL.search(/\.src$/i) == -1) ++ { ++ debug ("engineURL doesn't reference a .src file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ // make sure iconURL refers to a .gif/.jpg/.jpeg/.png file ++ if (iconURL.search(/\.(gif|jpg|jpeg|png)$/i) == -1) ++ { ++ debug ("iconURL doesn't reference a supported image file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ } ++ catch(ex) ++ { ++ this.promptService.alert(null, "Failed to add the search engine."); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ var titleMessage, dialogMessage; ++ try { ++ var stringBundle = srGetStrBundle("chrome://browser/locale/sidebar/sidebar.properties"); ++ if (stringBundle) { ++ titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle"); ++ dialogMessage = stringBundle.GetStringFromName("addEngineConfirmMessage"); ++ dialogMessage = dialogMessage.replace(/%title%/, suggestedTitle); ++ dialogMessage = dialogMessage.replace(/%category%/, suggestedCategory); ++ dialogMessage = dialogMessage.replace(/%url%/, engineURL); ++ dialogMessage = dialogMessage.replace(/#/g, "\n"); ++ } ++ } ++ catch (e) { ++ titleMessage = "Add Search Engine"; ++ dialogMessage = "Add the following search engine?\n\nName: " + suggestedTitle; ++ dialogMessage += "\nSearch Category: " + suggestedCategory; ++ dialogMessage += "\nSource: " + engineURL; ++ } ++ ++ var rv = this.promptService.confirm(null, titleMessage, dialogMessage); ++ ++ if (!rv) ++ return; ++ ++ var internetSearch = Components.classes[NETSEARCH_CONTRACTID].getService(); ++ if (internetSearch) ++ internetSearch = internetSearch.QueryInterface(nsIInternetSearchService); ++ if (internetSearch) ++ { ++ internetSearch.AddSearchEngine(engineURL, iconURL, suggestedTitle, ++ suggestedCategory); ++ } ++} ++ ++// property of nsIClassInfo ++nsSidebar.prototype.flags = nsIClassInfo.DOM_OBJECT; ++ ++// property of nsIClassInfo ++nsSidebar.prototype.classDescription = "Sidebar"; ++ ++// method of nsIClassInfo ++nsSidebar.prototype.getInterfaces = function(count) { ++ var interfaceList = [nsISidebar, nsIClassInfo]; ++ count.value = interfaceList.length; ++ return interfaceList; ++} ++ ++// method of nsIClassInfo ++nsSidebar.prototype.getHelperForLanguage = function(count) {return null;} ++ ++nsSidebar.prototype.QueryInterface = ++function (iid) { ++ if (!iid.equals(nsISidebar) && ++ !iid.equals(nsIClassInfo) && ++ !iid.equals(nsISupports)) ++ throw Components.results.NS_ERROR_NO_INTERFACE; ++ return this; ++} ++ ++var sidebarModule = new Object(); ++ ++sidebarModule.registerSelf = ++function (compMgr, fileSpec, location, type) ++{ ++ debug("registering (all right -- a JavaScript module!)"); ++ compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar); ++ ++ compMgr.registerFactoryLocation(SIDEBAR_CID, ++ "Sidebar JS Component", ++ SIDEBAR_CONTRACTID, ++ fileSpec, ++ location, ++ type); ++ const CATMAN_CONTRACTID = "@mozilla.org/categorymanager;1"; ++ const nsICategoryManager = Components.interfaces.nsICategoryManager; ++ var catman = Components.classes[CATMAN_CONTRACTID]. ++ getService(nsICategoryManager); ++ ++ const JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY = "JavaScript global property"; ++ catman.addCategoryEntry(JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY, ++ "sidebar", ++ SIDEBAR_CONTRACTID, ++ true, ++ true); ++} ++ ++sidebarModule.getClassObject = ++function (compMgr, cid, iid) { ++ if (!cid.equals(SIDEBAR_CID)) ++ throw Components.results.NS_ERROR_NO_INTERFACE; ++ ++ if (!iid.equals(Components.interfaces.nsIFactory)) ++ throw Components.results.NS_ERROR_NOT_IMPLEMENTED; ++ ++ return sidebarFactory; ++} ++ ++sidebarModule.canUnload = ++function(compMgr) ++{ ++ debug("Unloading component."); ++ return true; ++} ++ ++/* factory object */ ++var sidebarFactory = new Object(); ++ ++sidebarFactory.createInstance = ++function (outer, iid) { ++ debug("CI: " + iid); ++ if (outer != null) ++ throw Components.results.NS_ERROR_NO_AGGREGATION; ++ ++ return (new nsSidebar()).QueryInterface(iid); ++} ++ ++/* entrypoint */ ++function NSGetModule(compMgr, fileSpec) { ++ return sidebarModule; ++} ++ ++/* static functions */ ++if (DEBUG) ++ debug = function (s) { dump("-*- sidebar component: " + s + "\n"); } ++else ++ debug = function (s) {} ++ ++var strBundleService = null; ++function srGetStrBundle(path) ++{ ++ var strBundle = null; ++ if (!strBundleService) { ++ try { ++ strBundleService = ++ Components.classes["@mozilla.org/intl/stringbundle;1"].getService(); ++ strBundleService = ++ strBundleService.QueryInterface(Components.interfaces.nsIStringBundleService); ++ } catch (ex) { ++ dump("\n--** strBundleService failed: " + ex + "\n"); ++ return null; ++ } ++ } ++ strBundle = strBundleService.createBundle(path); ++ if (!strBundle) { ++ dump("\n--** strBundle createInstance failed **--\n"); ++ } ++ return strBundle; ++} --- xulrunner-1.8.1.4.orig/debian/patches/85_useragent.dpatch +++ xulrunner-1.8.1.4/debian/patches/85_useragent.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_useragent.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove useless useragent setter at startup. bz#331783. + +@DPATCH@ + +=== layout/build/Makefile.in +================================================================== +--- xulrunner/layout/build/Makefile.in (revision 42) ++++ xulrunner/layout/build/Makefile.in (local) +@@ -105,7 +105,6 @@ + + CPPSRCS = \ + nsLayoutModule.cpp \ +- nsContentHTTPStartup.cpp \ + nsContentDLF.cpp \ + $(NULL) + +=== layout/build/nsLayoutModule.cpp +================================================================== +--- xulrunner/layout/build/nsLayoutModule.cpp (revision 42) ++++ xulrunner/layout/build/nsLayoutModule.cpp (local) +@@ -43,7 +43,6 @@ + #include "nsCSSProps.h" // to addref/release table + #include "nsColorNames.h" // to addref/release table + #include "nsContentCID.h" +-#include "nsContentHTTPStartup.h" + #include "nsContentDLF.h" + #include "nsContentPolicyUtils.h" + #include "nsContentUtils.h" +@@ -593,7 +592,6 @@ + #ifdef MOZ_SVG + MAKE_CTOR(CreateSVGRect, nsIDOMSVGRect, NS_NewSVGRect) + #endif +-NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentHTTPStartup) + MAKE_CTOR(CreateContentDLF, nsIDocumentLoaderFactory, NS_NewContentDocumentLoaderFactory) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsCSSOMFactory) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsInspectorCSSUtils) +@@ -1258,13 +1256,6 @@ + CreateSVGRect }, + #endif + +- { "Content HTTP Startup Listener", +- NS_CONTENTHTTPSTARTUP_CID, +- NS_CONTENTHTTPSTARTUP_CONTRACTID, +- nsContentHTTPStartupConstructor, +- nsContentHTTPStartup::RegisterHTTPStartup, +- nsContentHTTPStartup::UnregisterHTTPStartup }, +- + { "Document Loader Factory", + NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID, + "@mozilla.org/content/document-loader-factory;1", --- xulrunner-1.8.1.4.orig/debian/patches/85_xpcomglue.dpatch +++ xulrunner-1.8.1.4/debian/patches/85_xpcomglue.dpatch @@ -0,0 +1,240 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_xpcomglue.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Build the xpcom glue as a shared library. Still hackish. +## DP: - Load DSOs from . when directory is not given. + +@DPATCH@ + +=== xpcom/glue/Makefile.in +================================================================== +--- xulrunner/xpcom/glue/Makefile.in (revision 62) ++++ xulrunner/xpcom/glue/Makefile.in (local) +@@ -45,6 +45,7 @@ + + DIRS = standalone + ++ifeq (1,0) + MODULE = xpcom + LIBRARY_NAME = xpcomglue_s + +@@ -64,6 +65,7 @@ + $(XPCOM_GLUE_SRC_LCPPSRCS) \ + $(XPCOM_GLUENS_SRC_LCPPSRCS) \ + $(NULL) ++endif + + EXPORTS = \ + pldhash.h \ +@@ -96,6 +98,7 @@ + nsVersionComparator.h \ + $(NULL) + ++ifeq (1,0) + SDK_LIBRARY = \ + $(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ + $(NULL) +@@ -105,6 +108,7 @@ + + # Force use of PIC + FORCE_USE_PIC = 1 ++endif + + include $(topsrcdir)/config/rules.mk + +=== xpcom/glue/standalone/Makefile.in +================================================================== +--- xulrunner/xpcom/glue/standalone/Makefile.in (revision 62) ++++ xulrunner/xpcom/glue/standalone/Makefile.in (local) +@@ -45,10 +45,14 @@ + + MODULE = xpcom + LIBRARY_NAME = xpcomglue ++SO_VERSION = 0d ++VISIBILITY_FLAGS= + + REQUIRES = string \ + $(NULL) + ++EXTRA_DSO_LDOPTS= -L$(topsrcdir)/dist/lib -lnspr4 ++ + LOCAL_INCLUDES = \ + -I$(srcdir)/../../build \ + $(NULL) +@@ -87,11 +91,11 @@ + $(NULL) + + SDK_LIBRARY = \ +- $(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \ ++ $(DLL_PREFIX)xpcomglue$(DLL_SUFFIX) \ + $(NULL) + + # we don't want the shared lib, but we want to force the creation of a static lib. +-FORCE_STATIC_LIB = 1 ++#FORCE_STATIC_LIB = 1 + + # Force use of PIC + FORCE_USE_PIC = 1 +=== xpcom/glue/standalone/nsGlueLinking.h +================================================================== +--- xulrunner/xpcom/glue/standalone/nsGlueLinking.h (revision 62) ++++ xulrunner/xpcom/glue/standalone/nsGlueLinking.h (local) +@@ -42,15 +42,15 @@ + + #define XPCOM_DEPENDENT_LIBS_LIST "dependentlibs.list" + +-NS_HIDDEN_(GetFrozenFunctionsFunc) ++NS_EXPORT_(GetFrozenFunctionsFunc) + XPCOMGlueLoad(const char *xpcomFile); + +-NS_HIDDEN_(void) ++NS_EXPORT_(void) + XPCOMGlueUnload(); + + typedef void (*DependentLibsCallback)(const char *aDependentLib); + +-NS_HIDDEN_(void) ++NS_EXPORT_(void) + XPCOMGlueLoadDependentLibs(const char *xpcomDir, DependentLibsCallback cb); + + #endif // nsGlueLinking_h__ +=== xpcom/glue/standalone/nsXPCOMGlue.h +================================================================== +--- xulrunner/xpcom/glue/standalone/nsXPCOMGlue.h (revision 62) ++++ xulrunner/xpcom/glue/standalone/nsXPCOMGlue.h (local) +@@ -99,7 +99,7 @@ + * Initialize the XPCOM glue by dynamically linking against the XPCOM + * shared library indicated by xpcomFile. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + XPCOMGlueStartup(const char* xpcomFile); + + typedef void (*NSFuncPtr)(); +@@ -118,13 +118,13 @@ + * @throws NS_ERROR_LOSS_OF_SIGNIFICANT_DATA if only some of the required + * functions were found. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + XPCOMGlueLoadXULFunctions(const nsDynamicFunctionLoad *symbols); + + /** + * Finish the XPCOM glue after it is no longer needed. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + XPCOMGlueShutdown(); + + +@@ -139,7 +139,7 @@ + * not need to free this buffer. + * @status DEPRECATED - Use GRE_GetGREPathWithProperties + */ +-extern "C" NS_HIDDEN_(char const *) ++extern "C" NS_EXPORT_(char const *) + GRE_GetXPCOMPath(); + + +@@ -148,7 +148,7 @@ + * + * @param _retval Ordinary XPCOM getter, returns an addrefed interface. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + GRE_GetGREDirectory(nsILocalFile* *_retval); + + +@@ -157,14 +157,14 @@ + * directoryserviceprovider may use GRE_Startup to start the XPCOM + * glue and initialize the GRE in one step. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + GRE_Startup(); + + + /** + * Shut down XPCOM and the XPCOM glue in one step. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + GRE_Shutdown(); + + #endif // XPCOM_GLUE +=== xpcom/string/public/nsStringAPI.h +================================================================== +--- xulrunner/xpcom/string/public/nsStringAPI.h (revision 62) ++++ xulrunner/xpcom/string/public/nsStringAPI.h (local) +@@ -75,7 +75,7 @@ + #include "nscore.h" + + #if defined( XPCOM_GLUE ) +-#define NS_STRINGAPI(type) extern "C" NS_HIDDEN_(type) ++#define NS_STRINGAPI(type) extern "C" NS_EXPORT_(type) + #elif defined( _IMPL_NS_STRINGAPI ) + #define NS_STRINGAPI(type) extern "C" NS_EXPORT type + #else +=== xpcom/tools/registry/Makefile.in +================================================================== +--- xulrunner/xpcom/tools/registry/Makefile.in (revision 62) ++++ xulrunner/xpcom/tools/registry/Makefile.in (local) +@@ -55,7 +55,6 @@ + + LIBS = \ + $(XPCOM_STANDALONE_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ + $(NULL) + + # Need to link with CoreFoundation on Mac +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 62) ++++ xulrunner/configure.in (local) +@@ -754,7 +754,7 @@ + XPCOM_FROZEN_LDOPTS='-L$(DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom' + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul' + XPCOM_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' +-XPCOM_STANDALONE_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)' ++XPCOM_STANDALONE_GLUE_LDOPTS='-L$(DIST)/lib -lxpcomglue' + + MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' + MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat' +=== xpcom/glue/standalone/nsGlueLinkingDlopen.cpp +================================================================== +--- xulrunner/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp (revision 65) ++++ xulrunner/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp (local) +@@ -86,20 +86,22 @@ + GetFrozenFunctionsFunc + XPCOMGlueLoad(const char *xpcomFile) + { +- char xpcomDir[MAXPATHLEN]; +- if (realpath(xpcomFile, xpcomDir)) { +- char *lastSlash = strrchr(xpcomDir, '/'); +- if (lastSlash) { +- *lastSlash = '\0'; ++ char xulFile[MAXPATHLEN]; ++ char *lastSlash = strrchr(xpcomFile, '/'); ++ if (!lastSlash) { ++ snprintf(xulFile, MAXPATHLEN, "./%s", xpcomFile); ++ return XPCOMGlueLoad(xulFile); ++ } ++ *lastSlash = '\0'; + +- XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB); ++ XPCOMGlueLoadDependentLibs(xpcomFile, ReadDependentCB); + +- snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), "/" XUL_DLL); ++ snprintf(xulFile, MAXPATHLEN - strlen(xpcomFile), "%s/" XUL_DLL, xpcomFile); + +- sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY); +- } +- } ++ sXULLibHandle = dlopen(xulFile, RTLD_GLOBAL | RTLD_LAZY); + ++ *lastSlash = '/'; ++ + // RTLD_DEFAULT is not defined in non-GNU toolchains, and it is + // (void*) 0 in any case. + --- xulrunner-1.8.1.4.orig/debian/patches/88_ubuntu_pyginputstream.dpatch +++ xulrunner-1.8.1.4/debian/patches/88_ubuntu_pyginputstream.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_ubuntu_pyginputstream.dpatch by Stephan Hermann +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyGInputStream.cpp xulrunner-1.8.0.9/extensions/python/xpcom/src/PyGInputStream.cpp +--- xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyGInputStream.cpp 2004-04-19 00:13:54.000000000 +0200 ++++ xulrunner-1.8.0.9/extensions/python/xpcom/src/PyGInputStream.cpp 2007-01-19 17:49:19.553832250 +0100 +@@ -105,7 +105,11 @@ + if (NS_SUCCEEDED(nr)) { + PRUint32 py_size; + const void *py_buf; ++#if defined(__x86_64__) || defined(__ia64__) ++ if (PyObject_AsReadBuffer(ret, &py_buf, (long *)&py_size)!=0) { ++#else + if (PyObject_AsReadBuffer(ret, &py_buf, (int *)&py_size)!=0) { ++#endif + PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", ret->ob_type->tp_name); + nr = HandleNativeGatewayError(methodName); + } else { --- xulrunner-1.8.1.4.orig/debian/patches/88_ubuntu_pyiinputstream.dpatch +++ xulrunner-1.8.1.4/debian/patches/88_ubuntu_pyiinputstream.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_ubuntu_pyiinputstream.dpatch by Stephan Hermann +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyIInputStream.cpp xulrunner-1.8.0.9/extensions/python/xpcom/src/PyIInputStream.cpp +--- xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyIInputStream.cpp 2004-04-19 00:13:54.000000000 +0200 ++++ xulrunner-1.8.0.9/extensions/python/xpcom/src/PyIInputStream.cpp 2007-01-20 16:39:36.756086250 +0100 +@@ -66,7 +66,11 @@ + PRUint32 nread; + void *buf; + PRUint32 buf_len; ++#if defined(__x86_64__) || defined(__ia64__) ++ if (PyObject_AsWriteBuffer(obBuffer, &buf, (long *)&buf_len) != 0) { ++#else + if (PyObject_AsWriteBuffer(obBuffer, &buf, (int *)&buf_len) != 0) { ++#endif + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "The buffer object does not have a write buffer!"); + return NULL; +@@ -117,7 +121,11 @@ + if (rc != NULL) { + void *ob_buf; + PRUint32 buf_len; ++#if defined(__x86_64__) || defined(__ia64__) ++ if (PyObject_AsWriteBuffer(rc, &ob_buf, (long *)&buf_len) != 0) { ++#else + if (PyObject_AsWriteBuffer(rc, &ob_buf, (int *)&buf_len) != 0) { ++#endif + // should never fail - we just created it! + return NULL; + } +@@ -141,12 +149,20 @@ + nsIInputStream *pI = GetI(self); + if (pI==NULL) + return NULL; ++#if defined(__x86_64__) || defined(__ia64__) ++ if (PyArg_ParseTuple(args, "|i", (long *)&n)) ++#else + if (PyArg_ParseTuple(args, "|i", (int *)&n)) ++#endif + // This worked - no args, or just an int. + return DoPyRead_Size(pI, n); + // try our other supported arg format. + PyErr_Clear(); ++#if defined(__x86_64__) || defined(__ia64__) ++ if (!PyArg_ParseTuple(args, "O|i", &obBuffer, (long *)&n)) { ++#else + if (!PyArg_ParseTuple(args, "O|i", &obBuffer, (int *)&n)) { ++#endif + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "'read()' must be called as (buffer_ob, int_size=-1) or (int_size=-1)"); + return NULL; --- xulrunner-1.8.1.4.orig/debian/changelog +++ xulrunner-1.8.1.4/debian/changelog @@ -0,0 +1,1195 @@ +xulrunner (1.8.1.4-2ubuntu2) gutsy; urgency=low + + * replacing bogus patches that can cause access to unintialized + memory and that should have never ended up in here: + - Dropped 88_ubuntu_pyginputstream.dpatch + - Dropped 88_ubuntu_pyiinputstream.dpatch + - Adding 61_python_py_ssize_t_detect.dpatch + - Adding 68_python25_api_breakage.dpatch + - Update 99_configure.dpatch because 61_python_py_ssize_t_detect.dpatch + touches configure.in. + New patches that do boundary checks are submitted to bugzilla + bug 386610 and debian bug 431483. + - update 00list accordingly + + Remaining Ubuntu Changes: + - Adding 61_python_py_ssize_t_detect.dpatch + - Adding 68_python25_api_breakage.dpatch + - update 00list accordingly + - Update 99_configure.dpatch like: + 1. dpatch-edit-patch 99_configure.dpatch + 2. autoconf2.13 + 3. exit 0 + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Alexander Sack Wed, 04 Jul 2007 14:13:40 +0200 + +xulrunner (1.8.1.4-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Fixing __x86_64__ and __ia64__ FTBFS + - Added 88_ubuntu_pyginputstream.dpatch + - Added 88_ubuntu_pyiinputstream.dpatch + - update debian/patches/00list + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michele Angrisano Mon, 11 Jun 2007 18:04:53 +0200 + +xulrunner (1.8.1.4-2) unstable; urgency=low + + * debian/patches/85_URI_fixup.dpatch: Enable keyword lookup by default in + URI fixup. Temporary until Galeon and Kazehakase are fixed. (bugs #428244 + and #428245) + * debian/patches/00list: Updated accordingly. + * debian/patches/80_xulrunner-config.dpatch: Substitutions being done only + once a line, split component_includes fixup. Thanks Alexander Sack. + Closes: #427079. + * debian/libxul0d.postinst, debian/python-xpcom.postinst, + debian/python-xpcom.prerm, debian/xulrunner-gnome-support.postinst, + debian/xulrunner-gnome-support.prerm: Remove compreg.dat and xpti.dat + when installing/removing packages. This avoids problems with compreg.dat + files generated ages ago. Closes: #426569, #427569. + * debian/patches/82_prefs.dpatch: Set layout.css.dpi to 0 instead of -1. + libxul will use system DPI and avoid using huge fonts on systems where + DPI < 96. Closes: #426229 + * debian/control: Improved spidermonkey-bin short description. Thanks CJ + Fearnley. Closes: #426614. + + -- Mike Hommey Sun, 10 Jun 2007 09:46:32 +0200 + +xulrunner (1.8.1.4-1ubuntu2) gutsy; urgency=low + + * Apply the fix for AMD64 also to IA64 + (this should hopefully fix the FTBFS on IA64). + + -- Michael Bienia Wed, 6 Jun 2007 10:07:27 -0500 + +xulrunner (1.8.1.4-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Fixing __x86_64__ FTBFS + - Added 88_ubuntu_pyginputstream.dpatch + - Added 88_ubuntu_pyiinputstream.dpatch + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Arthur Loiret Mon, 4 Jun 2007 00:19:28 +0200 + +xulrunner (1.8.1.4-1) unstable; urgency=high + + * New upstream release (taken from upstream CVS) + * Fixes several security issues, including CVE-2007-1116. Closes: #415945. + * Acknowledge Steve Langasek's NMU. + * debian/patches/65_native_uconv.dpatch: Properly handle when UTF16 + character can't be converted to the destination charset, avoiding + an infinite loop. Closes: #424042. + * debian/patches/10_dash_workaround.dpatch, + debian/patches/10_pangoxft.dpatch, + debian/patches/10_system_nss.dpatch, + debian/patches/15_atk_crash.dpatch, + debian/patches/15_gtk_dropdown.dpatch, + debian/patches/15_passwdmgr.dpatch, + debian/patches/20_visibility.dpatch, + debian/patches/82_ssl.dpatch: Removed, as being applied upstream. + * debian/patches/20_about:plugins.dpatch, + debian/patches/25_gnome_helpers_with_params.dpatch, + debian/patches/30_distclean.dpatch, + debian/patches/65_native_uconv.dpatch, + debian/patches/80_javaxpcom.dpatch, + debian/patches/81_sonames.dpatch, + debian/patches/85_sidebar.dpatch: Adapted to upstream changes. + * debian/patches/10_toolkit_library.dpatch: Add Freetype library to the + list of linked libraries. Stolen from bz#340795. + * debian/patches/61_javaxpcom.dpatch: + + Correctly build java files. This part is fixed on upstream trunk. + + Install jar file with appropriate permissions. bz#350886 comment #17. + * debian/libxul-common.install: Add new components, and remove + xmlextras.xpt, which disappeared. + * debian/patches/80_xulrunner-config.dpatch: Patch mozilla-config.in so that + the changes end up in xulrunner-config. + * debian/patches/00list: Updated accordingly. + * debian/xulrunner-config: Removed. + * debian/copyright: Fixed typo. Thanks to Sam Hocevar. + * debian/rules: + + Bumped shlibs for libmozjs0d and libxul0d. + + Removed shlibdeps tweaks. + + Removed dh_makeshlibs call for packages others than libmozjs0d and + libxul0d: there are no such packages anymore. + + Adapted rules to create javaxpcom jar files. + + Revert change from version 1.8.0.11-2 and 1.8.0.10-3 as gcj-4.1 and + pcmanx-gtk2 should be fixed now. + * debian/patches/80_hunspell.dpatch: Replace myspell support with hunspell, + and allow to build with system shared library. Stolen from iceape. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/mozconfig: + + Don't disable xpcom obsolete, it is needed for xpinstall. + + Enable spellchecker and use of the system hunspell library. + Closes: #404726. + * debian/control: + + Build depend on appropriate version of libhunspell. + + Remove libsmjs-dev and libsmjs1 transition packages. + * debian/libxul0d.install, debian/libxul-common.install: Install the + spellchecker components. + * debian/libxul0d.links: Create the /usr/lib/xulrunner/dictionaries link. + * debian/libsmjs-dev.links, debian/libsmjs1.links: Removed. + * debian/patches/65_mozjs_abi.dpatch: Make 1.8.1 ABI compatible with + version 1.8.0. + * debian/libmozjs0d.README.Debian: Added a note about ABI compatibility. + * debian/patches/35_psm_wakeups.dpatch: Avoid some cpu wake ups in PSM. + bz#380558. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sat, 26 May 2007 20:28:00 +0200 + +xulrunner (1.8.0.11-4.1) unstable; urgency=low + + * Non-maintainer upload + * Build with -Wl,--no-relax on alpha, to work around a binutils bug + causing a build failure. + + -- Steve Langasek Sun, 20 May 2007 18:14:00 -0700 + +xulrunner (1.8.0.11-4ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - resolve conflict in debian/control + debian/rules + - looks like candidate for sync + + -- Alexander Sack Fri, 18 May 2007 10:00:00 +0200 + +xulrunner (1.8.0.11-4) unstable; urgency=low + + * debian/rules: Don't make shlibs for components (which happened to make one + for libsystem-pref.so, because of the -). + * debian/mozconfig: Disabled spell checker, it requires too much cherry + picking from 1.8.1 to be any useful for epiphany. + * debian/patches/35_system_myspell.dpatch: Removed. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/control: Removed build dependency on libmyspell-dev. + * debian/libxul0d.install, debian/libxul-common.install: Don't install + spellchecker files. + * debian/libxul0d.links: Don't create the /usr/lib/xulrunner/dictionaries + link. + * debian/rules: + + Fixed the .pc files so that xpcom and js depend on xulrunner-nspr, so + that it can be taken from any existing version of libnspr, even the + one from older xulrunner releases, not only the one from the new + separate package. + + Removed shlib versioning for libxul0d, which was due to spellchecker + being added. + + -- Mike Hommey Mon, 09 Apr 2007 23:55:49 +0200 + +xulrunner (1.8.0.11-3) experimental; urgency=low + + * debian/control: + + Removed libnspr* and libnss* packages. + + Adapted dependencies accordingly. + + Build-Depend on libnspr4-dev. + + Build-Depend on libnss3-dev (>= 3.11.5-2) for nss-config and libcrmf. + + Build-Depend on libmyspell-dev. + + Bumped Standards-Version to 3.7.2.2. No changes. + * debian/libnspr*, debian/libnss*: Removed. + * debian/rules: + + Replaced some = with :=. + + Removed unused AUTOCONF_DIRS variable. + + Removed rules for libnspr and libnss. + + Added links to nspr include and lib files to sdk. + * debian/patches/18_kbsd_nspr.dpatch, debian/patches/60_nspr_m4.dpatch, + debian/patches/25_entropy.dpatch, debian/patches/28_ppc64_build.dpatch: + debian/patches/38_mips64_build.dpatch, + debian/patches/80_security_build.dpatch, + debian/patches/80_security_tools.dpatch, + debian/patches/38_unsupported_arch_build.dpatch: Removed. + * debian/patches/10_system_nss.dpatch: Build with system nss. bz#255408. + * debian/patches/35_system_myspell.dpatch: Build with system myspell. + Stolen from iceape. + * debian/patches/00list: Updated accordingly. + * debian/mozconfig: + + Use --with-system-nspr and the newly added --with-system-nss. + + Enable spellchecker. + * debian/patches/80_config.dpatch: Don't put the config.{guess|sub} + workaround in the nsprpub directory. + * debian/patches/38_kbsd.dpatch: Removed parts that apply to the nss + directories. + * debian/patches/81_sonames.dpatch: Removed parts that apply to both + nspr and nss directories. + * debian/patches/99_configure.dpatch: Removed part for the nspr configure + script and updated with autoconf. + * debian/rules: Set shlibs for libxul0d to versions higher than + 1.8.0.11-3. + * debian/libxul0d.install: Install the spellchecker component. + * debian/libxul0d.links: Create the /usr/lib/xulrunner/dictionaries link. + + -- Mike Hommey Wed, 28 Mar 2007 21:24:21 +0200 + +xulrunner (1.8.0.11-2) unstable; urgency=low + + * debian/rules: Use real upstream version instead for xulrunner-plugin.pc + dependency on xulrunner-xpcom.pc. Closes: #416425. + + -- Mike Hommey Wed, 28 Mar 2007 08:05:04 +0200 + +xulrunner (1.8.0.11-1) unstable; urgency=low + + * New upstream release (taken from upstream CVS) + * Fixes mfsa-2007-11. + * debian/python-xpcom.postinst, debian/python-xpcom.prerm: Added missing + component registration/unregistration. + * debian/patches/25_gnome_helpers_with_params.dpatch: Make MIME registry + use system mime.types when it doesn't get extensions from the Gnome + registry. Closes: #414008. + * debian/rules: Add the debugging symbols from python-xpcom to the + libxul0d-dbg package. + * debian/control: + + Make python-xpcom conflict with epiphany-browser until epiphany + fixes its problems with python thread state. Closes: #416031. + + Add the fact that python-xpcom debugging symbols are in the + libxul0d-dbg package. + + -- Mike Hommey Sat, 24 Mar 2007 18:04:03 +0100 + +xulrunner (1.8.0.10-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + + Fixing __x86_64__ FTBFS + - Added 100_ubuntu_pyginputstream.dpatch + - Added 100_ubuntu_pyiinputstream.dpatch + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michael Bienia Sat, 10 Mar 2007 18:44:59 +0100 + +xulrunner (1.8.0.10-3) unstable; urgency=low + + * debian/rules: Re-add xulrunner-xpcom requirement in xulrunner-plugin.pc, + until classpath, gcj-4.1 and pcmanx-gtk2 get fixed. Closes: #413964. + + -- Mike Hommey Fri, 9 Mar 2007 08:14:35 +0100 + +xulrunner (1.8.0.10-2) unstable; urgency=low + + * debian/copyright: Added licensing terms for the content in the debian + directory. + * debian/patches/15_passwdmgr.dpatch: Restore parts that were actually + NOT applied upstream, and adapt them. Thanks Sam Hocevar for spotting + this. Closes: #413991. + + -- Mike Hommey Thu, 8 Mar 2007 19:08:10 +0100 + +xulrunner (1.8.0.10-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + + Fixing __x86_64__ FTBFS + - Added 100_ubuntu_pyginputstream.dpatch + - Added 100_ubuntu_pyiinputstream.dpatch + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * UVF exception: LP: #89561 + + -- Michael Bienia Mon, 5 Mar 2007 12:34:50 +0100 + +xulrunner (1.8.0.10-1) unstable; urgency=low + + * New upstream release (taken from upstream CVS) + * Fixes mfsa-2007-{01-07}, also known as + CVE-2006-6077, CVE-2007-0008, CVE-2007-0009, CVE-2007-0045, + CVE-2007-0775, CVE-2007-0776, CVE-2007-0777, CVE-2007-0778, + CVE-2007-0779, CVE-2007-0780, CVE-2007-0800, CVE-2007-0981, + CVE-2007-0995. + * debian/patches/35_pango_null_char.dpatch: Avoid freeze/crash when null + characters are present in justified text by discarding NULL characters + before displaying. bz#366902. Closes: #406713. + * debian/patches/20_pangoxft.dpatch: Renamed to 10_pangoxft.dpatch and + updated with patch from bz#338446 (Stolen from iceape, actually) + Also added MOZ_PANGO_LIBS to build command line for the toolkit library. + * debian/patches/15_atk_crash.dpatch: Fix random crashed in GetMaiAtkType. + bz#302250. (Stolen from iceape, too) + * debian/control: Tighten dependency of libxul0d on libxul-common. + * debian/patches/15_pango_textarea_position.dpatch: Fix for cursor position + when moving in a textarea. bz#366796. Closes: #408914. + * debian/patches/35_zip_cache.dpatch: Invalidate cache for a zip file that + got modified. It will prevent corruption of the XUL FastLoad cache when + upgrade is performed while an instance of the application is running. + bz#368428. + * debian/patches/80_config.dpatch: Use config.guess and config.sub from + autotools-dev. + * debian/rules: Don't install config.{guess,sub}, since that was done as a + dpatch. + * debian/patches/15_nspr_setuid.dpatch, + debian/patches/25_passwdmgr_crash.dpatch, + debian/patches/20_broken_perl.dpatch: Removed, as being applied upstream. + * debian/patches/15_passwdmgr.dpatch, + debian/patches/30_distclean.dpatch: Removed parts that were applied + upstream. + * debian/patches/18_kbsd_nspr.dpatch, debian/patches/25_entropy.dpatch: + debian/patches/38_kbsd.dpatch, debian/patches/80_security_tools.dpatch: + debian/patches/80_security_build.dpatch, + debian/patches/60_xpcomstub.dpatch, debian/patches/61_javaxpcom.dpatch, + debian/patches/81_sonames.dpatch, debian/patches/85_installer.dpatch + debian/patches/15_passwdmgr.dpatch : Adapted to upstream changes. + * debian/patches/80_zip.dpatch: Removed part that is not needed anymore due + to changes upstream. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/control: Make libxul-dev and libmozjs-dev conflict with old + versions of mozilla-browser, not the current transition packages for + iceape-browser that don't contain conflicting files anymore. + Closes: #407966. + * debian/libnss3-0d.install: Install libfreebl files. + * debian/rules: + - Run shlibsign on libfreebl files. + - Bump shlibs for libnss3-0d and libnspr4-0d, as they introduced new + symbols. + * debian/patches/15_gtk_dropdown.dpatch: Fix for focus problem with drop + down lists. bz#281551. Closes: #409889. + * debian/patches/00list: Updated accordingly. + * debian/patches/80_security_build.dpatch: Also added a dirty hack to load + libfreebl from /usr/lib/xulrunner. + * debian/patches/80_security_tools.dpatch: Also disable rpath. + + -- Mike Hommey Thu, 1 Mar 2007 19:01:34 +0100 + +xulrunner (1.8.0.9-1ubuntu1) feisty; urgency=low + + * Fixing __x86_64__ FTBFS + + Added 100_ubuntu_pyginputstream.dpatch + + Added 100_ubuntu_pyiinputstream.dpatch + + -- Stephan Hermann Fri, 19 Jan 2007 17:50:12 +0100 + +xulrunner (1.8.0.9-1) unstable; urgency=low + + * New upstream release (taken from upstream CVS) + * Fixes mfsa-2006-{68-73} also known as + CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, CVE-2006-6500, + CVE-2006-6501, CVE-2006-6502, CVE-2006-6503, CVE-2006-6504. + * Removed non-free and sourceless binaries from source package + with the script from the gnuzilla project, with 2 additional removals of + IETF files. Closes: #393422. + You can find this modified script for reference in debian/remove.nonfree. + Note this script also removes useless CVS files. + * debian/patches/80_uname.dpatch: Fix OS_TARGET so that it is correctly set + to Linux for things that expect this value instead of linux-gnu (such as + the extensions manager) + * debian/libxul0d.links: Added a link for libgtkembedmoz in + /usr/lib/xulrunner. Closes: #393440. + * debian/patches/15_passwdmgr.dpatch: Adapted to changes in upstream. Thanks + to Andreas Metzler. + * debian/patches/35_crash_focus.dpatch: Removed: applied upstream. + * debian/patches/15_nspr_setuid.dpatch: Patches from bz#351470 and bz#365703 + to fix privilege escalation issues with setuid/setgid program linked + against libnspr and some other boundaries issue. Closes: #405062. + * debian/patches/18_m68k_xpcom.dpatch: Apply changes provided by Roman + Zippel to fix FTBFS of third party software on m68k. Closes: #402011. + Renamed as 68_m68k_xpcom.dpatch, since it needs to be sent upstream. + * debian/libnss3-dev.links: Add nss.pc symlink to xulrunner-nss.pc. + Closes: #402846. + * debian/patches/38_kbsd.dpatch, debian/patches/38_mips64_build.dpatch, + debian/patches/80_uname.dpatch, debian/patches/18_kbsd_nspr.dpatch: + Applied patch from Petr Salinger to build on GNU/kFreeBSD. + Closes: #388475. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/patches/81_soname.dpatch: Updated to fit changes to Linux2.6.mk in + 38_kbsd.dpatch. + * debian/patches/65_native_uconv.dpatch: + - Reworked so that UTF-16 is used internally instead of UCS-2, and + improved to better handle corner cases. + - Allow claimed iso-8859-1 actually encoded as windows-1252 to be + converted flawlessly. Closes: #368779, #401784, #405681 + + -- Mike Hommey Sat, 6 Jan 2007 17:51:16 +0100 + +xulrunner (1.8.0.8-1) unstable; urgency=high + + * New upstream release (taken from upstream CVS) + * Fixes several security issues, CVE-2006-5464, CVE-2006-5748, + CVE-2006-5462, CVE-2006-5463, CVE-2006-4310 being some of these. + * debian/patches/15_print_fontconfig.dpatch, + debian/patches/15_embed_initial_visibility.dpatch: Removed: + Applied upstream. + * debian/patches/00list: Updated accordingly. + * debian/rules: Changed the way we use uptodate config.guess and config.sub. + If will make the .diff.gz file lighter. + + -- Mike Hommey Sat, 18 Nov 2006 23:04:54 +0100 + +xulrunner (1.8.0.7-2) unstable; urgency=low + + * debian/patches/65_nativeuconv.dpatch: Reimplement most of the native + uconv service so that it works as proper nsUnicode(En|De)coder + implementations and don't break things when a multibyte character is + split between two buffers. Also add a workaround so that backslash is not + turned into Yen in shift-jis, which breaks javascript code using escaping. + The layout code turns it back to Yen anyways. + * debian/control: Changed dependency versions of arch-indep packages on + arch-dependent packages. Closes: #385793. + * debian/patches/15_print_fontconfig.dpatch: Patch from bz#294879 to avoid + crash with fontconfig when printing. Thanks Alexander Sack. + Closes: #390140, #390472, #391119. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Fri, 6 Oct 2006 19:13:56 +0200 + +xulrunner (1.8.0.7-1) unstable; urgency=low + + * New upstream release (taken from the MOZILLA_1_8_0_7_RELEASE tag in + upstream CVS) + + * Fixes the following security vulnerabilities: + CVE-2006-4340, CVE-2006-4253, CVE-2006-4565, CVE-2006-4566, + CVE-2006-4568, CVE-2006-4569, CVE-2006-4571. + + * Removed patches from NMUs by Matthias Klose, because work done on java + build in this release makes them unnecessary. + * debian/patches/15_nodataprotocolcontentpolicy_fix.dpatch, + debian/patches/15_overthespot.dpatch: Removed, since they've been applied + upstream. + * debian/patches/35_embed_initial_visibility.dpatch: Renamed as + debian/patches/15_embed_initial_visibility.dpatch, since it got applied in + an upstream branch. + * debian/patches/80_security_tools.dpatch: Added missing backslash. + Closes: #385847. + * debian/patches/15_jni.dpatch: Patch from bz#333738 to update java stubs. + * debian/patches/80_javaxpcom.dpatch: Force creation of Makefiles in + extensions/java, even when javaxpcom is disabled. Don't build the jars if + DEB_NO_JAR is defined. + * debian/patches/00list: Updated accordingly. + * debian/mozconfig: Disable javaxpcom. + * debian/rules: + + Added rules to build the java class files only for binary + independent build. This way, no more waiting on java on buildds + (especially on arm). + + Build the javaxpcomglue from the bundled jni headers instead of the gcj + headers. + * debian/control: Adapted build dependencies so that the minimum is taken to + build the architecture dependant part, and added adequate + Build-Depends-Indep field. + * debian/patches/80_uname.dpatch: Don't use the ppc_linux stuff for ppc64. + + -- Mike Hommey Thu, 28 Sep 2006 20:20:59 +0200 + +xulrunner (1.8.0.5-4.2) unstable; urgency=low + + * Relax the dependencies even more, so that the -dev packages can be + installed with the arm binaries currently in the archive (1.8.0.4). + + -- Matthias Klose Sun, 3 Sep 2006 13:39:45 +0200 + +xulrunner (1.8.0.5-4.1) unstable; urgency=medium + + * NMU + * Relax dependencies of the -dev packages on the libraries. Closes: #385793. + + -- Matthias Klose Sun, 3 Sep 2006 10:41:10 +0200 + +xulrunner (1.8.0.5-4) unstable; urgency=low + + * debian/patches/*: Moved around after some triage. + Some changed names, some changed only ordering number. + One got split. + One, that was disabled because it has been applied upstream, got removed. + Two, who were depending on each other, being reordered, have been updated. + * debian/patches/30_distclean.dpatch: Added a bit more clean-up, not + necessary for xulrunner, but still better to have around. One of the added + bits will actually be useful for the 1.8.1 branch, when we'll remove + debian/patches/20_visibility.dpatch. + * debian/patches/00list: Added a nomenclature for the patches naming. + + * debian/patches/80_security_tools.dpatch: Enable building of some NSS + tools. + * debian/patches/00list: Updated accordingly. + * debian/control: + + Added a libnss3-tools package to contain these NSS tools. + + Added proper conflicts to libnss3-tools. + * debian/libnss3-tools.install: Install the binary files in the newly + created package. + * debian/rules: Strip files from the libnss3-tools package and put the + debugging symbols into libnss3-dbg. + Closes: #377269. + * debian/control: Use the suggestion from lintian for binNMU safety instead + of our previous own. And really add binNMU safety to libnss3-dev. + + -- Mike Hommey Fri, 1 Sep 2006 07:38:05 +0200 + +xulrunner (1.8.0.5-3) unstable; urgency=low + + * The ${host_cpu} is not uname -m release. + + * debian/patches/90_xpcom_hppa.dpatch: Added support for 'hppa' instead of + 'parisc' and 'parisc64' since we changed from using `uname -m` to using + ${host_cpu}. I'm not putting hppa64 because I don't think the code works + on parisc64. + * debian/patches/01_uname.dpatch: Fixed + xpcom/reflect/xptcall/src/md/unix/Makefile.in so that it recognizes + powerpc instead of ppc, since we now use ${host_cpu}. Thanks a lot to + Michel Dänzer for the big hint. Closes: #383053, #383056, #383313. + + -- Mike Hommey Fri, 25 Aug 2006 20:37:55 +0200 + +xulrunner (1.8.0.5-2) unstable; urgency=low + + * The Fix-ups release. + + * debian/patches/01_libxpcom_hack.dpatch: Force libxpcom to be linked to + xulrunner-bin, xpcshell and libgtkmozembed so that it is loaded in most + of the cases. + * debian/patches/01_passwdmgr_crash.dpatch: Avoid crash of the password + manager when embedding applications don't set a profile directory. Patch + from bz#294075. Closes: #376323. + * debian/patches/01_gnome_helpers_with_params.dpatch: Make helper + applications with parameters work. Adapted patch from bz#273524. + Closes: #381291. + * debian/patches/01_nspr_m4.dpatch: Avoid aclocal warnings about + underquoted definition of AM_PATH_NSPR". Closes: #382539. + * debian/patches/01_gtkmozembed_change_toplevel.dpatch: Fix drop-down menus + when gtkmozembed is moved from different toplevel. Patch from bz#296002. + Closes: #367106. + * debian/patches/01_overthespot.dpatch: Apply patch from bz#271815 for GTK2 + IM Over-The-Spot support. + * debian/patches/00list: Updated accordingly. + * debian/control: + + Make the controls more BinNMU compliant. Closes: #384200, #384203. + + Bumped Standards-Version to 3.7.2.1. No changes. + + -- Mike Hommey Tue, 22 Aug 2006 23:15:16 +0200 + +xulrunner (1.8.0.5-1) unstable; urgency=high + + * The "upstream doesn't, so I do" release: Checked out the + XULRUNNER_1_8_0_5_RELEASE tagged code from upstream CVS. + + * Fixes the following security vulnerabilities: + 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. + + * debian/patches/01_pyxpcom_deadcode.dpatch: Remove pyxpcom dead code and + fix FTBFS on alpha this way. Closes: #381662. + * debian/patches/01_nodataprotocolcontentpolicy_fix.dpatch: Fix from + Firefox 1.5.0.6 to allow urls like mms:// in s + * debian/patches/01_uname.dpatch: Use ${host_*} variables instead of + uname in configure.in. Closes: #377418. + This is a minimalist patch to solve the particular bad assembler choice + issue. It would need a much greater work to actually do something totally + clean, but the current patch should be enough for Linux builds. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/libxul-dev.install: Install files from SDK independently and don't + install the jar files from sdk/lib, since they are in the + libmozillainterfaces-java package. + * debian/control: Fixed typo in libxul-common description. + * debian/rules: Bumped shlibs for libmozjs as this version introduced 2 + new symbols. + + -- Mike Hommey Wed, 9 Aug 2006 21:01:47 +0200 + +xulrunner (1.8.0.4-2) unstable; urgency=low + + * The "finally enabling these stuff" release. + + * debian/watch: Stole the watch file from firefox. + * debian/rules, debian/control, debian/mozconfig, + debian/libmozillainterfaces-java.install, + debian/libmozillainterfaces-java.links, debian/*.conf: Enable pyxpcom + and javaxpcom again, with some changes on the python part, to fit the + new python policy. Closes: #173264, #277120, #373906. + * debian/python-xpcom.dirs, debian/python-xpcom.install: Replace the + previous .in files, and replace PYVERS by a wildcard. + * debian/control: + + Added build dependency on python-support and python-dev. + + Only create a python-xpcom package instead of pythonX.Y-xpcom. + + Added XB-Python-Version field to python-xpcom. + + Bumped debhelper dependency. + * debian/pyversions, debian/pycompat: Files necessary for dh_pysupport and + dh_python. + + * debian/libxul-common.*, debian/libxul0d.*, debian/control: Create a new + libxul-common package for most architecture independent files. + + * debian/control: Add a build dependency on binutils >= 2.17-1 for mips and + mipsel, where #274738 is fixed. + * debian/patches/90_mips_performance.dpatch: Remove the xgot hack. + Closes: #374389. Thanks Thiemo Seufer. + Also remove the specific setting of MOZ_DEBUG_FLAGS="-g" for mips, it's + built with -g anyways. + * debian/rules: + + Bump shlib for libmozjs0d because of a new symbol. Other libraries were + not subject to symbol additions, so we can keep them as they are. + Closes: #376374. + + Removed an extra parenthesis to really build with minimal toc on ppc64. + Dammit. Closes: #361188. + * debian/patches/01_crash_focus: Fix a crasher and several similar potential + crashers. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sat, 8 Jul 2006 14:22:43 +0200 + +xulrunner (1.8.0.4-1) unstable; urgency=high + + * The "finally a new upstream" release. + * Fixes the following security vulnerabilities: + CVE-2006-2775, CVE-2006-2776, CVE-2006-2778, CVE-2006-2780, + CVE-2006-2782, CVE-2006-2783, CVE-2006-2784, CVE-2006-2785, + CVE-2006-2786, CVE-2006-2787. + + * debian/patches/00_securityfix.dpatch: Removed, since this release includes + all the security changes we brought from CVS in this patch. + * debian/patches/90_js_mipsel_endianness.dpatch: Removed, since it was + applied upstream. + * debian/patches/01_installer.dpatch, + debian/patches/01_javaxpcom.dpatch: Removed parts that were applied + * debian/patches/00list: Updated accordingly. + * debian/patches/01_distclean.dpatch, + debian/patches/01_xpcomglue.dpatch: Adapted to upstream changes. + upstream. + * debian/patches/99_configure.dpatch: Updated. + + * debian/patches/01_pyxpcom.dpatch: Use a make variable for PYTHON_SO. + * debian/patches/90_unichar_alignment.dpatch. + * debian/patches/00list: Added 90_unichar_alignment. + * debian/rules: + + Set this PYTHON_SO variable when building python modules. + + Disabled strict aliasing from optimized builds. + + Build with minimal toc on ppc64. Closes: #361188. + + Fix for Gecko date extraction from client.mk. + * debian/mozconfig: Set default mozilla home. + * debian/control: Replaced some Conflicts with Replaces, which should be fine. + + * debian/rules, debian/control, debian/mozconfig, debian/python-xpcom.dirs.in, + debian/python-xpcom.install.in, debian/libmozillainterfaces-java.install, + debian/libmozillainterfaces-java.links, debian/*.conf: Remove pyxpcom and + javaxpcom (again) packages and build. We want this release not to go through + NEW (again). + + -- Mike Hommey Thu, 15 Jun 2006 01:05:34 +0200 + +xulrunner (1.8.0.1-12) unstable; urgency=low + + * The release of the Beast. + * debian/control: + + Added dependency upon libnss3-dev to libxul-dev. + + Fixed dependencies and conflicts so that the package should be binNMU + safe. + + Depends upon dpkg-dev >= 1.13.19 accordingly. + * debian/control, debian/rules: xulrunner must depend on libxul0d + versions >= 1.8.0.1-9. Closes: #370152. + + * Add support for PyXPCOM: + + debian/mozconfig: Added the python/xpcom extension. + + debian/control: Added build dependency on python-dev. Added + python2.3-xpcom and python2.4-xpcom packages. + + debian/python-xpcom.install.in: Install template for python XPCOM files. + + debian/python-xpcom.dirs.in: Directories to create in python XPCOM + packages. + + debian/rules: + - Add rules to build the python xpcom packages. + - Add a shlibs.local hack to have python xpcom packages correctly depend + on libxul0d >= 1.8.0.1-12. + + debian/patches/01_no_examples.dpatch: Don't install the pyxpcom sample + component. + Closes: #173264, #277120. + + * Add support for JavaXPCOM again: + + debian/mozconfig: --enable-javaxpcom. + + debian/*.conf: Set javaxpcom=1. + + debian/control: Added a build dependency on java-gcj-compat-dev + >= 1.0.56 to avoid #365934, and force build dependency on ecj-bootstrap + >= 3.1.2-6 to avoid #361608. + + debian/rules: Uncommented the javaxpcom related rules. Removed the + workarounds for #365934 and #361608. Install all MozillaInterfaces jar + files in the sdk directory. + + debian/libxul0d.install: Uncommented the javaxpcom files. Removed + installation of MozillaInterfaces.jar. + + debian/control: Added a libmozillainterfaces-java package for the public + java interfaces. + + debian/libmozillainterfaces-java.(install|links): Install + MozillaInterfaces.jar in /usr/share/java, and install the -src.jar file + in the sdk directory. + + debian/patches/01_pyxpcom.dpatch: Fix installation directory. + + debian/patches/00list: Updated to include this new patch. + + -- Mike Hommey Tue, 6 Jun 2006 23:26:09 +0200 + +xulrunner (1.8.0.1-11) unstable; urgency=low + + * The "Let's get migrated" release. + * debian/control: Don't build-depend on java-gcj-compat-dev. + * debian/libxul0d.install: Comment out the javaxpcom files installation. + * debian/rules: Comment out javaxpcom related rules, but put the fix for + jni.h detection nevertheless. Closes: #367863. + * debian/*.conf: Set javaxpcom=0. + * debian/mozconfig: --disable-javaxpcom. + + * debian/rules: + + Remove extra parenthesis in the productComment. + + Generate the .chk file from the stripped libsoftokn3.so.0d. + * debian/patches/01_security.dpatch: Build the shlibsign utility again, so + that we can generate the .chk that can be useful for FIPS mode, but don't + build the .chk file automatically since we are going to strip the library, + making the .chk file obsolete. + * debian/patches/01_ssl.dpatch: Disable SSLv2 and SSLv3 40-bit ciphers. + Closes: #308334. + * debian/patches/01_soname.dpatch: Change the way libnss tries to find the + .chk file for FIPS mode so that the .chk file name needn't contain ".so" + when using a full SONAME. + * debian/patches/00list: Apply 01_security after 01_soname ; Added 01_ssl. + * debian/libxul0d.README.Debian: Add a note about SSLv2 and SSLv3 40-bit + ciphers. + + -- Mike Hommey Sat, 20 May 2006 21:23:00 +0200 + +xulrunner (1.8.0.1-10) unstable; urgency=critical + + * The "how dumb can I be ?" release. + * debian/rules: Don't use x86 specific directory to find jni.h. + + -- Mike Hommey Sun, 14 May 2006 01:25:10 +0200 + +xulrunner (1.8.0.1-9) unstable; urgency=critical + + * The "I wish they had a distribution-friendly security policy" release. + * Fixes the following security vulnerabilities: + CVE-2006-0297, CVE-2006-0748, CVE-2006-1530, CVE-2006-1531, + CVE-2006-1723, CVE-2006-1724, CVE-2006-1725, CVE-2006-1726, + CVE-2006-1727, CVE-2006-1728, CVE-2006-1729, CVE-2006-1730, + CVE-2006-1732, CVE-2006-1742. + * Should fix the following security vulnerabilities: + CVE-2006-0884, CVE-2006-1045, CVE-2006-1529, CVE-2005-2353. + * debian/patches/00_securityfix.dpatch: All security patches for the issues + above. I hope none has been forgotten, it has been a real PITA to go + through all the patches in upstream CVS to find those commits that *might* + be related to fixing the flaws. + + * debian/patches/01_native_uconv.dpatch: + + Add the scriptableunicodeconverter component. Will make chatzilla work. + + Fix GBK and EUC-TW charset names so that iconv recognizes them. + Closes: #365886. + * debian/patches/01_killAll.dpatch, debian/xulrunner.install: Correctly + install the killAll component. + * debian/patches/01_js_binary.dpatch: Add readline support to xpcshell. + * debian/patches/01_no_register.dpatch: Remove (un|)registering system. We + don't need it since we register ourselves. + * debian/patches/01_broken_perl.dpatch: Apply patch from bz#325148 instead + of removing the broken perl code. + * debian/patches/01_no_chromelist.dpatch: Also correctly call make-jars.pl + to avoid creation of unexpected chrome in dist/bin instead of + dist/bin/chrome. + * debian/mozconfig: + + Disable elf-dynstr-gc, which is pretty useless nowadays. + + Enable javaxpcom support. + * debian/rules: + + Added a check between dist/bin and $DESTDIR/usr/lib/xulrunner to see if + upstream correctly installs everything... + + Set JAVA_HOME for configure to find the java compiler. + + Work around bug #361806 by setting JAVAC at build time. + + Work around bug #365934 by using --with-java-include-path configure + option, and work around a feature of cpp by creating a symlink to the + real location of jni.h in the debian directory. + + Don't install dependentlibs.list (see debian/patches/01_xpcomstub.dpatch + below). + + Changed the way we move libraries to /usr/lib. + + Changed the User-Agent string again, it seems too many dumb scripts use + the useless date from the product string. + * debian/control: Added java-gcj-compat-dev to build dependencies. + * debian/patches/01_javaxpcom.dpatch: + + Apply patch from bz#327654 to be able to actually build the javaxpcom + stuff. + + Allow to build with gcj headers. + + Don't install GenerateJavaInterfaces. + + Correctly install javaxpcom.jar. + + Don't use visibility flags so that symbols are exported. + * debian/*.conf: Set jaxaxpcom to 1. + * debian/patches/01_icons.dpatch: Apply patch from bz#314927 to install + default.xpm in the right place + * debian/xulrunner.install: Install chrome/icons, where default.xpm is + sitting. + * debian/patches/01_installer.dpatch: Apply patch from bz#328505 to allow + to install without a vendor name. + * debian/patches/01_mouse_buttons.dpatch: Extended mouse buttons support + taken from #244305. Thanks Peter Colberg. + * debian/patches/01_xpcomstub.dpatch: Correctly install dependentlibs.list + and apply patch from bz#332262 for it to contain NSS libraries. + * debian/patches/01_distclean.dpatch: Make distclean cleaner. + * debian/patches/01_target_xpcom_abi.dpatch: Apply patch from bz#322450 plus + the OS_TEST fix that got landed at the same time so that TARGET_XPCOM_ABI + is correctly set on sparc. + * debian/patches/01_embed_initial_visibility.dpatch: Apply patch from + bz#312998 to fix gtkmozembed's EmbedWindow::GetVisibility. Closes: #365868. + * debian/patches/01_config_install.dpatch: Correct installation of all the + headers files from the config/ directory. + * debian/patches/00list: Updated to include all the new patches. + * debian/patches/99configure.dpatch: Updated. + * debian/control: + + Bumped Standards-Version to 3.7.2.0. No changes. + + Add small text about the SDK to libxul-dev's description. + + Make libxul-dev depend on xulrunner for the development tools (xpt_link, + xpt_dump, xpidl, regxpchrome) + * debian/rules, debian/libxul-dev.install: Install the SDK files. + * debian/libxul0d.install: Install MozillaInterfaces.jar in + /usr/lib/xulrunner instead of inside the SDK (but put a symlink there), + since it is useful to embed javaxpcom. + * debian/libxul0d.install, debian/xulrunner.install: Move the PSM files + from xulrunner to libxul0d. Closes: #359220, #359226. + * debian/control: Make libxul0d conflict with those older versions of + xulrunner that included the PSM files. + + -- Mike Hommey Sat, 13 May 2006 23:22:35 +0200 + +xulrunner (1.8.0.1-8) unstable; urgency=low + + * debian/libxul0d.install: + + Install xpt files one by one instead of glob, so that we: + - put mozgnome.xpt in xulrunner-gnome-support + (debian/xulrunner-gnome-support.install) + - don't install the sample simple.xpt + + Don't install the sample component libsimpletest.so. + * debian/rules: + + Don't remove the .chk file, since we don't install it anymore. + + Use -Wl,--as-needed as LDFLAGS. That will work around upstream linking + strategy to limit useless linkage. + + Use a specific LD_LIBRARY_PATH at link time so that we don't need to + link against indirect dependencies. This is a temporary workaround until + this is workaround some better other way. + + Added some install checks after binary packages build, so that we can + know if we forgot anything. + + Fixed the way we get the DEBIAN_VERSION. + * debian/patches/01_native_uconv.dpatch: + + Don't build intl/uconv/ucvja and friends, since this is supported by + the native uconv implementation and not even linked into something we + ship. + + Properly load invalid UTF-8 files and more generally malformed files + as to their (supposed) encoding. Closes: #358815, #359049, #358599. + * debian/patches/01_prefs.dpatch: set javascript.options.showInConsole. + * debian/patches/01_security_build.dpatch: + + Don't build the stuff we don't need, and dynamically link libnssckbi to + both libplc4 and libplds4 instead of linking statically. + + Build with debugging symbols. + * debian/patches/01_no_chromelist.dpatch: Don't build chromelist.txt files. + * debian/patches/01_no_sys_profile.dpatch: Don't install system profile. + * debian/patches/01_no_examples.dpatch: Don't build the examples. + * debian/patches/01_xpcomglue.dpatch: + + Build the xpcom glue as a shared library. + + Load DSOs from . when directory is not given. That makes regxpcom work + as "expected". + * debian/patches/80_xpidl.dpatch: Added an error message when no file is + given, to sync with the patch against trunk I sent upstream. + * debian/patches/01_about:plugins.dpatch: Install the files for + about:plugins. Closes: #354037, #356082. + * debian/patches/01_installer.dpatch: Install applications in /usr/local/lib + instead of /usr/lib. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + * debian/rules, debian/spidermonkey-bin.install: Move out some files from + the install target instead of the binary target. Install them with + dh_install. + * debian/control: Bumped to Standards-Version: 3.6.2.2. No changes required. + * debian/libxul0d.postinst, debian/libxul0d.preinst: Instead of removing + compreg.dat and xpti.dat to solve #357589, create a .autoreg file. That + will trigger components registration in all cases, even in cases where the + component registry was stored in a profile directory. + Do it on postinst at configure time instead of preinst. + * debian/xulrunner-gnome-support.{postinst|prerm}: Also do it when + configuring or removing xulrunner-gnome-support. + * debian/libxul0d.prerm: Remove all files that could be generated by running + xulrunner or programs using libxul as root, plus the .autoreg file we + create in case it's still there. + * debian/libxul0d.install, debian/libxul-dev.install: Install the + libxpcomglue files. + * debian/control, debian/rules: Added debugging symbols in separated + packages. + * debian/control, debian/compat: Bumped debhelper compatibility to 5. + * debian/libxul0d.links: Add links to the libraries in /usr/lib/xulrunner. + That will allow some (but not all, because of C++ ABI differences) + components from mozilla and/or upstream to work with xulrunner. It also + allows the XPCOM Glue to kinda work without deep modifications. + * debian/libxul0d.conf, debian/xulrunner.conf, debian/libxul0d.install, + debian/xulrunner.install, debian/rules: Install GRE "configurations" into + /etc/gre.d. That is used by the XPCOM Glue (thus, by the xulrunner stub). + * debian/rules, debian/libxul0d.install: Install the dependentlibs.list file. + + -- Mike Hommey Sat, 1 Apr 2006 16:09:27 +0200 + +xulrunner (1.8.0.1-7) unstable; urgency=low + + * 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? ;) + * debian/libxul0d.preinst, debian/libxul0d.prerm: Remove + /usr/lib/xulrunner/components/{compreg|xpti}.dat files on upgrade and + removal. Closes: #357589. That will also avoid gnome-support components to + be ignored if they were created when the components were not yet + installed. + + -- Mike Hommey Thu, 23 Mar 2006 23:02:29 +0100 + +xulrunner (1.8.0.1-6) unstable; urgency=low + + * debian/copyright: Fixed typo. + * debian/patches/90_mips64_build.dpatch: Patch from Martin Michlmayr for + mips64 builds. + * debian/patches/90_unsupported_arch_build.dpatch: Don't use x86 as CPU_ARCH + when building on an unsupported architectures. Closes: #357035. + * Put back some stuff that used to be in spidermonkey-bin: + + debian/rules, debian/smjs.1: Add the manual page. + + debian/rules, debian/spidermonkey-bin.menu: Add the menu item. + + debian/spidermonkey-bin.postinst, debian/spidermonkey-bin.prerm: + Add the /usr/bin/js alternative. Closes: #355729. + * debian/mozconfig: Enable iconv support. + * debian/patches/01_native_uconv.dpatch: Fix for the build to succeed when + iconv support is enabled. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Fri, 17 Mar 2006 07:16:10 +0100 + +xulrunner (1.8.0.1-5) unstable; urgency=low + + * debian/mozconfig: DON'T build the typeaheadfind module. It will cause + problems with firefox as stated before AND with the newer Galeons. I guess + it will also be problematic with newer Epiphanies. + * debian/rules: Changed the Gecko/Debian/x.y.z.t-r string to + Gecko/Debian-x.y.z.t-r for RFC2616 compliance. Thanks Josh Triplett and + Matthew Wilcox. + * debian/rules, debian/xulrunner-config: Provide a version of + xulrunner-config that gives more appropriate cflags and libs. + + -- Mike Hommey Mon, 27 Feb 2006 19:44:59 +0100 + +xulrunner (1.8.0.1-4) unstable; urgency=low + + * debian/mozconfig: + + Build the typeaheadfind module. It will enable it in Galeon and + Epiphany, but might cause problems with future firefoxes built on top on + xulrunner. That will need to be investigated further. + + Build with a flat chrome instead of jar files. + * debian/libxul0d.install, debian/xulrunner.install: Changed chrome + wildcards accordingly. + * debian/patches/01_zip.dpatch: Don't need zip if not needed (not building + jar files) + * debian/patches/01_broken_perl.dpatch: Remove useless broken perl code. + * debian/patches/01_useragent.dpatch: 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. + * debian/patches/99_configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + * debian/control: Removed build dependency upon zip. + + -- Mike Hommey Tue, 21 Feb 2006 18:36:26 +0100 + +xulrunner (1.8.0.1-3) unstable; urgency=low + + * debian/control: + + Added a conflict against mozilla-browser on libxul-dev. Closes: #353600. + + Renamed libsmjs1-dev to libsmjs-dev, since that what is the name of the + dev package provided by the old spidermonkey package. + + Sync sections with override for spidermonkey-bin, libsmjs1 and + libsmjs-dev. + * debian/libsmjs1-dev.links: Renamed to libsmjs-dev.links. + * debian/patches/90_xpcom_hppa.dpatch: Somehow, the assembler files got + their content twice. Fixing that should make it build properly on HPPA. + * debian/xulrunner.*, debian/libxul0d.*: + + Moved /usr/share/xulrunner/defaults from xulrunner to libxul0d ; leave + out profile and preferences. They will be reintroduced if they appear to + be really useful. As for now, they just seem to be vestiges of Mozilla, + Firefox or Thunderbird. + + Moved /usr/share/xulrunner/res from xulrunner to libxul0d. + + Moved /usr/share/xulrunner/chrome/classic.*, en-US.* and toolkit.* from + xulrunner to libxul0d. If the other chrome files appear to be required + for something else, we might consider moving them as well. + * debian/control: Add a conflict on older xulrunner to libxul0d according to + the moving around of files. + * debian/rules: Changed the way we identificate ourselves in + /usr/share/xulrunner/defaults/pref/vendor.js, and move it in libxul0d. + We will using be Gecko/Debian/ instead of Gecko/yyyymmdd, + which was pointless anyway, because it was giving the date of the build, + not the date of the API... + * debian/patches/01_prefs.dpatch: Fix some printer and font configuration. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Mon, 20 Feb 2006 23:11:39 +0100 + +xulrunner (1.8.0.1-2) unstable; urgency=low + + * debian/rules: + + copy LICENSE instead of creating a link. + + add -A to dh_installdocs. + + don't install README.txt. + + don't change xulrunner-gtkmozembed.pc, xulrunner-plugin.pc + and xulrunner-xpcom.pc. Some applications that build against gecko + seem to make bad assumptions, at least with gtkmozembed. It is safest + this way, until things change upstream. + * debian/patches/01_sonames.dpatch: Fix the dirname complain. + * debian/xulrunner.install, debian/xulrunner.links, debian/libxul0d.install, + debian/libxul0d.links: Moved greprefs from xulrunner to libxul0d. + The usually necessary changes to dependencies and conflicts have not been + made because 1.8.0.1-1 never reached the archive. + * debian/patches/90_js_mipsel_endianness.dpatch: Patch to fix little + endianness of mipsel. Thanks Ian Jackson and Thiemo Seufer. + * debian/patches/80_passwdmgr.dpatch: 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. + * debian/patches/01_gfx_cairo.dpatch, debian/patches/01_gfx_thebes.dpatch, + debian/patches/01_canvas_cairo.dpatch: Removed. They were for the 1.9 + branch. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Wed, 8 Feb 2006 18:53:28 +0100 + +xulrunner (1.8.0.1-1) unstable; urgency=low + + * Initial release. Closes: #284189. + * First upstream release: 1.8.0.1, synched with Firefox 1.5.0.1. + * debian/patches/99_configure.dpatch: Updated. + * debian/rules: + + Removed package names from the dh_makeshlibs call. It just works fine + with the -a option. + + Removed useless dh_shlibdeps call when building arch-independent + packages. + + Removed the -l option to the dh_shlibdeps call, it works fine without. + + Move libnssckbi.so back in /usr/lib/xulrunner. + + Add a MPL file to the docs installed, taken from the upstream LICENSE + file. + * debian/control: + + Added a xulrunner-gnome-support package for a separate gnome support. + + Made the xulrunner package suggest this new package. + + Typos corrections. + + Add sections to packages. + * debian/xulrunner-gnome-support.install: Install the gnome related + components. + * debian/libxul0d.install, debian/xulrunner.install: Moved some components + from libxul0d to xulrunner. + * debian/patches/01_ckbi_location: Removed. + * debian/patches/00list: Updated accordingly. + * debian/copyright: Updated. + + -- Mike Hommey Tue, 7 Feb 2006 19:52:24 +0100 + +xulrunner (1.7.99+cvs20060113-1) experimental; urgency=low + + * New CVS checkout. + * debian/mozconfig: Disable Java-XPCOM bridge. + * debian/control: Added | libreadline-dev to build dependencies. + * debian/patches/01_pangoxft.dpatch: force linking against pangoxft with + newer versions of pango. + * debian/patches/80_dash_workaround.dpatch, + debian/patches/80_entropy.dpatch, + debian/patches/80_xpidl.dpatch, + debian/patches/80_xrender_bug.dpatch, + debian/patches/90_ia64_align.dpatch, + debian/patches/90_mips_performance.dpatch, + debian/patches/90_ppc64_build.dpatch, + debian/patches/90_xpcom_arm_optim.dpatch, + debian/patches/90_xpcom_arm_unused_attribute.dpatch, + debian/patches/90_xpcom_hppa.dpatch, + debian/patches/90_xpcom_m68k.dpatch, + debian/patches/90_xpcom_mips.dpatch: Patches stolen from Firefox. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + + -- Mike Hommey Thu, 19 Jan 2006 17:08:58 +0100 + +xulrunner (1.7.99+cvs20051212-1) experimental; urgency=low + + * New CVS checkout. + * debian/control: Moved -dev packages from arch: any to arch: all. + * debian/rules: + + Properly copy nss includes. + + Properly call dh_shlibdeps with the changed package names. + + Add a vendor.js file adding debian version in user-agent string. + + Modify *.pc files to fit modified include and library directories + and install them. + * debian/lib*-dev.install: Removed pkgconfig files. + * debian/*-dev.dirs: Create usr/lib/pkgconfig in the dev packages. + * debian/xulrunner.dirs: Create the prefs dir for the vendor.js file. + * debian/patches/01_locale.dpatch: Correctly set locale. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sun, 18 Dec 2005 13:44:17 +0100 + +xulrunner (1.7.99+cvs20051130-1) experimental; urgency=low + + * New CVS checkout. + * debian/mozconfig: + + Added cookie and permissions extensions. + + Disabled building of the installer. + * debian/patches/01_sidebar.dpatch: Added the sidebar extension. + * debian/rules: + + Copy config.guess and config.sub files to the right places. + + Remove the .chk files. + + Add a debug DEB_BUILD_OPTIONS to add --enable-debug to configure. + * debian/patches/01_sonames.dpatch: Added soname support. + * debian/patches/01_js_binary.dpatch: Add dependency for js on libmozjs.so. + * debian/patches/99configure.dpatch: Updated and added nsprpub/configure.in + in the scope. + * debian/patches/00list: Updated accordingly. + * debian/libmozjs-dev.install, debian/libmozjs.install, + debian/libnspr4.6-dev.install, debian/libnspr4.6.install, + debian/libnss3.10-dev.install, debian/libnss3.10.install, + debian/libxul-dev.install, debian/libxul.install: + + Moved .so files in -dev packages and put .so.* files in non -dev + packages. + + put usr/lib/xulrunner/components in libxul instead of xulrunner. + * debian/*.preinst, debian/*.postrm: Removed, since we remove the + diversions. + * debian/control: + + Add proper conflicts with mozilla's packages. + + Renamed packages to reflect the sonames. + + Removed xulrunner-dev package. + * debian/lib*.install: Renamed accordingly. + * debian/patches/01_system_bz2.dpatch: Changes to better fit upstream build + system. + * debian/xulrunner-dev.install: Removed, as we removed the package. + * debian/libxul-dev.install: Added the xulrunner-config file that used to be + in xulrunner-dev. + * debian/xulrunner.install: Added xulrunner-stub. + * debian/libxul0d.dirs: Create /usr/lib/xulrunner/extensions, that the + extensions manager insists on having existing, even if empty. + * debian/libsmjs1.links: Changed link for the versioned library. + + -- Mike Hommey Mon, 12 Dec 2005 11:12:47 +0100 + +xulrunner (1.7.99+cvs20051002-1) experimental; urgency=low + + * New CVS checkout. + * debian/patches/01_visibility.dpatch: Use -fvisibility=hidden instead of + the system wrappers, since because of bug #331460, with the system + wrappers, the resulting binary is not PIC. + * debian/patches/99configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sun, 2 Oct 2005 12:48:41 +0200 + +xulrunner (1.7.99+cvs20050915-1) experimental; urgency=low + + * New CVS checkout of the less experimental 1.8 branch. + * debian/mozconfig: Use gtk2 gfx instead of cairo-gtk2 since it is not + developped in 1.8 branch. + * debian/patches/01_canvas_cairo.dpatch: Removed: been applied upstream. + * debian/patches/01_ckbi_location.dpatch: Allow libnssckbi to be loaded from + /usr/lib. (quite dirty, but, well...) + * debian/patches/01_gfx_cairo.dpatch, 01_gfx_thebes.dpatch: Removed. + * debian/patches/01_system_bz2.dpatch: Updated following upstream advices. + * debian/patches/99configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Thu, 15 Sep 2005 15:42:40 +0200 + +xulrunner (1.8.99+cvs20050816-0) experimental; urgency=low + + * Initial package. + * debian/mozconfig: Enabled build with system cairo and cairo-gtk2 gfx. + * debian/patches/01_canvas_cairo.dpatch: Correctly build with system cairo. + * debian/patches/01_embedding_tests.dpatch: Don't build embedding tests when + using --disable-tests. + * debian/patches/01_install_path.dpatch: Install in the xulrunner directory + instead of xulrunner-1.8. + * debian/patches/01_gfx_cairo.dpatch, 01_gfx_thebes.dpatch: Patches for + correct building of gfx with system cairo. + * debian/patches/01_js_binary.dpatch: Allow to build the js binary to + provide a more up-to-date spidermonkey. + * debian/patches/01_system_bz2.dpatch: Allow to build with the system bzip2 + library. + * debian/patches/99configure.dpatch: Changes to configure resulted from + changes to configure.in. + * debian/patches/00list: Built list accordingly. + + -- Mike Hommey Tue, 16 Aug 2005 13:45:47 +0200 --- xulrunner-1.8.1.4.orig/debian/compat +++ xulrunner-1.8.1.4/debian/compat @@ -0,0 +1 @@ +5 --- xulrunner-1.8.1.4.orig/debian/control +++ xulrunner-1.8.1.4/debian/control @@ -0,0 +1,226 @@ +Source: xulrunner +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Mike Hommey +Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, dpatch, libx11-dev, libxt-dev, libidl-dev, libgtk2.0-dev, libgnomevfs2-dev, libgnome2-dev, libgnomeui-dev, libcairo2-dev, libpng12-dev, libjpeg62-dev, zlib1g-dev, libbz2-dev, libreadline5-dev | libreadline-dev, libkrb5-dev, python-dev, python-support (>= 0.3), dpkg-dev (>= 1.13.19), binutils (>= 2.17-1) [mips mipsel], libnspr4-dev, libnss3-dev (>= 3.11.5-2), libhunspell-dev (>= 1.1.5-2) +Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.56), ecj-bootstrap (>= 3.1.2-6) +Standards-Version: 3.7.2.2 + +Package: xulrunner +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: xulrunner-gnome-support +Description: XUL + XPCOM application runner + XULRunner is a single "gecko runtime" that can be used to bootstrap + multiple XUL + XPCOM applications that are as rich as Firefox and + Thunderbird. + . + XUL is Mozilla's XML based User Interface language that lets you build + feature-rich cross platform applications. These applications are easily + customized with alternative text, graphics and layout so that they can be + readily branded or localized for various markets. Web developers already + familiar with Dynamic HTML (DHTML) will learn XUL quickly and can start + building applications right away. + . + XPCOM is a cross platform component model. It has multiple language + bindings and IDL descriptions so programmers can plug their custom + functionality into the framework and connect it with other components. + . + Homepage: http://developer.mozilla.org/en/docs/XULRunner + +Package: xulrunner-gnome-support +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Support for Gnome in xulrunner applications + This is an extension to xulrunner that allows XUL applications to use + protocol handlers from Gnome-VFS, such as smb or sftp, and other Gnome + integration features. + +Package: libmozjs0d +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: The Mozilla SpiderMonkey JavaScript library + This library provides the embeddable JavaScript/ECMAScript engine from + the Mozilla project (used among others by the Mozilla, Epiphany, Firefox + browsers as well as by the iPlanet WebServer). + . + Homepage: http://www.mozilla.org/js/ + +Package: libmozjs-dev +Section: libdevel +Architecture: all +Depends: ${misc:Depends}, libmozjs0d (>= ${source:Upstream-Version}), libmozjs0d (<< ${source:Version}.1~), libnspr4-dev +Conflicts: mozilla-browser (<< 2:1.8) +Description: Development files for the Mozilla SpiderMonkey JavaScript library + This library provides the embeddable JavaScript/ECMAScript engine from + the Mozilla project (used among others by the Mozilla, Epiphany, Firefox + browsers as well as by the iPlanet WebServer). + . + Install this package if you wish to develop your own programs using the + Mozilla SpiderMonkey JavaScript library. + . + Homepage: http://www.mozilla.org/js/ + +Package: libmozjs0d-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libmozjs0d (= ${binary:Version}) +Suggests: spidermonkey-bin +Conflicts: spidermonkey-bin (<< ${source:Version}), spidermonkey-bin (>= ${source:Version}.1~) +Description: Development files for the Mozilla SpiderMonkey JavaScript library + This library provides the embeddable JavaScript/ECMAScript engine from + the Mozilla project (used among others by the Mozilla, Epiphany, Firefox + browsers as well as by the iPlanet WebServer). + . + This package provides the debugging symbols for the library and for + the spidermonkey-bin package. + . + Homepage: http://www.mozilla.org/js/ + +Package: spidermonkey-bin +Section: interpreters +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: standalone JavaScript/ECMAScript (ECMA-262) interpreter + SpiderMonkey is a standalone JavaScript/ECMAScript interpreter. It can either + take input from files or from a command line driven interface. + . + ECMAScript (ECMA-262) is a dynamic scripting language supporting prototype + based object construction. The basic syntax is intentionally similar to + both Java and C++ to reduce the number of new concepts required to learn + the language. Language constructs, such as if statements, for and while + loops, and switch and try ... catch blocks function the same as these + languages (or nearly so). + . + JavaScript is a superset of the ECMA-262 Edition 3 (ECMAScript) standard + first introduced by Netscape and now led by the Mozilla project. + . + Homepage: http://www.mozilla.org/js/ + +Package: libxul0d +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libxul-common (>= ${source:Version}), libxul-common (<< ${source:Version}.1~) +Replaces: xulrunner (<< 1.8.0.1-9) +Description: Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, + JavaXPCOM, etc. + . + Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libxul-common +Section: libs +Architecture: all +Depends: ${misc:Depends} +Replaces: xulrunner (<< 1.8.0.1-9) +Conflicts: libxul0d (<< 1.8.0.4-2) +Description: Gecko engine library - common files + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, + JavaXPCOM, etc. + . + This package provides all architecture independent files for libxul0d. + . + Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libxul-dev +Section: libdevel +Architecture: all +Depends: ${misc:Depends}, libxul0d (>= ${source:Upstream-Version}), libxul0d (<< ${source:Version}.1~), libnss3-dev, libnspr4-dev, libmozjs-dev (= ${source:Version}), xulrunner +Conflicts: mozilla-browser (<< 2:1.8) +Description: Development files for the Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, etc. + . + Install this package if you wish to embed the Gecko engine in your + program or want to develop XPCOM components. + . + This package also provides the Xulrunner Software Development Kit in the + same form as the one you may find on mozilla.org in /usr/lib/xulrunner/sdk. + . + It also contains the JavaXPCOM interfaces and their sources. + . + Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libxul0d-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libxul0d (= ${binary:Version}) +Suggests: xulrunner, xulrunner-gnome-support +Conflicts: xulrunner (<< ${source:Version}), xulrunner (>= ${source:Version}.1~), xulrunner-gnome-support (<< ${source:Version}), xulrunner-gnome-support (>= ${source:Version}.1~) +Description: Development files for the Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, etc. + . + This package provides the debugging symbols for the library, and for the + xulrunner, xulrunner-gnome-support and python-xpcom packages. + . + Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libmozillainterfaces-java +Section: libdevel +Priority: extra +Architecture: all +Depends: libxul0d (>= 1.8.0.1-12), gij | java2-runtime +Description: XPCOM bindings for Java + JavaXPCOM allows for communication between Java and XPCOM, such that a + Java application can access XPCOM objects, and XPCOM can access any Java + class that implements an XPCOM interface. + With JavaXPCOM, a developer can talk to XPCOM or embed Gecko from a Java + application. JavaXPCOM is very similar to XPConnect (JavaScript-XPCOM + bridge), and uses XPIDL + . + Install this package if you wish to access XPCOM objects from Java. + The counterpart is built in libxul0d. + . + This package also provides the Java interfaces sources. + . + Homepage: http://developer.mozilla.org/en/docs/JavaXPCOM + +Package: python-xpcom +Section: python +Priority: extra +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Conflicts: epiphany-browser +XB-Python-Version: ${python:Versions} +Description: XPCOM bindings for Python + PyXPCOM allows for communication between Python and XPCOM, such that a + Python application can access XPCOM objects, and XPCOM can access any + Python class that implements an XPCOM interface. + With PyXPCOM, a developer can talk to XPCOM or embed Gecko from a + Python application. PyXPCOM is similar to JavaXPCOM (Java-XPCOM bridge) + or XPConnect (JavaScript-XPCOM bridge). + . + Install this package if you wish to access XPCOM objects from Python, or + want to use Python components from XPCOM. + . + Homepage: http://developer.mozilla.org/en/docs/pyxpcom --- xulrunner-1.8.1.4.orig/debian/copyright +++ xulrunner-1.8.1.4/debian/copyright @@ -0,0 +1,833 @@ +This package was debianized by Mike Hommey on +Tue, 16 Aug 2005 13:45:47 +0200. + +It was downloaded from http://ftp.mozilla.org/pub/mozilla.org/xulrunner/ + +The source tarball is an aggregate of several different works in which the +main one, developed by the Mozilla Project, is xulrunner. + +The contents of the debian directory are licensed like the bulk of +xulrunner, tri-licensed under the GPL/LGPL/MPL. + +Other works include gzip, bzip2, sqlite, libjpeg, libpng, cairo, and others. +Please see the sections following the copyright statements for xulrunner for +these. + +If this file is incomplete, which I'm pretty sure is the case, because it's +difficult not to forget anything in this huge amount of data, please file +a bug or contact me. + +=== xulrunner + +Overall, the xulrunner project is licensed under the terms of the Mozilla +Public License version 1.1 or, at your option, under the terms of the GNU +General 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 of the files are also licensed (single, dual or tri) under the terms of +the Netscape Public License (NPL) which can be found as amendments to the +MPL at the end of the file. + +While the Mozilla Project is undergoing a global relicensing so that the +aim is to have a full tree with these tri-license terms, there are at the +moment quite some exceptions as following: + +(Note that I sometimes assumed files not explicitely licensed to be licensed +under the same terms as the files around them and that a lot of the +information has been extracted automatically, thus maybe leaving some doubt. +Again, if you find "bugs", please contact me by email or via the BTS.) + +The following files are dual licensed under the terms of the MPL and of +the GPL: + + all files in directory/c-sdk/config, except the autoconf sub-directory and + the prmkdir.bat file. + all files in security/nss/lib/ckfw/dbm + + directory/c-sdk/configure.in + directory/c-sdk/gmakefile.win + nsprpub/configure.in + nsprpub/pr/include/md/_beos.cfg + nsprpub/pr/include/md/_netbsd.h + nsprpub/pr/src/linking/prlink.c + nsprpub/pr/src/md/beos/bfile.c + nsprpub/pr/src/md/beos/brng.c + nsprpub/pr/src/md/os2/os2emx.s + nsprpub/pr/src/md/os2/os2vaclegacy.s + nsprpub/pr/src/md/unix/os_AIX.s + nsprpub/pr/src/md/unix/os_BSD_386_2.s + nsprpub/pr/src/md/unix/os_Darwin_ppc.s + nsprpub/pr/src/md/unix/os_Darwin_x86.s + nsprpub/pr/src/md/unix/os_HPUX.s + nsprpub/pr/src/md/unix/os_Irix.s + nsprpub/pr/src/md/unix/os_Linux_ia64.s + nsprpub/pr/src/md/unix/os_Linux_x86.s + nsprpub/pr/src/md/unix/os_Linux_x86_64.s + nsprpub/pr/src/md/unix/os_ReliantUNIX.s + nsprpub/pr/src/md/unix/os_SunOS.s + nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s + nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s + nsprpub/pr/src/md/unix/os_SunOS_x86.s + nsprpub/pr/src/md/unix/os_SunOS_x86_64.s + nsprpub/pr/src/md/unix/unix.c + nsprpub/pr/tests/testfile.c + nsprpub/pr/tests/tmocon.c + security/nss/cmd/crlutil/crlgen.c + security/nss/lib/freebl/mpi/hpma512.s + security/nss/lib/freebl/mpi/hppa20.s + security/nss/lib/freebl/mpi/montmulf.s + security/nss/lib/freebl/mpi/montmulfv8.s + security/nss/lib/freebl/mpi/montmulfv9.s + security/nss/lib/freebl/mpi/mpi_i86pc.s + security/nss/lib/freebl/mpi/mpi_mips.s + security/nss/lib/freebl/mpi/mpi_x86.s + security/nss/lib/freebl/mpi/mpv_sparcv8.s + security/nss/lib/freebl/mpi/mpv_sparcv9.s + security/nss/lib/util/ret_cr16.s + security/nss/tests/pkcs11/netscape/trivial/configure.in + +The following files are licensed under the terms of the MPL only: + + configure.in + directory/c-sdk/ldap/build/autoconf.mk.in + directory/c-sdk/ldap/build/my_overrides.mk + extensions/xmlterm/scripts/xmlterm.spec + modules/libpr0n/decoders/jpeg/Makefile.in + modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp + modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h + netwerk/streamconv/converters/mozTXTToHTMLConv.cpp + netwerk/streamconv/converters/mozTXTToHTMLConv.h + netwerk/streamconv/public/mozITXTToHTMLConv.idl + security/nss/lib/freebl/mpi/doc/basecvt.pod + security/nss/lib/freebl/mpi/doc/gcd.pod + security/nss/lib/freebl/mpi/doc/invmod.pod + security/nss/lib/freebl/mpi/doc/isprime.pod + security/nss/lib/freebl/mpi/doc/lap.pod + security/nss/lib/freebl/mpi/doc/mpi-test.pod + security/nss/lib/freebl/mpi/doc/prime.txt + security/nss/lib/freebl/mpi/doc/prng.pod + security/nss/lib/freebl/mpi/tests/pi1k.txt + security/nss/lib/freebl/mpi/tests/pi2k.txt + security/nss/lib/freebl/mpi/tests/pi5k.txt + security/nss/lib/freebl/mpi/utils/PRIMES + toolkit/mozapps/preferences/fontscaling.xul + widget/src/windows/nsFilePicker.cpp + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.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_sparcv9_solaris.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp + xpcom/typelib/xpidl/xpidl_java.c + +The following files are tri licensed under the terms of the NPL, of the +GPL, and the LGPL: + + all files in accessible/src/atk, except the following: + accessible/src/atk/Makefile.in + accessible/src/atk/nsAccessNodeWrap.cpp + accessible/src/atk/nsAccessNodeWrap.h + accessible/src/atk/nsXULMenuAccessibleWrap.h + all files in extensions/pref, except autoconfig/resources/Makefile.in + all files in modules/libpref, except the following: + modules/libpref/Makefile.in + modules/libpref/public/Makefile.in + modules/libpref/src/Makefile.in + all files in sun-java, except the following: + sun-java/Makefile.in + sun-java/stubs/Makefile.in + sun-java/stubs/include/Makefile.in + sun-java/stubs/include/jni_md.h + sun-java/stubs/jri/Makefile.in + all files in xpcom/typelib/xpidl, except Makefile.in + + accessible/src/mac/nsTextAccessibleWrap.h + accessible/src/msaa/nsTextAccessibleWrap.cpp + accessible/src/msaa/nsTextAccessibleWrap.h + accessible/src/msaa/nsXULTreeAccessibleWrap.cpp + accessible/src/msaa/nsXULTreeAccessibleWrap.h + accessible/src/other/nsTextAccessibleWrap.h + dbm/include/cdefs.h + dbm/include/mcom_db.h + dbm/tests/lots.c + editor/ui/composer/content/editorInlineSpellCheck.js + mailnews/mime/cthandlers/calendar/mimecal.cpp + mailnews/mime/cthandlers/calendar/mimecal.h + mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp + toolkit/themes/qute/global/preferences.css + toolkit/themes/winstripe/global/preferences.css + widget/src/os2/nsAppShell.h + +The following files are dual licensed under the terms of the NPL and of +the GPL: + + gc/boehm/xSYM/SymFiles.cpp + gc/boehm/leaksoup/Addr2Line.java + gc/boehm/leaksoup/BlameTable.java + gc/boehm/leaksoup/CallTree.java + gc/boehm/leaksoup/FileLocator.java + gc/boehm/leaksoup/FileTable.java + gc/boehm/leaksoup/Histogram.java + gc/boehm/leaksoup/Reference.java + gc/boehm/leaksoup/RevisionTable.java + gc/boehm/leaksoup/StringTable.java + gc/boehm/leaksoup/Type.java + gc/boehm/leaksoup/bloatsoup.java + gc/boehm/leaksoup/leaksoup.java + gc/boehm/leaksoup/tracesoup.java + gc/boehm/xSYM/SymFiles.h + gc/boehm/xSYM/sym_file.h + js/src/lock_SunOS.s + +The following files are licensed under the terms of the NPL only: + + all files in directory/c-sdk/ldap, except the following: + directory/c-sdk/ldap/build/autoconf.mk.in + directory/c-sdk/ldap/build/my_overrides.mk + directory/c-sdk/ldap/examples/win32.mak + directory/c-sdk/ldap/libraries/libssldap/errormap.c + + dbm/Makefile.in + dbm/include/Makefile.in + dbm/include/Makefile.win + dbm/src/Makefile.in + dbm/src/Makefile.win + dbm/tests/Makefile.in + directory/c-sdk/aclocal.m4 + directory/c-sdk/build.mk + directory/c-sdk/component_versions.mk + directory/c-sdk/config/prmkdir.bat + directory/c-sdk/package.mk + extensions/pref/autoconfig/resources/Makefile.in + gc/boehm/Makefile.in + gc/boehm/makefile.win + intl/uconv/ucvibm/864i.uf + intl/uconv/ucvibm/cp850.uf + intl/uconv/ucvibm/cp852.uf + intl/uconv/ucvibm/cp855.uf + intl/uconv/ucvibm/cp857.uf + intl/uconv/ucvibm/cp862.uf + intl/uconv/ucvibm/cp864.uf + intl/uconv/ucvmath/mathematica1.uf + intl/uconv/ucvmath/mathematica2.uf + intl/uconv/ucvmath/mathematica3.uf + intl/uconv/ucvmath/mathematica4.uf + intl/uconv/ucvmath/mathematica5.uf + intl/uconv/ucvmath/mtextra.uf + intl/uconv/ucvmath/texcmex-t1.uf + intl/uconv/ucvmath/texcmex-ttf.uf + intl/uconv/ucvmath/texcmmi-t1.uf + intl/uconv/ucvmath/texcmmi-ttf.uf + intl/uconv/ucvmath/texcmr-ttf.uf + intl/uconv/ucvmath/texcmsy-t1.uf + jpeg/Makefile.in + jpeg/jerror.c + jpeg/jmorecfg.h + jpeg/netscape_mods.doc + mailnews/mime/cthandlers/calendar/Makefile.in + mailnews/mime/cthandlers/calendar/calendar.def + mailnews/mime/cthandlers/calendar/mimect-cal.def + modules/libimg/png/Makefile.in + modules/libpref/Makefile.in + modules/libpref/public/Makefile.in + modules/libpref/src/Makefile.in + modules/libpref/src/nsPref.cpp + modules/zlib/Makefile.in + modules/zlib/src/Makefile.in + modules/zlib/src/objs.mk + modules/zlib/standalone/Makefile.in + sun-java/Makefile.in + sun-java/stubs/Makefile.in + sun-java/stubs/include/Makefile.in + sun-java/stubs/include/jni_md.h + sun-java/stubs/jri/Makefile.in + toolkit/components/cookie/Makefile.in + xpcom/reflect/xptcall/src/md/mac/xptcinvoke_mac.s + xpcom/reflect/xptcall/src/md/mac/xptcstubs_mac.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_openvms_alpha.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_rhapsody.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_bsdos.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_openvms_alpha.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_solaris.s + xpcom/typelib/xpidl/Makefile.in + +The following files are licensed under the terms of the GPL only: + + build/autoconf/codeset.m4 + build/autoconf/config.guess + build/autoconf/config.sub + directory/c-sdk/config/autoconf/config.guess + directory/c-sdk/config/autoconf/config.sub + nsprpub/build/autoconf/config.guess + nsprpub/build/autoconf/config.sub + +The following files are in the Public Domain: + + aclocal.m4 + build/autoconf/freetype2.m4 + build/autoconf/gtk.m4 + build/autoconf/nspr.m4 + db/mork/src/morkDeque.cpp + db/mork/src/morkDeque.h + +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 following files come from X11R5, without any clear licensing terms: + + build/autoconf/install-sh + directory/c-sdk/config/autoconf/install-sh + nsprpub/build/autoconf/install-sh + +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. + +=== 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 the files listed under the xulrunner section, 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. --- xulrunner-1.8.1.4.orig/debian/libmozillainterfaces-java.install +++ xulrunner-1.8.1.4/debian/libmozillainterfaces-java.install @@ -0,0 +1,2 @@ +usr/lib/xulrunner/sdk/lib/MozillaInterfaces.jar usr/share/java +usr/lib/xulrunner/sdk/lib/MozillaInterfaces-src.jar --- xulrunner-1.8.1.4.orig/debian/libmozillainterfaces-java.links +++ xulrunner-1.8.1.4/debian/libmozillainterfaces-java.links @@ -0,0 +1 @@ +usr/share/java/MozillaInterfaces.jar usr/lib/xulrunner/sdk/lib/MozillaInterfaces.jar --- xulrunner-1.8.1.4.orig/debian/libmozjs-dev.dirs +++ xulrunner-1.8.1.4/debian/libmozjs-dev.dirs @@ -0,0 +1 @@ +usr/lib/pkgconfig --- xulrunner-1.8.1.4.orig/debian/libmozjs-dev.install +++ xulrunner-1.8.1.4/debian/libmozjs-dev.install @@ -0,0 +1,2 @@ +usr/include/mozjs +usr/lib/libmozjs.so --- xulrunner-1.8.1.4.orig/debian/libmozjs0d.README.Debian +++ xulrunner-1.8.1.4/debian/libmozjs0d.README.Debian @@ -0,0 +1,16 @@ +libmozjs for Debian +=================== + +While 1.8.1.x ABI is not entirely compatible with version 1.8.0.x, the +SONAME has not been bumped because while appearing in the header files, +ABI incompatible structures are supposed to be opaque and not directly +used. As far as I know, no program linked against libmozjs makes use of +these structure in a way that would break things. + +On the other hand, symbols exported from the 1.8.1.x ABI are verified to +be compatible with the 1.8.0.x ABI. + +I will try to get proper public headers so that only what can be used +appears there. + + -- Mike Hommey Sat, 26 May 2007 19:18:42 +0200 --- xulrunner-1.8.1.4.orig/debian/libmozjs0d.install +++ xulrunner-1.8.1.4/debian/libmozjs0d.install @@ -0,0 +1 @@ +usr/lib/libmozjs.so.* usr/lib --- xulrunner-1.8.1.4.orig/debian/libxul-common.dirs +++ xulrunner-1.8.1.4/debian/libxul-common.dirs @@ -0,0 +1 @@ +usr/share/xulrunner/defaults/pref --- xulrunner-1.8.1.4.orig/debian/libxul-common.install +++ xulrunner-1.8.1.4/debian/libxul-common.install @@ -0,0 +1,163 @@ +etc/gre.d/libxul0d.conf + +usr/lib/xulrunner/dependentlibs.list + +usr/lib/xulrunner/javaxpcom.jar + +usr/lib/xulrunner/greprefs usr/share/xulrunner +usr/lib/xulrunner/defaults/pref usr/share/xulrunner/defaults +usr/lib/xulrunner/defaults/autoconfig usr/share/xulrunner/defaults + +usr/lib/xulrunner/res usr/share/xulrunner + +usr/lib/xulrunner/chrome/classic* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/en-US* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/toolkit* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/pippki* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/comm* usr/share/xulrunner/chrome + +usr/lib/xulrunner/components/FeedProcessor.js +usr/lib/xulrunner/components/nsDefaultCLH.js +usr/lib/xulrunner/components/nsDictionary.js +usr/lib/xulrunner/components/nsFilePicker.js +usr/lib/xulrunner/components/nsHelperAppDlg.js +usr/lib/xulrunner/components/nsInterfaceInfoToIDL.js +usr/lib/xulrunner/components/nsProgressDialog.js +usr/lib/xulrunner/components/nsProxyAutoConfig.js +usr/lib/xulrunner/components/nsResetPref.js +usr/lib/xulrunner/components/nsSidebar.js +usr/lib/xulrunner/components/nsURLFormatter.js +usr/lib/xulrunner/components/nsXmlRpcClient.js + +usr/lib/xulrunner/components/accessibility-atk.xpt +usr/lib/xulrunner/components/accessibility.xpt +usr/lib/xulrunner/components/alerts.xpt +usr/lib/xulrunner/components/appshell.xpt +usr/lib/xulrunner/components/appstartup.xpt +usr/lib/xulrunner/components/autocomplete.xpt +usr/lib/xulrunner/components/autoconfig.xpt +usr/lib/xulrunner/components/caps.xpt +usr/lib/xulrunner/components/chardet.xpt +usr/lib/xulrunner/components/chrome.xpt +usr/lib/xulrunner/components/commandhandler.xpt +usr/lib/xulrunner/components/commandlines.xpt +usr/lib/xulrunner/components/composer.xpt +usr/lib/xulrunner/components/content_base.xpt +usr/lib/xulrunner/components/content_html.xpt +usr/lib/xulrunner/components/content_htmldoc.xpt +usr/lib/xulrunner/components/content_xmldoc.xpt +usr/lib/xulrunner/components/content_xslt.xpt +usr/lib/xulrunner/components/content_xtf.xpt +usr/lib/xulrunner/components/cookie.xpt +usr/lib/xulrunner/components/directory.xpt +usr/lib/xulrunner/components/docshell.xpt +usr/lib/xulrunner/components/dom.xpt +usr/lib/xulrunner/components/dom_base.xpt +usr/lib/xulrunner/components/dom_canvas.xpt +usr/lib/xulrunner/components/dom_core.xpt +usr/lib/xulrunner/components/dom_css.xpt +usr/lib/xulrunner/components/dom_events.xpt +usr/lib/xulrunner/components/dom_html.xpt +usr/lib/xulrunner/components/dom_loadsave.xpt +usr/lib/xulrunner/components/dom_range.xpt +usr/lib/xulrunner/components/dom_sidebar.xpt +usr/lib/xulrunner/components/dom_storage.xpt +usr/lib/xulrunner/components/dom_stylesheets.xpt +usr/lib/xulrunner/components/dom_svg.xpt +usr/lib/xulrunner/components/dom_traversal.xpt +usr/lib/xulrunner/components/dom_views.xpt +usr/lib/xulrunner/components/dom_xbl.xpt +usr/lib/xulrunner/components/dom_xpath.xpt +usr/lib/xulrunner/components/dom_xul.xpt +usr/lib/xulrunner/components/downloads.xpt +usr/lib/xulrunner/components/editor.xpt +usr/lib/xulrunner/components/embed_base.xpt +usr/lib/xulrunner/components/extensions.xpt +usr/lib/xulrunner/components/exthandler.xpt +usr/lib/xulrunner/components/fastfind.xpt +usr/lib/xulrunner/components/feeds.xpt +usr/lib/xulrunner/components/filepicker.xpt +usr/lib/xulrunner/components/find.xpt +usr/lib/xulrunner/components/gfx.xpt +usr/lib/xulrunner/components/gksvgrenderer.xpt +usr/lib/xulrunner/components/history.xpt +usr/lib/xulrunner/components/htmlparser.xpt +usr/lib/xulrunner/components/imgicon.xpt +usr/lib/xulrunner/components/imglib2.xpt +usr/lib/xulrunner/components/inspector.xpt +usr/lib/xulrunner/components/intl.xpt +usr/lib/xulrunner/components/jar.xpt +usr/lib/xulrunner/components/jsconsole.xpt +usr/lib/xulrunner/components/jsdservice.xpt +usr/lib/xulrunner/components/layout_base.xpt +usr/lib/xulrunner/components/layout_printing.xpt +usr/lib/xulrunner/components/layout_xul.xpt +usr/lib/xulrunner/components/layout_xul_tree.xpt +usr/lib/xulrunner/components/locale.xpt +usr/lib/xulrunner/components/lwbrk.xpt +usr/lib/xulrunner/components/mimetype.xpt +usr/lib/xulrunner/components/mozbrwsr.xpt +usr/lib/xulrunner/components/mozfind.xpt +usr/lib/xulrunner/components/necko.xpt +usr/lib/xulrunner/components/necko_about.xpt +usr/lib/xulrunner/components/necko_cache.xpt +usr/lib/xulrunner/components/necko_cookie.xpt +usr/lib/xulrunner/components/necko_data.xpt +usr/lib/xulrunner/components/necko_dns.xpt +usr/lib/xulrunner/components/necko_file.xpt +usr/lib/xulrunner/components/necko_ftp.xpt +usr/lib/xulrunner/components/necko_http.xpt +usr/lib/xulrunner/components/necko_res.xpt +usr/lib/xulrunner/components/necko_socket.xpt +usr/lib/xulrunner/components/necko_strconv.xpt +usr/lib/xulrunner/components/necko_viewsource.xpt +usr/lib/xulrunner/components/oji.xpt +usr/lib/xulrunner/components/passwordmgr.xpt +usr/lib/xulrunner/components/pipboot.xpt +usr/lib/xulrunner/components/pipnss.xpt +usr/lib/xulrunner/components/pippki.xpt +usr/lib/xulrunner/components/plugin.xpt +usr/lib/xulrunner/components/pref.xpt +usr/lib/xulrunner/components/prefetch.xpt +usr/lib/xulrunner/components/profile.xpt +usr/lib/xulrunner/components/progressDlg.xpt +usr/lib/xulrunner/components/proxyObjInst.xpt +usr/lib/xulrunner/components/rdf.xpt +usr/lib/xulrunner/components/satchel.xpt +usr/lib/xulrunner/components/saxparser.xpt +usr/lib/xulrunner/components/spellchecker.xpt +usr/lib/xulrunner/components/storage.xpt +usr/lib/xulrunner/components/shistory.xpt +usr/lib/xulrunner/components/sidebar.xpt +usr/lib/xulrunner/components/toolkitprofile.xpt +usr/lib/xulrunner/components/toolkitremote.xpt +usr/lib/xulrunner/components/txmgr.xpt +usr/lib/xulrunner/components/txtsvc.xpt +usr/lib/xulrunner/components/ucnative.xpt +usr/lib/xulrunner/components/uconv.xpt +usr/lib/xulrunner/components/unicharutil.xpt +usr/lib/xulrunner/components/update.xpt +usr/lib/xulrunner/components/uriloader.xpt +usr/lib/xulrunner/components/urlformatter.xpt +usr/lib/xulrunner/components/webBrowser_core.xpt +usr/lib/xulrunner/components/webbrowserpersist.xpt +usr/lib/xulrunner/components/webshell_idls.xpt +usr/lib/xulrunner/components/websrvcs.xpt +usr/lib/xulrunner/components/widget.xpt +usr/lib/xulrunner/components/windowds.xpt +usr/lib/xulrunner/components/windowwatcher.xpt +usr/lib/xulrunner/components/xml-rpc.xpt +usr/lib/xulrunner/components/xpcom_base.xpt +usr/lib/xulrunner/components/xpcom_components.xpt +usr/lib/xulrunner/components/xpcom_ds.xpt +usr/lib/xulrunner/components/xpcom_io.xpt +usr/lib/xulrunner/components/xpcom_obsolete.xpt +usr/lib/xulrunner/components/xpcom_threads.xpt +usr/lib/xulrunner/components/xpcom_xpti.xpt +usr/lib/xulrunner/components/xpconnect.xpt +usr/lib/xulrunner/components/xpinstall.xpt +usr/lib/xulrunner/components/xulapp.xpt +usr/lib/xulrunner/components/xulapp_setup.xpt +usr/lib/xulrunner/components/xuldoc.xpt +usr/lib/xulrunner/components/xulrunner.xpt +usr/lib/xulrunner/components/xultmpl.xpt --- xulrunner-1.8.1.4.orig/debian/libxul-common.links +++ xulrunner-1.8.1.4/debian/libxul-common.links @@ -0,0 +1,4 @@ +usr/share/xulrunner/greprefs usr/lib/xulrunner/greprefs +usr/share/xulrunner/res usr/lib/xulrunner/res +usr/share/xulrunner/defaults usr/lib/xulrunner/defaults +usr/share/xulrunner/chrome usr/lib/xulrunner/chrome --- xulrunner-1.8.1.4.orig/debian/libxul-dev.dirs +++ xulrunner-1.8.1.4/debian/libxul-dev.dirs @@ -0,0 +1 @@ +usr/lib/pkgconfig --- xulrunner-1.8.1.4.orig/debian/libxul-dev.install +++ xulrunner-1.8.1.4/debian/libxul-dev.install @@ -0,0 +1,11 @@ +usr/include/xulrunner +usr/share/idl +usr/lib/libxpcom.so +usr/lib/libxpcomglue.so +usr/lib/libxul.so +usr/lib/libgtkembedmoz.so +usr/bin/xulrunner-config +usr/lib/xulrunner/sdk/bin +usr/lib/xulrunner/sdk/idl +usr/lib/xulrunner/sdk/include +usr/lib/xulrunner/sdk/lib/*.so --- xulrunner-1.8.1.4.orig/debian/libxul0d.README.Debian +++ xulrunner-1.8.1.4/debian/libxul0d.README.Debian @@ -0,0 +1,18 @@ +Xulrunner for Debian +==================== + +Weak SSL +-------- + +From version 1.8.0.1-11 onwards, SSLv2 and SSLv3 40-bit ciphers are disabled +due to their weakness. If your xulrunner or embedding application provides a +way to alert the user about the weakness of the cipher in use, while still +allowing the user to use it, you may re-enable them in your application +preferences. + +The preferences to reenable them are the following: +pref("security.enable_ssl2", true); +pref("security.ssl3.rsa_rc4_40_md5", true); +pref("security.ssl3.rsa_rc2_40_md5", true); + + -- Mike Hommey Sat, 20 May 2006 11:03:22 +0200 --- xulrunner-1.8.1.4.orig/debian/libxul0d.conf +++ xulrunner-1.8.1.4/debian/libxul0d.conf @@ -0,0 +1,6 @@ +# Registration file installed by the libxul0d package. Please do not edit. + +[1.8.0.1] +GRE_PATH=/usr/lib/xulrunner +xulrunner=false +javaxpcom=1 --- xulrunner-1.8.1.4.orig/debian/libxul0d.dirs +++ xulrunner-1.8.1.4/debian/libxul0d.dirs @@ -0,0 +1 @@ +usr/lib/xulrunner/extensions --- xulrunner-1.8.1.4.orig/debian/libxul0d.install +++ xulrunner-1.8.1.4/debian/libxul0d.install @@ -0,0 +1,23 @@ +usr/lib/libxul.so.* +usr/lib/libxpcom.so.* +usr/lib/libxpcomglue.so.* +usr/lib/libgtkembedmoz.so.* + +usr/lib/xulrunner/libjavaxpcomglue.so + +usr/lib/xulrunner/components/libauth.so +usr/lib/xulrunner/components/libautoconfig.so +usr/lib/xulrunner/components/libcookie.so +usr/lib/xulrunner/components/libfileview.so +usr/lib/xulrunner/components/libmyspell.so +usr/lib/xulrunner/components/libpermissions.so +usr/lib/xulrunner/components/libpipboot.so +usr/lib/xulrunner/components/libpipnss.so +usr/lib/xulrunner/components/libpippki.so +usr/lib/xulrunner/components/libspellchecker.so +usr/lib/xulrunner/components/libsystem-pref.so +usr/lib/xulrunner/components/libtransformiix.so +usr/lib/xulrunner/components/libuniversalchardet.so +usr/lib/xulrunner/components/libwebsrvcs.so +usr/lib/xulrunner/components/libxmlextras.so +usr/lib/xulrunner/components/libxulutil.so --- xulrunner-1.8.1.4.orig/debian/libxul0d.links +++ xulrunner-1.8.1.4/debian/libxul0d.links @@ -0,0 +1,8 @@ +usr/lib/libnspr4.so.0d usr/lib/xulrunner/libnspr4.so +usr/lib/libplds4.so.0d usr/lib/xulrunner/libplds4.so +usr/lib/libplc4.so.0d usr/lib/xulrunner/libplc4.so +usr/lib/libmozjs.so.0d usr/lib/xulrunner/libmozjs.so +usr/lib/libxul.so.0d usr/lib/xulrunner/libxul.so +usr/lib/libxpcom.so.0d usr/lib/xulrunner/libxpcom.so +usr/lib/libgtkembedmoz.so.0d usr/lib/xulrunner/libgtkembedmoz.so +usr/share/myspell/dicts usr/lib/xulrunner/dictionaries --- xulrunner-1.8.1.4.orig/debian/libxul0d.postinst +++ xulrunner-1.8.1.4/debian/libxul0d.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# + --- xulrunner-1.8.1.4.orig/debian/libxul0d.prerm +++ xulrunner-1.8.1.4/debian/libxul0d.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat \ + /usr/lib/xulrunner/.autoreg +fi + +#DEBHELPER# --- xulrunner-1.8.1.4.orig/debian/mozconfig +++ xulrunner-1.8.1.4/debian/mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/xulrunner/config/mozconfig +ac_add_options --prefix=/usr +ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-pango +ac_add_options --enable-xft +ac_add_options --disable-freetype2 +ac_add_options --enable-system-cairo +ac_add_options --with-system-png +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-gssapi=/usr +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --enable-xinerama +ac_add_options --enable-single-profile +ac_add_options --disable-profilesharing +ac_add_options --enable-svg +ac_add_options --enable-svg-renderer=cairo +ac_add_options --enable-mathml +ac_add_options --disable-pedantic +ac_add_options --disable-long-long-warning +ac_add_options --enable-gnomevfs +ac_add_options --enable-gnomeui +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --enable-canvas +#ac_add_options --disable-xpcom-obsolete +ac_add_options --enable-js-binary +ac_add_options --with-readline +ac_add_options --enable-extensions="default cookie permissions python/xpcom spellcheck" +ac_add_options --disable-installer +ac_add_options --disable-javaxpcom +ac_add_options --enable-chrome-format=flat +ac_add_options --enable-native-uconv +ac_add_options --disable-elf-dynstr-gc +ac_add_options --enable-system-hunspell --- xulrunner-1.8.1.4.orig/debian/pycompat +++ xulrunner-1.8.1.4/debian/pycompat @@ -0,0 +1 @@ +2 --- xulrunner-1.8.1.4.orig/debian/python-xpcom.dirs +++ xulrunner-1.8.1.4/debian/python-xpcom.dirs @@ -0,0 +1 @@ +usr/lib/xulrunner/components --- xulrunner-1.8.1.4.orig/debian/python-xpcom.install +++ xulrunner-1.8.1.4/debian/python-xpcom.install @@ -0,0 +1,2 @@ +usr/lib/python* +usr/lib/xulrunner/components/libpyloader.so --- xulrunner-1.8.1.4.orig/debian/python-xpcom.postinst +++ xulrunner-1.8.1.4/debian/python-xpcom.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# + --- xulrunner-1.8.1.4.orig/debian/python-xpcom.prerm +++ xulrunner-1.8.1.4/debian/python-xpcom.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# --- xulrunner-1.8.1.4.orig/debian/pyversions +++ xulrunner-1.8.1.4/debian/pyversions @@ -0,0 +1 @@ +current --- xulrunner-1.8.1.4.orig/debian/remove.nonfree +++ xulrunner-1.8.1.4/debian/remove.nonfree @@ -0,0 +1,155 @@ +#! /bin/sh + +rm -fv ./build/wince/shunt/build/shunt.vcb +rm -fv ./build/wince/shunt/build/shunt.vco +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u +# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it: +rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u +rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp +rm -fv ./modules/oji/tests/script/killer.exe +rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc +rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo +rm -fv ./extensions/manticore/resources/manticore.psd +rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc +rm -fv ./config/bin2rc.exe +rm -fv ./config/makedep.exe +rm -fv ./config/mangle.exe +rm -fv ./config/mantomak.exe +rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL +rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx +rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx +rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib +rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc +rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc +rm -fv ./embedding/minimo/mozconfig +rm -fv ./embedding/qa/testembed/testembed.aps +rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo +rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib +rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk +rm -fv ./intl/unicharutil/tools/data/case.dat +rm -fv ./intl/unicharutil/tools/data/cmbcl.dat +rm -fv ./intl/unicharutil/tools/data/ctype.dat +rm -fv ./intl/unicharutil/tools/data/decomp.dat +rm -fv ./intl/unicharutil/tools/data/num.dat +rm -fv ./js/src/fdlibm/fdlibm.mdp +rm -fv ./js/src/js.mdp +rm -fv ./js/src/liveconnect/jsj_nodl.c +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc +rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection +rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp +rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib +rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc +rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp +rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp +rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp +rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script +rm -fv ./xpinstall/test/pre_checkin.xpi +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib +rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc +rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc +rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp +rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib +rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings +rm -fv ./gfx/src/mac/nsMacGFX.rsrc +rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda +rm -fv ./layout/doc/object_diagram_template.sda +rm -fv ./layout/html/tests/block/bugs/RealSnow.jar +rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc +rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc +rm -fv ./webshell/tests/viewer/mac/viewer.ppob +rm -fv ./webshell/tests/viewer/mac/viewer.rsrc +rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc +rm -fv ./webshell/tests/viewer/viewer-beos.rsrc +rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc +rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt + + +echo also we need to remove any copyrighted image files from the mozilla src suite, not replaced by the branding process. This includes theme throbbers depending on how you handle that and windows icons, app icons, windows splash etc + +rm -fv ./xpfe/bootstrap/splash.bmp +rm -fv ./xpfe/bootstrap/mozilla.ico +rm -fv ./xpfe/bootstrap/mozos2.ico +rm -fv ./browser/app/mozicon128.png +rm -fv ./browser/app/mozicon16.xpm +rm -fv ./browser/app/mozicon50.xpm + +# I'm not sure about the os2 as I can't see them +rm -fv ./xpfe/bootstrap/icons/os2/mozilla.ico + +rm -fv ./xpinstall/wizard/windows/setuprsc/bitmap1.bmp +rm -fv ./xpinstall/wizard/windows/setuprsc/downloadLogo.bmp +rm -fv ./xpinstall/wizard/windows/setuprsc/turbo-systray.bmp + +rm -fv ./xpinstall/wizard/os2/nsinstall/stubinstall.ico +rm -fv ./xpinstall/wizard/os2/setuprsc/downloadLogo.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/bitmap1.bmp + +rm -fv ./suite/branding/icons/gtk/seamonkey.png # 128x128 +rm -fv ./suite/branding/icons/gtk/default.xpm # 32x32 +rm -fv ./suite/branding/icons/gtk/default16.xpm #16x16 +rm -fv ./suite/branding/content/logo.gif # 200x200 + +# remove the throbbers as they are branded + +rm -fv ./themes/classic/communicator/brand/throbber-single.gif +rm -fv ./themes/classic/communicator/brand/throbber16-single.gif +rm -fv ./themes/classic/communicator/brand/throbber-anim.gif +rm -fv ./themes/classic/communicator/brand/throbber16-anim.gif + +rm -fv ./themes/modern/communicator/brand/throbber-single.gif +rm -fv ./themes/modern/communicator/brand/throbber16-single.gif +rm -fv ./themes/modern/communicator/brand/throbber-anim.gif +rm -fv ./themes/modern/communicator/brand/throbber16-anim.gif + +rm -fv ./xpfe/bootstrap/splash.xpm +rm -fv ./themes/classic/communicator/icons/turbo-systray.gif +rm -fv ./themes/modern/communicator/icons/turbo-systray.gif + + +rm -fvr other-licenses/ +rm -fv README/mozilla/README.os2 + +rm -fv netwerk/protocol/ftp/doc/rfc959.txt +rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt + +# CVS stuff +find . -type d -name CVS | xargs rm -rf +find . -type f -name .cvsignore | xargs rm -f --- xulrunner-1.8.1.4.orig/debian/rules +++ xulrunner-1.8.1.4/debian/rules @@ -0,0 +1,217 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# 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') +UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)-.*$$/\1/ p') + +PYVER := $(shell pyversions -d) + +CFLAGS := -Wall -pipe + +JAVA_VARS := MOZ_JAVAXPCOM=1 JAVA_INCLUDE_PATH=$(CURDIR)/sun-java/stubs/include JAVAC=javac JAR=jar + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPTCFLAGS := -O0 +else + OPTCFLAGS := -O2 -fno-strict-aliasing +endif + +OPTCFLAGS += -g + +ifeq ($(DEB_BUILD_ARCH),alpha) + OPTCFLAGS += -Wl,--no-relax +endif + +ifeq ($(DEB_BUILD_ARCH),ppc64) + OPTCFLAGS += -mminimal-toc +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS := --enable-debug +endif + +config.status: patch-stamp ./configure debian/mozconfig + dh_testdir + # Add here commands to configure the package. + JAVA_HOME=/usr/lib/jvm/java-gcj \ + MOZCONFIG=debian/mozconfig \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="-Wl,--as-needed" \ + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --enable-optimize="$(OPTCFLAGS)" \ + $(DEBUGFLAGS) + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + LD_LIBRARY_PATH=$(CURDIR)/dist/lib $(MAKE) PYTHON_SO=$(shell objdump -x /usr/lib/lib$(shell pyversions -d).so | grep SONAME | awk '{print $$2}') $(JAVA_VARS) DEB_NO_JAR=1 + #docbook-to-man debian/xulrunner.sgml > xulrunner.1 + + touch build-stamp + +build-jars: build-jars-stamp + +build-jars-stamp: build-stamp + $(MAKE) -C extensions/java/xpcom/interfaces $(JAVA_VARS) + $(MAKE) -C extensions/java/xpcom/src jar-libs $(JAVA_VARS) + + touch build-jars-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build*-stamp install*-stamp mozilla MPL debian/*.shlibs.local + rm -rf debian/include + + # Add here commands to clean up after the build process. + -$(MAKE) distclean $(JAVA_VARS) + + dh_clean + +install: install-stamp + +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C extensions/java/xpcom/glue install DESTDIR=$(CURDIR)/debian/tmp + find dist/bin -printf %P\\n | sort -u > debian/dist.list + find debian/tmp/usr/lib/xulrunner -printf %P\\n | sort -u > debian/tmp.list + diff debian/tmp.list debian/dist.list | grep "^[<>]" | grep -v "^> DEBIAN" | sort + rm -f debian/tmp.list debian/dist.list + + # Move out libraries in /usr + mv $(CURDIR)/debian/tmp/usr/include/xulrunner/js $(CURDIR)/debian/tmp/usr/include/mozjs + for lib in mozjs gtkembedmoz xpcom xpcomglue xul; do \ + mv $(CURDIR)/debian/tmp/usr/lib/xulrunner/lib$$lib* $(CURDIR)/debian/tmp/usr/lib; \ + done + mv $(CURDIR)/debian/tmp/usr/lib/xulrunner/js $(CURDIR)/debian/tmp/usr/bin/smjs + + sed 's,/xulrunner,, ; s,/js,/mozjs, ; s,nspr.*,xulrunner-nspr >= 4.6.5,' \ + $(CURDIR)/debian/tmp/usr/lib/pkgconfig/xulrunner-js.pc \ + > $(CURDIR)/debian/libmozjs-dev/usr/lib/pkgconfig/xulrunner-js.pc + sed 's,nspr.*,xulrunner-nspr >= 4.6.5,' \ + $(CURDIR)/debian/tmp/usr/lib/pkgconfig/xulrunner-xpcom.pc \ + > $(CURDIR)/debian/libxul-dev/usr/lib/pkgconfig/xulrunner-xpcom.pc + for file in usr/lib/pkgconfig/xulrunner-gtkmozembed.pc \ + usr/lib/pkgconfig/xulrunner-plugin.pc; do \ + install -m 644 $(CURDIR)/debian/tmp/$$file $(CURDIR)/debian/libxul-dev/$$file ; \ + done + #sed s,/lib/xulrunner,/lib, $(CURDIR)/debian/tmp/$$file \ + # > $(CURDIR)/debian/libxul-dev/$$file ; + install -d -m 755 $(CURDIR)/debian/tmp/etc/gre.d + install -m 644 $(CURDIR)/debian/*.conf $(CURDIR)/debian/tmp/etc/gre.d + + # Add Debian package version to preferences + echo // Debian package version \ + > debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + echo "pref(\"general.useragent.product\",\"Gecko\");" \ + >> debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + echo "pref(\"general.useragent.productSub\",\"`perl -e '($$s,$$m,$$h,$$d,$$M,$$y) = gmtime((stat("client.mk"))[9]); printf "%04d%02d%02d\n",$$y + 1900,$$M + 1,$$d;'`\");" \ + >> debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + echo "pref(\"general.useragent.productComment\",\"Debian-$(DEBIAN_VERSION)\");" \ + >> debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + + # Install the SDK + for dir in bin idl include lib; do install -d -m 755 debian/tmp/usr/lib/xulrunner/sdk/$$dir; done + for file in dist/sdk/lib/*.so; do ln -s ../../../`basename $$file` debian/tmp/usr/lib/xulrunner/sdk/lib/; done + for file in dist/sdk/bin/*; do ln -s ../../`basename $$file` debian/tmp/usr/lib/xulrunner/sdk/bin/; done + for file in dist/sdk/include/*; do f=`basename $$file`; ff=`find debian/tmp -name $$f -printf "%P\n" | head -1`; if [ -n "$$ff" ]; then ln -s ../../../../../$$ff debian/tmp/usr/lib/xulrunner/sdk/include/; else echo "Can't find $$f"; exit 1; fi; done + for file in dist/sdk/idl/*; do f=`basename $$file`; if [ -e "debian/tmp/usr/share/idl/xulrunner/$$f" ]; then ln -s ../../../../share/idl/xulrunner/$$f debian/tmp/usr/lib/xulrunner/sdk/idl/; else echo "Can't find $$f"; exit 1; fi; done + for file in /usr/include/nspr/*; do ln -s $$file debian/tmp/usr/lib/xulrunner/sdk/include/; done + for file in /usr/lib/libnspr4.so /usr/lib/libplc4.so /usr/lib/libplds4.so; do ln -s $$file debian/tmp/usr/lib/xulrunner/sdk/lib/; done + + cp -f LICENSE MPL + touch install-stamp + +install-jars: install-jars-stamp + +install-jars-stamp: build-jars-stamp + dh_testdir + dh_testroot + + $(MAKE) -C extensions/java/xpcom/interfaces install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C extensions/java/xpcom/src jar-install DESTDIR=$(CURDIR)/debian/tmp + + # Install the jar files + install -d -m 755 debian/tmp/usr/lib/xulrunner/sdk/lib/ + install -m 644 dist/sdk/lib/MozillaInterfaces*.jar debian/tmp/usr/lib/xulrunner/sdk/lib/ + + touch install-jars-stamp + +# Build architecture-independent files here. +binary-indep: build build-jars install install-jars + dh_testdir + dh_testroot + dh_installchangelogs -i + dh_installdocs -A -i MPL + dh_installexamples -i + dh_install -i --sourcedir=debian/tmp + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a + dh_installdocs -A -a -XREADME.txt MPL + dh_installexamples -a + dh_installmenu -pspidermonkey-bin + dh_install -a --sourcedir=debian/tmp + dh_pysupport -a + dh_python -a + dh_installman -pspidermonkey-bin $(CURDIR)/debian/smjs.1 + dh_link -a + dh_strip -plibxul0d -pxulrunner -pxulrunner-gnome-support -ppython-xpcom --dbg-package=libxul0d-dbg + dh_strip -plibmozjs0d -pspidermonkey-bin --dbg-package=libmozjs0d-dbg + dh_compress -a + dh_fixperms -a + dh_makeshlibs -plibxul0d -Xusr/lib/xulrunner/components -V 'libxul0d (>= 1.8.1.4)' + dh_makeshlibs -plibmozjs0d -V 'libmozjs0d (>= 1.8.1.4)' + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +source: clean + find . -name CVS -o -name .cvsignore | xargs rm -rf + tar -C .. -zcf ../`dpkg-parsechangelog | sed -n '/Source:/ N; s/Source: \(.*\)\nVersion: \(.*\)-[0-9][0-9]*$$/\1_\2/ p'`.orig.tar.gz --exclude=`basename $(CURDIR)`/debian `basename $(CURDIR)` + +binary: binary-indep binary-arch + find debian/tmp -printf %P\\n | sort -u > debian/tmp.list + find `grep Package: debian/control | awk '{print "debian/"$$2}'` -printf %P\\n | sed 's,usr/share/xulrunner,usr/lib/xulrunner,' | sort -u > debian/pkg.list + diff debian/tmp.list debian/pkg.list | grep "^[<>]" | grep -v "^> DEBIAN" | sort + rm -f debian/tmp.list debian/pkg.list + +.PHONY: build clean clean-patched binary-indep binary-arch binary install source build-jars install-jars --- xulrunner-1.8.1.4.orig/debian/smjs.1 +++ xulrunner-1.8.1.4/debian/smjs.1 @@ -0,0 +1,16 @@ +.TH SMJS 1 "7 March 2003" +.SH NAME +smjs - javascript shell +.SH SYNOPSIS +\fBsmjs\fP +.SH DESCRIPTION +The "JS shell", a simple interpreter program that uses the JS API and more +than a few internal interfaces (some of these internal interfaces could +be replaced by jsapi.h calls). The js program built from this +source provides a test vehicle for evaluating scripts and calling functions, +trying out new debugger primitives, etc. +.SH AUTHOR +This manpage was originally written by Bastian Kleineidam + for the Debian distribution of Spidermonkey. + +The main author of Spidermonkey is the Mozilla Project. --- xulrunner-1.8.1.4.orig/debian/spidermonkey-bin.dirs +++ xulrunner-1.8.1.4/debian/spidermonkey-bin.dirs @@ -0,0 +1 @@ +usr/bin --- xulrunner-1.8.1.4.orig/debian/spidermonkey-bin.install +++ xulrunner-1.8.1.4/debian/spidermonkey-bin.install @@ -0,0 +1 @@ +usr/bin/smjs --- xulrunner-1.8.1.4.orig/debian/spidermonkey-bin.menu +++ xulrunner-1.8.1.4/debian/spidermonkey-bin.menu @@ -0,0 +1,2 @@ +?package(spidermonkey-bin):needs="text" section="Apps/Programming" \ + title="SpiderMonkey JavaScript Interpreter" command="/usr/bin/smjs" --- xulrunner-1.8.1.4.orig/debian/spidermonkey-bin.postinst +++ xulrunner-1.8.1.4/debian/spidermonkey-bin.postinst @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +# Rationale: we install the alternative at upgrade time only if we upgrade +# from a version between 1.8 and 1.8.0.1-6 (versions where the alternative +# was not installed, and only if the alternative is not present (it can be +# there because we first upgraded from an older version) +if [ "$1" = "configure" ] || + ( [ "$1" = "upgrade" ] && + dpkg --compare-versions "$2" ge "1.8" && + dpkg --compare-versions "$2" lt "1.8.0.1-6" && + update-alternatives --list js | grep ^/usr/bin/smjs$ > /dev/null + ); then + update-alternatives --install /usr/bin/js js /usr/bin/smjs 200 \ + --slave /usr/share/man/man1/js.1.gz js.1.gz /usr/share/man/man1/smjs.1.gz +fi + +#DEBHELPER# + --- xulrunner-1.8.1.4.orig/debian/spidermonkey-bin.prerm +++ xulrunner-1.8.1.4/debian/spidermonkey-bin.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove js /usr/bin/smjs +fi + +#DEBHELPER# --- xulrunner-1.8.1.4.orig/debian/watch +++ xulrunner-1.8.1.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/(\d\.[\d\.]+)/source/xulrunner-([\d\.]+)-source\.tar\.bz2 --- xulrunner-1.8.1.4.orig/debian/xulrunner-gnome-support.install +++ xulrunner-1.8.1.4/debian/xulrunner-gnome-support.install @@ -0,0 +1,4 @@ +usr/lib/xulrunner/components/mozgnome.xpt +usr/lib/xulrunner/components/libimgicon.so +usr/lib/xulrunner/components/libmozgnome.so +usr/lib/xulrunner/components/libnkgnomevfs.so --- xulrunner-1.8.1.4.orig/debian/xulrunner-gnome-support.postinst +++ xulrunner-1.8.1.4/debian/xulrunner-gnome-support.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# + --- xulrunner-1.8.1.4.orig/debian/xulrunner-gnome-support.prerm +++ xulrunner-1.8.1.4/debian/xulrunner-gnome-support.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# --- xulrunner-1.8.1.4.orig/debian/xulrunner.conf +++ xulrunner-1.8.1.4/debian/xulrunner.conf @@ -0,0 +1,6 @@ +# Registration file installed by the xulrunner package. Please do not edit. + +[1.8.0.1] +GRE_PATH=/usr/lib/xulrunner +xulrunner=true +javaxpcom=1 --- xulrunner-1.8.1.4.orig/debian/xulrunner.dirs +++ xulrunner-1.8.1.4/debian/xulrunner.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/xulrunner --- xulrunner-1.8.1.4.orig/debian/xulrunner.docs +++ xulrunner-1.8.1.4/debian/xulrunner.docs @@ -0,0 +1 @@ +README.txt --- xulrunner-1.8.1.4.orig/debian/xulrunner.install +++ xulrunner-1.8.1.4/debian/xulrunner.install @@ -0,0 +1,26 @@ +etc/gre.d/xulrunner.conf + +usr/bin/xulrunner +usr/lib/xulrunner/xpt_dump +usr/lib/xulrunner/run-mozilla.sh +usr/lib/xulrunner/xpt_link +usr/lib/xulrunner/xpidl +usr/lib/xulrunner/regxpcom +usr/lib/xulrunner/xpcshell +usr/lib/xulrunner/mozilla-xremote-client +usr/lib/xulrunner/updater +usr/lib/xulrunner/xpicleanup +usr/lib/xulrunner/xulrunner-bin +usr/lib/xulrunner/xulrunner-stub + +usr/lib/xulrunner/plugins + +usr/lib/xulrunner/icons usr/share/xulrunner +usr/lib/xulrunner/chrome/icons usr/share/xulrunner/chrome + +usr/lib/xulrunner/components/jsconsole-clhandler.js +usr/lib/xulrunner/components/nsCloseAllWindows.js +usr/lib/xulrunner/components/nsExtensionManager.js +usr/lib/xulrunner/components/nsKillAll.js +usr/lib/xulrunner/components/nsUpdateService.js +usr/lib/xulrunner/components/nsXULAppInstall.js --- xulrunner-1.8.1.4.orig/debian/xulrunner.links +++ xulrunner-1.8.1.4/debian/xulrunner.links @@ -0,0 +1 @@ +usr/share/xulrunner/icons usr/lib/xulrunner/icons