sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update thunderbird to 1.5 [1]

Browse source 
- Remove thunderbird-devel
- Remove thunderbird from supported geckos for 4.x

Release notes:	http://www.mozilla.com/thunderbird/releases/1.5.html
This commit is contained in:
Michael Johnson 2006-01-12 05:54:32 +00:00
parent 1e3402ad51
commit b895aa0bf9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=153334
83 changed files with 124 additions and 4433 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -2052,3 +2052,4 @@ deskutils/gdesklets-ltvariations||2006-01-04|Deleted; dead and unfetchable
editors/vimpart||2006-01-08|As of 3.5.0, vimpart is no longer part of KDE. editors/vimpart||2006-01-08|As of 3.5.0, vimpart is no longer part of KDE.
sysutils/linneighborhood|net/linneighborhood|2006-01-10|Move to a more appropriate category sysutils/linneighborhood|net/linneighborhood|2006-01-10|Move to a more appropriate category
www/plog|www/lifetype|2006-01-11|project renamed www/plog|www/lifetype|2006-01-11|project renamed
mail/thunderbird-devel|mail/thunderbird|2006-01-12|Thunderbird 1.5 is now stable

82
mail/thunderbird-devel/Makefile
View file

@ -1,82 +0,0 @@
# New ports collection makefile for: mozilla-thunderbird
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
# $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
#
PORTNAME= thunderbird
DISTVERSION= 1.5rc2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
--enable-application=mail -enable-official-branding
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/icons/default.xpm
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
CONFLICTS= thunderbird-1.0*
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/Makefile.common"
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= core dumps at runtime
.endif # ${ARCH} == "alpha" && ${OSVERSION} < 500035
.if ${PERL_LEVEL} < 500600
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif # ${PERL_LEVEL} < 500600
post-extract::
@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
/dom.disable_window_open_feature.toolbar/s/false/true/'
@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
${WRKSRC}/configure \
${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
pre-install:
${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
post-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk>

3
mail/thunderbird-devel/distinfo
View file

@ -1,3 +0,0 @@
MD5 (thunderbird-1.5rc2-source.tar.bz2) = de9476d1a7807627985304bfa69085a3
SHA256 (thunderbird-1.5rc2-source.tar.bz2) = f931a858c921162673f9eaf27048dbf477cb123d9178dd85431288422ee1c2c5
SIZE (thunderbird-1.5rc2-source.tar.bz2) = 35187072

10
mail/thunderbird-devel/files/extra-patch-config_make-jars.pl
View file

@ -1,10 +0,0 @@
--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004
+++ config/make-jars.pl Wed Oct 13 16:17:07 2004
@@ -40,6 +40,7 @@
last if ($arg eq "--");
}
my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
+splice @ARGV, $ddindex, $#ARGV;
getopts("d:s:t:f:avlD:o:p:xz:");

34
mail/thunderbird-devel/files/moz_pis_S50cleanhome
View file

@ -1,34 +0,0 @@
#!/bin/sh
#
# S50cleanhome
# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
# We run in our own subshell
# First, verify protocol
[ "$1" != "start" ] && exit 1
[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
# Try to polite ${HOME}/${MOZ_PIS_USER_DIR}
# This must be really needed?
# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
# Try to polite profile dirs
if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
| while read dir
do
[ ! -d "${dir}" ] && continue
# at last, debian do this, we do for new builds
# rm -f "${dir}/XUL.mfasl"
# make reclaculate compreg.dat, xpti.dat for new builds
[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
done
fi

59
mail/thunderbird-devel/files/patch-Double.cpp
View file

@ -1,59 +0,0 @@
--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003
+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003
@@ -51,10 +51,10 @@
//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
#ifdef __FreeBSD__
#include <ieeefp.h>
-#ifdef __alpha__
-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
+#if defined(__i386__)
fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
+#else
+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
#endif
fp_except_t oldmask = fpsetmask(~allmask);
#endif
@@ -75,22 +75,31 @@
#define TX_DOUBLE_HI32_EXPMASK 0x7ff00000
#define TX_DOUBLE_HI32_MANTMASK 0x000fffff
+union ui32dun {
+ PRUint32 i[2];
+ double d;
+};
+
//-- Initialize Double related constants
#ifdef IS_BIG_ENDIAN
-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
- 0xffffffff};
-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0};
-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
+const union ui32dun nanMask =
+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
+const union ui32dun infMask =
+ {{TX_DOUBLE_HI32_EXPMASK, 0}};
+const union ui32dun negInfMask =
+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
#else
-const PRUint32 nanMask[2] = {0xffffffff,
- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK};
-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
+const union ui32dun nanMask =
+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
+const union ui32dun infMask =
+ {{0, TX_DOUBLE_HI32_EXPMASK}};
+const union ui32dun negInfMask =
+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
#endif
-const double Double::NaN = *((double*)nanMask);
-const double Double::POSITIVE_INFINITY = *((double*)infMask);
-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
+const double Double::NaN = nanMask.d;
+const double Double::POSITIVE_INFINITY = infMask.d;
+const double Double::NEGATIVE_INFINITY = negInfMask.d;
/*
* Determines whether the given double represents positive or negative

11
mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh
View file

@ -1,11 +0,0 @@
--- build/unix/run-mozilla.sh.orig Mon Dec 15 18:27:28 2003
+++ build/unix/run-mozilla.sh Fri Feb 27 11:54:10 2004
@@ -355,7 +355,7 @@
fi
##
## Set LD_LIBRARY_PATH
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
if [ -n "$LD_LIBRARYN32_PATH" ]
then
LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}

10
mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h
View file

@ -1,10 +0,0 @@
--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
@@ -278,4 +278,7 @@
"-D__i386__",
# endif
+# if defined(__amd64__) || defined(__x86_64__)
+ "-D__amd64__ -D__x86_64__",
+# endif
# ifdef __GNUC__
"-traditional",

14
mail/thunderbird-devel/files/patch-config-rules.mk
View file

@ -1,14 +0,0 @@
--- config/rules.mk.orig Tue Aug 26 13:28:47 2003
+++ config/rules.mk Sun Feb 1 15:11:41 2004
@@ -444,7 +444,11 @@
ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
+else
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
endif
endif

18
mail/thunderbird-devel/files/patch-config_autoconf.mk.in
View file

@ -1,18 +0,0 @@
--- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005
+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005
@@ -50,13 +50,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/%%MOZILLA%%
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir = $(libdir)/%%MOZILLA%%
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir = $(mredir)/lib

46
mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
View file

@ -1,46 +0,0 @@
--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003
+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004
@@ -323,11 +323,11 @@
prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
&mStartLinksOnlyPref);
- PRBool isSoundEnabled = PR_TRUE;
+ mIsSoundEnabled = PR_TRUE;
prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
- &isSoundEnabled);
+ &mIsSoundEnabled);
nsXPIDLCString soundStr;
- if (isSoundEnabled) {
+ if (mIsSoundEnabled && mIsSoundEnabled) {
prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
getter_Copies(soundStr));
}
@@ -758,7 +758,7 @@
}
else {
// No find string to backspace in!
- if (mIsBackspaceProtectOn) {
+ if (mIsBackspaceProtectOn && mIsSoundEnabled) {
// This flag should be on only if the last key was a backspace.
// It keeps us from accidentally hitting backspace too many times and
// going back in history when we really just wanted to clear
@@ -1012,7 +1012,9 @@
// Error sound (don't fire when backspace is pressed, they're
// trying to correct the mistake!)
- PlayNotFoundSound();
+ if (mIsSoundEnabled) {
+ PlayNotFoundSound();
+ }
// Remove bad character from buffer, so we can continue typing from
// last matched character
@@ -1059,7 +1061,7 @@
void
nsTypeAheadFind::PlayNotFoundSound()
{
- if (mNotFoundSoundURL.IsEmpty()) // no sound
+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound
return;
if (!mSoundInterface) {
mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");

12
mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
View file

@ -1,12 +0,0 @@
--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003
+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004
@@ -194,6 +194,9 @@
nsCString mNotFoundSoundURL;
+ // Move the sound enabled boolean out for all methods to access.
+ PRBool mIsSoundEnabled;
+
// PRBool's are used instead of PRPackedBool's where the address of the
// boolean variable is getting passed into a method. For example:
// GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);

25
mail/thunderbird-devel/files/patch-libm
View file

@ -1,25 +0,0 @@
--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
@@ -148,5 +148,4 @@
endif
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
JSMATH_PRELINK = jsmathtemp.o
JS_SAFE_ARENA = 1
@@ -320,7 +319,4 @@
endif
@$(RM) -f $(JSMATH_PRELINK)
-else
-# Create dependency so we build fdlibm
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
endif
--- js/Makefile.in Sun Mar 23 14:36:00 2003
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
@@ -46,5 +46,5 @@
#
-DIRS = src/fdlibm src
+DIRS = src
include $(topsrcdir)/config/rules.mk

124
mail/thunderbird-devel/files/patch-mail_app_mozilla.in
View file

@ -1,124 +0,0 @@
--- mail/app/mozilla.in.orig Mon Apr 4 15:08:49 2005
+++ mail/app/mozilla.in Fri Jun 10 06:18:49 2005
@@ -49,51 +49,82 @@
## the mozilla-bin binary to work.
##
+#
+# MOZ_PIS, "Mozilla Plugable Init Scripts"
+# MOZ_PIS_ is the name space used
+# These variables and there meaning are specified in
+# mozilla/xpfe/bootstrap/init.d/README
moz_pis_startstop_scripts()
{
- MOZ_USER_DIR="%MOZ_USER_DIR%"
- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
- # These variables and there meaning are specified in
- # mozilla/xpfe/bootstrap/init.d/README
- MOZ_PIS_API=2
- MOZ_PIS_MOZBINDIR="${dist_bin}"
- MOZ_PIS_SESSION_PID="$$"
- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-
- case "${1}" in
- "start")
- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
- if [ -x "${curr_pis}" ] ; then
- case "${curr_pis}" in
- *.sh) . "${curr_pis}" ;;
- *) "${curr_pis}" "start" ;;
- esac
- fi
- done
- ;;
- "stop")
- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
- if [ -x "${curr_pis}" ] ; then
- case "${curr_pis}" in
- *.sh) . "${curr_pis}" ;;
- *) "${curr_pis}" "stop" ;;
- esac
- fi
- done
- ;;
- *)
- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
- exit 1
- ;;
- esac
+ MOZ_PIS_API=2
+ MOZ_PIS_MOZBINDIR="${dist_bin}"
+ MOZ_PIS_SESSION_PID="$$"
+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
+
+ case "${1}" in
+ "start")
+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
+ if [ -x "${curr_pis}" ]; then
+ case "${curr_pis}" in
+ *.sh)
+ . "${curr_pis}"
+ ;;
+ *)
+ ${curr_pis} "start"
+ ;;
+ esac
+ fi
+ done
+ ;;
+ "stop")
+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
+ if [ -x "${curr_pis}" ]; then
+ case "${curr_pis}" in
+ *.sh)
+ . "${curr_pis}"
+ ;;
+ *)
+ ${curr_pis} "stop"
+ ;;
+ esac
+ fi
+ done
+ ;;
+ *)
+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
+ exit 1
+ ;;
+ esac
}
-#uncomment for debugging
+# uncomment for debugging
#set -x
-moz_libdir=%MOZAPPDIR%
-MRE_HOME=%MREDIR%
+#
+# variables
+#
+#location="new-tab"
+#MOZILLA_UILOCALE="en-US"
+#MOZILLA_UIREGION="US"
+
+#
+# working definitions
+#
+MOZ_USER_DIR="%MOZ_USER_DIR%"
+moz_libdir="%MOZAPPDIR%"
+MRE_HOME="%MREDIR%"
+
+debugging= # set the debugging level
+here=`pwd`
+
+if [ ! -d "${MRE_HOME}" ]; then
+ # use moz_libdir as MRE_HOME
+ MRE_HOME="${moz_libdir}"
+fi
+export MRE_HOME
# Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh

28
mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk
View file

@ -1,28 +0,0 @@
--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003
+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004
@@ -43,8 +43,12 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
+ifeq ($(OS_TEST),amd64)
+CPU_ARCH = amd64
+else
CPU_ARCH = x86
endif
+endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -71,7 +75,11 @@
DLL_SUFFIX = so.1.0
endif
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
+endif
ifdef MAPFILE
# Add LD options to restrict exported symbols to those in the map file
endif

178
mail/thunderbird-devel/files/patch-sysnss
View file

@ -1,178 +0,0 @@
--- Makefile.in Tue Sep 14 16:59:40 2004
+++ Makefile.in Tue Aug 2 08:26:55 2005
@@ -102,6 +102,4 @@
# tier 1 - 3rd party individual libraries
#
-tier_1_dirs += dbm
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
@@ -37,16 +37,7 @@
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
HAVE_FREEBL_MODULES \
$(NULL)
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
ifeq (,$(filter i86pc ia64,$(OS_TEST)))
@@ -132,9 +123,4 @@
.nss.cleaned: .nss.checkout
$(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
touch $@
@@ -153,43 +139,4 @@
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
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
-ifndef DISABLE_DIST_GRE
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
-endif
endif
$(MAKE) -C boot $@
@@ -200,18 +147,4 @@
install::
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_MODULES
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
-endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
@@ -227,9 +160,4 @@
endif
$(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
echo-requires-recursive::
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
@@ -117,5 +117,5 @@
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
$(NULL)
--- config/config.mk Tue Oct 12 00:11:11 2004
+++ config/config.mk Tue Aug 2 09:19:18 2005
@@ -170,5 +170,4 @@
NSS_LIBS = \
$(LIBS_DIR) \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-lsmime3 \
-lssl3 \
@@ -189,11 +188,5 @@
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)
+NSS_DEP_LIBS =
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
@@ -88,4 +88,8 @@
}
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -406,4 +410,5 @@
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
NS_XPCOM_CURRENT_PROCESS_DIR
};
@@ -419,5 +424,5 @@
}
- char *fullModuleName = nsnull;
+ char *fullModuleName;
#ifdef XP_MAC
nsCAutoString nativePath;
@@ -431,4 +436,12 @@
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
#endif
+ if (fullModuleName == nsnull)
+ continue;
+ struct stat sb;
+ if (stat(fullModuleName, &sb)) {
+ if (errno != ENOENT)
+ perror(fullModuleName);
+ continue;
+ }
/* If a module exists with the same name, delete it. */
NS_ConvertUCS2toUTF8 modNameUTF8(modName);

29
mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
View file

@ -1,29 +0,0 @@
--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004
+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004
@@ -143,7 +143,7 @@
PR_END_MACRO
// Attempt to open libgconf
- gconfLib = LoadVersionedLibrary("gconf-2", ".4");
+ gconfLib = PR_LoadLibrary("libgconf-2.so");
ENSURE_LIB(gconfLib);
GET_LIB_FUNCTION(gconf, gconf_client_get_default);
@@ -151,7 +151,7 @@
GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
// Attempt to open libgnome
- gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
+ gnomeLib = PR_LoadLibrary("libgnome-2.so");
ENSURE_LIB(gnomeLib);
GET_LIB_FUNCTION(gnome, gnome_url_show);
@@ -160,7 +160,7 @@
GET_LIB_FUNCTION(gnome, gnome_program_get);
// Attempt to open libgnomevfs
- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
ENSURE_LIB(vfsLib);
GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);

11
mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
View file

@ -1,11 +0,0 @@
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Mon May 3 13:05:12 2004
@@ -8,7 +8,7 @@
* 1 is AddRef
* 2 is Release
*/
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
+#if !defined(__ia64)
NS_IMETHOD Stub3();
NS_IMETHOD Stub4();
NS_IMETHOD Stub5();

54
mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
View file

@ -1,54 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004
@@ -49,6 +49,9 @@
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
+ifeq (amd64,$(OS_TEST))
+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
+endif
endif
#
# New code for Linux, et. al., with gcc
@@ -60,7 +63,7 @@
endif
endif
# IA64 Linux
-ifneq (,$(filter Linux,$(OS_ARCH)))
+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
ifneq (,$(findstring ia64,$(OS_TEST)))
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
@@ -106,9 +109,15 @@
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
#
+# FreeBSD/Alpha
+#
+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
+endif
+#
# Linux/Alpha
#
-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
endif
#
@@ -294,6 +303,15 @@
ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+endif
+#
+# FreeBSD/SPARC64
+#
+ifeq ($(OS_ARCH),FreeBSD)
+ifneq (,$(findstring sparc,$(OS_TEST)))
+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
+endif
endif
#
# Solaris/SPARC

459
mail/thunderbird-devel/files/patch-xptcall-alpha
View file

@ -1,459 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
@@ -0,0 +1,184 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* Platform specific code to invoke XPCOM methods on native objects */
+
+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
+
+#include "xptcprivate.h"
+
+/* Prototype specifies unmangled function name and disables unused warning */
+static void
+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+__asm__("invoke_copy_to_stack") __attribute__((unused));
+
+static void
+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+{
+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
+
+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
+ {
+ if(s->IsPtrData())
+ {
+ *d = (PRUint64)s->ptr;
+ continue;
+ }
+ switch(s->type)
+ {
+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break;
+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break;
+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break;
+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break;
+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break;
+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break;
+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break;
+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break;
+ case nsXPTType::T_FLOAT :
+ if(i < NUM_ARG_REGS)
+ {
+ // convert floats to doubles if they are to be passed
+ // via registers so we can just deal with doubles later
+ union { PRUint64 u64; double d; } t;
+ t.d = (double)s->val.f;
+ *d = t.u64;
+ }
+ else
+ // otherwise copy to stack normally
+ *d = (PRUint64)s->val.u32;
+ break;
+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break;
+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break;
+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break;
+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break;
+ default:
+ // all the others are plain pointer types
+ *d = (PRUint64)s->val.p;
+ break;
+ }
+ }
+}
+
+/*
+ * XPTC_PUBLIC_API(nsresult)
+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt)
+ */
+__asm__(
+ "#### XPTC_InvokeByIndex ####\n"
+".text\n\t"
+ ".align 5\n\t"
+ ".globl XPTC_InvokeByIndex\n\t"
+ ".ent XPTC_InvokeByIndex\n"
+"XPTC_InvokeByIndex:\n\t"
+ ".frame $15,32,$26,0\n\t"
+ ".mask 0x4008000,-32\n\t"
+ "ldgp $29,0($27)\n"
+"$XPTC_InvokeByIndex..ng:\n\t"
+ "subq $30,32,$30\n\t"
+ "stq $26,0($30)\n\t"
+ "stq $15,8($30)\n\t"
+ "bis $30,$30,$15\n\t"
+ ".prologue 1\n\t"
+
+ /*
+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters
+ * is required for storage of those passed via registers.
+ */
+
+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */
+ "cmplt $2,$18,$1\n\t"
+ "cmovne $1,$18,$2\n\t"
+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */
+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */
+ "subq $30,$1,$30\n\t"
+
+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */
+ "stq $17,16($15)\n\t" /* save "methodIndex" */
+
+ "addq $30,8,$16\n\t" /* pass stack pointer */
+ "bis $18,$18,$17\n\t" /* pass "paramCount" */
+ "bis $19,$19,$18\n\t" /* pass "params" */
+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */
+
+ /*
+ * Copy the first 6 parameters to registers and remove from stack frame.
+ * Both the integer and floating point registers are set for each parameter
+ * except the first which is the "this" pointer. (integer only)
+ * The floating point registers are all set as doubles since the
+ * invoke_copy_to_stack function should have converted the floats.
+ */
+ "ldq $16,0($30)\n\t" /* integer registers */
+ "ldq $17,8($30)\n\t"
+ "ldq $18,16($30)\n\t"
+ "ldq $19,24($30)\n\t"
+ "ldq $20,32($30)\n\t"
+ "ldq $21,40($30)\n\t"
+ "ldt $f17,8($30)\n\t" /* floating point registers */
+ "ldt $f18,16($30)\n\t"
+ "ldt $f19,24($30)\n\t"
+ "ldt $f20,32($30)\n\t"
+ "ldt $f21,40($30)\n\t"
+
+ "addq $30,48,$30\n\t" /* remove params from stack */
+
+ /*
+ * Call the virtual function with the constructed stack frame.
+ */
+ "bis $16,$16,$1\n\t" /* load "this" */
+ "ldq $2,16($15)\n\t" /* load "methodIndex" */
+ "ldq $1,0($1)\n\t" /* load vtable */
+#if 0
+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */
+#else
+ "mulq $2, 8, $2\n\t"
+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */
+#endif
+ "addq $1,$2,$1\n\t"
+ "ldq $27,0($1)\n\t" /* load address of function */
+ "jsr $26,($27),0\n\t" /* call virtual function */
+ "ldgp $29,0($26)\n\t"
+
+ "bis $15,$15,$30\n\t"
+ "ldq $26,0($30)\n\t"
+ "ldq $15,8($30)\n\t"
+ "addq $30,32,$30\n\t"
+ "ret $31,($26),1\n\t"
+ ".end XPTC_InvokeByIndex"
+ );
+
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003
@@ -0,0 +1,269 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* Implement shared vtbl methods. */
+
+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
+
+#include <sys/types.h>
+#include <machine/cpu.h>
+#include "xptcprivate.h"
+
+/* Prototype specifies unmangled function name and disables unused warning */
+static nsresult
+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
+__asm__("PrepareAndDispatch") __attribute__((unused));
+
+static nsresult
+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
+{
+ const PRUint8 PARAM_BUFFER_COUNT = 16;
+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
+
+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+ nsXPTCMiniVariant* dispatchParams = NULL;
+ nsIInterfaceInfo* iface_info = NULL;
+ const nsXPTMethodInfo* info;
+ PRUint8 paramCount;
+ PRUint8 i;
+ nsresult result = NS_ERROR_FAILURE;
+
+ NS_ASSERTION(self,"no self");
+
+ self->GetInterfaceInfo(&iface_info);
+ NS_ASSERTION(iface_info,"no interface info");
+
+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
+ NS_ASSERTION(info,"no interface info");
+
+ paramCount = info->GetParamCount();
+
+ // setup variant array pointer
+ if(paramCount > PARAM_BUFFER_COUNT)
+ dispatchParams = new nsXPTCMiniVariant[paramCount];
+ else
+ dispatchParams = paramBuffer;
+ NS_ASSERTION(dispatchParams,"no place for params");
+
+ // args[0] to args[NUM_ARG_REGS] hold floating point register values
+ PRUint64* ap = args + NUM_ARG_REGS;
+ for(i = 0; i < paramCount; i++, ap++)
+ {
+ const nsXPTParamInfo& param = info->GetParam(i);
+ const nsXPTType& type = param.GetType();
+ nsXPTCMiniVariant* dp = &dispatchParams[i];
+
+ if(param.IsOut() || !type.IsArithmetic())
+ {
+ dp->val.p = (void*) *ap;
+ continue;
+ }
+ // else
+ switch(type)
+ {
+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break;
+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break;
+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break;
+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break;
+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break;
+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break;
+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break;
+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break;
+ case nsXPTType::T_FLOAT :
+ if(i < NUM_ARG_REGS)
+ {
+ // floats passed via registers are stored as doubles
+ // in the first NUM_ARG_REGS entries in args
+ dp->val.u64 = (PRUint64) args[i];
+ dp->val.f = (float) dp->val.d; // convert double to float
+ }
+ else
+ dp->val.u32 = (PRUint32) *ap;
+ break;
+ case nsXPTType::T_DOUBLE :
+ // doubles passed via registers are also stored
+ // in the first NUM_ARG_REGS entries in args
+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
+ break;
+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break;
+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break;
+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break;
+ default:
+ NS_ASSERTION(0, "bad type");
+ break;
+ }
+ }
+
+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
+
+ NS_RELEASE(iface_info);
+
+ if(dispatchParams != paramBuffer)
+ delete [] dispatchParams;
+
+ return result;
+}
+
+/*
+ * SharedStub()
+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is
+ * passed to this function via $1 to preserve the argument registers.
+ */
+__asm__(
+ "#### SharedStub ####\n"
+".text\n\t"
+ ".align 5\n\t"
+ ".ent SharedStub\n"
+"SharedStub:\n\t"
+ ".frame $30,96,$26,0\n\t"
+ ".mask 0x4000000,-96\n\t"
+ "ldgp $29,0($27)\n"
+"$SharedStub..ng:\n\t"
+ "subq $30,96,$30\n\t"
+ "stq $26,0($30)\n\t"
+ ".prologue 1\n\t"
+
+ /*
+ * Store arguments passed via registers to the stack.
+ * Floating point registers are stored as doubles and converted
+ * to floats in PrepareAndDispatch if necessary.
+ */
+ "stt $f17,16($30)\n\t" /* floating point registers */
+ "stt $f18,24($30)\n\t"
+ "stt $f19,32($30)\n\t"
+ "stt $f20,40($30)\n\t"
+ "stt $f21,48($30)\n\t"
+ "stq $17,56($30)\n\t" /* integer registers */
+ "stq $18,64($30)\n\t"
+ "stq $19,72($30)\n\t"
+ "stq $20,80($30)\n\t"
+ "stq $21,88($30)\n\t"
+
+ /*
+ * Call PrepareAndDispatch function.
+ */
+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */
+ "addq $30,16,$18\n\t" /* pass "args" */
+ "bsr $26,$PrepareAndDispatch..ng\n\t"
+
+ "ldq $26,0($30)\n\t"
+ "addq $30,96,$30\n\t"
+ "ret $31,($26),1\n\t"
+ ".end SharedStub"
+ );
+
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+/*
+ * nsresult nsXPTCStubBase::Stub##n()
+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
+ */
+#define STUB_ENTRY(n) \
+__asm__( \
+ "#### Stub"#n" ####\n" \
+".text\n\t" \
+ ".align 5\n\t" \
+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
+ ".frame $30,0,$26,0\n\t" \
+ "ldgp $29,0($27)\n" \
+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
+ ".prologue 1\n\t" \
+ "lda $1,"#n"\n\t" \
+ "br $31,$SharedStub..ng\n\t" \
+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
+ ); \
+__asm__( \
+ "#### Stub"#n" ####\n" \
+".text\n\t" \
+ ".align 5\n\t" \
+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
+ ".frame $30,0,$26,0\n\t" \
+ "ldgp $29,0($27)\n" \
+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
+ ".prologue 1\n\t" \
+ "lda $1,"#n"\n\t" \
+ "br $31,$SharedStub..ng\n\t" \
+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
+ ); \
+__asm__( \
+ "#### Stub"#n" ####\n" \
+".text\n\t" \
+ ".align 5\n\t" \
+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
+ ".frame $30,0,$26,0\n\t" \
+ "ldgp $29,0($27)\n" \
+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
+ ".prologue 1\n\t" \
+ "lda $1,"#n"\n\t" \
+ "br $31,$SharedStub..ng\n\t" \
+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
+ );
+#else
+/*
+ * nsresult nsXPTCStubBase::Stub##n()
+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
+ */
+#define STUB_ENTRY(n) \
+nsresult nsXPTCStubBase::Stub##n() \
+{ \
+ nsresult result; \
+__asm__ __volatile__( \
+ "ldah $29,0($27)\n\t" \
+ "lda $29,0($29)\n\t" \
+ "lda $1, "#n"\n\t" \
+ "br $31, $SharedStub..ng\n\t" \
+ "mov $0, %0\n\t" \
+ : "=r" (result) \
+ ); \
+ return result; \
+}
+#endif
+
+#define SENTINEL_ENTRY(n) \
+nsresult nsXPTCStubBase::Sentinel##n() \
+{ \
+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+ return NS_ERROR_NOT_IMPLEMENTED; \
+}
+
+#include "xptcstubsdef.inc"
+

327
mail/thunderbird-devel/files/patch-xptcall-sparc64
View file

@ -1,327 +0,0 @@
--- /dev/null Mon May 26 13:22:00 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * Stuart Parmenter <pavlov@netscape.com>
+ */
+
+/* Implement shared vtbl methods. */
+
+#include "xptcprivate.h"
+
+#if defined(sparc) || defined(__sparc__)
+
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
+{
+
+#define PARAM_BUFFER_COUNT 16
+
+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+ nsXPTCMiniVariant* dispatchParams = NULL;
+ nsIInterfaceInfo* iface_info = NULL;
+ const nsXPTMethodInfo* info;
+ PRUint8 paramCount;
+ PRUint8 i;
+ nsresult result = NS_ERROR_FAILURE;
+
+ NS_ASSERTION(self,"no self");
+
+ self->GetInterfaceInfo(&iface_info);
+ NS_ASSERTION(iface_info,"no interface info");
+
+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
+ NS_ASSERTION(info,"no interface info");
+
+ paramCount = info->GetParamCount();
+
+ // setup variant array pointer
+ if(paramCount > PARAM_BUFFER_COUNT)
+ dispatchParams = new nsXPTCMiniVariant[paramCount];
+ else
+ dispatchParams = paramBuffer;
+ NS_ASSERTION(dispatchParams,"no place for params");
+
+ PRUint64* ap = args;
+ for(i = 0; i < paramCount; i++, ap++)
+ {
+ const nsXPTParamInfo& param = info->GetParam(i);
+ const nsXPTType& type = param.GetType();
+ nsXPTCMiniVariant* dp = &dispatchParams[i];
+
+ if(param.IsOut() || !type.IsArithmetic())
+ {
+ dp->val.p = (void*) *ap;
+ continue;
+ }
+ // else
+ switch(type)
+ {
+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break;
+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break;
+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break;
+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break;
+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break;
+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break;
+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break;
+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break;
+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break;
+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break;
+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break;
+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break;
+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break;
+ default:
+ NS_ASSERTION(0, "bad type");
+ break;
+ }
+ }
+
+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
+
+ NS_RELEASE(iface_info);
+
+ if(dispatchParams != paramBuffer)
+ delete [] dispatchParams;
+
+ return result;
+}
+
+extern "C" int SharedStub(int, int*);
+
+#define STUB_ENTRY(n) \
+nsresult nsXPTCStubBase::Stub##n() \
+{ \
+ int dummy; /* defeat tail-call optimization */ \
+ return SharedStub(n, &dummy); \
+}
+
+#define SENTINEL_ENTRY(n) \
+nsresult nsXPTCStubBase::Sentinel##n() \
+{ \
+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+ return NS_ERROR_NOT_IMPLEMENTED; \
+}
+
+#include "xptcstubsdef.inc"
+
+#endif /* sparc || __sparc__ */
--- /dev/null Mon May 26 13:22:00 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003
@@ -0,0 +1,104 @@
+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * Stuart Parmenter <pavlov@netscape.com>
+ * Chris Seawood <cls@seawood.org>
+ */
+
+/*
+ Platform specific code to invoke XPCOM methods on native objects
+ for sparcv9 Solaris.
+
+ See the SPARC Compliance Definition (SCD) Chapter 3
+ for more information about what is going on here, including
+ the use of BIAS (0x7ff).
+ The SCD is available from http://www.sparc.com/.
+*/
+
+ .global XPTC_InvokeByIndex
+ .type XPTC_InvokeByIndex, #function
+
+/*
+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+ PRUint32 paramCount, nsXPTCVariant* params);
+
+*/
+XPTC_InvokeByIndex:
+ save %sp,-(128 + 64),%sp ! room for the register window and
+ ! struct pointer, rounded up to 0 % 64
+ sll %i2,4,%l0 ! assume the worst case
+ ! paramCount * 2 * 8 bytes
+ cmp %l0, 0 ! are there any args? If not,
+ be .invoke ! no need to copy args to stack
+ nop
+
+ sub %sp,%l0,%sp ! create the additional stack space
+ add %sp,0x7ff+136,%o0 ! step past the register window, the
+ ! struct result pointer and the 'this' slot
+ mov %i2,%o1 ! paramCount
+ call invoke_copy_to_stack
+ mov %i3,%o2 ! params
+
+!
+! load arguments from stack into the outgoing registers
+! BIAS is 0x7ff (2047)
+!
+
+! load the %o1..5 64bit (extended word) output registers registers
+ ldx [%sp + 0x7ff + 136],%o1 ! %i1
+ ldx [%sp + 0x7ff + 144],%o2 ! %i2
+ ldx [%sp + 0x7ff + 152],%o3 ! %i3
+ ldx [%sp + 0x7ff + 160],%o4 ! %i4
+ ldx [%sp + 0x7ff + 168],%o5 ! %i5
+
+! load the even number double registers starting with %d2
+ ldd [%sp + 0x7ff + 136],%f2
+ ldd [%sp + 0x7ff + 144],%f4
+ ldd [%sp + 0x7ff + 152],%f6
+ ldd [%sp + 0x7ff + 160],%f8
+ ldd [%sp + 0x7ff + 168],%f10
+ ldd [%sp + 0x7ff + 176],%f12
+ ldd [%sp + 0x7ff + 184],%f14
+ ldd [%sp + 0x7ff + 192],%f16
+ ldd [%sp + 0x7ff + 200],%f18
+ ldd [%sp + 0x7ff + 208],%f20
+ ldd [%sp + 0x7ff + 216],%f22
+ ldd [%sp + 0x7ff + 224],%f24
+ ldd [%sp + 0x7ff + 232],%f26
+ ldd [%sp + 0x7ff + 240],%f28
+ ldd [%sp + 0x7ff + 248],%f30
+
+!
+! calculate the target address from the vtable
+!
+.invoke:
+ sll %i1,3,%l0 ! index *= 8
+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes)
+ ldx [%i0],%l1 ! *that --> address of vtable
+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address
+
+ jmpl %l0,%o7 ! call the routine
+ mov %i0,%o0 ! move 'this' pointer to out register
+
+ mov %o0,%i0 ! propagate return value
+ ret
+ restore
+
+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
--- /dev/null Mon May 26 14:00:00 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * Stuart Parmenter <pavlov@netscape.com>
+ * Chris Seawood <cls@seawood.org>
+ */
+
+
+/* Platform specific code to invoke XPCOM methods on native objects */
+
+#include "xptcprivate.h"
+
+#if !defined(__sparc) && !defined(__sparc__)
+#error "This code is for Sparc only"
+#endif
+
+/* Prototype specifies unmangled function name */
+extern "C" PRUint64
+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
+
+extern "C" PRUint64
+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+{
+ /*
+ We need to copy the parameters for this function to locals and use them
+ from there since the parameters occupy the same stack space as the stack
+ we're trying to populate.
+ */
+ PRUint64 *l_d = d;
+ nsXPTCVariant *l_s = s;
+ PRUint64 l_paramCount = paramCount;
+ PRUint64 regCount = 0; // return the number of registers to load from the stack
+
+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
+ {
+ if (regCount < 5) regCount++;
+
+ if (l_s->IsPtrData())
+ {
+ *l_d = (PRUint64)l_s->ptr;
+ continue;
+ }
+ switch (l_s->type)
+ {
+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break;
+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break;
+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break;
+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break;
+
+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break;
+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break;
+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break;
+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break;
+
+ /* in the case of floats, we want to put the bits in to the
+ 64bit space right justified... floats in the paramter array on
+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
+ the space that would be occupied by %f0, %f2, etc.
+ */
+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break;
+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break;
+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break;
+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break;
+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break;
+
+ default:
+ // all the others are plain pointer types
+ *((void**)l_d) = l_s->val.p;
+ break;
+ }
+ }
+
+ return regCount;
+}

11
mail/thunderbird-devel/files/thunderbird.desktop.in
View file

@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=Thunderbird
GenericName=Mail Client
Comment=Mail client and News Reader
Exec=thunderbird %U
Icon=@PORTNAME_ICON@
StartupNotify=false
Terminal=false
Type=Application
Categories=Application;Network;

28
mail/thunderbird-devel/pkg-deinstall.in
View file

@ -1,28 +0,0 @@
#!/bin/sh
#
# $FreeBSD$
# $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
# Fix the chrome registry.
umask 022
PATH=/bin:/usr/bin
[ "x$1" = "x" ] && exit 1
[ "x$2" != "xDEINSTALL" ] && exit 0
MOZDIR=%%MOZDIR%%
rm -rf ${MOZDIR}/chrome/overlayinfo
rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
rm -f ${MOZDIR}/component.reg
rm -f ${MOZDIR}/components.ini
rm -f ${MOZDIR}/defaults.ini
rm -f ${MOZDIR}/components/*.dat
#rm -rf ${MOZDIR}/extensions
rm -rf ${MOZDIR}/updates
exit 0

6
mail/thunderbird-devel/pkg-descr
View file

@ -1,6 +0,0 @@
Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
of becoming a cross-platform stand alone mail application using the XUL
user interface language. See the Mozilla Thunderbird project page for
more details.
WWW: http://www.mozilla.com/thunderbird/

26
mail/thunderbird-devel/pkg-install.in
View file

@ -1,26 +0,0 @@
#!/bin/sh
#
# $FreeBSD$
# $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
# Fix the chrome registry.
umask 022
PATH=/bin:/usr/bin:/usr/local/bin
[ "x$1" = "x" ] && exit 1
[ "x$2" != "xPOST-INSTALL" ] && exit 0
MOZDIR=%%MOZDIR%%
REGXPCOM=${MOZDIR}/regxpcom
THUNDERBIRD=${MOZDIR}/thunderbird-bin
echo "===> Building Chrome's registry..."
cd ${MOZDIR} || exit 1
./run-mozilla.sh ${REGXPCOM} || true
./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
exit 0

27
mail/thunderbird-esr/Makefile
View file

@ -3,16 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
# #
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0.7 DISTVERSION= 1.5
PORTREVISION= 6
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-source DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
@ -24,22 +23,22 @@ HAS_CONFIGURE= yes
USE_BZIP2= yes USE_BZIP2= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
--enable-official-branding --enable-application=mail -enable-official-branding
MOZ_EXPORT= MOZ_THUNDERBIRD=1
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/icons/default.xpm
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
CONFLICTS= thunderbird*-1.5*
NOT_FOR_ARCHS= ia64
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/Makefile.common" .include "${.CURDIR}/../../www/mozilla/Makefile.common"
@ -80,8 +79,8 @@ pre-install:
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
post-install: post-install:
${MKDIR} ${PREFIX}/share/applications ${MKDIR} ${PREFIX}/share/applications

6
mail/thunderbird-esr/distinfo
View file

@ -1,3 +1,3 @@
MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d MD5 (thunderbird-1.5-source.tar.bz2) = 781c1cd1a01583d9b666d8c2fe4288e6
SHA256 (thunderbird-1.0.7-source.tar.bz2) = 6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f SHA256 (thunderbird-1.5-source.tar.bz2) = f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57
SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665 SIZE (thunderbird-1.5-source.tar.bz2) = 35028308

342
mail/thunderbird-esr/files/patch-bugzilla149334
View file

@ -1,342 +0,0 @@
Index: gfx/idl/nsIFreeType2.idl
===================================================================
RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsIFreeType2.idl
--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10
+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000
@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
native FT_Sfnt_Tag(FT_Sfnt_Tag);
native FT_Size(FT_Size);
-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
+[ptr] native FTC_ImageType_p(FTC_ImageType);
native FTC_Face_Requester(FTC_Face_Requester);
native FTC_Font(FTC_Font);
-native FTC_Image_Cache(FTC_Image_Cache);
+native FTC_FaceID(FTC_FaceID);
+native FTC_ImageCache(FTC_ImageCache);
native FTC_Manager(FTC_Manager);
// #ifdef MOZ_SVG
@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
readonly attribute FT_Library library;
readonly attribute FTC_Manager FTCacheManager;
- readonly attribute FTC_Image_Cache ImageCache;
+ readonly attribute FTC_ImageCache ImageCache;
void doneFace(in FT_Face face);
void doneFreeType(in FT_Library lib);
@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
void outlineDecompose(in FT_Outline_p outline,
in const_FT_Outline_Funcs_p funcs, in voidPtr p);
void setCharmap(in FT_Face face, in FT_CharMap charmap);
- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
in FT_UInt gindex, out FT_Glyph glyph);
- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
- out FT_Face face, out FT_Size size);
+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
+ out FT_Face face);
void managerDone(in FTC_Manager manager);
void managerNew(in FT_Library lib, in FT_UInt max_faces,
in FT_UInt max_sizes, in FT_ULong max_bytes,
in FTC_Face_Requester requester, in FT_Pointer req_data,
out FTC_Manager manager);
- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
/* #ifdef MOZ_SVG */
void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
in FT_Vector_p delta);
Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25
+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000
@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
// #ifdef MOZ_SVG
{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
}
NS_IMETHODIMP
-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
FT_UInt glyphID, FT_Glyph *glyph)
{
// call the FreeType2 function via the function pointer
@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
}
NS_IMETHODIMP
-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
- FT_Face *face, FT_Size *size)
+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
+ FT_Face *face)
{
// call the FreeType2 function via the function pointer
- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
return error ? NS_ERROR_FAILURE : NS_OK;
}
@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
}
NS_IMETHODIMP
-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
{
// call the FreeType2 function via the function pointer
FT_Error error = nsFTC_Image_Cache_New(manager, cache);
@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
}
NS_IMETHODIMP
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
{
*aCache = mImageCache;
return NS_OK;
Index: gfx/src/freetype/nsFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
retrieving revision 1.17
diff -u -3 -p -r1.17 nsFreeType.h
--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17
+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000
@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
typedef FT_Error (*FTC_Image_Cache_Lookup_t)
- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
+typedef FT_Error (*FTC_Manager_LookupFace_t)
+ (FTC_Manager, FTC_FaceID, FT_Face*);
typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
FTC_Face_Requester, FT_Pointer, FTC_Manager*);
-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
// #ifdef MOZ_SVG
typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
typedef FT_Error (*FT_Get_Kerning_t)
@@ -181,7 +181,7 @@ protected:
FT_Outline_Decompose_t nsFT_Outline_Decompose;
FT_Set_Charmap_t nsFT_Set_Charmap;
FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
FTC_Manager_Done_t nsFTC_Manager_Done;
FTC_Manager_New_t nsFTC_Manager_New;
FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
@@ -229,7 +229,7 @@ protected:
PRLibrary *mSharedLib;
FT_Library mFreeTypeLibrary;
FTC_Manager mFTCacheManager;
- FTC_Image_Cache mImageCache;
+ FTC_ImageCache mImageCache;
static nsHashtable *sFontFamilies;
static nsHashtable *sRange1CharSetNames;
Index: gfx/src/ps/nsFontMetricsPS.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
retrieving revision 1.43
diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43
+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000
@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
mPixelSize = NSToIntRound(app2dev * mFont->size);
- mImageDesc.font.face_id = (void*)mEntry;
- mImageDesc.font.pix_width = mPixelSize;
- mImageDesc.font.pix_height = mPixelSize;
- mImageDesc.image_type = 0;
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
+ mImageDesc->width = mPixelSize;
+ mImageDesc->height = mPixelSize;
+ mImageDesc->flags = 0;
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
if (!face)
return 0;
- FTC_Image_Cache iCache;
+ FTC_ImageCache iCache;
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
- &face, nsnull);
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+ &face);
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);
- mImageDesc.font.face_id = (void*)mEntry;
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
// TT glyph has no relation to size
- mImageDesc.font.pix_width = 16;
- mImageDesc.font.pix_height = 16;
- mImageDesc.image_type = 0;
+ mImageDesc->width = 16;
+ mImageDesc->height = 16;
+ mImageDesc->flags = 0;
FT_Face face = nsnull;
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
- &face, nsnull);
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+ &face);
if (NS_FAILED(rv))
return;
Index: gfx/src/ps/nsFontMetricsPS.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFontMetricsPS.h
--- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25
+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000
@@ -319,7 +319,7 @@ protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
@@ -362,7 +362,7 @@ public:
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
};
#endif
Index: gfx/src/x11shared/nsFontFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
retrieving revision 1.14
diff -u -3 -p -r1.14 nsFontFreeType.cpp
--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14
+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000
@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
FTC_Manager mgr;
nsresult rv;
mFt2->GetFTCacheManager(&mgr);
- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
if (NS_FAILED(rv))
return nsnull;
@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
PRBool embedded_bimap = PR_FALSE;
mFaceID = aFaceID;
mPixelSize = aPixelSize;
- mImageDesc.font.face_id = (void*)mFaceID;
- mImageDesc.font.pix_width = aPixelSize;
- mImageDesc.font.pix_height = aPixelSize;
- mImageDesc.image_type = 0;
+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
+ mImageDesc->width = aPixelSize;
+ mImageDesc->height = aPixelSize;
+ mImageDesc->flags = 0;
if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
- mImageDesc.image_type |= ftc_image_mono;
anti_alias = PR_FALSE;
}
- if (nsFreeType2::gFreeType2Autohinted)
- mImageDesc.image_type |= ftc_image_flag_autohinted;
-
- if (nsFreeType2::gFreeType2Unhinted)
- mImageDesc.image_type |= ftc_image_flag_unhinted;
-
PRUint32 num_embedded_bitmaps, i;
PRInt32* embedded_bitmapheights;
mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
if (embedded_bitmapheights[i] == aPixelSize) {
embedded_bimap = PR_TRUE;
// unhinted must be set for embedded bitmaps to be used
- mImageDesc.image_type |= ftc_image_flag_unhinted;
break;
}
}
@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
if (!face)
return NS_ERROR_FAILURE;
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return NS_ERROR_FAILURE;
@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
if (!face)
return 0;
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
#endif
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
Index: gfx/src/x11shared/nsFontFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsFontFreeType.h
--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10
+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000
@@ -110,7 +110,7 @@ protected:
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
nsCOMPtr<nsIFreeType2> mFt2;
};

10
mail/thunderbird-esr/files/patch-bugzilla243151
View file

@ -1,10 +0,0 @@
Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151
--- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003
+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005
@@ -374,5 +374,4 @@
status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit);
if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index");
}

8
mail/thunderbird-esr/files/patch-build_unix_mozilla-xpcom.pc.in
View file

@ -1,8 +0,0 @@
--- build/unix/mozilla-xpcom.pc.in.orig Thu Jun 24 12:23:09 2004
+++ build/unix/mozilla-xpcom.pc.in Thu Jun 24 12:23:18 2004
@@ -8,4 +8,4 @@
Version: %MOZILLA_VERSION%
Requires: mozilla-nspr = %MOZILLA_VERSION%
Libs: -L${libdir} -lxpcom
-Cflags: -I${includedir}/xpcom -I${includedir}/string
+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}

2
mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh
View file

@ -5,7 +5,7 @@
## ##
## Set LD_LIBRARY_PATH ## Set LD_LIBRARY_PATH
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} +LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
if [ -n "$LD_LIBRARYN32_PATH" ] if [ -n "$LD_LIBRARYN32_PATH" ]
then then
LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}

10
mail/thunderbird-esr/files/patch-config::mkdepend::Makefile.in
View file

@ -1,10 +0,0 @@
--- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004
+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004
@@ -57,6 +57,7 @@
include $(topsrcdir)/config/rules.mk
HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)

17
mail/thunderbird-esr/files/patch-configure
View file

@ -1,17 +0,0 @@
--- configure.orig Wed Nov 23 13:17:02 2005
+++ configure Wed Nov 23 13:17:20 2005
@@ -11417,12 +11417,12 @@
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
echo "configure:11420: checking MOZ_GTK2_CFLAGS" >&5
- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
echo "configure:11425: checking MOZ_GTK2_LIBS" >&5
- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
else
MOZ_GTK2_CFLAGS=""

15
mail/thunderbird-esr/files/patch-gfx-src-gtk-Makefile.in
View file

@ -1,15 +0,0 @@
When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
This causes an error, because libgfxshared_s is only under dist/lib.
-mi
--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
@@ -165,4 +165,5 @@
ifdef MOZ_ENABLE_GTK2
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+ $(LIBS_DIR) \
-lgkgfx \
-lgfxshared_s \

9
mail/thunderbird-esr/files/patch-jsosdep
View file

@ -1,9 +0,0 @@
--- js/src/jsosdep.h Fri Nov 14 19:10:59 2003
+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005
@@ -102,5 +102,5 @@
#define JS_HAVE_LONG_LONG
-#elif defined(FREEBSD)
+#elif defined(FREEBSD) || defined(__FreeBSD__)
#define JS_HAVE_LONG_LONG

356
mail/thunderbird-esr/files/patch-mail_app_mozilla.in
View file

@ -1,6 +1,6 @@
--- mail/app/mozilla.in.orig Sun Jul 25 01:58:06 2004 --- mail/app/mozilla.in.orig Mon Apr 4 15:08:49 2005
+++ mail/app/mozilla.in Tue Mar 22 23:59:11 2005 +++ mail/app/mozilla.in Fri Jun 10 06:18:49 2005
@@ -29,51 +29,82 @@ @@ -49,51 +49,82 @@
## the mozilla-bin binary to work. ## the mozilla-bin binary to work.
## ##
@ -122,353 +122,3 @@
# Use run-mozilla.sh in the current dir if it exists # Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh # If not, then start resolving symlinks until we find run-mozilla.sh
@@ -82,162 +113,214 @@
curdir=`dirname "$progname"`
progbase=`basename "$progname"`
run_moz="$curdir/run-mozilla.sh"
-if test -x "$run_moz"; then
- dist_bin="$curdir"
- found=1
+if [ -x "$run_moz" ]; then
+ dist_bin="$curdir"
+ found=1
else
- here=`/bin/pwd`
- while [ -h "$progname" ]; do
- bn=`basename "$progname"`
- cd `dirname "$progname"`
- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
- if [ ! -x "$progname" ]; then
- break
- fi
- curdir=`dirname "$progname"`
- run_moz="$curdir/run-mozilla.sh"
- if [ -x "$run_moz" ]; then
- cd "$curdir"
- dist_bin=`pwd`
- found=1
- break
- fi
- done
- cd "$here"
+ while [ -h "${progname}" ]; do
+ bn=`basename "${progname}"`
+ cd `dirname "${progname}"`
+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'`
+ if [ ! -x "$progname" ]; then
+ break
+ fi
+ curdir=`dirname "${progname}"`
+ run_moz="${curdir}/run-mozilla.sh"
+ if [ -x "${run_moz}" ]; then
+ cd "$curdir"
+ dist_bin=`pwd`
+ run_moz="${dist_bin}/run-mozilla.sh"
+ found=1
+ break
+ fi
+ done
+ cd "${here}"
fi
if [ $found = 0 ]; then
- # Check default compile-time libdir
- if [ -x "$moz_libdir/run-mozilla.sh" ]; then
- dist_bin="$moz_libdir"
- else
- echo "Cannot find mozilla runtime directory. Exiting."
- exit 1
- fi
-fi
-
-script_args=""
-debugging=0
-MOZILLA_BIN="${progbase}-bin"
-
-# The following is to check for a currently running instance.
-# This is taken almost verbatim from the Mozilla RPM package's launch script.
-MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
-check_running() {
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
- RETURN_VAL=$?
- if [ $RETURN_VAL -eq 0 ]; then
- echo 1
- return 1
+ # Check default compile-time libdir
+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then
+ dist_bin="$moz_libdir"
+ run_moz="${dist_bin}/run-mozilla.sh"
else
- echo 0
- return 0
+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2
+ exit 1
fi
-}
+fi
+MOZILLA_BIN="${progbase}-bin"
if [ "$OSTYPE" = "beos" ]; then
- mimeset -F "$MOZILLA_BIN"
+ mimeset -F "$MOZILLA_BIN"
fi
-ALREADY_RUNNING=`check_running`
+# test for binary apps in ${dist_bin}
+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then
+ MOZILLA_BIN="${dist_bin}/${progbase}-bin"
+else
+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2
+ exit 1
+fi
+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then
+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}"
+else
+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}"
+fi
-################################################################ Parse Arguments
-# If there's a command line argument but it doesn't begin with a -
-# it's probably a url. Try to send it to a running instance.
-_USE_EXIST=0
-_NEW_WINDOW=
-_optOne="$1"
-case "${_optOne}" in
- -*)
- ;;
+# guest a default remote command
+_remote_cmd="xfeDoCommand(openInbox)"
+
+# parse options
+script_args= # null
+moreargs= # null
+target= # null
+ALREADY_RUNNING="test"
+while [ $# -gt 0 ]
+do
+ if [ -n "${target}" ]; then
+ # well, this can't be the target if not last
+ moreargs="${moreargs} \"${target}\""
+ target= # null
+ fi
+ case "$1" in
+ # preserve [pP] for profile
+ --pure | -pure)
+ MOZILLA_BIN="${MOZILLA_BIN}.pure"
+ shift
+ ;;
+ -g | --debug)
+ script_args="${script_args} -g"
+ debugging=1
+ shift
+ ;;
+ -d | --debugger)
+ if [ -n "$2" ]; then
+ script_args="${script_args} -d $2"
+ shift 2
+ else
+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -[Uu][Ii][Ll]ocale)
+ if [ -n "$2" ]; then
+ uilocale="$2"
+ shift 2
+ else
+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -[Uu][Ii][Rr]egion)
+ if [ -n "$2" ]; then
+ uiregion="$2"
+ shift 2
+ else
+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -mail)
+ # mail is default for ithunderbird
+ shift
+ ;;
+ -compose)
+ _remote_cmd="xfeDoCommand(composeMessage)"
+ moreargs="${moreargs} $1"
+ shift
+ ;;
+ -turbo | -nosplash | -quiet)
+ # use remote even with this
+ moreargs="${moreargs} $1"
+ shift
+ ;;
+ -*)
+ # don't use remote with options
+ ALREADY_RUNNING= # null
+ moreargs="${moreargs} $1"
+ shift
+ ;;
*)
- _USE_EXIST=1
- ;;
-esac
-
-_optOthers=
-_optLast=
-for i in "$@"; do
- _optLast="${i}"
-done #last arg
-
-for i in "$@"; do
- [ $i = ${_optLast} ] && break
- _optOthers="${_optOthers} ${i}"
-done #others arg
-
-#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
- # Last argument seems to be a local file/directory
- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
- # If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
- _NEW_WINDOW=1
-fi
-################################################################ Parse Arguments
-
-########################################################################### Main
-if [ $ALREADY_RUNNING -eq 1 ]; then
- # There's an instance already running. Use it.
- # Any command line args passed in?
- if [ $# -gt 0 ]; then
- # There were "some" command line args.
- if [ ${_USE_EXIST} -eq 1 ]; then
- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
- _open_type="window"
- #_open_type="tab"
- _remote_cmd="openURL(${_optLast} , new-${_open_type})"
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
- unset _remote_cmd _open_type
- exit $?
- fi
+ target="$1"
+ shift
+ ;;
+ esac
+done
+
+# test for a running copy of firefox
+# seems this is not needed
+#if [-n "${ALREADY_RUNNING}" ]; then
+# if [ -n "${DISPLAY}" ]; then
+# if [ -n "${debugging}" ]; then
+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()"
+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes"
+# else
+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 &&
+# ALREADY_RUNNING="yes"
+# fi
+# elif [ -n "${debugging}" ]; then
+# echo "$0: WARN, no DISPLAY environment" 1>&2
+# fi
+#fi
+
+# process target
+if [ -n "${target}" ]; then
+ moreargs="${moreargs} \"${target}\""
+ if [ -n "${ALREADY_RUNNING}" ]; then
+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then
+ # not an URI, don't use xremote
+ ALREADY_RUNNING= # null
+ fi
+ fi
+fi
+
+# try remote protocol if running
+if [ -n "${ALREADY_RUNNING}" ]; then
+ if [ -n "${target}" ]; then
+ if [ -n "${location}" ]; then
+ _remote_cmd="openURL(${target},${location})"
else
- # No command line args. Open new window/tab
- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)"
- exit $?
+ _remote_cmd="openURL(${target})"
fi
+ fi
+ # FIXME problems with freedesktop StartupNotify
+ if [ -n "${debugging}" ]; then
+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}"
+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} &&
+ exit 0
+ else
+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \
+ >/dev/null 2>&1 && exit 0
+ fi
fi
-# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
-########################################################################### Main
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
- case "$1" in
- -p | --pure | -pure)
- MOZILLA_BIN="${MOZILLA_BIN}.pure"
- shift
- ;;
- -g | --debug)
- script_args="$script_args -g"
- debugging=1
- shift
- ;;
- -d | --debugger)
- script_args="$script_args -d $2"
- shift 2
- ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
- shift
- set -- "$@" "$arg"
- pass_arg_count=`expr $pass_arg_count + 1`
- ;;
- esac
-done
+# fallback to direct invocation
+
+# UILocale, UIRegion
+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then
+ uilocale="${MOZILLA_UILOCALE}"
+fi
+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then
+ uiregion="${MOZILLA_UIREGION}"
+fi
+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then
+ uilocale="en-US"
+fi
+if [ -n "${uilocale}" ]; then
+ if [ -n "${uiregion}" ]; then
+ moreargs="-UIRegion ${uiregion} ${moreargs}"
+ fi
+ moreargs="-UILocale ${uilocale} ${moreargs}"
+fi
-export MRE_HOME
+# real invocation
+eval "set -- ${moreargs}"
## Start addon scripts
moz_pis_startstop_scripts "start"
-if [ $debugging = 1 ]
-then
- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+if [ -n "${debugging}" ]; then
+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@"
fi
-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+${run_moz} ${script_args} ${MOZILLA_BIN} "$@"
exitcode=$?
## Stop addon scripts

12
mail/thunderbird-esr/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
View file

@ -1,12 +0,0 @@
--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002
+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005
@@ -168,7 +168,9 @@
drawingarea = MOZ_DRAWINGAREA(object);
+ gdk_window_set_user_data(drawingarea->inner_window, NULL);
gdk_window_destroy(drawingarea->inner_window);
+ gdk_window_set_user_data(drawingarea->clip_window, NULL);
gdk_window_destroy(drawingarea->clip_window);
(* parent_class->finalize) (object);

0
mail/thunderbird-devel/files/patch-nopangoxft → mail/thunderbird-esr/files/patch-nopangoxft
View file

60
mail/thunderbird-esr/files/patch-oji-threads
View file

@ -1,60 +0,0 @@
--- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001
+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005
@@ -113,5 +113,5 @@
*/
NS_IMETHOD
- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0;
+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0;
/**
@@ -122,5 +122,5 @@
*/
NS_IMETHOD
- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0;
+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0;
};
--- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004
+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005
@@ -268,9 +268,9 @@
NS_METHOD
-nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable)
+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable)
{
PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable,
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
- *outThreadID = NS_PTR_TO_INT32(thread);
+ *outThreadID = (uintptr_t)(thread);
return (thread != NULL ? NS_OK : NS_ERROR_FAILURE);
}
@@ -308,5 +308,5 @@
NS_METHOD
-nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async)
+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async)
{
nsresult rv;
@@ -873,5 +873,5 @@
do {
- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory());
+ JSJ_RegisterLiveConnectFactory();
if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) {
JVM_InitLCGlue();
--- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003
+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005
@@ -122,5 +122,5 @@
*/
NS_IMETHOD
- CreateThread(PRUint32* threadID, nsIRunnable* runnable);
+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable);
/**
@@ -131,5 +131,5 @@
*/
NS_IMETHOD
- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async);
+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async);
/* from nsILiveConnectManager: */

21
mail/thunderbird-esr/files/patch-sysnspr
View file

@ -1,21 +0,0 @@
--- directory/c-sdk/ldap/include/Makefile.in.orig Sat Aug 20 02:15:05 2005
+++ directory/c-sdk/ldap/include/Makefile.in Sat Aug 20 02:15:55 2005
@@ -76,7 +76,6 @@
$(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)
--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig Sat Aug 20 02:14:33 2005
+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in Sat Aug 20 02:14:39 2005
@@ -58,7 +58,7 @@
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
- -I$(DIST)/include/nspr
+ $(shell nspr-config --cflags)
DEFINES += $(DEFS)
PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS

38
mail/thunderbird-esr/files/patch-xptcall-ia64
View file

@ -1,38 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003
@@ -8,6 +8,7 @@
// Section has executable code
.section .text, "ax","progbits"
// procedure named 'XPTC_InvokeByIndex'
+ .global XPTC_InvokeByIndex
.proc XPTC_InvokeByIndex
// manual bundling
.explicit
@@ -24,7 +25,7 @@
// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
// PRUint32 paramCount, nsXPTCVariant* params);
-XPTC_InvokeByIndex::
+XPTC_InvokeByIndex:
.prologue
.save ar.pfs, r37
// allocate 4 input args, 6 local args, and 8 output args
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003
@@ -6,6 +6,7 @@
// Section has executable code
.section .text, "ax","progbits"
// procedure named 'SharedStub'
+ .global SharedStub
.proc SharedStub
// manual bundling
.explicit
@@ -14,7 +15,7 @@
// .exclass PrepareAndDispatch, @fullyvisible
.type PrepareAndDispatch,@function
-SharedStub::
+SharedStub:
// 9 arguments, first 8 are the input arguments of previous
// function call. The last one is methodIndex, and is passed in memory
.prologue

17
mail/thunderbird-esr/files/patch-xptcinvoke_x86_64_linux
View file

@ -1,17 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005
@@ -82,11 +82,11 @@
PRUint64 value;
- for (uint32 i = 0; i < paramCount; i++, s++) {
+ for (unsigned int i = 0; i < paramCount; i++, s++) {
if (s->IsPtrData())
value = (PRUint64) s->ptr;
else {
switch (s->type) {
- case nsXPTType::T_FLOAT: break;
- case nsXPTType::T_DOUBLE: break;
+ case nsXPTType::T_FLOAT:
+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break;
case nsXPTType::T_I8: value = s->val.i8; break;
case nsXPTType::T_I16: value = s->val.i16; break;

8
mail/thunderbird-esr/pkg-deinstall.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
# #
# Date created: Mon Nov 29, 2003 # Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>) # Whom: Thierry Thomas (<thierry@pompo.net>)
@ -16,11 +16,13 @@ PATH=/bin:/usr/bin
MOZDIR=%%MOZDIR%% MOZDIR=%%MOZDIR%%
rm -rf ${MOZDIR}/chrome/overlayinfo rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
rm -f ${MOZDIR}/component.reg rm -f ${MOZDIR}/component.reg
rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/components.ini
rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/defaults.ini
rm -f ${MOZDIR}/components/*.dat rm -f ${MOZDIR}/components/*.dat
rm -rf ${MOZDIR}/extensions #rm -rf ${MOZDIR}/extensions
rm -rf ${MOZDIR}/updates
exit 0 exit 0

9
mail/thunderbird-esr/pkg-install.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
# #
# Date created: Mon Nov 29, 2003 # Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>) # Whom: Thierry Thomas (<thierry@pompo.net>)
@ -15,19 +15,12 @@ PATH=/bin:/usr/bin:/usr/local/bin
MOZDIR=%%MOZDIR%% MOZDIR=%%MOZDIR%%
REGXPCOM=${MOZDIR}/regxpcom REGXPCOM=${MOZDIR}/regxpcom
REGCHROME=${MOZDIR}/regchrome
THUNDERBIRD=${MOZDIR}/thunderbird-bin THUNDERBIRD=${MOZDIR}/thunderbird-bin
echo "===> Building Chrome's registry..." echo "===> Building Chrome's registry..."
rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf
mkdir -p ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/component.reg
rm -rf ${MOZDIR}/extensions
cd ${MOZDIR} || exit 1 cd ${MOZDIR} || exit 1
./run-mozilla.sh ${REGXPCOM} || true ./run-mozilla.sh ${REGXPCOM} || true
./run-mozilla.sh ${REGCHROME} || true
./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1 ./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
exit 0 exit 0

27
mail/thunderbird/Makefile
View file

@ -3,16 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
# #
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0.7 DISTVERSION= 1.5
PORTREVISION= 6
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-source DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
@ -24,22 +23,22 @@ HAS_CONFIGURE= yes
USE_BZIP2= yes USE_BZIP2= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
--enable-official-branding --enable-application=mail -enable-official-branding
MOZ_EXPORT= MOZ_THUNDERBIRD=1
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/icons/default.xpm
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
CONFLICTS= thunderbird*-1.5*
NOT_FOR_ARCHS= ia64
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/Makefile.common" .include "${.CURDIR}/../../www/mozilla/Makefile.common"
@ -80,8 +79,8 @@ pre-install:
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
post-install: post-install:
${MKDIR} ${PREFIX}/share/applications ${MKDIR} ${PREFIX}/share/applications

6
mail/thunderbird/distinfo
View file

@ -1,3 +1,3 @@
MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d MD5 (thunderbird-1.5-source.tar.bz2) = 781c1cd1a01583d9b666d8c2fe4288e6
SHA256 (thunderbird-1.0.7-source.tar.bz2) = 6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f SHA256 (thunderbird-1.5-source.tar.bz2) = f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57
SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665 SIZE (thunderbird-1.5-source.tar.bz2) = 35028308

342
mail/thunderbird/files/patch-bugzilla149334
View file

@ -1,342 +0,0 @@
Index: gfx/idl/nsIFreeType2.idl
===================================================================
RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsIFreeType2.idl
--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10
+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000
@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
native FT_Sfnt_Tag(FT_Sfnt_Tag);
native FT_Size(FT_Size);
-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
+[ptr] native FTC_ImageType_p(FTC_ImageType);
native FTC_Face_Requester(FTC_Face_Requester);
native FTC_Font(FTC_Font);
-native FTC_Image_Cache(FTC_Image_Cache);
+native FTC_FaceID(FTC_FaceID);
+native FTC_ImageCache(FTC_ImageCache);
native FTC_Manager(FTC_Manager);
// #ifdef MOZ_SVG
@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
readonly attribute FT_Library library;
readonly attribute FTC_Manager FTCacheManager;
- readonly attribute FTC_Image_Cache ImageCache;
+ readonly attribute FTC_ImageCache ImageCache;
void doneFace(in FT_Face face);
void doneFreeType(in FT_Library lib);
@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
void outlineDecompose(in FT_Outline_p outline,
in const_FT_Outline_Funcs_p funcs, in voidPtr p);
void setCharmap(in FT_Face face, in FT_CharMap charmap);
- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
in FT_UInt gindex, out FT_Glyph glyph);
- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
- out FT_Face face, out FT_Size size);
+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
+ out FT_Face face);
void managerDone(in FTC_Manager manager);
void managerNew(in FT_Library lib, in FT_UInt max_faces,
in FT_UInt max_sizes, in FT_ULong max_bytes,
in FTC_Face_Requester requester, in FT_Pointer req_data,
out FTC_Manager manager);
- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
/* #ifdef MOZ_SVG */
void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
in FT_Vector_p delta);
Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25
+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000
@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
// #ifdef MOZ_SVG
{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
}
NS_IMETHODIMP
-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
FT_UInt glyphID, FT_Glyph *glyph)
{
// call the FreeType2 function via the function pointer
@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
}
NS_IMETHODIMP
-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
- FT_Face *face, FT_Size *size)
+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
+ FT_Face *face)
{
// call the FreeType2 function via the function pointer
- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
return error ? NS_ERROR_FAILURE : NS_OK;
}
@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
}
NS_IMETHODIMP
-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
{
// call the FreeType2 function via the function pointer
FT_Error error = nsFTC_Image_Cache_New(manager, cache);
@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
}
NS_IMETHODIMP
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
{
*aCache = mImageCache;
return NS_OK;
Index: gfx/src/freetype/nsFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
retrieving revision 1.17
diff -u -3 -p -r1.17 nsFreeType.h
--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17
+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000
@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
typedef FT_Error (*FTC_Image_Cache_Lookup_t)
- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
+typedef FT_Error (*FTC_Manager_LookupFace_t)
+ (FTC_Manager, FTC_FaceID, FT_Face*);
typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
FTC_Face_Requester, FT_Pointer, FTC_Manager*);
-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
// #ifdef MOZ_SVG
typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
typedef FT_Error (*FT_Get_Kerning_t)
@@ -181,7 +181,7 @@ protected:
FT_Outline_Decompose_t nsFT_Outline_Decompose;
FT_Set_Charmap_t nsFT_Set_Charmap;
FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
FTC_Manager_Done_t nsFTC_Manager_Done;
FTC_Manager_New_t nsFTC_Manager_New;
FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
@@ -229,7 +229,7 @@ protected:
PRLibrary *mSharedLib;
FT_Library mFreeTypeLibrary;
FTC_Manager mFTCacheManager;
- FTC_Image_Cache mImageCache;
+ FTC_ImageCache mImageCache;
static nsHashtable *sFontFamilies;
static nsHashtable *sRange1CharSetNames;
Index: gfx/src/ps/nsFontMetricsPS.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
retrieving revision 1.43
diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43
+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000
@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
mPixelSize = NSToIntRound(app2dev * mFont->size);
- mImageDesc.font.face_id = (void*)mEntry;
- mImageDesc.font.pix_width = mPixelSize;
- mImageDesc.font.pix_height = mPixelSize;
- mImageDesc.image_type = 0;
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
+ mImageDesc->width = mPixelSize;
+ mImageDesc->height = mPixelSize;
+ mImageDesc->flags = 0;
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
if (!face)
return 0;
- FTC_Image_Cache iCache;
+ FTC_ImageCache iCache;
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
- &face, nsnull);
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+ &face);
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);
- mImageDesc.font.face_id = (void*)mEntry;
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
// TT glyph has no relation to size
- mImageDesc.font.pix_width = 16;
- mImageDesc.font.pix_height = 16;
- mImageDesc.image_type = 0;
+ mImageDesc->width = 16;
+ mImageDesc->height = 16;
+ mImageDesc->flags = 0;
FT_Face face = nsnull;
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
- &face, nsnull);
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+ &face);
if (NS_FAILED(rv))
return;
Index: gfx/src/ps/nsFontMetricsPS.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFontMetricsPS.h
--- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25
+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000
@@ -319,7 +319,7 @@ protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
@@ -362,7 +362,7 @@ public:
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
};
#endif
Index: gfx/src/x11shared/nsFontFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
retrieving revision 1.14
diff -u -3 -p -r1.14 nsFontFreeType.cpp
--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14
+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000
@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
FTC_Manager mgr;
nsresult rv;
mFt2->GetFTCacheManager(&mgr);
- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
if (NS_FAILED(rv))
return nsnull;
@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
PRBool embedded_bimap = PR_FALSE;
mFaceID = aFaceID;
mPixelSize = aPixelSize;
- mImageDesc.font.face_id = (void*)mFaceID;
- mImageDesc.font.pix_width = aPixelSize;
- mImageDesc.font.pix_height = aPixelSize;
- mImageDesc.image_type = 0;
+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
+ mImageDesc->width = aPixelSize;
+ mImageDesc->height = aPixelSize;
+ mImageDesc->flags = 0;
if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
- mImageDesc.image_type |= ftc_image_mono;
anti_alias = PR_FALSE;
}
- if (nsFreeType2::gFreeType2Autohinted)
- mImageDesc.image_type |= ftc_image_flag_autohinted;
-
- if (nsFreeType2::gFreeType2Unhinted)
- mImageDesc.image_type |= ftc_image_flag_unhinted;
-
PRUint32 num_embedded_bitmaps, i;
PRInt32* embedded_bitmapheights;
mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
if (embedded_bitmapheights[i] == aPixelSize) {
embedded_bimap = PR_TRUE;
// unhinted must be set for embedded bitmaps to be used
- mImageDesc.image_type |= ftc_image_flag_unhinted;
break;
}
}
@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
if (!face)
return NS_ERROR_FAILURE;
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return NS_ERROR_FAILURE;
@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
if (!face)
return 0;
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
#endif
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
Index: gfx/src/x11shared/nsFontFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsFontFreeType.h
--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10
+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000
@@ -110,7 +110,7 @@ protected:
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
nsCOMPtr<nsIFreeType2> mFt2;
};

10
mail/thunderbird/files/patch-bugzilla243151
View file

@ -1,10 +0,0 @@
Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151
--- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003
+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005
@@ -374,5 +374,4 @@
status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit);
if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index");
}

8
mail/thunderbird/files/patch-build_unix_mozilla-xpcom.pc.in
View file

@ -1,8 +0,0 @@
--- build/unix/mozilla-xpcom.pc.in.orig Thu Jun 24 12:23:09 2004
+++ build/unix/mozilla-xpcom.pc.in Thu Jun 24 12:23:18 2004
@@ -8,4 +8,4 @@
Version: %MOZILLA_VERSION%
Requires: mozilla-nspr = %MOZILLA_VERSION%
Libs: -L${libdir} -lxpcom
-Cflags: -I${includedir}/xpcom -I${includedir}/string
+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}

2
mail/thunderbird/files/patch-build_unix_run-mozilla.sh
View file

@ -5,7 +5,7 @@
## ##
## Set LD_LIBRARY_PATH ## Set LD_LIBRARY_PATH
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} +LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
if [ -n "$LD_LIBRARYN32_PATH" ] if [ -n "$LD_LIBRARYN32_PATH" ]
then then
LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}

10
mail/thunderbird/files/patch-config::mkdepend::Makefile.in
View file

@ -1,10 +0,0 @@
--- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004
+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004
@@ -57,6 +57,7 @@
include $(topsrcdir)/config/rules.mk
HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)

17
mail/thunderbird/files/patch-configure
View file

@ -1,17 +0,0 @@
--- configure.orig Wed Nov 23 13:17:02 2005
+++ configure Wed Nov 23 13:17:20 2005
@@ -11417,12 +11417,12 @@
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
echo "configure:11420: checking MOZ_GTK2_CFLAGS" >&5
- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
echo "configure:11425: checking MOZ_GTK2_LIBS" >&5
- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
else
MOZ_GTK2_CFLAGS=""

15
mail/thunderbird/files/patch-gfx-src-gtk-Makefile.in
View file

@ -1,15 +0,0 @@
When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
This causes an error, because libgfxshared_s is only under dist/lib.
-mi
--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
@@ -165,4 +165,5 @@
ifdef MOZ_ENABLE_GTK2
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+ $(LIBS_DIR) \
-lgkgfx \
-lgfxshared_s \

9
mail/thunderbird/files/patch-jsosdep
View file

@ -1,9 +0,0 @@
--- js/src/jsosdep.h Fri Nov 14 19:10:59 2003
+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005
@@ -102,5 +102,5 @@
#define JS_HAVE_LONG_LONG
-#elif defined(FREEBSD)
+#elif defined(FREEBSD) || defined(__FreeBSD__)
#define JS_HAVE_LONG_LONG

356
mail/thunderbird/files/patch-mail_app_mozilla.in
View file

@ -1,6 +1,6 @@
--- mail/app/mozilla.in.orig Sun Jul 25 01:58:06 2004 --- mail/app/mozilla.in.orig Mon Apr 4 15:08:49 2005
+++ mail/app/mozilla.in Tue Mar 22 23:59:11 2005 +++ mail/app/mozilla.in Fri Jun 10 06:18:49 2005
@@ -29,51 +29,82 @@ @@ -49,51 +49,82 @@
## the mozilla-bin binary to work. ## the mozilla-bin binary to work.
## ##
@ -122,353 +122,3 @@
# Use run-mozilla.sh in the current dir if it exists # Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh # If not, then start resolving symlinks until we find run-mozilla.sh
@@ -82,162 +113,214 @@
curdir=`dirname "$progname"`
progbase=`basename "$progname"`
run_moz="$curdir/run-mozilla.sh"
-if test -x "$run_moz"; then
- dist_bin="$curdir"
- found=1
+if [ -x "$run_moz" ]; then
+ dist_bin="$curdir"
+ found=1
else
- here=`/bin/pwd`
- while [ -h "$progname" ]; do
- bn=`basename "$progname"`
- cd `dirname "$progname"`
- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
- if [ ! -x "$progname" ]; then
- break
- fi
- curdir=`dirname "$progname"`
- run_moz="$curdir/run-mozilla.sh"
- if [ -x "$run_moz" ]; then
- cd "$curdir"
- dist_bin=`pwd`
- found=1
- break
- fi
- done
- cd "$here"
+ while [ -h "${progname}" ]; do
+ bn=`basename "${progname}"`
+ cd `dirname "${progname}"`
+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'`
+ if [ ! -x "$progname" ]; then
+ break
+ fi
+ curdir=`dirname "${progname}"`
+ run_moz="${curdir}/run-mozilla.sh"
+ if [ -x "${run_moz}" ]; then
+ cd "$curdir"
+ dist_bin=`pwd`
+ run_moz="${dist_bin}/run-mozilla.sh"
+ found=1
+ break
+ fi
+ done
+ cd "${here}"
fi
if [ $found = 0 ]; then
- # Check default compile-time libdir
- if [ -x "$moz_libdir/run-mozilla.sh" ]; then
- dist_bin="$moz_libdir"
- else
- echo "Cannot find mozilla runtime directory. Exiting."
- exit 1
- fi
-fi
-
-script_args=""
-debugging=0
-MOZILLA_BIN="${progbase}-bin"
-
-# The following is to check for a currently running instance.
-# This is taken almost verbatim from the Mozilla RPM package's launch script.
-MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
-check_running() {
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
- RETURN_VAL=$?
- if [ $RETURN_VAL -eq 0 ]; then
- echo 1
- return 1
+ # Check default compile-time libdir
+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then
+ dist_bin="$moz_libdir"
+ run_moz="${dist_bin}/run-mozilla.sh"
else
- echo 0
- return 0
+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2
+ exit 1
fi
-}
+fi
+MOZILLA_BIN="${progbase}-bin"
if [ "$OSTYPE" = "beos" ]; then
- mimeset -F "$MOZILLA_BIN"
+ mimeset -F "$MOZILLA_BIN"
fi
-ALREADY_RUNNING=`check_running`
+# test for binary apps in ${dist_bin}
+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then
+ MOZILLA_BIN="${dist_bin}/${progbase}-bin"
+else
+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2
+ exit 1
+fi
+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then
+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}"
+else
+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}"
+fi
-################################################################ Parse Arguments
-# If there's a command line argument but it doesn't begin with a -
-# it's probably a url. Try to send it to a running instance.
-_USE_EXIST=0
-_NEW_WINDOW=
-_optOne="$1"
-case "${_optOne}" in
- -*)
- ;;
+# guest a default remote command
+_remote_cmd="xfeDoCommand(openInbox)"
+
+# parse options
+script_args= # null
+moreargs= # null
+target= # null
+ALREADY_RUNNING="test"
+while [ $# -gt 0 ]
+do
+ if [ -n "${target}" ]; then
+ # well, this can't be the target if not last
+ moreargs="${moreargs} \"${target}\""
+ target= # null
+ fi
+ case "$1" in
+ # preserve [pP] for profile
+ --pure | -pure)
+ MOZILLA_BIN="${MOZILLA_BIN}.pure"
+ shift
+ ;;
+ -g | --debug)
+ script_args="${script_args} -g"
+ debugging=1
+ shift
+ ;;
+ -d | --debugger)
+ if [ -n "$2" ]; then
+ script_args="${script_args} -d $2"
+ shift 2
+ else
+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -[Uu][Ii][Ll]ocale)
+ if [ -n "$2" ]; then
+ uilocale="$2"
+ shift 2
+ else
+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -[Uu][Ii][Rr]egion)
+ if [ -n "$2" ]; then
+ uiregion="$2"
+ shift 2
+ else
+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -mail)
+ # mail is default for ithunderbird
+ shift
+ ;;
+ -compose)
+ _remote_cmd="xfeDoCommand(composeMessage)"
+ moreargs="${moreargs} $1"
+ shift
+ ;;
+ -turbo | -nosplash | -quiet)
+ # use remote even with this
+ moreargs="${moreargs} $1"
+ shift
+ ;;
+ -*)
+ # don't use remote with options
+ ALREADY_RUNNING= # null
+ moreargs="${moreargs} $1"
+ shift
+ ;;
*)
- _USE_EXIST=1
- ;;
-esac
-
-_optOthers=
-_optLast=
-for i in "$@"; do
- _optLast="${i}"
-done #last arg
-
-for i in "$@"; do
- [ $i = ${_optLast} ] && break
- _optOthers="${_optOthers} ${i}"
-done #others arg
-
-#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
- # Last argument seems to be a local file/directory
- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
- # If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
- _NEW_WINDOW=1
-fi
-################################################################ Parse Arguments
-
-########################################################################### Main
-if [ $ALREADY_RUNNING -eq 1 ]; then
- # There's an instance already running. Use it.
- # Any command line args passed in?
- if [ $# -gt 0 ]; then
- # There were "some" command line args.
- if [ ${_USE_EXIST} -eq 1 ]; then
- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
- _open_type="window"
- #_open_type="tab"
- _remote_cmd="openURL(${_optLast} , new-${_open_type})"
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
- unset _remote_cmd _open_type
- exit $?
- fi
+ target="$1"
+ shift
+ ;;
+ esac
+done
+
+# test for a running copy of firefox
+# seems this is not needed
+#if [-n "${ALREADY_RUNNING}" ]; then
+# if [ -n "${DISPLAY}" ]; then
+# if [ -n "${debugging}" ]; then
+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()"
+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes"
+# else
+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 &&
+# ALREADY_RUNNING="yes"
+# fi
+# elif [ -n "${debugging}" ]; then
+# echo "$0: WARN, no DISPLAY environment" 1>&2
+# fi
+#fi
+
+# process target
+if [ -n "${target}" ]; then
+ moreargs="${moreargs} \"${target}\""
+ if [ -n "${ALREADY_RUNNING}" ]; then
+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then
+ # not an URI, don't use xremote
+ ALREADY_RUNNING= # null
+ fi
+ fi
+fi
+
+# try remote protocol if running
+if [ -n "${ALREADY_RUNNING}" ]; then
+ if [ -n "${target}" ]; then
+ if [ -n "${location}" ]; then
+ _remote_cmd="openURL(${target},${location})"
else
- # No command line args. Open new window/tab
- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)"
- exit $?
+ _remote_cmd="openURL(${target})"
fi
+ fi
+ # FIXME problems with freedesktop StartupNotify
+ if [ -n "${debugging}" ]; then
+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}"
+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} &&
+ exit 0
+ else
+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \
+ >/dev/null 2>&1 && exit 0
+ fi
fi
-# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
-########################################################################### Main
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
- case "$1" in
- -p | --pure | -pure)
- MOZILLA_BIN="${MOZILLA_BIN}.pure"
- shift
- ;;
- -g | --debug)
- script_args="$script_args -g"
- debugging=1
- shift
- ;;
- -d | --debugger)
- script_args="$script_args -d $2"
- shift 2
- ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
- shift
- set -- "$@" "$arg"
- pass_arg_count=`expr $pass_arg_count + 1`
- ;;
- esac
-done
+# fallback to direct invocation
+
+# UILocale, UIRegion
+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then
+ uilocale="${MOZILLA_UILOCALE}"
+fi
+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then
+ uiregion="${MOZILLA_UIREGION}"
+fi
+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then
+ uilocale="en-US"
+fi
+if [ -n "${uilocale}" ]; then
+ if [ -n "${uiregion}" ]; then
+ moreargs="-UIRegion ${uiregion} ${moreargs}"
+ fi
+ moreargs="-UILocale ${uilocale} ${moreargs}"
+fi
-export MRE_HOME
+# real invocation
+eval "set -- ${moreargs}"
## Start addon scripts
moz_pis_startstop_scripts "start"
-if [ $debugging = 1 ]
-then
- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+if [ -n "${debugging}" ]; then
+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@"
fi
-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+${run_moz} ${script_args} ${MOZILLA_BIN} "$@"
exitcode=$?
## Stop addon scripts

12
mail/thunderbird/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
View file

@ -1,12 +0,0 @@
--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002
+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005
@@ -168,7 +168,9 @@
drawingarea = MOZ_DRAWINGAREA(object);
+ gdk_window_set_user_data(drawingarea->inner_window, NULL);
gdk_window_destroy(drawingarea->inner_window);
+ gdk_window_set_user_data(drawingarea->clip_window, NULL);
gdk_window_destroy(drawingarea->clip_window);
(* parent_class->finalize) (object);

20
mail/thunderbird/files/patch-nopangoxft Normal file
View file

@ -0,0 +1,20 @@
--- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400
+++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400
@@ -40,7 +40,7 @@
#define PANGO_ENABLE_ENGINE
#include "mozilla-decoder.h"
-#include <pango/pangoxft.h>
+#include <pango/pangocairo.h>
#include <pango/pangofc-fontmap.h>
#include <pango/pangofc-font.h>
#include <gdk/gdkx.h>
@@ -208,7 +208,7 @@
}
}
- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
mozilla_find_decoder,
NULL,
NULL);

60
mail/thunderbird/files/patch-oji-threads
View file

@ -1,60 +0,0 @@
--- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001
+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005
@@ -113,5 +113,5 @@
*/
NS_IMETHOD
- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0;
+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0;
/**
@@ -122,5 +122,5 @@
*/
NS_IMETHOD
- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0;
+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0;
};
--- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004
+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005
@@ -268,9 +268,9 @@
NS_METHOD
-nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable)
+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable)
{
PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable,
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
- *outThreadID = NS_PTR_TO_INT32(thread);
+ *outThreadID = (uintptr_t)(thread);
return (thread != NULL ? NS_OK : NS_ERROR_FAILURE);
}
@@ -308,5 +308,5 @@
NS_METHOD
-nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async)
+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async)
{
nsresult rv;
@@ -873,5 +873,5 @@
do {
- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory());
+ JSJ_RegisterLiveConnectFactory();
if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) {
JVM_InitLCGlue();
--- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003
+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005
@@ -122,5 +122,5 @@
*/
NS_IMETHOD
- CreateThread(PRUint32* threadID, nsIRunnable* runnable);
+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable);
/**
@@ -131,5 +131,5 @@
*/
NS_IMETHOD
- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async);
+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async);
/* from nsILiveConnectManager: */

21
mail/thunderbird/files/patch-sysnspr
View file

@ -1,21 +0,0 @@
--- directory/c-sdk/ldap/include/Makefile.in.orig Sat Aug 20 02:15:05 2005
+++ directory/c-sdk/ldap/include/Makefile.in Sat Aug 20 02:15:55 2005
@@ -76,7 +76,6 @@
$(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)
--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig Sat Aug 20 02:14:33 2005
+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in Sat Aug 20 02:14:39 2005
@@ -58,7 +58,7 @@
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
- -I$(DIST)/include/nspr
+ $(shell nspr-config --cflags)
DEFINES += $(DEFS)
PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS

38
mail/thunderbird/files/patch-xptcall-ia64
View file

@ -1,38 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003
@@ -8,6 +8,7 @@
// Section has executable code
.section .text, "ax","progbits"
// procedure named 'XPTC_InvokeByIndex'
+ .global XPTC_InvokeByIndex
.proc XPTC_InvokeByIndex
// manual bundling
.explicit
@@ -24,7 +25,7 @@
// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
// PRUint32 paramCount, nsXPTCVariant* params);
-XPTC_InvokeByIndex::
+XPTC_InvokeByIndex:
.prologue
.save ar.pfs, r37
// allocate 4 input args, 6 local args, and 8 output args
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003
@@ -6,6 +6,7 @@
// Section has executable code
.section .text, "ax","progbits"
// procedure named 'SharedStub'
+ .global SharedStub
.proc SharedStub
// manual bundling
.explicit
@@ -14,7 +15,7 @@
// .exclass PrepareAndDispatch, @fullyvisible
.type PrepareAndDispatch,@function
-SharedStub::
+SharedStub:
// 9 arguments, first 8 are the input arguments of previous
// function call. The last one is methodIndex, and is passed in memory
.prologue

17
mail/thunderbird/files/patch-xptcinvoke_x86_64_linux
View file

@ -1,17 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005
@@ -82,11 +82,11 @@
PRUint64 value;
- for (uint32 i = 0; i < paramCount; i++, s++) {
+ for (unsigned int i = 0; i < paramCount; i++, s++) {
if (s->IsPtrData())
value = (PRUint64) s->ptr;
else {
switch (s->type) {
- case nsXPTType::T_FLOAT: break;
- case nsXPTType::T_DOUBLE: break;
+ case nsXPTType::T_FLOAT:
+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break;
case nsXPTType::T_I8: value = s->val.i8; break;
case nsXPTType::T_I16: value = s->val.i16; break;

8
mail/thunderbird/pkg-deinstall.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
# #
# Date created: Mon Nov 29, 2003 # Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>) # Whom: Thierry Thomas (<thierry@pompo.net>)
@ -16,11 +16,13 @@ PATH=/bin:/usr/bin
MOZDIR=%%MOZDIR%% MOZDIR=%%MOZDIR%%
rm -rf ${MOZDIR}/chrome/overlayinfo rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
rm -f ${MOZDIR}/component.reg rm -f ${MOZDIR}/component.reg
rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/components.ini
rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/defaults.ini
rm -f ${MOZDIR}/components/*.dat rm -f ${MOZDIR}/components/*.dat
rm -rf ${MOZDIR}/extensions #rm -rf ${MOZDIR}/extensions
rm -rf ${MOZDIR}/updates
exit 0 exit 0

9
mail/thunderbird/pkg-install.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
# #
# Date created: Mon Nov 29, 2003 # Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>) # Whom: Thierry Thomas (<thierry@pompo.net>)
@ -15,19 +15,12 @@ PATH=/bin:/usr/bin:/usr/local/bin
MOZDIR=%%MOZDIR%% MOZDIR=%%MOZDIR%%
REGXPCOM=${MOZDIR}/regxpcom REGXPCOM=${MOZDIR}/regxpcom
REGCHROME=${MOZDIR}/regchrome
THUNDERBIRD=${MOZDIR}/thunderbird-bin THUNDERBIRD=${MOZDIR}/thunderbird-bin
echo "===> Building Chrome's registry..." echo "===> Building Chrome's registry..."
rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf
mkdir -p ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/component.reg
rm -rf ${MOZDIR}/extensions
cd ${MOZDIR} || exit 1 cd ${MOZDIR} || exit 1
./run-mozilla.sh ${REGXPCOM} || true ./run-mozilla.sh ${REGXPCOM} || true
./run-mozilla.sh ${REGCHROME} || true
./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1 ./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
exit 0 exit 0

27
mail/thunderbird3/Makefile
View file

@ -3,16 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
# #
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0.7 DISTVERSION= 1.5
PORTREVISION= 6
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-source DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
@ -24,22 +23,22 @@ HAS_CONFIGURE= yes
USE_BZIP2= yes USE_BZIP2= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
--enable-official-branding --enable-application=mail -enable-official-branding
MOZ_EXPORT= MOZ_THUNDERBIRD=1
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/icons/default.xpm
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
CONFLICTS= thunderbird*-1.5*
NOT_FOR_ARCHS= ia64
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/Makefile.common" .include "${.CURDIR}/../../www/mozilla/Makefile.common"
@ -80,8 +79,8 @@ pre-install:
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
post-install: post-install:
${MKDIR} ${PREFIX}/share/applications ${MKDIR} ${PREFIX}/share/applications

6
mail/thunderbird3/distinfo
View file

@ -1,3 +1,3 @@
MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d MD5 (thunderbird-1.5-source.tar.bz2) = 781c1cd1a01583d9b666d8c2fe4288e6
SHA256 (thunderbird-1.0.7-source.tar.bz2) = 6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f SHA256 (thunderbird-1.5-source.tar.bz2) = f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57
SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665 SIZE (thunderbird-1.5-source.tar.bz2) = 35028308

342
mail/thunderbird3/files/patch-bugzilla149334
View file

@ -1,342 +0,0 @@
Index: gfx/idl/nsIFreeType2.idl
===================================================================
RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsIFreeType2.idl
--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10
+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000
@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
native FT_Sfnt_Tag(FT_Sfnt_Tag);
native FT_Size(FT_Size);
-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
+[ptr] native FTC_ImageType_p(FTC_ImageType);
native FTC_Face_Requester(FTC_Face_Requester);
native FTC_Font(FTC_Font);
-native FTC_Image_Cache(FTC_Image_Cache);
+native FTC_FaceID(FTC_FaceID);
+native FTC_ImageCache(FTC_ImageCache);
native FTC_Manager(FTC_Manager);
// #ifdef MOZ_SVG
@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
readonly attribute FT_Library library;
readonly attribute FTC_Manager FTCacheManager;
- readonly attribute FTC_Image_Cache ImageCache;
+ readonly attribute FTC_ImageCache ImageCache;
void doneFace(in FT_Face face);
void doneFreeType(in FT_Library lib);
@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
void outlineDecompose(in FT_Outline_p outline,
in const_FT_Outline_Funcs_p funcs, in voidPtr p);
void setCharmap(in FT_Face face, in FT_CharMap charmap);
- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
in FT_UInt gindex, out FT_Glyph glyph);
- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
- out FT_Face face, out FT_Size size);
+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
+ out FT_Face face);
void managerDone(in FTC_Manager manager);
void managerNew(in FT_Library lib, in FT_UInt max_faces,
in FT_UInt max_sizes, in FT_ULong max_bytes,
in FTC_Face_Requester requester, in FT_Pointer req_data,
out FTC_Manager manager);
- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
/* #ifdef MOZ_SVG */
void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
in FT_Vector_p delta);
Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25
+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000
@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
// #ifdef MOZ_SVG
{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
}
NS_IMETHODIMP
-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
FT_UInt glyphID, FT_Glyph *glyph)
{
// call the FreeType2 function via the function pointer
@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
}
NS_IMETHODIMP
-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
- FT_Face *face, FT_Size *size)
+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
+ FT_Face *face)
{
// call the FreeType2 function via the function pointer
- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
return error ? NS_ERROR_FAILURE : NS_OK;
}
@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
}
NS_IMETHODIMP
-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
{
// call the FreeType2 function via the function pointer
FT_Error error = nsFTC_Image_Cache_New(manager, cache);
@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
}
NS_IMETHODIMP
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
{
*aCache = mImageCache;
return NS_OK;
Index: gfx/src/freetype/nsFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
retrieving revision 1.17
diff -u -3 -p -r1.17 nsFreeType.h
--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17
+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000
@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
typedef FT_Error (*FTC_Image_Cache_Lookup_t)
- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
+typedef FT_Error (*FTC_Manager_LookupFace_t)
+ (FTC_Manager, FTC_FaceID, FT_Face*);
typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
FTC_Face_Requester, FT_Pointer, FTC_Manager*);
-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
// #ifdef MOZ_SVG
typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
typedef FT_Error (*FT_Get_Kerning_t)
@@ -181,7 +181,7 @@ protected:
FT_Outline_Decompose_t nsFT_Outline_Decompose;
FT_Set_Charmap_t nsFT_Set_Charmap;
FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
FTC_Manager_Done_t nsFTC_Manager_Done;
FTC_Manager_New_t nsFTC_Manager_New;
FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
@@ -229,7 +229,7 @@ protected:
PRLibrary *mSharedLib;
FT_Library mFreeTypeLibrary;
FTC_Manager mFTCacheManager;
- FTC_Image_Cache mImageCache;
+ FTC_ImageCache mImageCache;
static nsHashtable *sFontFamilies;
static nsHashtable *sRange1CharSetNames;
Index: gfx/src/ps/nsFontMetricsPS.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
retrieving revision 1.43
diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43
+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000
@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
mPixelSize = NSToIntRound(app2dev * mFont->size);
- mImageDesc.font.face_id = (void*)mEntry;
- mImageDesc.font.pix_width = mPixelSize;
- mImageDesc.font.pix_height = mPixelSize;
- mImageDesc.image_type = 0;
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
+ mImageDesc->width = mPixelSize;
+ mImageDesc->height = mPixelSize;
+ mImageDesc->flags = 0;
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
if (!face)
return 0;
- FTC_Image_Cache iCache;
+ FTC_ImageCache iCache;
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
- &face, nsnull);
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+ &face);
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);
- mImageDesc.font.face_id = (void*)mEntry;
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
// TT glyph has no relation to size
- mImageDesc.font.pix_width = 16;
- mImageDesc.font.pix_height = 16;
- mImageDesc.image_type = 0;
+ mImageDesc->width = 16;
+ mImageDesc->height = 16;
+ mImageDesc->flags = 0;
FT_Face face = nsnull;
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
- &face, nsnull);
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+ &face);
if (NS_FAILED(rv))
return;
Index: gfx/src/ps/nsFontMetricsPS.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFontMetricsPS.h
--- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25
+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000
@@ -319,7 +319,7 @@ protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
@@ -362,7 +362,7 @@ public:
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
};
#endif
Index: gfx/src/x11shared/nsFontFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
retrieving revision 1.14
diff -u -3 -p -r1.14 nsFontFreeType.cpp
--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14
+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000
@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
FTC_Manager mgr;
nsresult rv;
mFt2->GetFTCacheManager(&mgr);
- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
if (NS_FAILED(rv))
return nsnull;
@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
PRBool embedded_bimap = PR_FALSE;
mFaceID = aFaceID;
mPixelSize = aPixelSize;
- mImageDesc.font.face_id = (void*)mFaceID;
- mImageDesc.font.pix_width = aPixelSize;
- mImageDesc.font.pix_height = aPixelSize;
- mImageDesc.image_type = 0;
+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
+ mImageDesc->width = aPixelSize;
+ mImageDesc->height = aPixelSize;
+ mImageDesc->flags = 0;
if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
- mImageDesc.image_type |= ftc_image_mono;
anti_alias = PR_FALSE;
}
- if (nsFreeType2::gFreeType2Autohinted)
- mImageDesc.image_type |= ftc_image_flag_autohinted;
-
- if (nsFreeType2::gFreeType2Unhinted)
- mImageDesc.image_type |= ftc_image_flag_unhinted;
-
PRUint32 num_embedded_bitmaps, i;
PRInt32* embedded_bitmapheights;
mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
if (embedded_bitmapheights[i] == aPixelSize) {
embedded_bimap = PR_TRUE;
// unhinted must be set for embedded bitmaps to be used
- mImageDesc.image_type |= ftc_image_flag_unhinted;
break;
}
}
@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
if (!face)
return NS_ERROR_FAILURE;
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return NS_ERROR_FAILURE;
@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
if (!face)
return 0;
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
#endif
- FTC_Image_Cache icache;
+ FTC_ImageCache icache;
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
Index: gfx/src/x11shared/nsFontFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsFontFreeType.h
--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10
+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000
@@ -110,7 +110,7 @@ protected:
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
nsCOMPtr<nsIFreeType2> mFt2;
};

10
mail/thunderbird3/files/patch-bugzilla243151
View file

@ -1,10 +0,0 @@
Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151
--- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003
+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005
@@ -374,5 +374,4 @@
status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit);
if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index");
}

8
mail/thunderbird3/files/patch-build_unix_mozilla-xpcom.pc.in
View file

@ -1,8 +0,0 @@
--- build/unix/mozilla-xpcom.pc.in.orig Thu Jun 24 12:23:09 2004
+++ build/unix/mozilla-xpcom.pc.in Thu Jun 24 12:23:18 2004
@@ -8,4 +8,4 @@
Version: %MOZILLA_VERSION%
Requires: mozilla-nspr = %MOZILLA_VERSION%
Libs: -L${libdir} -lxpcom
-Cflags: -I${includedir}/xpcom -I${includedir}/string
+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}

2
mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
View file

@ -5,7 +5,7 @@
## ##
## Set LD_LIBRARY_PATH ## Set LD_LIBRARY_PATH
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} +LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
if [ -n "$LD_LIBRARYN32_PATH" ] if [ -n "$LD_LIBRARYN32_PATH" ]
then then
LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}

10
mail/thunderbird3/files/patch-config::mkdepend::Makefile.in
View file

@ -1,10 +0,0 @@
--- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004
+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004
@@ -57,6 +57,7 @@
include $(topsrcdir)/config/rules.mk
HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)

17
mail/thunderbird3/files/patch-configure
View file

@ -1,17 +0,0 @@
--- configure.orig Wed Nov 23 13:17:02 2005
+++ configure Wed Nov 23 13:17:20 2005
@@ -11417,12 +11417,12 @@
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
echo "configure:11420: checking MOZ_GTK2_CFLAGS" >&5
- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
echo "configure:11425: checking MOZ_GTK2_LIBS" >&5
- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
else
MOZ_GTK2_CFLAGS=""

15
mail/thunderbird3/files/patch-gfx-src-gtk-Makefile.in
View file

@ -1,15 +0,0 @@
When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
This causes an error, because libgfxshared_s is only under dist/lib.
-mi
--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
@@ -165,4 +165,5 @@
ifdef MOZ_ENABLE_GTK2
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+ $(LIBS_DIR) \
-lgkgfx \
-lgfxshared_s \

9
mail/thunderbird3/files/patch-jsosdep
View file

@ -1,9 +0,0 @@
--- js/src/jsosdep.h Fri Nov 14 19:10:59 2003
+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005
@@ -102,5 +102,5 @@
#define JS_HAVE_LONG_LONG
-#elif defined(FREEBSD)
+#elif defined(FREEBSD) || defined(__FreeBSD__)
#define JS_HAVE_LONG_LONG

356
mail/thunderbird3/files/patch-mail_app_mozilla.in
View file

@ -1,6 +1,6 @@
--- mail/app/mozilla.in.orig Sun Jul 25 01:58:06 2004 --- mail/app/mozilla.in.orig Mon Apr 4 15:08:49 2005
+++ mail/app/mozilla.in Tue Mar 22 23:59:11 2005 +++ mail/app/mozilla.in Fri Jun 10 06:18:49 2005
@@ -29,51 +29,82 @@ @@ -49,51 +49,82 @@
## the mozilla-bin binary to work. ## the mozilla-bin binary to work.
## ##
@ -122,353 +122,3 @@
# Use run-mozilla.sh in the current dir if it exists # Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh # If not, then start resolving symlinks until we find run-mozilla.sh
@@ -82,162 +113,214 @@
curdir=`dirname "$progname"`
progbase=`basename "$progname"`
run_moz="$curdir/run-mozilla.sh"
-if test -x "$run_moz"; then
- dist_bin="$curdir"
- found=1
+if [ -x "$run_moz" ]; then
+ dist_bin="$curdir"
+ found=1
else
- here=`/bin/pwd`
- while [ -h "$progname" ]; do
- bn=`basename "$progname"`
- cd `dirname "$progname"`
- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
- if [ ! -x "$progname" ]; then
- break
- fi
- curdir=`dirname "$progname"`
- run_moz="$curdir/run-mozilla.sh"
- if [ -x "$run_moz" ]; then
- cd "$curdir"
- dist_bin=`pwd`
- found=1
- break
- fi
- done
- cd "$here"
+ while [ -h "${progname}" ]; do
+ bn=`basename "${progname}"`
+ cd `dirname "${progname}"`
+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'`
+ if [ ! -x "$progname" ]; then
+ break
+ fi
+ curdir=`dirname "${progname}"`
+ run_moz="${curdir}/run-mozilla.sh"
+ if [ -x "${run_moz}" ]; then
+ cd "$curdir"
+ dist_bin=`pwd`
+ run_moz="${dist_bin}/run-mozilla.sh"
+ found=1
+ break
+ fi
+ done
+ cd "${here}"
fi
if [ $found = 0 ]; then
- # Check default compile-time libdir
- if [ -x "$moz_libdir/run-mozilla.sh" ]; then
- dist_bin="$moz_libdir"
- else
- echo "Cannot find mozilla runtime directory. Exiting."
- exit 1
- fi
-fi
-
-script_args=""
-debugging=0
-MOZILLA_BIN="${progbase}-bin"
-
-# The following is to check for a currently running instance.
-# This is taken almost verbatim from the Mozilla RPM package's launch script.
-MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
-check_running() {
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
- RETURN_VAL=$?
- if [ $RETURN_VAL -eq 0 ]; then
- echo 1
- return 1
+ # Check default compile-time libdir
+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then
+ dist_bin="$moz_libdir"
+ run_moz="${dist_bin}/run-mozilla.sh"
else
- echo 0
- return 0
+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2
+ exit 1
fi
-}
+fi
+MOZILLA_BIN="${progbase}-bin"
if [ "$OSTYPE" = "beos" ]; then
- mimeset -F "$MOZILLA_BIN"
+ mimeset -F "$MOZILLA_BIN"
fi
-ALREADY_RUNNING=`check_running`
+# test for binary apps in ${dist_bin}
+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then
+ MOZILLA_BIN="${dist_bin}/${progbase}-bin"
+else
+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2
+ exit 1
+fi
+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then
+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}"
+else
+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}"
+fi
-################################################################ Parse Arguments
-# If there's a command line argument but it doesn't begin with a -
-# it's probably a url. Try to send it to a running instance.
-_USE_EXIST=0
-_NEW_WINDOW=
-_optOne="$1"
-case "${_optOne}" in
- -*)
- ;;
+# guest a default remote command
+_remote_cmd="xfeDoCommand(openInbox)"
+
+# parse options
+script_args= # null
+moreargs= # null
+target= # null
+ALREADY_RUNNING="test"
+while [ $# -gt 0 ]
+do
+ if [ -n "${target}" ]; then
+ # well, this can't be the target if not last
+ moreargs="${moreargs} \"${target}\""
+ target= # null
+ fi
+ case "$1" in
+ # preserve [pP] for profile
+ --pure | -pure)
+ MOZILLA_BIN="${MOZILLA_BIN}.pure"
+ shift
+ ;;
+ -g | --debug)
+ script_args="${script_args} -g"
+ debugging=1
+ shift
+ ;;
+ -d | --debugger)
+ if [ -n "$2" ]; then
+ script_args="${script_args} -d $2"
+ shift 2
+ else
+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -[Uu][Ii][Ll]ocale)
+ if [ -n "$2" ]; then
+ uilocale="$2"
+ shift 2
+ else
+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -[Uu][Ii][Rr]egion)
+ if [ -n "$2" ]; then
+ uiregion="$2"
+ shift 2
+ else
+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
+ exit 1
+ fi
+ ;;
+ -mail)
+ # mail is default for ithunderbird
+ shift
+ ;;
+ -compose)
+ _remote_cmd="xfeDoCommand(composeMessage)"
+ moreargs="${moreargs} $1"
+ shift
+ ;;
+ -turbo | -nosplash | -quiet)
+ # use remote even with this
+ moreargs="${moreargs} $1"
+ shift
+ ;;
+ -*)
+ # don't use remote with options
+ ALREADY_RUNNING= # null
+ moreargs="${moreargs} $1"
+ shift
+ ;;
*)
- _USE_EXIST=1
- ;;
-esac
-
-_optOthers=
-_optLast=
-for i in "$@"; do
- _optLast="${i}"
-done #last arg
-
-for i in "$@"; do
- [ $i = ${_optLast} ] && break
- _optOthers="${_optOthers} ${i}"
-done #others arg
-
-#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
- # Last argument seems to be a local file/directory
- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
- # If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
- _NEW_WINDOW=1
-fi
-################################################################ Parse Arguments
-
-########################################################################### Main
-if [ $ALREADY_RUNNING -eq 1 ]; then
- # There's an instance already running. Use it.
- # Any command line args passed in?
- if [ $# -gt 0 ]; then
- # There were "some" command line args.
- if [ ${_USE_EXIST} -eq 1 ]; then
- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
- _open_type="window"
- #_open_type="tab"
- _remote_cmd="openURL(${_optLast} , new-${_open_type})"
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
- unset _remote_cmd _open_type
- exit $?
- fi
+ target="$1"
+ shift
+ ;;
+ esac
+done
+
+# test for a running copy of firefox
+# seems this is not needed
+#if [-n "${ALREADY_RUNNING}" ]; then
+# if [ -n "${DISPLAY}" ]; then
+# if [ -n "${debugging}" ]; then
+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()"
+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes"
+# else
+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 &&
+# ALREADY_RUNNING="yes"
+# fi
+# elif [ -n "${debugging}" ]; then
+# echo "$0: WARN, no DISPLAY environment" 1>&2
+# fi
+#fi
+
+# process target
+if [ -n "${target}" ]; then
+ moreargs="${moreargs} \"${target}\""
+ if [ -n "${ALREADY_RUNNING}" ]; then
+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then
+ # not an URI, don't use xremote
+ ALREADY_RUNNING= # null
+ fi
+ fi
+fi
+
+# try remote protocol if running
+if [ -n "${ALREADY_RUNNING}" ]; then
+ if [ -n "${target}" ]; then
+ if [ -n "${location}" ]; then
+ _remote_cmd="openURL(${target},${location})"
else
- # No command line args. Open new window/tab
- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)"
- exit $?
+ _remote_cmd="openURL(${target})"
fi
+ fi
+ # FIXME problems with freedesktop StartupNotify
+ if [ -n "${debugging}" ]; then
+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}"
+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} &&
+ exit 0
+ else
+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \
+ >/dev/null 2>&1 && exit 0
+ fi
fi
-# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
-########################################################################### Main
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
- case "$1" in
- -p | --pure | -pure)
- MOZILLA_BIN="${MOZILLA_BIN}.pure"
- shift
- ;;
- -g | --debug)
- script_args="$script_args -g"
- debugging=1
- shift
- ;;
- -d | --debugger)
- script_args="$script_args -d $2"
- shift 2
- ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
- shift
- set -- "$@" "$arg"
- pass_arg_count=`expr $pass_arg_count + 1`
- ;;
- esac
-done
+# fallback to direct invocation
+
+# UILocale, UIRegion
+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then
+ uilocale="${MOZILLA_UILOCALE}"
+fi
+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then
+ uiregion="${MOZILLA_UIREGION}"
+fi
+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then
+ uilocale="en-US"
+fi
+if [ -n "${uilocale}" ]; then
+ if [ -n "${uiregion}" ]; then
+ moreargs="-UIRegion ${uiregion} ${moreargs}"
+ fi
+ moreargs="-UILocale ${uilocale} ${moreargs}"
+fi
-export MRE_HOME
+# real invocation
+eval "set -- ${moreargs}"
## Start addon scripts
moz_pis_startstop_scripts "start"
-if [ $debugging = 1 ]
-then
- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+if [ -n "${debugging}" ]; then
+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@"
fi
-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+${run_moz} ${script_args} ${MOZILLA_BIN} "$@"
exitcode=$?
## Stop addon scripts

12
mail/thunderbird3/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
View file

@ -1,12 +0,0 @@
--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002
+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005
@@ -168,7 +168,9 @@
drawingarea = MOZ_DRAWINGAREA(object);
+ gdk_window_set_user_data(drawingarea->inner_window, NULL);
gdk_window_destroy(drawingarea->inner_window);
+ gdk_window_set_user_data(drawingarea->clip_window, NULL);
gdk_window_destroy(drawingarea->clip_window);
(* parent_class->finalize) (object);

20
mail/thunderbird3/files/patch-nopangoxft Normal file
View file

@ -0,0 +1,20 @@
--- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400
+++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400
@@ -40,7 +40,7 @@
#define PANGO_ENABLE_ENGINE
#include "mozilla-decoder.h"
-#include <pango/pangoxft.h>
+#include <pango/pangocairo.h>
#include <pango/pangofc-fontmap.h>
#include <pango/pangofc-font.h>
#include <gdk/gdkx.h>
@@ -208,7 +208,7 @@
}
}
- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
mozilla_find_decoder,
NULL,
NULL);

60
mail/thunderbird3/files/patch-oji-threads
View file

@ -1,60 +0,0 @@
--- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001
+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005
@@ -113,5 +113,5 @@
*/
NS_IMETHOD
- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0;
+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0;
/**
@@ -122,5 +122,5 @@
*/
NS_IMETHOD
- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0;
+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0;
};
--- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004
+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005
@@ -268,9 +268,9 @@
NS_METHOD
-nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable)
+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable)
{
PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable,
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
- *outThreadID = NS_PTR_TO_INT32(thread);
+ *outThreadID = (uintptr_t)(thread);
return (thread != NULL ? NS_OK : NS_ERROR_FAILURE);
}
@@ -308,5 +308,5 @@
NS_METHOD
-nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async)
+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async)
{
nsresult rv;
@@ -873,5 +873,5 @@
do {
- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory());
+ JSJ_RegisterLiveConnectFactory();
if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) {
JVM_InitLCGlue();
--- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003
+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005
@@ -122,5 +122,5 @@
*/
NS_IMETHOD
- CreateThread(PRUint32* threadID, nsIRunnable* runnable);
+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable);
/**
@@ -131,5 +131,5 @@
*/
NS_IMETHOD
- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async);
+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async);
/* from nsILiveConnectManager: */

21
mail/thunderbird3/files/patch-sysnspr
View file

@ -1,21 +0,0 @@
--- directory/c-sdk/ldap/include/Makefile.in.orig Sat Aug 20 02:15:05 2005
+++ directory/c-sdk/ldap/include/Makefile.in Sat Aug 20 02:15:55 2005
@@ -76,7 +76,6 @@
$(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)
--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig Sat Aug 20 02:14:33 2005
+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in Sat Aug 20 02:14:39 2005
@@ -58,7 +58,7 @@
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
- -I$(DIST)/include/nspr
+ $(shell nspr-config --cflags)
DEFINES += $(DEFS)
PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS

38
mail/thunderbird3/files/patch-xptcall-ia64
View file

@ -1,38 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003
@@ -8,6 +8,7 @@
// Section has executable code
.section .text, "ax","progbits"
// procedure named 'XPTC_InvokeByIndex'
+ .global XPTC_InvokeByIndex
.proc XPTC_InvokeByIndex
// manual bundling
.explicit
@@ -24,7 +25,7 @@
// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
// PRUint32 paramCount, nsXPTCVariant* params);
-XPTC_InvokeByIndex::
+XPTC_InvokeByIndex:
.prologue
.save ar.pfs, r37
// allocate 4 input args, 6 local args, and 8 output args
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003
@@ -6,6 +6,7 @@
// Section has executable code
.section .text, "ax","progbits"
// procedure named 'SharedStub'
+ .global SharedStub
.proc SharedStub
// manual bundling
.explicit
@@ -14,7 +15,7 @@
// .exclass PrepareAndDispatch, @fullyvisible
.type PrepareAndDispatch,@function
-SharedStub::
+SharedStub:
// 9 arguments, first 8 are the input arguments of previous
// function call. The last one is methodIndex, and is passed in memory
.prologue

17
mail/thunderbird3/files/patch-xptcinvoke_x86_64_linux
View file

@ -1,17 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005
@@ -82,11 +82,11 @@
PRUint64 value;
- for (uint32 i = 0; i < paramCount; i++, s++) {
+ for (unsigned int i = 0; i < paramCount; i++, s++) {
if (s->IsPtrData())
value = (PRUint64) s->ptr;
else {
switch (s->type) {
- case nsXPTType::T_FLOAT: break;
- case nsXPTType::T_DOUBLE: break;
+ case nsXPTType::T_FLOAT:
+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break;
case nsXPTType::T_I8: value = s->val.i8; break;
case nsXPTType::T_I16: value = s->val.i16; break;

8
mail/thunderbird3/pkg-deinstall.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
# #
# Date created: Mon Nov 29, 2003 # Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>) # Whom: Thierry Thomas (<thierry@pompo.net>)
@ -16,11 +16,13 @@ PATH=/bin:/usr/bin
MOZDIR=%%MOZDIR%% MOZDIR=%%MOZDIR%%
rm -rf ${MOZDIR}/chrome/overlayinfo rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
rm -f ${MOZDIR}/component.reg rm -f ${MOZDIR}/component.reg
rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/components.ini
rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/defaults.ini
rm -f ${MOZDIR}/components/*.dat rm -f ${MOZDIR}/components/*.dat
rm -rf ${MOZDIR}/extensions #rm -rf ${MOZDIR}/extensions
rm -rf ${MOZDIR}/updates
exit 0 exit 0

9
mail/thunderbird3/pkg-install.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
# #
# Date created: Mon Nov 29, 2003 # Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>) # Whom: Thierry Thomas (<thierry@pompo.net>)
@ -15,19 +15,12 @@ PATH=/bin:/usr/bin:/usr/local/bin
MOZDIR=%%MOZDIR%% MOZDIR=%%MOZDIR%%
REGXPCOM=${MOZDIR}/regxpcom REGXPCOM=${MOZDIR}/regxpcom
REGCHROME=${MOZDIR}/regchrome
THUNDERBIRD=${MOZDIR}/thunderbird-bin THUNDERBIRD=${MOZDIR}/thunderbird-bin
echo "===> Building Chrome's registry..." echo "===> Building Chrome's registry..."
rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf
mkdir -p ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/component.reg
rm -rf ${MOZDIR}/extensions
cd ${MOZDIR} || exit 1 cd ${MOZDIR} || exit 1
./run-mozilla.sh ${REGXPCOM} || true ./run-mozilla.sh ${REGXPCOM} || true
./run-mozilla.sh ${REGCHROME} || true
./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1 ./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
exit 0 exit 0

4
www/mozilla/bsd.gecko.mk
View file

@ -64,9 +64,9 @@ Gecko_Pre_Include= bsd.gecko.mk
# .endif # .endif
.if ${OSVERSION} >= 500000 .if ${OSVERSION} >= 500000
_GECKO_ALL= firefox nvu seamonkey sunbird _GECKO_ALL= firefox nvu seamonkey sunbird thunderbird
.endif .endif
_GECKO_ALL+= mozilla thunderbird _GECKO_ALL+= mozilla
sunbird_PORTSDIR= deskutils sunbird_PORTSDIR= deskutils