diff --git a/firefox-1.0-system-nspr-ldap.patch b/firefox-1.0-system-nspr-ldap.patch deleted file mode 100644 index e587385..0000000 --- a/firefox-1.0-system-nspr-ldap.patch +++ /dev/null @@ -1,1056 +0,0 @@ -Index: directory/c-sdk/configure.in -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/configure.in,v -retrieving revision 5.0.2.28 -diff -u -r5.0.2.28 configure.in ---- directory/c-sdk/configure.in 26 Aug 2004 23:03:00 -0000 5.0.2.28 -+++ directory/c-sdk/configure.in 28 Apr 2005 21:23:12 -0000 -@@ -43,6 +43,7 @@ - dnl ======================================================== - dnl = Defaults - dnl ======================================================== -+NSPR_VERSION=4 - _HAVE_PTHREADS= - USE_PTHREADS= - USE_USER_PTHREADS= -@@ -217,29 +223,27 @@ - AC_ARG_WITH(system-nspr, - [ --with-system-nspr Use system installed NSPR], - [ if test "$withval" = "yes"; then -- _NO_NSPR= -+ _SYSTEM_NSPR=1 - else -- _NO_NSPR=1 -- fi]) -+ _SYSTEM_NSPR= -+ fi], _SYSTEM_NSPR= ) - - if test "$_WIN32_MSVC"; then -- _NO_NSPR=1 -+ _SYSTEM_NSPR= - fi - --if test -z "$_NO_NSPR"; then -+if test -n "$_SYSTEM_NSPR"; then - AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=]) - fi - - if test -z "$MOZ_NATIVE_NSPR"; then -- NSPR_CFLAGS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --cflags`' -+ NSPR_CFLAGS='-I$(DIST)/include/nspr' -+ NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION" - # explicitly set libs for Visual Age C++ for OS/2 - if test "$VACPP" = "yes"; then - NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS'' - elif test "$_WIN32_MSVC"; then - NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib ' -- NSPR_CFLAGS='-I$(DIST)/include/nspr' -- else -- NSPR_LIBS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`' - fi - fi - -Index: directory/c-sdk/config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf.mk.in,v -retrieving revision 5.0.2.3 -diff -u -r5.0.2.3 autoconf.mk.in ---- directory/c-sdk/config/autoconf.mk.in 7 Mar 2003 20:57:13 -0000 5.0.2.3 -+++ directory/c-sdk/config/autoconf.mk.in 28 Apr 2005 21:23:12 -0000 -@@ -45,6 +45,9 @@ - PTHREADS_USER = @USE_USER_PTHREADS@ - CLASSIC_NSPR = @USE_NSPR_THREADS@ - -+NSPR_CFLAGS = @NSPR_CFLAGS@ -+NSPR_LIBS = @NSPR_LIBS@ -+ - AS = @AS@ - ASFLAGS = @ASFLAGS@ - CC = @CC@ -Index: directory/c-sdk/ldap/include/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/Makefile.in,v -retrieving revision 5.0.2.4 -diff -u -r5.0.2.4 Makefile.in ---- directory/c-sdk/ldap/include/Makefile.in 24 Apr 2002 23:03:25 -0000 5.0.2.4 -+++ directory/c-sdk/ldap/include/Makefile.in 28 Apr 2005 21:23:12 -0000 -@@ -63,7 +63,6 @@ - - INCLUDEDIR = $(DIST)/public/ldap - PRIVATEINCDIR = $(DIST)/public/ldap-private --NSPRINCDIR = $(DIST)/public/ldap-nspr - GENHEADERS = $(addprefix $(INCLUDEDIR)/, $(GENERATED_HEADERS)) - - GARBAGE += sdkver.h dirver.h $(GENHEADERS) -@@ -72,11 +71,8 @@ - - all export:: $(INCLUDEDIR) $(GENHEADERS) - $(NSINSTALL) -D $(PRIVATEINCDIR) -- $(NSINSTALL) -D $(NSPRINCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR) -- rm -rf $(NSPRINCDIR)/* -- cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR) - - $(INCLUDEDIR): FORCE - $(NSINSTALL) -D $(INCLUDEDIR) -Index: directory/c-sdk/ldap/libraries/libprldap/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in,v -retrieving revision 5.0.2.16 -diff -u -r5.0.2.16 Makefile.in ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in 10 Mar 2004 18:47:26 -0000 5.0.2.16 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 28 Apr 2005 21:23:12 -0000 -@@ -56,9 +56,9 @@ - - GARBAGE += $(LIBPRLDAP) $(DLLPRLDAP) - --LOCAL_INCLUDES = -I$(PUBLIC)/nspr -+LOCAL_INCLUDES = - INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \ -- -I$(DIST)/include/nspr -+ $(NSPR_CFLAGS) - DEFINES += $(DEFS) - - PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS -Index: directory/c-sdk/configure -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/configure,v -retrieving revision 5.0.2.25.2.1 -diff -d -u -p -r5.0.2.25.2.1 configure ---- directory/c-sdk/configure 14 Sep 2004 21:14:38 -0000 5.0.2.25.2.1 -+++ directory/c-sdk/configure 12 Jul 2005 22:23:32 -0000 -@@ -682,6 +682,7 @@ test "$host_alias" != "$target_alias" && - program_prefix=${target_alias}- - - -+NSPR_VERSION=4 - _HAVE_PTHREADS= - USE_PTHREADS= - USE_USER_PTHREADS= -@@ -718,7 +719,7 @@ 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:722: checking for $ac_word" >&5 -+echo "configure:723: 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 -@@ -903,18 +904,20 @@ fi - if test "${with_system_nspr+set}" = set; then - withval="$with_system_nspr" - if test "$withval" = "yes"; then -- _NO_NSPR= -+ _SYSTEM_NSPR=1 - else -- _NO_NSPR=1 -+ _SYSTEM_NSPR= - fi -+else -+ _SYSTEM_NSPR= - fi - - - if test "$_WIN32_MSVC"; then -- _NO_NSPR=1 -+ _SYSTEM_NSPR= - fi - --if test -z "$_NO_NSPR"; then -+if test -n "$_SYSTEM_NSPR"; then - - # Check whether --with-nspr-prefix or --without-nspr-prefix was given. - if test "${with_nspr_prefix+set}" = set; then -@@ -951,7 +954,7 @@ fi - # 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:955: checking for $ac_word" >&5 -+echo "configure:958: 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 -@@ -986,7 +989,7 @@ fi - - min_nspr_version=4.0.0 - echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 --echo "configure:990: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:993: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" = "no"; then -@@ -1018,15 +1021,13 @@ echo "configure:990: checking for NSPR - - fi - - if test -z "$MOZ_NATIVE_NSPR"; then -- NSPR_CFLAGS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --cflags`' -+ NSPR_CFLAGS='-I$(DIST)/include/nspr' -+ NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION" - # explicitly set libs for Visual Age C++ for OS/2 - if test "$VACPP" = "yes"; then - NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS'' - elif test "$_WIN32_MSVC"; then - NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib ' -- NSPR_CFLAGS='-I$(DIST)/include/nspr' -- else -- NSPR_LIBS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`' - fi - fi - -@@ -1119,7 +1120,7 @@ if test -z "$SKIP_PATH_CHECKS"; then - # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. - set dummy $WHOAMI whoami; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1123: checking for $ac_word" >&5 -+echo "configure:1124: 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 -@@ -1194,13 +1195,13 @@ if test "$target" != "$host"; then - _SAVE_LDFLAGS="$LDFLAGS" - - echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 --echo "configure:1198: checking for $host compiler" >&5 -+echo "configure:1199: checking for $host compiler" >&5 - for ac_prog in gcc cc /usr/ucb/cc - 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:1204: checking for $ac_word" >&5 -+echo "configure:1205: 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 -@@ -1246,16 +1247,16 @@ test -n "$HOST_CC" || HOST_CC="""" - LDFLAGS="$HOST_LDFLAGS" - - echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1250: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 -+echo "configure:1251: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 - else -@@ -1275,7 +1276,7 @@ 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:1279: checking for $ac_word" >&5 -+echo "configure:1280: 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 -@@ -1309,7 +1310,7 @@ test -n "$CC" || CC="echo" - # 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:1313: checking for $ac_word" >&5 -+echo "configure:1314: 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 -@@ -1339,7 +1340,7 @@ if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1343: checking for $ac_word" >&5 -+echo "configure:1344: 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 -@@ -1390,7 +1391,7 @@ fi - # 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:1394: checking for $ac_word" >&5 -+echo "configure:1395: 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 -@@ -1422,7 +1423,7 @@ fi - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1426: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1427: 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. -@@ -1433,12 +1434,12 @@ cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext << EOF - --#line 1437 "configure" -+#line 1438 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1443: \"$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 -@@ -1464,12 +1465,12 @@ if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1468: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1469: 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:1473: checking whether we are using GNU C" >&5 -+echo "configure:1474: 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 -@@ -1478,7 +1479,7 @@ else - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1482: \"$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:1483: \"$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 -@@ -1497,7 +1498,7 @@ ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1501: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1502: 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 -@@ -1533,7 +1534,7 @@ 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:1537: checking for $ac_word" >&5 -+echo "configure:1538: 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 -@@ -1569,7 +1570,7 @@ 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:1573: checking for $ac_word" >&5 -+echo "configure:1574: 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 -@@ -1601,7 +1602,7 @@ test -n "$CXX" || CXX="gcc" - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1606: 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. -@@ -1612,12 +1613,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext << EOF - --#line 1616 "configure" -+#line 1617 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1622: \"$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 -@@ -1643,12 +1644,12 @@ if test $ac_cv_prog_cxx_works = no; then - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1647: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1648: 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:1652: checking whether we are using GNU C++" >&5 -+echo "configure:1653: 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 -@@ -1657,7 +1658,7 @@ else - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1661: \"$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:1662: \"$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 -@@ -1676,7 +1677,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1680: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1681: 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 -@@ -1717,7 +1718,7 @@ for ac_declaration in \ - 'void exit (int);' - do - cat > conftest.$ac_ext < - $ac_declaration -@@ -1725,7 +1726,7 @@ int main() { - exit (42); - ; return 0; } - EOF --if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -1735,14 +1736,14 @@ else - fi - rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break - else -@@ -1763,7 +1764,7 @@ 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:1767: checking for $ac_word" >&5 -+echo "configure:1768: 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 -@@ -1798,7 +1799,7 @@ 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:1802: checking for $ac_word" >&5 -+echo "configure:1803: 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 -@@ -1833,7 +1834,7 @@ 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:1837: checking for $ac_word" >&5 -+echo "configure:1838: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1868,7 +1869,7 @@ 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:1872: checking for $ac_word" >&5 -+echo "configure:1873: 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 -@@ -1903,7 +1904,7 @@ 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:1907: checking for $ac_word" >&5 -+echo "configure:1908: 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 -@@ -1938,7 +1939,7 @@ 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:1942: checking for $ac_word" >&5 -+echo "configure:1943: 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 -@@ -1975,7 +1976,7 @@ 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:1979: checking for $ac_word" >&5 -+echo "configure:1980: 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 -@@ -2007,7 +2008,7 @@ test -n "$CXX" || CXX="gcc" - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2011: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:2012: 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. -@@ -2018,12 +2019,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext << EOF - --#line 2022 "configure" -+#line 2023 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2028: \"$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 -@@ -2049,12 +2050,12 @@ if test $ac_cv_prog_cxx_works = no; then - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2053: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2054: 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:2058: checking whether we are using GNU C++" >&5 -+echo "configure:2059: 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 -@@ -2063,7 +2064,7 @@ else - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2067: \"$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:2068: \"$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 -@@ -2082,7 +2083,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:2086: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:2087: 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 -@@ -2123,7 +2124,7 @@ for ac_declaration in \ - 'void exit (int);' - do - cat > conftest.$ac_ext < - $ac_declaration -@@ -2131,7 +2132,7 @@ int main() { - exit (42); - ; return 0; } - EOF --if { (eval echo configure:2135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -2141,14 +2142,14 @@ else - fi - rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break - else -@@ -2170,7 +2171,7 @@ fi - # 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:2174: checking for $ac_word" >&5 -+echo "configure:2175: 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 -@@ -2200,7 +2201,7 @@ if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2204: checking for $ac_word" >&5 -+echo "configure:2205: 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 -@@ -2251,7 +2252,7 @@ fi - # 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:2255: checking for $ac_word" >&5 -+echo "configure:2256: 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 -@@ -2283,7 +2284,7 @@ fi - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2287: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2288: 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. -@@ -2294,12 +2295,12 @@ cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext << EOF - --#line 2298 "configure" -+#line 2299 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2304: \"$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 -@@ -2325,12 +2326,12 @@ if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2329: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2330: 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:2334: checking whether we are using GNU C" >&5 -+echo "configure:2335: 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 -@@ -2339,7 +2340,7 @@ else - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2343: \"$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:2344: \"$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 -@@ -2358,7 +2359,7 @@ ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2362: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2363: 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 -@@ -2391,7 +2392,7 @@ fi - - fi - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2395: checking how to run the C preprocessor" >&5 -+echo "configure:2396: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -2406,13 +2407,13 @@ else - # 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:2416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2417: \"$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 - : -@@ -2423,13 +2424,13 @@ else - 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:2433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2434: \"$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 - : -@@ -2440,13 +2441,13 @@ else - 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:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2451: \"$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 - : -@@ -2473,7 +2474,7 @@ echo "$ac_t""$CPP" 1>&6 - # 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:2477: checking for $ac_word" >&5 -+echo "configure:2478: 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 -@@ -2505,7 +2506,7 @@ 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:2509: checking for $ac_word" >&5 -+echo "configure:2510: 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 -@@ -2546,7 +2547,7 @@ 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:2550: checking for $ac_word" >&5 -+echo "configure:2551: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2587,7 +2588,7 @@ 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:2591: checking for $ac_word" >&5 -+echo "configure:2592: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2628,7 +2629,7 @@ 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:2632: checking for $ac_word" >&5 -+echo "configure:2633: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2669,7 +2670,7 @@ 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:2673: checking for $ac_word" >&5 -+echo "configure:2674: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2731,7 +2732,7 @@ else - fi - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:2735: checking for gcc -pipe support" >&5 -+echo "configure:2736: 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 -@@ -2746,14 +2747,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CX - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pipe" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:2757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _res_gcc_pipe="yes" - else -@@ -2786,7 +2787,7 @@ 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:2790: checking for $ac_word" >&5 -+echo "configure:2791: 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 -@@ -3020,17 +3021,17 @@ EOF - DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' - ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 --echo "configure:3024: checking for sys/atomic_op.h" >&5 -+echo "configure:3025: checking for sys/atomic_op.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:3034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3035: \"$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* -@@ -3188,7 +3189,7 @@ EOF - _DEBUG_FLAGS='-gdwarf-2 -O0' - MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' - echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 --echo "configure:3192: checking for gethostbyaddr in -lbind" >&5 -+echo "configure:3193: checking for gethostbyaddr in -lbind" >&5 - ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3196,7 +3197,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lbind $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3212: \"$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 -@@ -4429,17 +4430,17 @@ EOF - - ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 --echo "configure:4433: checking for machine/builtins.h" >&5 -+echo "configure:4434: checking for machine/builtins.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:4443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4444: \"$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* -@@ -4837,12 +4838,12 @@ esac - if test -z "$SKIP_LIBRARY_CHECKS"; then - - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:4841: checking for dlopen" >&5 -+echo "configure:4842: checking for dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_func_dlopen'+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:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" - else -@@ -4884,7 +4885,7 @@ else - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:4888: checking for dlopen in -ldl" >&5 -+echo "configure:4889: 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 -@@ -4892,7 +4893,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4908: \"$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 -@@ -4931,13 +4932,13 @@ fi - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:4935: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:4936: 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 -@@ -4955,7 +4956,7 @@ rm -f conftest* - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext < - Autoconf TCGETA -@@ -4979,12 +4980,12 @@ fi - for ac_func in lchown strerror - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4983: checking for $ac_func" >&5 -+echo "configure:4984: 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:5012: \"$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 -@@ -5045,7 +5046,7 @@ fi - - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:5049: checking for pthread_create in -lpthreads" >&5 -+echo "configure:5050: checking for pthread_create in -lpthreads" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -5067,7 +5068,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:5071: checking for pthread_create in -lpthread" >&5 -+echo "configure:5072: checking for pthread_create in -lpthread" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -5089,7 +5090,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:5093: checking for pthread_create in -lc_r" >&5 -+echo "configure:5094: checking for pthread_create in -lc_r" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -5111,7 +5112,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:5115: checking for pthread_create in -lc" >&5 -+echo "configure:5116: checking for pthread_create in -lc" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -5261,7 +5262,7 @@ if test -n "$USE_PTHREADS"; then - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:5265: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:5266: 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 -@@ -5277,7 +5278,7 @@ echo "configure:5265: checking whether $ - 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:5281: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:5282: 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 diff --git a/firefox-1.1-nss-system-nspr.patch b/firefox-1.1-nss-system-nspr.patch deleted file mode 100644 index e69de29..0000000 diff --git a/firefox-1.5-with-system-nss.patch b/firefox-1.5-with-system-nss.patch deleted file mode 100644 index 1e9c701..0000000 --- a/firefox-1.5-with-system-nss.patch +++ /dev/null @@ -1,627 +0,0 @@ -Index: mozilla/configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1503.2.15 -diff -u -r1.1503.2.15 configure.in ---- mozilla/configure.in 4 Oct 2005 05:53:49 -0000 1.1503.2.15 -+++ mozilla/configure.in 15 Dec 2005 05:40:40 -0000 -@@ -86,6 +86,7 @@ - MOZPNG=10207 - MOZZLIB=1.2.3 - NSPR_VERSION=4 -+NSS_VERSION=3 - - dnl Set the minimum version of toolkit libs used by mozilla - dnl ======================================================== -@@ -3472,6 +3473,19 @@ - fi - fi - -+dnl ======================================================== -+dnl = If NSS was not detected in the system, -+dnl = use the one in the source tree (mozilla/security/nss) -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-nss, -+[ --with-system-nss Use system installed NSS], -+ _USE_SYSTEM_NSS=1 ) -+ -+if test -n "$_USE_SYSTEM_NSS"; then -+ AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=]) -+fi -+ - if test -z "$SKIP_LIBRARY_CHECKS"; then - dnl system JPEG support - dnl ======================================================== -@@ -6698,6 +6712,10 @@ - AC_SUBST(NSPR_LIBS) - AC_SUBST(MOZ_NATIVE_NSPR) - -+AC_SUBST(NSS_CFLAGS) -+AC_SUBST(NSS_LIBS) -+AC_SUBST(MOZ_NATIVE_NSS) -+ - AC_SUBST(CFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(CPPFLAGS) -Index: mozilla/configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1492.2.17 -diff -u -r1.1492.2.17 configure ---- mozilla/configure 4 Oct 2005 06:01:48 -0000 1.1492.2.17 -+++ mozilla/configure 15 Dec 2005 05:40:53 -0000 -@@ -44,6 +44,13 @@ - --with-nspr-exec-prefix=PFX - Exec prefix where NSPR is installed" - ac_help="$ac_help -+ --with-system-nss Use system installed NSS" -+ac_help="$ac_help -+ --with-nss-prefix=PFX Prefix where NSS is installed" -+ac_help="$ac_help -+ --with-nss-exec-prefix=PFX -+ Exec prefix where NSS is installed" -+ac_help="$ac_help - --with-system-jpeg[=PFX] - Use system libjpeg [installed at prefix PFX]" - ac_help="$ac_help -@@ -1020,6 +1027,7 @@ - MOZPNG=10207 - MOZZLIB=1.2.3 - NSPR_VERSION=4 -+NSS_VERSION=3 - - GLIB_VERSION=1.2.0 - GTK_VERSION=1.2.0 -@@ -11300,6 +11308,123 @@ - fi - fi - -+ -+# Check whether --with-system-nss or --without-system-nss was given. -+if test "${with_system_nss+set}" = set; then -+ withval="$with_system_nss" -+ if test "$withval" = "yes"; then -+ _USE_SYSTEM_NSS=1 -+ elif test "$withval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; } -+ fi -+fi -+ -+ -+if test -n "$_USE_SYSTEM_NSS"; then -+ -+# Check whether --with-nss-prefix or --without-nss-prefix was given. -+if test "${with_nss_prefix+set}" = set; then -+ withval="$with_nss_prefix" -+ nss_config_prefix="$withval" -+else -+ nss_config_prefix="" -+fi -+ -+ -+# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given. -+if test "${with_nss_exec_prefix+set}" = set; then -+ withval="$with_nss_exec_prefix" -+ nss_config_exec_prefix="$withval" -+else -+ nss_config_exec_prefix="" -+fi -+ -+ -+ if test -n "$nss_config_exec_prefix"; then -+ nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config -+ fi -+ fi -+ if test -n "$nss_config_prefix"; then -+ nss_config_args="$nss_config_args --prefix=$nss_config_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_prefix/bin/nss-config -+ fi -+ fi -+ -+ unset ac_cv_path_NSS_CONFIG -+ # Extract the first word of "nss-config", so it can be a program name with args. -+set dummy nss-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:11363: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$NSS_CONFIG" in -+ /*) -+ ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_NSS_CONFIG="$NSS_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_NSS_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no" -+ ;; -+esac -+fi -+NSS_CONFIG="$ac_cv_path_NSS_CONFIG" -+if test -n "$NSS_CONFIG"; then -+ echo "$ac_t""$NSS_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ min_nss_version=3.0.0 -+ echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 -+echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5 -+ -+ no_nss="" -+ if test "$NSS_CONFIG" = "no"; then -+ no_nss="yes" -+ else -+ NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` -+ NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` -+ -+ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ fi -+ -+ if test -z "$no_nss"; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_NATIVE_NSS=1 -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ -+ -+ -+ -+ -+fi -+ - if test -z "$SKIP_LIBRARY_CHECKS"; then - # Check whether --with-system-jpeg or --without-system-jpeg was given. - if test "${with_system_jpeg+set}" = set; then -@@ -19473,6 +19602,9 @@ - s%@NSPR_CONFIG@%$NSPR_CONFIG%g - s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g - s%@NSPR_LIBS@%$NSPR_LIBS%g -+s%@NSS_CONFIG@%$NSS_CONFIG%g -+s%@NSS_CFLAGS@%$NSS_CFLAGS%g -+s%@NSS_LIBS@%$NSS_LIBS%g - s%@GTK_CONFIG@%$GTK_CONFIG%g - s%@GTK_CFLAGS@%$GTK_CFLAGS%g - s%@GTK_LIBS@%$GTK_LIBS%g -@@ -19753,6 +19885,7 @@ - s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g - s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g - s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g -+s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g - s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g - s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g - s%@CROSS_COMPILE@%$CROSS_COMPILE%g -Index: mozilla/aclocal.m4 -=================================================================== -RCS file: /cvsroot/mozilla/aclocal.m4,v -retrieving revision 1.14 -diff -u -r1.14 aclocal.m4 ---- mozilla/aclocal.m4 13 May 2004 03:12:47 -0000 1.14 -+++ mozilla/aclocal.m4 15 Dec 2005 05:40:53 -0000 -@@ -8,6 +8,7 @@ - builtin(include, build/autoconf/libIDL.m4)dnl - builtin(include, build/autoconf/libIDL-2.m4)dnl - builtin(include, build/autoconf/nspr.m4)dnl -+builtin(include, build/autoconf/nss.m4)dnl - builtin(include, build/autoconf/libart.m4)dnl - builtin(include, build/autoconf/pkg.m4)dnl - builtin(include, build/autoconf/freetype2.m4)dnl -Index: mozilla/config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.363.2.1 -diff -u -r3.363.2.1 autoconf.mk.in ---- mozilla/config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1 -+++ mozilla/config/autoconf.mk.in 15 Dec 2005 05:40:53 -0000 -@@ -229,6 +229,7 @@ - MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@ - - MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@ -+MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@ - - CROSS_COMPILE = @CROSS_COMPILE@ - -@@ -384,6 +385,48 @@ - NSPR_CFLAGS = @NSPR_CFLAGS@ - NSPR_LIBS = @NSPR_LIBS@ - -+NSS_CONFIG = @NSS_CONFIG@ -+NSS_CFLAGS = @NSS_CFLAGS@ -+NSS_LIBS = @NSS_LIBS@ -+ -+ifdef MOZ_NATIVE_NSS -+NSS_DEP_LIBS = \ -+ $(NULL) -+NSS_LIBS += \ -+ -lcrmf \ -+ $(NULL) -+else -+NSS_DEP_LIBS = \ -+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -+ $(NULL) -+NSS_LIBS = \ -+ $(LIBS_DIR) \ -+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ -lsmime3 \ -+ -lssl3 \ -+ -lnss3 \ -+ -lsoftokn3 \ -+ $(NULL) -+endif -+ -+ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) -+ifndef GNU_CC -+ifndef MOZ_NATIVE_NSS -+NSS_LIBS = \ -+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ -+ $(NULL) -+endif -+endif -+endif -+ - LDAP_CFLAGS = @LDAP_CFLAGS@ - LDAP_LIBS = @LDAP_LIBS@ - XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ -Index: mozilla/config/config.mk -=================================================================== -RCS file: /cvsroot/mozilla/config/config.mk,v -retrieving revision 3.337 -diff -u -r3.337 config.mk ---- mozilla/config/config.mk 28 Jul 2005 19:48:11 -0000 3.337 -+++ mozilla/config/config.mk 15 Dec 2005 05:40:54 -0000 -@@ -138,39 +138,6 @@ - FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps - FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names - --# --# NSS libs needed for final link in static build --# -- --NSS_LIBS = \ -- $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- -lsmime3 \ -- -lssl3 \ -- -lnss3 \ -- -lsoftokn3 \ -- $(NULL) -- --ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) --ifndef GNU_CC --NSS_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ -- $(NULL) --endif --endif -- --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -- - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) - MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) - MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) -Index: mozilla/build/autoconf/nss.m4 -=================================================================== -RCS file: mozilla/build/autoconf/nss.m4 -diff -N mozilla/build/autoconf/nss.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ mozilla/build/autoconf/nss.m4 15 Dec 2005 05:40:54 -0000 -@@ -0,0 +1,67 @@ -+# -*- tab-width: 4; -*- -+# Configure paths for NSS -+# Public domain - Chris Seawood 2001-04-05 -+# Based upon gtk.m4 (also PD) by Owen Taylor -+ -+dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS -+AC_DEFUN(AM_PATH_NSS, -+[dnl -+ -+AC_ARG_WITH(nss-prefix, -+ [ --with-nss-prefix=PFX Prefix where NSS is installed], -+ nss_config_prefix="$withval", -+ nss_config_prefix="") -+ -+AC_ARG_WITH(nss-exec-prefix, -+ [ --with-nss-exec-prefix=PFX -+ Exec prefix where NSS is installed], -+ nss_config_exec_prefix="$withval", -+ nss_config_exec_prefix="") -+ -+ if test -n "$nss_config_exec_prefix"; then -+ nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config -+ fi -+ fi -+ if test -n "$nss_config_prefix"; then -+ nss_config_args="$nss_config_args --prefix=$nss_config_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_prefix/bin/nss-config -+ fi -+ fi -+ -+ unset ac_cv_path_NSS_CONFIG -+ AC_PATH_PROG(NSS_CONFIG, nss-config, no) -+ min_nss_version=ifelse([$1], ,3.0.0,$1) -+ AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping)) -+ -+ no_nss="" -+ if test "$NSS_CONFIG" = "no"; then -+ no_nss="yes" -+ else -+ NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` -+ NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` -+ -+ dnl Skip version check for now -+ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ fi -+ -+ if test -z "$no_nss"; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ -+ -+ AC_SUBST(NSS_CFLAGS) -+ AC_SUBST(NSS_LIBS) -+ -+]) -Index: mozilla/security/manager/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v -retrieving revision 1.57 -diff -u -r1.57 Makefile.in ---- mozilla/security/manager/Makefile.in 2 Jun 2005 02:03:05 -0000 1.57 -+++ mozilla/security/manager/Makefile.in 15 Dec 2005 05:40:54 -0000 -@@ -46,6 +46,8 @@ - MODULE = psm - - PACKAGE_FILE = psm.pkg -+ -+ifndef MOZ_NATIVE_NSS - PACKAGE_VARS += \ - NSS3_LIB \ - SMIME3_LIB \ -@@ -57,6 +59,7 @@ - $(NULL) - - LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -+endif - - NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) - SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -@@ -147,6 +150,7 @@ - export:: .nss.cleaned - - .nss.cleaned: .nss.checkout -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - ifndef SKIP_CHK -@@ -154,9 +158,12 @@ - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - endif - touch $@ -+endif - - .nss.checkout: -+ifndef MOZ_NATIVE_NSS - touch $(srcdir)/$@ -+endif - - dependclean export packages chrome:: - $(MAKE) -C boot $@ -@@ -167,12 +174,15 @@ - endif - - libs:: -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) -+endif - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -@@ -210,6 +220,7 @@ - $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin - endif - endif -+endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -218,6 +229,7 @@ - endif - - install:: -+ifndef MOZ_NATIVE_NSS - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) - ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) -@@ -232,6 +244,7 @@ - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) - endif -+endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -246,15 +259,18 @@ - ifdef MOZ_XUL - $(MAKE) -C pki $@ - endif -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - endif -+endif - - echo-requires-recursive:: - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C pki $@ - $(MAKE) -C locales $@ -+ -Index: mozilla/security/manager/ssl/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v -retrieving revision 1.67 -diff -u -r1.67 Makefile.in ---- mozilla/security/manager/ssl/src/Makefile.in 3 Aug 2005 05:24:18 -0000 1.67 -+++ mozilla/security/manager/ssl/src/Makefile.in 15 Dec 2005 05:40:56 -0000 -@@ -123,8 +123,13 @@ - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's -+ifdef MOZ_NATIVE_NSS -+LOCAL_INCLUDES += $(NSS_CFLAGS) \ -+ $(NULL) -+else - LOCAL_INCLUDES += -I$(DIST)/public/nss \ - $(NULL) -+endif - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ -Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v -retrieving revision 1.126.2.1 -diff -u -r1.126.2.1 nsNSSComponent.cpp ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp 26 Aug 2005 06:41:50 -0000 1.126.2.1 -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 15 Dec 2005 05:41:00 -0000 -@@ -488,14 +488,6 @@ - } - - --#ifdef XP_MAC --#ifdef DEBUG --#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb") --#else --#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb") --#endif /*DEBUG*/ --#endif /*XP_MAC*/ -- - static void setOCSPOptions(nsIPrefBranch * pref); - - NS_IMETHODIMP -@@ -689,40 +681,40 @@ - - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -- NS_XPCOM_CURRENT_PROCESS_DIR -+ NS_XPCOM_CURRENT_PROCESS_DIR, -+ 0 - }; -- -+ - for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { - nsCOMPtr mozFile; -- directoryService->Get( possible_ckbi_locations[il], -- NS_GET_IID(nsILocalFile), -- getter_AddRefs(mozFile)); -+ char *fullModuleName = nsnull; -+ -+ if (!possible_ckbi_locations[il]) -+ { -+ fullModuleName = PR_GetLibraryName(nsnull, "nssckbi"); -+ } -+ else -+ { -+ directoryService->Get( possible_ckbi_locations[il], -+ NS_GET_IID(nsILocalFile), -+ getter_AddRefs(mozFile)); - -- if (!mozFile) { -- continue; -+ if (!mozFile) { -+ continue; -+ } -+ -+ nsCAutoString processDir; -+ mozFile->GetNativePath(processDir); -+ fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - } - -- char *fullModuleName = nsnull; --#ifdef XP_MAC -- nsCAutoString nativePath; -- mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files")); -- mozFile->AppendNative(LOADABLE_CERTS_MODULE); -- mozFile->GetNativePath(nativePath); -- fullModuleName = (char *) nativePath.get(); --#else -- nsCAutoString processDir; -- mozFile->GetNativePath(processDir); -- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); --#endif - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); - int modType; - SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType); - SECStatus rv_add = - SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0); --#ifndef XP_MAC -- PR_Free(fullModuleName); // allocated by NSPR --#endif -+ PR_FreeLibraryName(fullModuleName); // allocated by NSPR - if (SECSuccess == rv_add) { - // found a module, no need to try other directories - break; diff --git a/firefox-2.0-visibility.patch b/firefox-2.0-visibility.patch deleted file mode 100644 index acb0f27..0000000 --- a/firefox-2.0-visibility.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- mozilla/config/system-headers.visibility 2005-06-17 17:03:42.000000000 -0400 -+++ mozilla/config/system-headers 2006-10-26 22:40:49.000000000 -0400 -@@ -66,6 +66,8 @@ - Button.h - byteswap.h - cairo.h -+cairo-xlib.h -+cairo-xlib-xrender.h - callconv.h - Carbon/Carbon.h - CarbonEvents.h -@@ -176,7 +178,7 @@ - freetype/freetype.h - freetype/ftcache.h - freetype/ftglyph.h --freetype/ftoutlin.h -+freetype/ftoutln.h - freetype/ttnameid.h - freetype/tttables.h - fribidi/fribidi.h -@@ -192,6 +194,8 @@ - gdk/gdkregion.h - gdk/gdkwindow.h - gdk/gdkx.h -+gdk/gdkpango.h -+gdk/gdkalias.h - gdk-pixbuf/gdk-pixbuf.h - Gestalt.h - getopt.h -@@ -212,7 +216,11 @@ - gtk/gtkcontainer.h - gtk/gtkdialog.h - gtk/gtkentry.h -+gtk/gtkfilechooser.h -+gtk/gtkfixed.h - gtk/gtk.h -+gtk/gtkiconfactory.h -+gtk/gtkimage.h - gtk/gtkimmulticontext.h - gtk/gtkinvisible.h - gtk/gtkmain.h -@@ -496,10 +504,12 @@ - photon/PtWebClient.h - photon/PxImage.h - pk11func.h -+pk11pub.h - pkcs11t.h - PLStringFuncs.h - PMApplication.h - pmddim.h -+png.h - poll.h - Polygon.h - portable.h -@@ -874,6 +884,7 @@ - X11/Xutil.h - xpt_struct.h - xpt_xdr.h -+zlib.h - zmouse.h - sslt.h - smime.h ---- mozilla/modules/oji/src/nsJVMManager.cpp.visibility 2005-08-22 10:09:59.000000000 -0400 -+++ mozilla/modules/oji/src/nsJVMManager.cpp 2006-10-26 22:38:48.000000000 -0400 -@@ -845,7 +845,7 @@ - return fStatus; - } - --extern "C" nsresult JSJ_RegisterLiveConnectFactory(void); -+extern "C" NS_VISIBILITY_DEFAULT nsresult JSJ_RegisterLiveConnectFactory(void); - - PRBool - nsJVMManager::MaybeStartupLiveConnect(void) diff --git a/firefox-RC1-stock-icons-be.patch b/firefox-RC1-stock-icons-be.patch deleted file mode 100644 index e29aa72..0000000 --- a/firefox-RC1-stock-icons-be.patch +++ /dev/null @@ -1,1161 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1335.2.6.2.18 -diff -u -r1.1335.2.6.2.18 configure.in ---- configure.in 31 Oct 2004 07:17:58 -0000 1.1335.2.6.2.18 -+++ configure.in 3 Nov 2004 10:03:35 -0000 -@@ -92,6 +92,7 @@ - MAKE_VERSION=3.78 - WINDRES_VERSION=2.14.90 - W32API_VERSION=2.4 -+GNOMEUI_VERSION=2.0.6 - GNOMEVFS_VERSION=2.0 - GCONF_VERSION=1.2.1 - LIBGNOME_VERSION=2.0 -@@ -3588,7 +3589,35 @@ - - AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT) - fi -+dnl = libgnomeui support module -+dnl ======================================================== -+ -+if test "$MOZ_ENABLE_GTK2" -+then -+ MOZ_ENABLE_GNOMEUI=1 -+ -+ MOZ_ARG_DISABLE_BOOL(gnomeui, -+ [ --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) ], -+ MOZ_ENABLE_GNOMEUI=, -+ MOZ_ENABLE_GNOMEUI=force) -+ -+ if test "$MOZ_ENABLE_GNOMEUI" -+ then -+ PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION, -+ [MOZ_ENABLE_GNOMEUI=1], [ -+ if test "$MOZ_ENABLE_GNOMEUI" = "force" -+ then -+ AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION]) -+ fi -+ MOZ_ENABLE_GNOMEUI= -+ ]) -+ fi - -+ AC_SUBST(MOZ_ENABLE_GNOMEUI) -+ AC_SUBST(MOZ_GNOMEUI_CFLAGS) -+ AC_SUBST(MOZ_GNOMEUI_LIBS) -+ -+fi - dnl ======================================================== - dnl = Setting MOZ_EXTRA_X11CONVERTERS turns on additional - dnl = converters in intl/uconv that are used only by X11 gfx -@@ -3999,6 +4028,17 @@ - MOZ_IMG_DECODERS_DEFAULT="$MOZ_IMG_DECODERS_DEFAULT icon" - fi - ;; -+*) -+ if test "$MOZ_ENABLE_GNOMEUI"; then -+ -+ MOZ_IMG_DECODERS_DEFAULT="$MOZ_IMG_DECODERS_DEFAULT icon" -+ fi -+ ;; -+*) -+ if test "$MOZ_ENABLE_GNOMEUI"; then -+ MOZ_IMG_DECODERS_DEFAULT="$MOZ_IMG_DECODERS_DEFAULT icon" -+ fi -+ ;; - esac - - MOZ_ARG_ENABLE_STRING(image-decoders, -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.310.6.7 -diff -u -r3.310.6.7 autoconf.mk.in ---- config/autoconf.mk.in 31 Oct 2004 04:29:54 -0000 3.310.6.7 -+++ config/autoconf.mk.in 3 Nov 2004 10:03:54 -0000 -@@ -165,8 +165,14 @@ - endif - endif - MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@ -+ - MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@ - -+MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@ -+MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ -+MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@ -+ -+ - MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@ - MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@ - -Index: modules/libpr0n/decoders/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/Makefile.in,v -retrieving revision 1.10 -diff -u -r1.10 Makefile.in ---- modules/libpr0n/decoders/Makefile.in 1 Jul 2003 03:57:24 -0000 1.10 -+++ modules/libpr0n/decoders/Makefile.in 3 Nov 2004 10:03:59 -0000 -@@ -29,6 +29,9 @@ - DIRS = $(MOZ_IMG_DECODERS) - - ifneq (,$(findstring icon,$(MOZ_IMG_DECODERS))) -+ifdef MOZ_ENABLE_GNOMEUI -+DIRS := icon/gtk $(DIRS) -+endif - ifeq ($(OS_ARCH),WINNT) - DIRS := icon/win $(DIRS) - endif -@@ -39,6 +42,9 @@ - DIRS := icon/mac $(DIRS) - endif - endif # icon -+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -+DIRS := icon/gtk $(DIRS) -+endif - - include $(topsrcdir)/config/rules.mk - -Index: modules/libpr0n/decoders/icon/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/Makefile.in,v -retrieving revision 1.9.20.1 -diff -u -r1.9.20.1 Makefile.in ---- modules/libpr0n/decoders/icon/Makefile.in 22 Jun 2004 22:37:07 -0000 1.9.20.1 -+++ modules/libpr0n/decoders/icon/Makefile.in 3 Nov 2004 10:03:59 -0000 -@@ -35,6 +35,13 @@ - - PACKAGE_FILE = imgicon.pkg - -+ifdef MOZ_ENABLE_GNOMEUI -+EXTRA_DSO_LDOPTS = $(MOZ_GNOMEUI_LIBS) -+PLATFORM = gtk -+FORCE_SHARED_LIB = 1 -+EXPORT_LIBRARY = -+endif -+ - ifeq ($(OS_ARCH),WINNT) - EXTRA_DSO_LIBS = gkgfx - PLATFORM = win -@@ -48,6 +55,10 @@ - PLATFORM = mac - endif - -+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -+PLATFORM = gtk -+endif -+ - DIRS = $(PLATFORM) - - REQUIRES = xpcom \ -@@ -68,7 +79,7 @@ - - SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX) - --EXTRA_DSO_LDOPTS = \ -+EXTRA_DSO_LDOPTS += \ - $(EXTRA_DSO_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) -Index: modules/libpr0n/decoders/icon/nsIIconURI.idl -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/nsIIconURI.idl,v -retrieving revision 1.5 -diff -u -r1.5 nsIIconURI.idl ---- modules/libpr0n/decoders/icon/nsIIconURI.idl 27 Apr 2002 05:32:16 -0000 1.5 -+++ modules/libpr0n/decoders/icon/nsIIconURI.idl 3 Nov 2004 10:03:59 -0000 -@@ -21,26 +21,90 @@ - - #include "nsIURI.idl" - --// --// moz-icon URLs have the following syntax --// --// moz-icon:?size=16&contentType=text/html --// OR --// moz-icon://dummyfile.html --// moz-icon://dummyfile.html?size=32 --// --// The content type field is optional. The size field is optional. You only need to specify a file url inside the icon --// if the file you want the icon for actually exists. Otherwise you can omit the file:// and just place a dummy file name with the extension --// or content type you want: moz-icon://dummy.html. --// -+ /** -+ * nsIIconURI -+ * -+ * This interface derives from nsIURI, to provide additional information -+ * about moz-icon URIs. These URIs -+ * -+ * What *is* a moz-icon URI you ask? Well, it has the following syntax: -+ * -+ * moz-icon://[ | ]? ['?'[]] -+ * -+ * is a legal file: URI spec. You only need to specify a file: URI inside the icon -+ * if the file you want the icon for actually exists. -+ * -+ * is any filename with an extension, e.g. "dummy.html". -+ * If the file you want an icon for isn't known to exist, you can omit the file URI, and just -+ * place a dummy file name with the extension or content type you want: moz-icon://dummy.html. -+ * -+ * is of the format: stock/ -+ * -+ * is a valid icon name, such as 'ok', 'cancel', 'yes', 'no'. -+ * XXXcaa document or reference to all 76 (yes, 76) of them. -+ * -+ * Legal parameter value pairs are listed below: -+ * -+ * Parameter: size -+ * Values: [ | button | toolbar | toolbarsmall | menu | dialog] -+ * Description: If integer, this is the desired size in square pixels of the icon -+ * Else, use the OS default for the specified keyword context. -+ * Note that stock images require a keyword, not an integer pixel value. -+ * -+ * Parameter: contentType -+ * Values: -+ * Description: A valid mime type for the icon. -+ */ - - [scriptable, uuid(733A7A16-2D36-11d5-9907-001083010E9B)] - interface nsIMozIconURI : nsIURI - { -- // Returns the file URL contained within this -moz-icon url. -- attribute nsIURI IconFile; // maybe null if there isn't a real file we are trying to fetch -+ /** -+ * iconFile -+ * -+ * the file URL contained within this moz-icon url, or null. -+ */ -+ attribute nsIURI iconFile; -+ /** -+ * imageSize -+ * -+ * The image area in square pixels, defaulting to 16 if unspecified. -+ */ -+ attribute unsigned long imageSize; - -- attribute unsigned long imageSize; // measured by # of pixels in a row. defaults to 16. -- attribute ACString contentType; // may be an empty string -+ /** -+ * contentType -+ * -+ * A valid mime type, or the empty string. -+ */ -+ -+ attribute ACString contentType; -+ -+ /** -+ * fileExtension -+ * -+ * The file extension of the file which we are looking up. -+ */ - readonly attribute ACString fileExtension; -+ -+ /** -+ * stockIcon -+ * -+ * The stock icon name requested from the OS. -+ */ -+ readonly attribute ACString stockIcon; -+ -+ /** -+ * stockIconSize -+ * -+ * The stock icon size requested from the OS. -+ */ -+ readonly attribute ACString stockIconSize; -+ -+ /** -+ * stockIconState -+ * -+ * The stock icon state requested from the OS. -+ */ -+ readonly attribute ACString stockIconState; - }; -Index: modules/libpr0n/decoders/icon/nsIconModule.cpp -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp,v -retrieving revision 1.4 -diff -u -r1.4 nsIconModule.cpp ---- modules/libpr0n/decoders/icon/nsIconModule.cpp 30 Jan 2002 21:05:40 -0000 1.4 -+++ modules/libpr0n/decoders/icon/nsIconModule.cpp 3 Nov 2004 10:03:59 -0000 -@@ -26,6 +26,7 @@ - - #include "nsIconDecoder.h" - #include "nsIconProtocolHandler.h" -+#include "nsIconURI.h" - - // objects that just require generic constructors - /****************************************************************************** -@@ -41,7 +42,8 @@ - { "icon decoder", - NS_ICONDECODER_CID, - "@mozilla.org/image/decoder;2?type=image/icon", -- nsIconDecoderConstructor, }, -+ nsIconDecoderConstructor -+ }, - - { "Icon Protocol Handler", - NS_ICONPROTOCOL_CID, -@@ -50,4 +52,12 @@ - } - }; - --NS_IMPL_NSGETMODULE(nsIconDecoderModule, components) -+PR_STATIC_CALLBACK(nsresult) -+IconDecoderModuleCtor(nsIModule* aSelf) -+{ -+ nsMozIconURI::InitAtoms(); -+ return NS_OK; -+} -+ -+NS_IMPL_NSGETMODULE_WITH_CTOR(nsIconDecoderModule, components, -+ IconDecoderModuleCtor) -Index: modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp,v -retrieving revision 1.12 -diff -u -r1.12 nsIconProtocolHandler.cpp ---- modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp 8 Jan 2003 22:02:55 -0000 1.12 -+++ modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp 3 Nov 2004 10:03:59 -0000 -@@ -89,15 +89,18 @@ - - NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result) - { -- nsCOMPtr channel; -- NS_NEWXPCOM(channel, nsIconChannel); -+ nsIconChannel* channel = new nsIconChannel; -+ if (!channel) -+ return NS_ERROR_OUT_OF_MEMORY; -+ NS_ADDREF(channel); - -- if (channel) -- NS_STATIC_CAST(nsIconChannel*,NS_STATIC_CAST(nsIChannel*, channel))->Init(url); -+ nsresult rv = channel->Init(url); -+ if (NS_FAILED(rv)) { -+ delete channel; -+ return rv; -+ } - - *result = channel; -- NS_IF_ADDREF(*result); -- - return NS_OK; - } - -Index: modules/libpr0n/decoders/icon/nsIconURI.cpp -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp,v -retrieving revision 1.16 -diff -u -r1.16 nsIconURI.cpp ---- modules/libpr0n/decoders/icon/nsIconURI.cpp 17 Mar 2004 21:23:51 -0000 1.16 -+++ modules/libpr0n/decoders/icon/nsIconURI.cpp 3 Nov 2004 10:03:59 -0000 -@@ -26,6 +26,8 @@ - #include "nsCRT.h" - #include "nsReadableUtils.h" - #include "nsPrintfCString.h" -+#include "nsIAtom.h" -+#include "nsStaticAtom.h" - - static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - #define DEFAULT_IMAGE_SIZE 16 -@@ -34,17 +36,48 @@ - // from the icon url. - static void extractAttributeValue(const char * searchString, const char * attributeName, char ** result); - -+static nsIAtom *sStockSizeButton = nsnull; -+static nsIAtom *sStockSizeToolbar = nsnull; -+static nsIAtom *sStockSizeToolbarsmall = nsnull; -+static nsIAtom *sStockSizeMenu = nsnull; -+static nsIAtom *sStockSizeDialog = nsnull; -+static nsIAtom *sStockStateNormal = nsnull; -+static nsIAtom *sStockStateDisabled = nsnull; -+ -+/* static */ const nsStaticAtom nsMozIconURI::sSizeAtoms[] = -+{ -+ { "button", &sStockSizeButton }, -+ { "toolbar", &sStockSizeToolbar }, -+ { "toolbarsmall", &sStockSizeToolbarsmall }, -+ { "menu", &sStockSizeMenu }, -+ { "dialog", &sStockSizeDialog } -+}; -+ -+/* static */ const nsStaticAtom nsMozIconURI::sStateAtoms[] = -+{ -+ { "normal", &sStockStateNormal }, -+ { "disabled", &sStockStateDisabled } -+}; -+ - //////////////////////////////////////////////////////////////////////////////// - - nsMozIconURI::nsMozIconURI() -+ : mSize(DEFAULT_IMAGE_SIZE) - { -- mSize = DEFAULT_IMAGE_SIZE; - } - - nsMozIconURI::~nsMozIconURI() - { - } - -+ -+/* static */ void -+nsMozIconURI::InitAtoms() -+{ -+ NS_RegisterStaticAtoms(sSizeAtoms, NS_ARRAY_LENGTH(sSizeAtoms)); -+ NS_RegisterStaticAtoms(sStateAtoms, NS_ARRAY_LENGTH(sStateAtoms)); -+} -+ - NS_IMPL_THREADSAFE_ISUPPORTS2(nsMozIconURI, nsIMozIconURI, nsIURI) - - #define NS_MOZICON_SCHEME "moz-icon:" -@@ -64,6 +97,26 @@ - NS_ENSURE_SUCCESS(rv, rv); - spec += fileIconSpec; - } -+ else if (!mStockIcon.IsEmpty()) -+ { -+ spec += "//stock/"; -+ spec += mStockIcon; -+ if (mStockIconSize) { -+ spec += NS_MOZ_ICON_DELIMITER; -+ spec += "size="; -+ const char *size_string; -+ mStockIconSize->GetUTF8String(&size_string); -+ spec.Append(nsPrintfCString("%s", size_string)); -+ } -+ if (mStockIconState) { -+ spec += NS_MOZ_ICON_DELIMITER; -+ spec += "state="; -+ const char *state_string; -+ mStockIconSize->GetUTF8String(&state_string); -+ spec.Append(nsPrintfCString("%s", state_string)); -+ } -+ return NS_OK; -+ } - else - { - spec += "//"; -@@ -116,12 +169,10 @@ - else // there is nothing left so eat up rest of line. - attributeValue = PL_strdup(startOfAttribute); - } // if we have a attribute value -- - } // if we have a attribute name - } // if we got non-null search string and attribute name values - - *result = attributeValue; // passing ownership of attributeValue into result...no need to -- return; - } - - NS_IMETHODIMP -@@ -138,6 +189,8 @@ - if (strcmp("moz-icon", scheme.get()) != 0) - return NS_ERROR_MALFORMED_URI; - -+ nsXPIDLCString sizeString; -+ nsXPIDLCString stateString; - nsCAutoString mozIconPath(aSpec); - PRInt32 endPos = mozIconPath.FindChar(':') + 1; // guaranteed to exist! - PRInt32 pos = mozIconPath.FindChar(NS_MOZ_ICON_DELIMITER); -@@ -150,26 +203,48 @@ - { - mozIconPath.Mid(mDummyFilePath, endPos, pos - endPos); - // fill in any size and content type values... -- nsXPIDLCString sizeString; - nsXPIDLCString contentTypeString; - extractAttributeValue(mozIconPath.get() + pos, "size=", getter_Copies(sizeString)); -+ extractAttributeValue(mozIconPath.get() + pos, "state=", getter_Copies(stateString)); - extractAttributeValue(mozIconPath.get() + pos, "contentType=", getter_Copies(contentTypeString)); - mContentType = contentTypeString; -- -- if (sizeString.get()) -- { -- PRInt32 sizeValue = atoi(sizeString); -- // if the size value we got back is > 0 then use it -- if (sizeValue) -- mSize = sizeValue; -- } - } - -- // Okay now we have a bit of a hack here...filePath can have two forms: -+ // Okay now we have a bit of a hack here...filePath can have three forms: - // (1) file:// - // (2) // -+ // (3) stock/ - // We need to determine which case we are and behave accordingly... -- if (mDummyFilePath.Length() > 2) // we should at least have two forward slashes followed by a file or a file:// -+ if (mDummyFilePath.Length() > 2) -+ { -+ if (!strncmp("//stock/", mDummyFilePath.get(), 8)) -+ { -+ // we have a stock icon -+ mStockIcon = Substring(mDummyFilePath, 8); -+ if (!sizeString.IsEmpty()) -+ { -+ nsCOMPtr atom = do_GetAtom(sizeString); -+ for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(sSizeAtoms); i++) -+ { -+ if (atom == *(sSizeAtoms[i].mAtom)) -+ { -+ mStockIconSize = atom; -+ break; -+ } -+ } -+ -+ atom = do_GetAtom(stateString); -+ for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(sStateAtoms); i++) -+ { -+ if (atom == *(sStateAtoms[i].mAtom)) -+ { -+ mStockIconState = atom; -+ break; -+ } -+ } -+ } -+ } -+ else - { - if (!nsCRT::strncmp("//", mDummyFilePath.get(), 2))// must not have a url here.. - { -@@ -177,16 +252,22 @@ - // and remember the rest in mDummyFilePath - mDummyFilePath.Cut(0, 2); // cut the first 2 bytes.... - } -- -- if (!nsCRT::strncmp("file://", mDummyFilePath.get(), 7)) -+ else if (!nsCRT::strncmp("file://", mDummyFilePath.get(), 7)) - { - // we have a file url.....so store it... - rv = ioService->NewURI(mDummyFilePath, nsnull, nsnull, getter_AddRefs(mFileIcon)); -- if (NS_FAILED(rv)) return NS_ERROR_MALFORMED_URI; -+ } -+ if (!sizeString.IsEmpty()) -+ { -+ PRInt32 sizeValue = atoi(sizeString); -+ // if the size value we got back is > 0 then use it -+ if (sizeValue) -+ mSize = sizeValue; -+ } - } - } - else -- return NS_ERROR_MALFORMED_URI; // they didn't include a file path... -+ rv = NS_ERROR_MALFORMED_URI; // they didn't include a file path... - return rv; - } - -@@ -436,10 +517,35 @@ - const char * chFileName = fileExtension.get(); // get the underlying buffer - const char * fileExt = strrchr(chFileName, '.'); - if (!fileExt) return NS_ERROR_FAILURE; // no file extension to work from. -- else -+ - aFileExtension = nsDependentCString(fileExt); - - return NS_OK; - } - -+NS_IMETHODIMP -+nsMozIconURI::GetStockIcon(nsACString &aStockIcon) -+{ -+ aStockIcon.Assign(mStockIcon); -+ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsMozIconURI::GetStockIconSize(nsACString &aSize) -+{ -+ if (mStockIconSize) -+ return mStockIconSize->ToUTF8String(aSize); -+ aSize.Truncate(); -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsMozIconURI::GetStockIconState(nsACString &aState) -+{ -+ if (mStockIconState) -+ return mStockIconState->ToUTF8String(aState); -+ aState.Truncate(); -+ return NS_OK; -+} - //////////////////////////////////////////////////////////////////////////////// -Index: modules/libpr0n/decoders/icon/nsIconURI.h -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/nsIconURI.h,v -retrieving revision 1.6 -diff -u -r1.6 nsIconURI.h ---- modules/libpr0n/decoders/icon/nsIconURI.h 6 Mar 2002 07:47:49 -0000 1.6 -+++ modules/libpr0n/decoders/icon/nsIconURI.h 3 Nov 2004 10:04:00 -0000 -@@ -25,6 +25,9 @@ - #include "nsIIconURI.h" - #include "nsCOMPtr.h" - #include "nsString.h" -+class nsStaticAtom; -+ -+class nsIAtom; - - #define NS_MOZICONURI_CID \ - { \ -@@ -41,6 +44,8 @@ - NS_DECL_NSIURI - NS_DECL_NSIMOZICONURI - -+ static void InitAtoms(); -+ - // nsJARURI - nsMozIconURI(); - virtual ~nsMozIconURI(); -@@ -50,6 +55,12 @@ - PRUint32 mSize; // the # of pixels in a row that we want for this image. Typically 16, 32, 128, etc. - nsCString mContentType; // optional field explicitly specifying the content type - nsCString mDummyFilePath; // if we don't have a valid file url, the file path is stored here....i.e if mFileIcon is null..... -+ nsCString mStockIcon; -+ nsCOMPtr mStockIconSize; -+ nsCOMPtr mStockIconState; -+ -+ static const nsStaticAtom sSizeAtoms[]; -+ static const nsStaticAtom sStateAtoms[]; - - nsresult FormatSpec(nsACString &result); - }; -Index: modules/libpr0n/decoders/icon/win/nsIconChannel.h -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h,v -retrieving revision 1.6 -diff -u -r1.6 nsIconChannel.h ---- modules/libpr0n/decoders/icon/win/nsIconChannel.h 19 Dec 2003 15:04:27 -0000 1.6 -+++ modules/libpr0n/decoders/icon/win/nsIconChannel.h 3 Nov 2004 10:04:00 -0000 -@@ -45,7 +45,7 @@ - NS_DECL_NSISTREAMLISTENER - - nsIconChannel(); -- virtual ~nsIconChannel(); -+ ~nsIconChannel(); - - nsresult Init(nsIURI* uri); - -Index: caps/src/nsScriptSecurityManager.cpp -=================================================================== -RCS file: /cvsroot/mozilla/caps/src/nsScriptSecurityManager.cpp,v -retrieving revision 1.229.6.6 -diff -u -r1.229.6.6 nsScriptSecurityManager.cpp ---- caps/src/nsScriptSecurityManager.cpp 24 Oct 2004 12:04:33 -0000 1.229.6.6 -+++ caps/src/nsScriptSecurityManager.cpp 3 Nov 2004 10:11:43 -0000 -@@ -1233,6 +1233,7 @@ - // to increase performance - { "http", AllowProtocol }, - { "chrome", ChromeProtocol }, -+ { "moz-icon", ChromeProtocol }, - { "file", PrefControlled }, - { "https", AllowProtocol }, - { "mailbox", DenyProtocol }, ---- /dev/null 2004-11-03 10:29:10.174421952 +0100 -+++ modules/libpr0n/decoders/icon/gtk/Makefile.in 2004-10-17 15:14:05.000000000 +0200 -@@ -0,0 +1,63 @@ -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is the Makefile for the Gnome icon decoder. -+# -+# The Initial Developer of the Original Code is -+# Christian Biesinger . -+# Portions created by the Initial Developer are Copyright (C) 2004 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+ -+DEPTH = ../../../../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+include $(DEPTH)/config/autoconf.mk -+ -+MODULE = imgicon -+LIBRARY_NAME = imgicongtk_s -+ -+REQUIRES = xpcom \ -+ string \ -+ necko \ -+ intl \ -+ mimetype \ -+ $(NULL) -+ -+CPPSRCS = nsIconChannel.cpp -+ -+LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS) $(MOZ_GTK2_CFLAGS) -+ -+# we don't want the shared lib, but we want to force the creation of a static lib. -+FORCE_STATIC_LIB = 1 -+ -+include $(topsrcdir)/config/rules.mk -+ ---- /dev/null 2004-11-03 10:29:10.174421952 +0100 -+++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.h 2004-10-17 15:14:05.000000000 +0200 -@@ -0,0 +1,84 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is the Mozilla icon channel for gnome. -+ * -+ * The Initial Developer of the Original Code is -+ * Christian Biesinger . -+ * Portions created by the Initial Developer are Copyright (C) 2004 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifndef nsIconChannel_h_ -+#define nsIconChannel_h_ -+ -+#include "nsIChannel.h" -+#include "nsIStreamListener.h" -+#include "nsIURI.h" -+#include "nsIIconURI.h" -+#include "nsCOMPtr.h" -+ -+/** -+ * This class is the gnome implementation of nsIconChannel. It basically asks -+ * gtk/gnome for an icon, saves it as a tmp icon, and creates a new channel for -+ * that file to which all calls will be proxied. -+ */ -+class nsIconChannel : public nsIChannel -+{ -+ public: -+ NS_DECL_ISUPPORTS -+ NS_FORWARD_NSIREQUEST(mRealChannel->) -+ NS_FORWARD_NSICHANNEL(mRealChannel->) -+ -+ nsIconChannel() {} -+ ~nsIconChannel() {} -+ -+ /** -+ * Called by nsIconProtocolHandler after it creates this channel. -+ * Must be called before calling any other function on this object. -+ * If this method fails, no other function must be called on this object. -+ */ -+ NS_HIDDEN_(nsresult) Init(nsIURI* aURI); -+ private: -+ /** -+ * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html). -+ * Will always be non-null after a successful Init. -+ */ -+ nsCOMPtr mRealChannel; -+ /** -+ * The moz-icon URI we're loading. Always non-null after a successful Init. -+ */ -+ nsCOMPtr mURI; -+ -+ /** -+ * Called by Init if we need to use the gnomeui library. -+ */ -+ nsresult InitWithGnome(); -+}; -+ -+#endif ---- /dev/null 2004-11-03 10:29:10.174421952 +0100 -+++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp 2004-10-23 12:15:15.000000000 +0200 -@@ -0,0 +1,352 @@ -+/* vim:set ts=2 sw=2 sts=2 cin et: */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is the Mozilla icon channel for gnome. -+ * -+ * The Initial Developer of the Original Code is -+ * Christian Biesinger . -+ * Portions created by the Initial Developer are Copyright (C) 2004 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include -+#include -+// Older versions of these headers seem to be missing an extern "C" -+extern "C" { -+#include -+#include -+#include -+#include -+ -+#include -+#include -+} -+ -+#include -+#include -+ -+#include "nsIMIMEService.h" -+ -+#include "nsIStringBundle.h" -+ -+#include "nsEscape.h" -+#include "nsNetUtil.h" -+#include "nsIURL.h" -+#include "prlink.h" -+#include "nsIconChannel.h" -+ -+NS_IMPL_ISUPPORTS2(nsIconChannel, nsIRequest, nsIChannel) -+ -+/** -+ * Given a path to a PNG Image, creates a channel from it. -+ * Note that the channel will delete the file when it's done with it. -+ * -+ * (When this function fails, the file will NOT be deleted) -+ */ -+static nsresult pngfile_to_channel(const char* aFilename, nsIChannel** aChannel) { -+ // Now we have to create an uri for the file... -+ nsCOMPtr lf; -+ nsresult rv = NS_NewNativeLocalFile(nsDependentCString(aFilename), PR_FALSE, -+ getter_AddRefs(lf)); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ nsCOMPtr is; -+ rv = NS_NewLocalFileInputStream(getter_AddRefs(is), lf, -1, -1, -+ nsIFileInputStream::DELETE_ON_CLOSE); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ nsCOMPtr realURI; -+ rv = NS_NewFileURI(getter_AddRefs(realURI), lf); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ rv = NS_NewInputStreamChannel(aChannel, realURI, is, -+ NS_LITERAL_CSTRING("image/png")); -+ return rv; -+} -+ -+static nsresult -+moz_gdk_pixbuf_to_channel(GdkPixbuf* aPixbuf, nsIChannel **aChannel) -+{ -+ char tmpfile[] = "/tmp/moziconXXXXXX"; -+ int fd = mkstemp(tmpfile); -+ if (fd == -1) { -+ return NS_ERROR_UNEXPECTED; -+ } -+ -+ GError *err = NULL; -+ gboolean ok = gdk_pixbuf_save(aPixbuf, tmpfile, "png", &err, NULL); -+ if (!ok) { -+ close(fd); -+ remove(tmpfile); -+ if (err) -+ g_error_free(err); -+ return NS_ERROR_UNEXPECTED; -+ } -+ -+ nsresult rv = pngfile_to_channel(tmpfile, aChannel); -+ close(fd); -+ if (NS_FAILED(rv)) -+ remove(tmpfile); -+ return rv; -+} -+ -+static GtkWidget *gProtoWindow = nsnull; -+static GtkWidget *gStockImageWidget = nsnull; -+static GtkIconFactory *gIconFactory = nsnull; -+ -+static void -+ensure_stock_image_widget() -+{ -+ if (!gProtoWindow) { -+ gProtoWindow = gtk_window_new(GTK_WINDOW_POPUP); -+ gtk_widget_realize(gProtoWindow); -+ GtkWidget* protoLayout = gtk_fixed_new(); -+ gtk_container_add(GTK_CONTAINER(gProtoWindow), protoLayout); -+ -+ gStockImageWidget = gtk_image_new(); -+ gtk_container_add(GTK_CONTAINER(protoLayout), gStockImageWidget); -+ gtk_widget_realize(gStockImageWidget); -+ } -+} -+ -+static void -+ensure_icon_factory() -+{ -+ if (!gIconFactory) { -+ gIconFactory = gtk_icon_factory_new(); -+ gtk_icon_factory_add_default (gIconFactory); -+ g_object_unref(gIconFactory); -+ } -+} -+ -+static GtkIconSize -+moz_gtk_icon_size(const char *name) -+{ -+ if (strcmp(name, "button") == 0) -+ return GTK_ICON_SIZE_BUTTON; -+ -+ if (strcmp(name, "menu") == 0) -+ return GTK_ICON_SIZE_MENU; -+ -+ if (strcmp(name, "toolbar") == 0) -+ return GTK_ICON_SIZE_LARGE_TOOLBAR; -+ -+ if (strcmp(name, "toolbarsmall") == 0) -+ return GTK_ICON_SIZE_SMALL_TOOLBAR; -+ -+ if (strcmp(name, "dialog") == 0) -+ return GTK_ICON_SIZE_DIALOG; -+ -+ return GTK_ICON_SIZE_INVALID; -+} -+ -+nsresult -+nsIconChannel::InitWithGnome() -+{ -+ if (!gnome_program_get()) { -+ // Get the brandShortName from the string bundle to pass to GNOME -+ // as the application name. This may be used for things such as -+ // the title of grouped windows in the panel. -+ nsCOMPtr bundleService = -+ do_GetService(NS_STRINGBUNDLE_CONTRACTID); -+ -+ NS_ASSERTION(bundleService, "String bundle service must be present!"); -+ -+ nsCOMPtr bundle; -+ bundleService->CreateBundle("chrome://global/locale/brand.properties", -+ getter_AddRefs(bundle)); -+ nsXPIDLString appName; -+ -+ if (bundle) { -+ bundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), -+ getter_Copies(appName)); -+ } else { -+ NS_WARNING("brand.properties not present, using default application name"); -+ appName.Assign(NS_LITERAL_STRING("Gecko")); -+ } -+ -+ char* empty[] = { "" }; -+ gnome_init(NS_ConvertUTF16toUTF8(appName).get(), "1.0", 1, empty); -+ } -+ -+ PRUint32 iconSize; -+ nsresult rv = mURI->GetImageSize(&iconSize); -+ NS_ASSERTION(NS_SUCCEEDED(rv), "GetImageSize failed"); -+ -+ nsCAutoString type; -+ mURI->GetContentType(type); -+ -+ GnomeVFSFileInfo fileInfo = {0}; -+ fileInfo.refcount = 1; // In case some GnomeVFS function addrefs and releases it -+ -+ nsCAutoString spec; -+ nsCOMPtr fileURI; -+ rv = mURI->GetIconFile(getter_AddRefs(fileURI)); -+ if (fileURI) { -+ fileURI->GetAsciiSpec(spec); -+ // Only ask gnome-vfs for a GnomeVFSFileInfo for file: uris, to avoid a -+ // network request -+ PRBool isFile; -+ if (NS_SUCCEEDED(fileURI->SchemeIs("file", &isFile)) && isFile) { -+ gnome_vfs_get_file_info(spec.get(), &fileInfo, GNOME_VFS_FILE_INFO_DEFAULT); -+ } -+ else { -+ // We have to get a leaf name from our uri... -+ nsCOMPtr url(do_QueryInterface(fileURI)); -+ if (url) { -+ nsCAutoString name; -+ // The filename we get is UTF-8-compatible, which matches gnome expectations. -+ // See also: http://lists.gnome.org/archives/gnome-vfs-list/2004-March/msg00049.html -+ // "Whenever we can detect the charset used for the URI type we try to -+ // convert it to/from utf8 automatically inside gnome-vfs." -+ // I'll interpret that as "otherwise, this field is random junk". -+ url->GetFileName(name); -+ fileInfo.name = g_strdup(name.get()); -+ } -+ // If this is no nsIURL, nothing we can do really. -+ -+ if (!type.IsEmpty()) { -+ fileInfo.valid_fields = GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE; -+ fileInfo.mime_type = g_strdup(type.get()); -+ } -+ } -+ } -+ -+ -+ if (type.IsEmpty()) { -+ nsCOMPtr ms(do_GetService("@mozilla.org/mime;1")); -+ if (ms) { -+ nsCAutoString fileExt; -+ mURI->GetFileExtension(fileExt); -+ nsXPIDLCString extType; -+ ms->GetTypeFromExtension(fileExt.get(), getter_Copies(extType)); -+ fileExt.Assign(extType); -+ } -+ } -+ -+ // Get the icon theme -+ GnomeIconTheme *t = gnome_icon_theme_new(); -+ if (!t) { -+ gnome_vfs_file_info_clear(&fileInfo); -+ return NS_ERROR_NOT_AVAILABLE; -+ } -+ -+ -+ char* name = gnome_icon_lookup(t, NULL, spec.get(), NULL, &fileInfo, type.get(), GNOME_ICON_LOOKUP_FLAGS_NONE, NULL); -+ gnome_vfs_file_info_clear(&fileInfo); -+ if (!name) { -+ g_object_unref(G_OBJECT(t)); -+ return NS_ERROR_NOT_AVAILABLE; -+ } -+ -+ char* file = gnome_icon_theme_lookup_icon(t, name, iconSize, NULL, NULL); -+ g_free(name); -+ g_object_unref(G_OBJECT(t)); -+ if (!file) -+ return NS_ERROR_NOT_AVAILABLE; -+ -+ // Create a GdkPixbuf buffer and scale it -+ GError *err = nsnull; -+ GdkPixbuf* buf = gdk_pixbuf_new_from_file(file, &err); -+ g_free(file); -+ if (!buf) { -+ if (err) -+ g_error_free(err); -+ return NS_ERROR_UNEXPECTED; -+ } -+ -+ // scale... -+ GdkPixbuf* scaled = gdk_pixbuf_scale_simple(buf, iconSize, iconSize, GDK_INTERP_BILINEAR); -+ gdk_pixbuf_unref(buf); -+ if (!scaled) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ rv = moz_gdk_pixbuf_to_channel(scaled, getter_AddRefs(mRealChannel)); -+ gdk_pixbuf_unref(scaled); -+ return rv; -+} -+ -+nsresult -+nsIconChannel::Init(nsIURI* aURI) { -+ mURI = do_QueryInterface(aURI); -+ NS_ASSERTION(mURI, "URI passed to nsIconChannel is no nsIMozIconURI!"); -+ -+ nsCAutoString stockIcon; -+ mURI->GetStockIcon(stockIcon); -+ if (stockIcon.IsEmpty()) { -+ return InitWithGnome(); -+ } -+ -+ nsCAutoString iconSizeString; -+ mURI->GetStockIconSize(iconSizeString); -+ -+ nsCAutoString iconStateString; -+ mURI->GetStockIconState(iconStateString); -+ -+ GtkIconSize icon_size = moz_gtk_icon_size(iconSizeString.get()); -+ if (icon_size == GTK_ICON_SIZE_INVALID) { -+ NS_WARNING(iconSizeString.get()); -+ return NS_ERROR_FAILURE; -+ } -+ -+ ensure_stock_image_widget(); -+ -+ gboolean sensitive = strcmp(iconStateString.get(), "disabled"); -+ gtk_widget_set_sensitive (gStockImageWidget, sensitive); -+ -+ GdkPixbuf *icon = gtk_widget_render_icon(gStockImageWidget, stockIcon.get(), -+ icon_size, NULL); -+ if (!icon) { -+ ensure_icon_factory(); -+ -+ GtkIconSet *icon_set = gtk_icon_set_new(); -+ GtkIconSource *icon_source = gtk_icon_source_new(); -+ -+ gtk_icon_source_set_icon_name(icon_source, stockIcon.get()); -+ gtk_icon_set_add_source(icon_set, icon_source); -+ gtk_icon_factory_add(gIconFactory, stockIcon.get(), icon_set); -+ gtk_icon_set_unref(icon_set); -+ gtk_icon_source_free(icon_source); -+ -+ icon = gtk_widget_render_icon(gStockImageWidget, stockIcon.get(), -+ icon_size, NULL); -+ } -+ -+ if (!icon) -+ return NS_ERROR_NOT_AVAILABLE; -+ -+ nsresult rv = moz_gdk_pixbuf_to_channel(icon, getter_AddRefs(mRealChannel)); -+ -+ gdk_pixbuf_unref(icon); -+ -+ return rv; -+} diff --git a/firefox-RC1-stock-icons-fe.patch b/firefox-RC1-stock-icons-fe.patch deleted file mode 100644 index 4805452..0000000 --- a/firefox-RC1-stock-icons-fe.patch +++ /dev/null @@ -1,784 +0,0 @@ -Index: toolkit/components/filepicker/content/filepicker.js -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/filepicker/content/filepicker.js,v -retrieving revision 1.5.18.1.2.1 -diff -u -r1.5.18.1.2.1 filepicker.js ---- toolkit/components/filepicker/content/filepicker.js 10 Aug 2004 00:20:32 -0000 1.5.18.1.2.1 -+++ toolkit/components/filepicker/content/filepicker.js 3 Nov 2004 13:21:22 -0000 -@@ -67,6 +67,7 @@ - if (o.displayDirectory) { - const directory = o.displayDirectory.path; - } -+ - const initialText = o.defaultString; - const filterTitles = o.filters.titles; - const filterTypes = o.filters.types; -@@ -121,13 +122,18 @@ - treeView.showOnlyDirectories = true; - } - -+ // set up the right icon for GNOME stock icons -+ if (filePickerMode == nsIFilePicker.modeSave) -+ okButton.setAttribute("icon","save"); -+ else -+ okButton.setAttribute("icon","open"); -+ - // start out with a filename sort - handleColumnClick("FilenameColumn"); - - document.documentElement.setAttribute("ondialogcancel", "return onCancel();"); - try { -- var buttonLabel = getOKAction(); -- okButton.setAttribute("label", buttonLabel); -+ setOKAction(); - } catch (exception) { - // keep it set to "OK" - } -@@ -496,8 +502,9 @@ - onFileSelected(treeView.selectedFiles); - } - --function getOKAction(file) { -+function setOKAction(file) { - var buttonLabel; -+ var buttonIcon = "open"; // used in all but one case - - if (file && file.isDirectory() && filePickerMode != nsIFilePicker.modeGetFolder) { - document.documentElement.setAttribute("ondialogaccept", "return openOnOK();"); -@@ -515,11 +522,12 @@ - break; - case nsIFilePicker.modeSave: - buttonLabel = gFilePickerBundle.getString("saveButtonLabel"); -+ buttonIcon = "save"; - break; - } - } -- -- return buttonLabel; -+ okButton.setAttribute("label", buttonLabel); -+ okButton.setAttribute("icon", buttonIcon); - } - - function onSelect(event) { -@@ -558,8 +566,7 @@ - } - - if (validFileSelected) { -- var buttonLabel = getOKAction(file); -- okButton.setAttribute("label", buttonLabel); -+ setOKAction(file); - okButton.disabled = invalidSelection; - } else - okButton.disabled = (textInput.value == ""); -@@ -586,8 +593,7 @@ - } - - function onTextFieldFocus() { -- var buttonLabel = getOKAction(null); -- okButton.setAttribute("label", buttonLabel); -+ setOKAction(null); - doEnabling(); - } - -Index: toolkit/components/filepicker/content/filepicker.xul -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/filepicker/content/filepicker.xul,v -retrieving revision 1.4.8.1 -diff -u -r1.4.8.1 filepicker.xul ---- toolkit/components/filepicker/content/filepicker.xul 24 Jul 2004 23:36:19 -0000 1.4.8.1 -+++ toolkit/components/filepicker/content/filepicker.xul 3 Nov 2004 13:21:24 -0000 -@@ -95,7 +95,7 @@ - - --