From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 23 Jul 2010 09:19:51 +0000 (+0000)
Subject: - up to icedove 3.1
X-Git-Tag: auto/th/icedove-3_1_2-1~20
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=5101173ea55eefb9cd3528d671565d220b0a57b1;p=packages%2Ficedove.git

- up to icedove 3.1

Changed files:
    mozilla-ac.patch -> 1.11
    mozilla-nocross.patch -> 1.3
---

diff --git a/mozilla-ac.patch b/mozilla-ac.patch
index 372cd50..98cf5c7 100644
--- a/mozilla-ac.patch
+++ b/mozilla-ac.patch
@@ -1,6 +1,6 @@
---- mozilla/configure.in	2010-03-17 19:02:26.000000000 +0200
-+++ mozilla/configure.in	2010-04-09 15:34:47.102899038 +0300
-@@ -65,6 +65,9 @@
+--- icedove-3.1/mozilla/configure.in	2010-06-23 20:43:07.000000000 +0300
++++ icedove-3.1/mozilla/configure.in	2010-07-23 12:00:43.318986326 +0300
+@@ -67,6 +67,9 @@
  
  AC_PREREQ(2.13)
  AC_INIT(config/config.mk)
@@ -10,7 +10,7 @@
  MOZILLA_SRCDIR=$topsrcdir/mozilla
  AC_CONFIG_AUX_DIR(${MOZILLA_SRCDIR}/build/autoconf)
  AC_CANONICAL_SYSTEM
-@@ -358,7 +358,8 @@
+@@ -375,7 +378,8 @@
  
      AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -20,7 +20,7 @@
  	AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
  
      CC="$HOST_CXX"
-@@ -366,7 +367,8 @@
+@@ -383,7 +387,8 @@
  
      AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -30,7 +30,7 @@
  	AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
      
      CC=$_SAVE_CC
-@@ -586,17 +588,17 @@
+@@ -579,17 +584,17 @@
          # Make sure compilers are valid
          CFLAGS="$CFLAGS -TC -nologo"
          CXXFLAGS="$CXXFLAGS -TP -nologo"
@@ -52,7 +52,7 @@
          
          changequote(,)
          _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'
-@@ -1070,14 +1072,13 @@
+@@ -1051,14 +1056,13 @@
      fi
    fi
  
@@ -69,7 +69,7 @@
    AC_MSG_RESULT($result)
  
    if test "$result" = "no" ; then
-@@ -1137,6 +1138,9 @@
+@@ -1079,6 +1083,9 @@
  dnl ========================================================
  dnl set the defaults first
  dnl ========================================================
@@ -79,7 +79,7 @@
  AS_BIN=$AS
  AR_FLAGS='cr $@'
  AR_LIST='$(AR) t'
-@@ -1608,8 +1612,7 @@
+@@ -1547,8 +1554,7 @@
      AC_CACHE_CHECK(whether the compiler supports -Wno-invalid-offsetof,
                     ac_has_wno_invalid_offsetof,
          [
@@ -89,7 +89,7 @@
              _SAVE_CXXFLAGS="$CXXFLAGS"
              CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-invalid-offsetof"
              AC_TRY_COMPILE([],
-@@ -1617,7 +1620,7 @@
+@@ -1556,7 +1562,7 @@
                             ac_has_wno_invalid_offsetof="yes",
                             ac_has_wno_invalid_offsetof="no")
              CXXFLAGS="$_SAVE_CXXFLAGS"
@@ -98,7 +98,45 @@
          ])
      if test "$ac_has_wno_invalid_offsetof" = "yes"; then
          _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-invalid-offsetof"
-@@ -1680,8 +1683,8 @@
+@@ -1565,8 +1571,7 @@
+     AC_CACHE_CHECK(whether the compiler supports -Wno-variadic-macros,
+                    ac_has_wno_variadic_macros,
+         [
+-            AC_LANG_SAVE
+-            AC_LANG_CPLUSPLUS
++            AC_LANG_PUSH([C++])
+             _SAVE_CXXFLAGS="$CXXFLAGS"
+             CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-variadic-macros"
+             AC_TRY_COMPILE([],
+@@ -1574,7 +1579,7 @@
+                            ac_has_wno_variadic_macros="yes",
+                            ac_has_wno_variadic_macros="no")
+             CXXFLAGS="$_SAVE_CXXFLAGS"
+-            AC_LANG_RESTORE
++            AC_LANG_POP
+         ])
+     if test "$ac_has_wno_variadic_macros" = "yes"; then
+         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-variadic-macros"
+@@ -1583,8 +1588,7 @@
+     AC_CACHE_CHECK(whether the compiler supports -Werror=return-type,
+                    ac_has_werror_return_type,
+         [
+-            AC_LANG_SAVE
+-            AC_LANG_CPLUSPLUS
++            AC_LANG_PUSH([C++])
+             _SAVE_CXXFLAGS="$CXXFLAGS"
+             CXXFLAGS="$CXXFLAGS -Werror=return-type"
+             AC_TRY_COMPILE([],
+@@ -1592,7 +1596,7 @@
+                            ac_has_werror_return_type="yes",
+                            ac_has_werror_return_type="no")
+             CXXFLAGS="$_SAVE_CXXFLAGS"
+-            AC_LANG_RESTORE
++            AC_LANG_POP
+         ])
+     if test "$ac_has_werror_return_type" = "yes"; then
+         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=return-type"
+@@ -1656,8 +1660,8 @@
  dnl test that the macros actually work:
  AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
  AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
@@ -109,7 +147,7 @@
    ac_cv_static_assertion_macros_work="yes"
    AC_TRY_COMPILE([$configure_static_assert_macros],
                   [CONFIGURE_STATIC_ASSERT(1)],
-@@ -1691,7 +1694,8 @@
+@@ -1667,7 +1671,8 @@
                   [CONFIGURE_STATIC_ASSERT(0)],
                   ac_cv_static_assertion_macros_work="no",
                   )
@@ -119,7 +157,7 @@
    AC_TRY_COMPILE([$configure_static_assert_macros],
                   [CONFIGURE_STATIC_ASSERT(1)],
                   ,
-@@ -1700,7 +1704,7 @@
+@@ -1676,7 +1681,7 @@
                   [CONFIGURE_STATIC_ASSERT(0)],
                   ac_cv_static_assertion_macros_work="no",
                   )
@@ -128,7 +166,7 @@
   ])
  AC_MSG_RESULT("$ac_cv_static_assertion_macros_work")
  if test "$ac_cv_static_assertion_macros_work" = "no"; then
-@@ -1712,8 +1716,7 @@
+@@ -1688,8 +1693,7 @@
  dnl Checking for 64-bit OS
  dnl ========================================================
  if test "$COMPILE_ENVIRONMENT"; then
@@ -137,8 +175,8 @@
 +AC_LANG_PUSH([C])
  AC_MSG_CHECKING(for 64-bit OS)
  AC_TRY_COMPILE([$configure_static_assert_macros],
-                [CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)],
-@@ -1724,7 +1727,7 @@
+                [CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8)],
+@@ -1700,7 +1704,7 @@
      HAVE_64BIT_OS=1
  fi
  AC_SUBST(HAVE_64BIT_OS)
@@ -147,7 +185,7 @@
  fi # COMPILE_ENVIRONMENT
  
  dnl ========================================================
-@@ -1853,8 +1856,7 @@
+@@ -1830,8 +1834,7 @@
          MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
          MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
          if test "$COMPILE_ENVIRONMENT"; then
@@ -157,7 +195,7 @@
              AC_MSG_CHECKING([for VisualAge C++ compiler version >= 6.0.0.3])
              AC_TRY_COMPILE([],
                  [#if (__IBMCPP__ < 600)
-@@ -1867,7 +1869,7 @@
+@@ -1844,7 +1847,7 @@
              else
                  AC_MSG_RESULT([yes])    
              fi
@@ -166,20 +204,7 @@
              TARGET_COMPILER_ABI="ibmc"
              CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
              CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-@@ -2391,10 +2393,9 @@
-     *)
-         AC_CHECK_HEADERS(mmintrin.h oleacc.idl)
- 
--        AC_LANG_SAVE
--        AC_LANG_CPLUSPLUS
-+        AC_LANG_PUSH([C++])
-         AC_CHECK_HEADERS(atlbase.h wpcapi.h)
--        AC_LANG_RESTORE
-+        AC_LANG_POP
-         ;;
-     esac
- 
-@@ -2657,8 +2658,7 @@
+@@ -2682,8 +2685,7 @@
         CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
         CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
         AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
@@ -189,7 +214,7 @@
         AC_TRY_COMPILE([],
             [#if (__SUNPRO_CC < 0x590)
             #error "Denied"
-@@ -2671,7 +2671,7 @@
+@@ -2696,7 +2698,7 @@
              _res="yes"
          fi
          AC_MSG_RESULT([$_res])
@@ -198,7 +223,7 @@
      else
         ASFLAGS="$ASFLAGS -fPIC"
         DSO_LDOPTS='-G'
-@@ -2796,7 +2796,7 @@
+@@ -2808,7 +2810,7 @@
  if test -z "$SKIP_COMPILER_CHECKS"; then
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ========================================================
@@ -207,7 +232,7 @@
  AC_HEADER_STDC
  AC_C_CONST
  AC_TYPE_MODE_T
-@@ -2911,11 +2911,12 @@
+@@ -2923,11 +2925,12 @@
  else
    AC_MSG_RESULT(no)
  fi
@@ -221,36 +246,17 @@
  
  AC_MSG_CHECKING(for uname.domainname)
  AC_CACHE_VAL(ac_cv_have_uname_domainname_field,
-@@ -2946,8 +2947,7 @@
- else
-     AC_MSG_RESULT(no)
+@@ -3019,8 +3022,7 @@
+         CXXFLAGS=$_SAVE_CXXFLAGS
+     fi
  fi
 -
 -AC_LANG_C
 +AC_LANG_POP
  
- dnl Check for usable wchar_t (2 bytes, unsigned)
- dnl (we really don't need the unsignedness check anymore)
-@@ -2971,8 +2971,7 @@
- dnl only have short-wchar support for c++.
- dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
- 
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
-+    AC_LANG_PUSH([C++])
-     _SAVE_CXXFLAGS=$CXXFLAGS
-     CXXFLAGS="$CXXFLAGS -fshort-wchar"
- 
-@@ -2991,7 +2990,7 @@
-     else    
-         CXXFLAGS=$_SAVE_CXXFLAGS
-     fi
--    AC_LANG_RESTORE
-+    AC_LANG_POP
- fi
- 
  dnl Check for .hidden assembler directive and visibility attribute.
-@@ -3141,11 +3140,11 @@
+ dnl Borrowed from glibc configure.in
+@@ -3168,11 +3170,11 @@
  
  dnl Check whether the compiler supports the new-style C++ standard
  dnl library headers (i.e. <new>) or needs the old "new.h"
@@ -264,24 +270,22 @@
  
  AC_ARG_ENABLE(dtrace,
                [  --enable-dtrace         build with dtrace support if available (default=no)],
-@@ -3191,10 +3190,12 @@
+@@ -3220,10 +3222,11 @@
      ;;
  *)
      AC_CHECK_LIB(m, atan)
 -    AC_CHECK_LIB(dl, dlopen,
 -    AC_CHECK_HEADER(dlfcn.h, 
--        LIBS="-ldl $LIBS"
--        AC_DEFINE(HAVE_LIBDL)))
 +    AC_CHECK_LIB(dl, dlopen, [
-+        AC_CHECK_HEADER(dlfcn.h, [
-+            LIBS="-ldl $LIBS"
-+            AC_DEFINE(HAVE_LIBDL)
++    AC_CHECK_HEADER(dlfcn.h, [
+         LIBS="-ldl $LIBS"
+-        ))
 +        ])
 +    ])
      ;;
  esac
  
-@@ -3488,8 +3489,7 @@
+@@ -3490,8 +3493,7 @@
  dnl check for wcrtomb/mbrtowc
  dnl =======================================================================
  if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
@@ -291,7 +295,7 @@
  AC_CACHE_CHECK(for wcrtomb,
      ac_cv_have_wcrtomb,
      [AC_TRY_LINK([#include <wchar.h>],
-@@ -3508,7 +3508,7 @@
+@@ -3510,7 +3512,7 @@
  if test "$ac_cv_have_mbrtowc" = "yes"; then
      AC_DEFINE(HAVE_MBRTOWC)
  fi
@@ -300,7 +304,7 @@
  fi
  
  AC_CACHE_CHECK(
-@@ -3533,7 +3533,7 @@
+@@ -3535,7 +3537,7 @@
  dnl        AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
  fi
  
@@ -309,7 +313,7 @@
  AC_CACHE_CHECK(
      [for gnu_get_libc_version()],
      ac_cv_func_gnu_get_libc_version,
-@@ -3611,7 +3611,7 @@
+@@ -3613,7 +3615,7 @@
  
  AM_LANGINFO_CODESET
  
@@ -318,7 +322,7 @@
  
  dnl **********************
  dnl *** va_copy checks ***
-@@ -3774,7 +3774,7 @@
+@@ -3776,7 +3778,7 @@
  dnl ========================================================
  dnl Put your C++ language/feature checks below
  dnl ========================================================
@@ -327,8 +331,8 @@
  
  HAVE_GCC3_ABI=
  if test "$GNU_CC"; then
-@@ -4101,7 +4101,7 @@
- fi
+@@ -4150,7 +4152,7 @@
+                                ac_cv_attribute_noreturn=no)])
  
  dnl End of C++ language/feature checks
 -AC_LANG_C
@@ -336,7 +340,7 @@
  
  dnl ========================================================
  dnl =  Internationalization checks
-@@ -6289,10 +6296,9 @@
+@@ -6300,10 +6302,9 @@
      MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
  if test "$COMPILE_ENVIRONMENT"; then
  if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
@@ -349,7 +353,7 @@
      AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
  fi
  fi # COMPILE_ENVIRONMENT
-@@ -6409,10 +6415,9 @@
+@@ -6397,10 +6398,9 @@
  dnl = Support for demangling undefined symbols
  dnl ========================================================
  if test -z "$SKIP_LIBRARY_CHECKS"; then
@@ -362,7 +366,7 @@
  fi
  
  # Demangle only for debug or trace-malloc builds
-@@ -6647,7 +6652,7 @@
+@@ -6640,7 +6640,7 @@
  AC_SUBST(PROFILE_USE_CFLAGS)
  AC_SUBST(PROFILE_USE_LDFLAGS)
  
@@ -371,7 +375,7 @@
  
  dnl ========================================================
  dnl Test for -pedantic bustage
-@@ -6788,7 +6793,7 @@
+@@ -6784,7 +6784,7 @@
  else
      AC_DEFINE(CPP_THROW_NEW, [throw()])
  fi
@@ -380,7 +384,7 @@
  
  dnl ========================================================
  dnl =
-@@ -7617,7 +7622,7 @@
+@@ -7606,7 +7606,7 @@
  if test -n "$MOZ_CURRENT_PROJECT"; then
      export MOZ_BUILD_APP="$MOZ_CURRENT_PROJECT"
  fi
@@ -389,38 +393,11 @@
  ac_configure_args="$_SUBDIR_CONFIG_ARGS"
  MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
  
-@@ -7650,7 +7655,7 @@
-     if test -n "$HAVE_64BIT_OS"; then
+@@ -7630,6 +7630,6 @@
+         dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
          ac_configure_args="$ac_configure_args --enable-64bit"
      fi
 -    AC_OUTPUT_SUBDIRS(directory/c-sdk)
 +    AC_CONFIG_SUBDIRS(directory/c-sdk)
      ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- fi
- fi # COMPILE_ENVIRONMENT
---- mozilla/mozilla/build/autoconf/altoptions.m4~	2009-03-26 22:38:57.000000000 +0200
-+++ mozilla/mozilla/build/autoconf/altoptions.m4	2009-07-29 01:34:11.680668351 +0300
-@@ -146,9 +146,10 @@
- ])
- 
- dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
--AC_DEFUN([MOZ_READ_MOZCONFIG],
-+AC_DEFUN([[MOZ_READ_MOZCONFIG]],
- [AC_REQUIRE([AC_INIT_BINSH])dnl
- # Read in '.mozconfig' script to set the initial options.
- # See the mozconfig2configure script for more details.
- _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
--. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
-+. $_AUTOCONF_TOOLS_DIR/mozconfig2configure
-+])
---- mozilla/mozilla/build/autoconf/nss.m4~	2009-03-26 22:38:57.000000000 +0200
-+++ mozilla/mozilla/build/autoconf/nss.m4	2009-07-29 01:57:50.473936834 +0300
-@@ -5,7 +5,7 @@
- 
- 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,
-+AC_DEFUN([AM_PATH_NSS],
- [dnl
- 
- AC_ARG_WITH(nss-prefix,
+ fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
diff --git a/mozilla-nocross.patch b/mozilla-nocross.patch
index abd1961..0a69a70 100644
--- a/mozilla-nocross.patch
+++ b/mozilla-nocross.patch
@@ -1,6 +1,6 @@
---- mozilla/configure.in~	2010-04-09 16:29:26.353057952 +0300
-+++ mozilla/configure.in	2010-04-09 16:46:29.789148843 +0300
-@@ -324,105 +324,8 @@
+--- icedove-3.1/mozilla/configure.in~	2010-07-23 12:04:13.419122641 +0300
++++ icedove-3.1/mozilla/configure.in	2010-07-23 12:05:09.659376310 +0300
+@@ -341,105 +341,8 @@
  esac
  
  if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
@@ -67,8 +67,8 @@
 -        dnl checks will fail.  Fake a working SDK in that case.
 -        _SAVE_CFLAGS=$CFLAGS
 -        _SAVE_CXXFLAGS=$CXXLAGS
--        dnl 1.9.1 and 1.9.2 support 10.4, 1.9.3 and later don't.
--        if test "$MOZILLA_1_9_1_BRANCH" = "1" -o "$MOZILLA_1_9_2_BRANCH" = "1";
+-        dnl 1.9.2 support 10.4, 1.9.3 and later don't.
+-        if test "$MOZILLA_1_9_2_BRANCH" = "1";
 -        then
 -        CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
 -        CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
@@ -98,12 +98,12 @@
 -
 -    AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
 -    AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
--    AC_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
+-    MOZ_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
 -    AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :)
 -    AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
 -    AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
 -    AC_DEFINE(CROSS_COMPILE)
-+    echo >&2 Cross compile block breaks whole configure script
++    echo >&2 Cross compile block breaks whole configure script, be first to figure it out and fix it
 +    exit 1
  else
      AC_PROG_CC