build enigmail against thunderbird-1.5 final

(Portage version: 2.1_pre3-r1)

5 files changed, 289 insertions, 26 deletions

diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.93.1-r1 b/x11-plugins/enigmail/files/digest-enigmail-0.93.1-r1
deleted file mode 100644
index 657403383cf6..000000000000
--- a/x11-plugins/enigmail/files/digest-enigmail-0.93.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0de6d3968dc6a38e60578d6cf9098fd enigmail-0.93.1.tar.gz 405011
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-MD5 de9476d1a7807627985304bfa69085a3 thunderbird-1.5rc2-source.tar.bz2 35187072
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.93.1 b/x11-plugins/enigmail/files/digest-enigmail-0.93.1-r2
index 218dd5ebd57f..7516b7070337 100644
--- a/x11-plugins/enigmail/files/digest-enigmail-0.93.1
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.93.1-r2
@@ -1,3 +1,3 @@
 MD5 d0de6d3968dc6a38e60578d6cf9098fd enigmail-0.93.1.tar.gz 405011
 MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-MD5 0df70073cc6ac9f6772f82bc9e024543 thunderbird-1.5rc1-source.tar.bz2 35022501
+MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
diff --git a/x11-plugins/enigmail/files/firefox-1.1-visibility.patch b/x11-plugins/enigmail/files/firefox-1.1-visibility.patch
deleted file mode 100644
index e0665fe742b4..000000000000
--- a/x11-plugins/enigmail/files/firefox-1.1-visibility.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/mozilla/configure,v
-retrieving revision 1.1443
-diff -u -p -6 -r1.1443 configure
---- configure	2 Jun 2005 04:00:20 -0000	1.1443
-+++ configure	6 Jun 2005 07:34:06 -0000
-@@ -7303,13 +7303,13 @@ else
-                       int foo_default = 1;
- EOF
-                       ac_cv_visibility_pragma=no
-                       if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-                         if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then
-                           if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then
--                            ac_cv_visibility_pragma=yes
-+                            ac_cv_visibility_pragma=no
-                           fi
-                         fi
-                       fi
-                       rm -f conftest.cs
-                     
- fi
diff --git a/x11-plugins/enigmail/files/firefox-1.5-visibility-check.patch b/x11-plugins/enigmail/files/firefox-1.5-visibility-check.patch
new file mode 100644
index 000000000000..eda8ed458f9d
--- /dev/null
+++ b/x11-plugins/enigmail/files/firefox-1.5-visibility-check.patch
@@ -0,0 +1,273 @@
+diff -Nur mozilla/configure.in mozilla.bug307168/configure.in
+--- mozilla/configure.in	2005-10-04 05:53:49.000000000 +0000
++++ mozilla.bug307168/configure.in	2005-12-06 16:42:46.000000000 +0000
+@@ -1036,9 +1036,9 @@
+ dnl GNU specific defaults
+ dnl ========================================================
+ if test "$GNU_CC"; then
+-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-    DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
++    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
++    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
++    DSO_LDOPTS='-shared'
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
+@@ -1063,9 +1063,9 @@
+     _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
+     _USE_CPP_INCLUDE_FLAG=1
+ else
+-    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-    DSO_LDOPTS='-shared -h $@'
++    MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
++    MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
++    DSO_LDOPTS='-shared'
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-KPIC'
+     _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+@@ -1292,9 +1292,9 @@
+ 
+ *-beos*)
+     no_x=yes
+-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
++    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+     _PLATFORM_DEFAULT_TOOLKIT="beos"
+-    DSO_LDOPTS='-nostart -Wl,-h -Wl,$@'
++    DSO_LDOPTS='-nostart'
+     TK_LIBS='-lbe -lroot'
+     LIBS="$LIBS -lbe"
+     if test "$COMPILE_ENVIRONMENT"; then
+@@ -1379,16 +1379,16 @@
+ *-hpux*)
+     DLL_SUFFIX=".sl"
+     if test ! "$GNU_CC"; then
+-    	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
++    	DSO_LDOPTS='-b -Wl,+s'
+     	DSO_CFLAGS=""
+     	DSO_PIC_CFLAGS="+Z"
+-    	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
++    	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@'
+     	MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@'
+         CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
+     else
+-    	DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
+-    	MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-    	MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
++        DSO_LDOPTS='-b -E +s'
++        MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
++        MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
+     fi
+     MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
+     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+@@ -1397,11 +1397,16 @@
+ *-irix5*)
+     AC_DEFINE(IRIX)
+     DSO_LDOPTS='-elf -shared'
++
+     if test "$GNU_CC"; then
++       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-Wl,-all'
+        MKSHLIB_UNFORCE_ALL='-Wl,-none'
+        CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
+     else
++       MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
++       MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-all'
+        MKSHLIB_UNFORCE_ALL='-none'
+     fi
+@@ -1755,7 +1760,7 @@
+     if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
+         DLL_SUFFIX=".so"
+         DSO_PIC_CFLAGS='-fPIC -DPIC'
+-        DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
++        DSO_LDOPTS='-shared'
+ 	BIN_FLAGS='-Wl,--export-dynamic'
+     else
+     	DSO_PIC_CFLAGS='-fPIC -DPIC'
+@@ -1768,6 +1773,8 @@
+     if test "$LIBRUNPATH"; then
+ 	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
+     fi
++    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
++    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
+     ;;
+ 
+ *-nto*) 
+@@ -1931,17 +1938,19 @@
+ 
+ alpha*-*-osf*)
+     if test "$GNU_CC"; then
+-	DSO_LDOPTS='-shared -Wl,-soname -Wl,$@'
++      MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
++      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
++
+     else
+ 	MOZ_DEBUG_FLAGS='-g'
+ 	ASFLAGS='-I$(topsrcdir)/xpcom/reflect/xptcall/public -g'
+ 	CFLAGS="$CFLAGS -ieee"
+ 	CXXFLAGS="$CXXFLAGS "'-noexceptions -ieee  -ptr $(DIST)/cxx_repository'
+-	DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@ -update_registry $(DIST)/so_locations'
++	DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations'
+ 	DSO_CFLAGS=
+ 	DSO_PIC_CFLAGS=
+-	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
++	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
+ 	MKSHLIB_FORCE_ALL='-all'
+ 	MKSHLIB_UNFORCE_ALL='-none'
+ 	dnl Might fix the libxpcom.so breakage on this platform as well....
+@@ -1973,7 +1982,7 @@
+     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+     CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
+     if test ! "$GNU_CC"; then
+-       DSO_LDOPTS='-G -h $@'
++       DSO_LDOPTS='-G'
+     fi
+     ;;
+ 
+@@ -1989,11 +1998,11 @@
+        CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"
+        LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS"
+        MOZ_OPTIMIZE_FLAGS="-xO4"
+-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
+-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
++       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
++       KCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -Qoption ld -z,muldefs'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
+@@ -2019,7 +2028,7 @@
+         AC_MSG_RESULT([$_res])
+     else
+        ASFLAGS="$ASFLAGS -fPIC"
+-       DSO_LDOPTS='-G -h $@'
++       DSO_LDOPTS='-G'
+        _WARNINGS_CFLAGS=''
+        _WARNINGS_CXXFLAGS=''
+        if test "$OS_RELEASE" = "5.3"; then
+@@ -2378,8 +2387,25 @@
+                   fi
+                   rm -f conftest.[cs]
+                  ])
+-   if test "$ac_cv_visibility_hidden" = "yes"; then
+-      AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
++  if test "$ac_cv_visibility_hidden" = "yes"; then
++    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
++
++    AC_CACHE_CHECK(for visibility(default) attribute,
++                   ac_cv_visibility_default,
++                   [cat > conftest.c <<EOF
++                    int foo __attribute__ ((visibility ("default"))) = 1;
++EOF
++                    ac_cv_visibility_default=no
++                    if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
++                      if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
++                        ac_cv_visibility_default=yes
++                      fi
++                    fi
++                    rm -f conftest.[cs]
++                   ])
++    if test "$ac_cv_visibility_default" = "yes"; then
++      AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
++
+       AC_CACHE_CHECK(for visibility pragma support,
+                      ac_cv_visibility_pragma,
+                      [cat > conftest.c <<EOF
+@@ -2399,12 +2425,35 @@
+                       rm -f conftest.[cs]
+                     ])
+       if test "$ac_cv_visibility_pragma" = "yes"; then
+-        AC_DEFINE(HAVE_VISIBILITY_PRAGMA)
+-        VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-        WRAP_SYSTEM_INCLUDES=1
+-      fi
+-   fi
+-fi     # GNU_CC
++        AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
++                       ac_cv_have_visibility_builtin_bug,
++                       [cat > conftest.c <<EOF
++#pragma GCC visibility push(hidden)
++#pragma GCC visibility push(default)
++#include <string.h>
++#pragma GCC visibility pop
++
++__attribute__ ((visibility ("default"))) void Func() {
++  char c[[100]];
++  memset(c, 0, sizeof(c));
++}
++EOF
++                       ac_cv_have_visibility_builtin_bug=no
++                       if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then
++                         ac_cv_have_visibility_builtin_bug=yes
++                       fi
++                       rm -f conftest.{c,so}
++                       ])
++        if test "$ac_cv_have_visibility_builtin_bug" = "no"; then
++          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
++          WRAP_SYSTEM_INCLUDES=1
++        else
++          VISIBILITY_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
++        fi # have visibility pragma bug
++      fi   # have visibility pragma
++    fi     # have visibility(default) attribute
++  fi       # have visibility(hidden) attribute
++fi         # GNU_CC
+ 
+ AC_SUBST(WRAP_SYSTEM_INCLUDES)
+ AC_SUBST(VISIBILITY_FLAGS)
+diff -Nur mozilla/js/src/jstypes.h mozilla.bug307168/js/src/jstypes.h
+--- mozilla/js/src/jstypes.h	2005-09-18 04:35:05.000000000 +0000
++++ mozilla.bug307168/js/src/jstypes.h	2005-12-06 16:35:57.000000000 +0000
+@@ -109,7 +109,7 @@
+ 
+ #else /* Unix */
+ 
+-#ifdef HAVE_VISIBILITY_PRAGMA
++#ifdef HAVE_VISIBILITY_ATTRIBUTE
+ #define JS_EXTERNAL_VIS __attribute__((visibility ("default")))
+ #else
+ #define JS_EXTERNAL_VIS
+diff -Nur mozilla/modules/libreg/include/NSReg.h mozilla.bug307168/modules/libreg/include/NSReg.h
+--- mozilla/modules/libreg/include/NSReg.h	2004-12-15 05:52:38.000000000 +0000
++++ mozilla.bug307168/modules/libreg/include/NSReg.h	2005-12-06 16:35:57.000000000 +0000
+@@ -129,7 +129,7 @@
+   #endif
+ #elif defined XP_MAC
+   #define VR_INTERFACE(__x)  __declspec(export) __x
+-#elif defined (HAVE_VISIBILITY_PRAGMA)
++#elif defined (HAVE_VISIBILITY_ATTRIBUTE)
+   #define VR_INTERFACE(type)     __attribute__ ((visibility ("default"))) type
+ #else
+   #define VR_INTERFACE(type)     type
+diff -Nur mozilla/modules/zlib/src/mozzconf.h mozilla.bug307168/modules/zlib/src/mozzconf.h
+--- mozilla/modules/zlib/src/mozzconf.h	2005-08-04 19:14:14.000000000 +0000
++++ mozilla.bug307168/modules/zlib/src/mozzconf.h	2005-12-06 16:35:57.000000000 +0000
+@@ -41,7 +41,7 @@
+ #undef ZLIB_DLL
+ #endif
+ 
+-#ifdef HAVE_VISIBILITY_PRAGMA
++#ifdef HAVE_VISIBILITY_ATTRIBUTE
+ #define ZEXTERN __attribute__((visibility ("default"))) extern
+ #endif
+ 
+diff -Nur mozilla/xpcom/base/nscore.h mozilla.bug307168/xpcom/base/nscore.h
+--- mozilla/xpcom/base/nscore.h	2005-07-21 22:15:00.000000000 +0000
++++ mozilla.bug307168/xpcom/base/nscore.h	2005-12-06 16:35:57.000000000 +0000
+@@ -105,7 +105,7 @@
+ #define NS_VISIBILITY_HIDDEN
+ #endif
+ 
+-#if defined(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) && defined(HAVE_VISIBILITY_PRAGMA)
++#if defined(HAVE_VISIBILITY_ATTRIBUTE)
+ #define NS_VISIBILITY_DEFAULT __attribute__ ((visibility ("default")))
+ #else
+ #define NS_VISIBILITY_DEFAULT
diff --git a/x11-plugins/enigmail/files/firefox-1.5-visibility-fix.patch b/x11-plugins/enigmail/files/firefox-1.5-visibility-fix.patch
new file mode 100644
index 000000000000..8beb92492923
--- /dev/null
+++ b/x11-plugins/enigmail/files/firefox-1.5-visibility-fix.patch
@@ -0,0 +1,15 @@
+diff -u -r3.30 -r3.31
+--- nsprpub/pr/include/prtypes.h        29 Apr 2005 21:02:54 -0000      3.30
++++ nsprpub/pr/include/prtypes.h        13 Oct 2005 17:43:36 -0000      3.31
+@@ -178,7 +178,9 @@
+
+ #else /* Unix */
+
+-#ifdef HAVE_VISIBILITY_PRAGMA
++/* GCC 3.3 and later support the visibility attribute. */
++#if (__GNUC__ >= 4) || \
++    (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+ #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
+ #else
+ #define PR_VISIBILITY_DEFAULT
+