New commits:
commit ae8488cddede88247fb2d77f8fbc478760c67049
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
mozilla: Updated Enigmail to 0.93.2
commit 48a67b4d59b7ee1fc6703e53d1a5fdd860cc0f1f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
if spell_ok Firebird; then
@@ -5,14 +7,13 @@ if spell_ok Firebird; then
fi &&
#fix firefox-config file to match installed configuration
if [ "$FIREFOX_CVS" == "n" ]; then
-patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
+ patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
fi &&
if [ "$FIREFOX_CVS" == "n" ]; then
-# make the pkgconfig files reference the nspr from the standalone nspr spell
-sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
-sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc
&&
-sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
-sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
+ # make the pkgconfig files reference the nspr from the standalone nspr
spell
+ sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
+ sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc &&
+ sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
+ sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
fi &&
if [ "$FIREFOX_CVS" == "n" ]; then
-patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
+ patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
+ patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
fi &&
if [ "$FIREFOX_CVS" == "y" ]; then
- cp $SCRIPT_DIRECTORY/mozconfig3 $SOURCE_DIRECTORY/.mozconfig
+ cp $SCRIPT_DIRECTORY/mozconfig3 .mozconfig
else
- cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig
+ cp $SCRIPT_DIRECTORY/mozconfig .mozconfig
fi &&
if [ "$FIREFOX_OFFICIAL" == "y" ]; then
- sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
+ sedit '24iac_add_options --enable-official-branding' .mozconfig
fi
diff --git a/http/mozilla/BUILD b/http/mozilla/BUILD
index 40a2ac1..d7eac55 100755
--- a/http/mozilla/BUILD
+++ b/http/mozilla/BUILD
@@ -1,4 +1,5 @@
-MOZILLA_HOME=$INSTALL_ROOT/usr/lib/mozilla &&
+cd $SOURCE_DIRECTORY/mozilla &&
+MOZILLA_HOME=$INSTALL_ROOT/usr/lib/mozilla &&
if [[ "$MOZILLA_ENIGMAIL" == 'y' ]]; then
MOZILLA_EXT="$MOZILLA_EXT,ipc,enigmail"
diff --git a/http/mozilla/DETAILS b/http/mozilla/DETAILS
index f17c04e..595d7f2 100755
--- a/http/mozilla/DETAILS
+++ b/http/mozilla/DETAILS
@@ -1,7 +1,8 @@
SPELL=mozilla
VERSION=1.7.13
-ENIGMAIL_VERSION=0.92.1
+ENIGMAIL_VERSION=0.93.2
IPC_VERSION=1.1.3
+ PATCHLEVEL=1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
@@ -15,7 +16,7 @@ ENIGMAIL_VERSION=0.92.1
SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE3_GPG="enigmail.gpg:${SOURCE4}:UPSTREAM_KEY"
SOURCE5_GPG="enigmail.gpg:${SOURCE6}:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=mozilla/releases/$SPELL$VERSION/source/$SOURCE
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=ftp://archive.progeny.com/$SOURCE_URI
diff --git a/http/mozilla/HISTORY b/http/mozilla/HISTORY
index e6aec3c..34a8c97 100644
--- a/http/mozilla/HISTORY
+++ b/http/mozilla/HISTORY
@@ -1,3 +1,9 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated Enigmail to 0.93.2
+ PATCHLEVEL=1
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-09-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* freetype.patch: another fix for a freetype2 api change, some const
were added to functions in freetype
diff --git a/http/mozilla/PRE_BUILD b/http/mozilla/PRE_BUILD
index 40826a6..bbfc663 100755
--- a/http/mozilla/PRE_BUILD
+++ b/http/mozilla/PRE_BUILD
@@ -1,5 +1,7 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&
# fixes the "nsBuildID.h: No such file or directory" problem
patch -p1 < $SCRIPT_DIRECTORY/xpfe-bootstrap.diff &&
@@ -7,7 +9,6 @@ patch -p0 < $SCRIPT_DIRECTORY/libreg-standalone.diff &&
patch -p1 < $SCRIPT_DIRECTORY/freetype.patch &&
-
if use_gcc ^4; then
patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch
fi &&
@@ -19,8 +20,8 @@ sedit 's/\\$/ \\/' extensions/p3p/Makefile.in &&
# Enigmail extensions
#
if [[ "$MOZILLA_ENIGMAIL" == 'y' ]]; then
- cd $SOURCE_DIRECTORY/extensions &&
- unpack_file 3 &&
+ cd extensions &&
+ unpack_file 3 &&
unpack_file 5
fi &&
#
# Only strip if the user wants us to
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index c5df487..e3852d9 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.1.8
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE_HASH=sha512:8cea1796743608c61b432ebfa391b53e96df59213e2c232105fe5ef2df98fd87d8743444f23c712f4c4fa66e068acca410760f0f3b74997e0561baeb14112952:UPSTREAM_HASH
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.mozilla.org/
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 358325b..d8f15ea 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2008-02-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.1.8. SECUIRTY_PATCH++
#
# Only strip if the user wants us to
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 90a7a26..907c63b 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -4,7 +4,7 @@
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
SOURCE_GPG=mozilla.gpg:$SOURCE2:WORKS_FOR_ME
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URI=$SPELL/releases/$VERSION/source/$SOURCE2
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 277aa78..05e6679 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-10-27 Lalo Martins <lalo AT sourcemage.org>
* BUILD: fix build on non-ia32
(no PATCHLEVEL, as it only makes it buildable for users when it
wasn't
@@ -29,3 +33,4 @@
SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
if [ "$BUILD_ENIGMAIL" = "y" ]; then
-ENIGMAIL_VERSION=0.95.5
+ENIGMAIL_VERSION=0.95.6
PATCHLEVEL=0
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
SOURCE4=${SOURCE3}.sig
SOURCE4_IGNORE=signature
SOURCE3_GPG="enigmail.gpg:$SOURCE4:UPSTREAM_KEY"
- SOURCE3_URL[0]=http://www.mozilla-enigmail.org/downloads/src/$SOURCE3
+ SOURCE3_URL[0]=http://www.mozilla-enigmail.org/download/source/$SOURCE3
SOURCE4_URL[0]=${SOURCE3_URL}.sig
LICENSE[1]=MPL
LICENSE[2]=MPL
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index fa43cce..39f1d18 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,14 @@
+2008-02-12 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Apply enigmail.patch if Enigmail is enabled
+ * enigmail.patch: Patch for Engimail to be registered (Bug #10720)
+ Probably a better way, but this is the quick fix
+
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated Enigmail to 0.95.6
+ Enigmail SOURCE_URL changed to /download/source from /downloads/src
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-11-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.9, SECURITY_PATCH=10
* mozilla.gpg: updated "Mozilla Software Releases" key
diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index 9e976ee..ab35c19 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -5,7 +5,12 @@ ln -s $THUNDERBIRD_HOME $THUNDERBIRD_HOME-$VERSION &&
make install &&
if [ "$BUILD_ENIGMAIL" == "y" ]; then
- make -C mailnews/extensions/enigmail install
+ make -C mailnews/extensions/enigmail install &&
+ #
+ # Register Enigmail if it is installed
+ #
+ patch $INSTALL_ROOT/usr/lib/thunderbird/chrome/app-chrome.manifest \
+ $SCRIPT_DIRECTORY/enigmail.patch
fi &&
+
#
# Create symlink from NSS Root CA store, if it exists. NSS requires this
# to be in the same directory as the current application binary. See:
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 770e954..9e3013f 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,9 +1,11 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&