diff --git a/general.ent b/general.ent
index 50228224d6..24069a4a62 100644
--- a/general.ent
+++ b/general.ent
@@ -3,8 +3,8 @@ $LastChangedBy$
$Date$
-->
-
-
+
+
@@ -563,7 +563,7 @@ $Date$
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 1576eeb461..4119e2825d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
-->
+
+ May 18th, 2007
+
+
+ [dnicholson] - Updated to Thunderbird-2.0.0.0 with
+ Enigmail-0.95.0.
+
+
+
+
May 13th, 2007
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index 0e523c35f3..9be36d9d08 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -6,14 +6,15 @@
-
-
-
-
+
+
+
+
-
+
-
+
+
]>
@@ -59,24 +60,6 @@
- Additional Downloads
-
-
- Required patch (if using system-installed versions of
- NSS and NSPR:)
-
-
-
-
- Required patch (if enabling Pango
- font rendering):
-
-
-
-
-
To enable the Enigmail extension to the
Thunderbird mail client, you'll need to download
the tarball shown below. The Enigmail extension
@@ -92,6 +75,9 @@
Download MD5 sum: &thunderbird-enigmail-md5sum;
+
+ Download size: &thunderbird-enigmail-size;
+
Thunderbird Dependencies
@@ -239,23 +225,15 @@ ac_add_options --enable-ldap
EOF
- If you wish to use Pango for font
- rendering and have uncommented the appropriate option in
- .mozconfig, apply the following patch:
-
-patch -Np1 -i ../thunderbird-&thunderbird-version;-pangoxft-1.patch
-
- If you have system-installed Network Security Services (NSS) and
- Netscape Portable Runtime (NSPR) libraries and you uncommented the
- appropriate lines in the .mozconfig file to utilize
- them, apply the following patch:
-
-patch -Np1 -i ../thunderbird-&thunderbird-version;-system_nss-1.patch
-
Compile Thunderbird by
issuing the following commands:
-sed -i "s/^ enum$/& xptinfo_enum_1/" \
+cat >> layout/build/Makefile.in << "EOF" &&
+ifdef MOZ_ENABLE_CANVAS
+EXTRA_DSO_LDOPTS += -lX11 -lXrender
+endif
+EOF
+sed -i "s/^ enum$/& xptinfo_enum_1/" \
xpcom/reflect/xptinfo/public/xptinfo.h &&
make -f client.mk build
@@ -269,7 +247,7 @@ make -f client.mk build
make -C ../thunderbird-build/mailnews/extensions/enigmail &&
make -C ../thunderbird-build/mailnews/extensions/enigmail \
- XPIFILE=enigmail.xpi xpi
+ XPIFILE=enigmail-&thunderbird-enigmail-version;.xpi xpi
Install Thunderbird by running the following
commands as the root user:
@@ -279,12 +257,11 @@ make -C ../thunderbird-build/mailnews/extensions/enigmail \
install -v -m644 ../thunderbird-build/dist/public/ldap-private/* \
/usr/include/thunderbird-&thunderbird-version;/ldap &&
-install -v -m755 -d /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/US &&
-install -v -m644 mailnews/base/ispdata/movemail.rdf \
- mail/extensions/newsblog/rss.rdf \
- /usr/lib/thunderbird-&thunderbird-version;/defaults/isp &&
-ln -v -s ../{movemail,rss}.rdf \
- /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/US
+install -v -m755 -d /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/en-US &&
+install -v -m644 ../thunderbird-build/dist/bin/isp/*.{rdf,sfd} \
+ /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/ &&
+install -v -m644 ../thunderbird-build/dist/bin/isp/en-US/*.rdf \
+ /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/en-US/
If you built Thunderbird utilizing
system-installed NSS and NSPR libraries, the
@@ -312,8 +289,8 @@ cp -v -Lf ../thunderbird-build/dist/{private,public}/nss/*.h \
class="username">root user to install the
.xpi file:
-install -v -m644 -D ../thunderbird-build/dist/bin/enigmail.xpi \
- /usr/lib/thunderbird-&thunderbird-version;/xpi_store/enigmail.xpi
+install -v -m644 -D ../thunderbird-build/dist/bin/enigmail-&thunderbird-enigmail-version;.xpi \
+ /usr/lib/thunderbird-&thunderbird-version;/xpi_store/enigmail-&thunderbird-enigmail-version;.xpi
If you want to install Enigmail globally
so that all users who run Thunderbird will have
@@ -323,7 +300,7 @@ cp -v -Lf ../thunderbird-build/dist/{private,public}/nss/*.h \
root user:
/usr/bin/thunderbird -install-global-extension \
- /usr/lib/thunderbird-&thunderbird-version;/xpi_store/$ENIGMAIL_FILENAME
+ /usr/lib/thunderbird-&thunderbird-version;/xpi_store/enigmail-&thunderbird-enigmail-version;.xpi
Global installation of other extensions can be done using the same
basic method as the Enigmail extension. See the
@@ -360,6 +337,10 @@ touch `find . -name *.rdf`
Command Explanations
+ 'EXTRA_DSO_LDOPTS' += -lX11 -lXrender ...:
+ Building the layout backend will break when the canvas element is enabled
+ without adding these two required libraries.
+
sed -i "s/^ enum$/& xptinfo_enum_1/" ...:
This command is used to fix an anonymous enum in an external/public
interface header file.
@@ -383,8 +364,8 @@ touch `find . -name *.rdf`
.xpi file which is used to install
Enigmail.
- install .../movemail.rdf .../rss.rdf ...: These
- commands are used to install two files inadvertently left out of the
+ install .../*.{rdf,sfd}: These commands are used
+ to install a few mail extensions inadvertantly left out of the
installation script.