Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (43942c777cbabcb600894365b51bbc5e297fbe80)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (43942c777cbabcb600894365b51bbc5e297fbe80)
  • Date: Tue, 23 Jan 2007 15:15:08 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

mail/thunderbird/BUILD | 63 +---------
mail/thunderbird/CONFIGURE | 1
mail/thunderbird/DEPENDS | 20 +--
mail/thunderbird/DETAILS | 2
mail/thunderbird/HISTORY | 18 +++
mail/thunderbird/PRE_BUILD | 7 -
mail/thunderbird/security_manager_makefile.diff | 142
------------------------
mail/thunderbird/visibility.patch | 12 --
8 files changed, 35 insertions(+), 230 deletions(-)

New commits:
commit 43942c777cbabcb600894365b51bbc5e297fbe80
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Updated thunderbird to 2.0b1 (works much better than 1.5.x)

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index d000500..d965be0 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,6 +1,4 @@
THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
-export MOZILLA_OFFICIAL="1" &&
-export BUILD_OFFICIAL="1" &&
export MOZ_THUNDERBIRD="1" &&

#
@@ -9,66 +7,17 @@ export MOZ_THUNDERBIRD="1" &&
export CFLAGS="${CFLAGS//-O3/-O2}" &&
export CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&

-# these two are simply bugs in the Makefile-s
-sedit 's#-lgfxshared_s#-L../shared -lgfxshared_s#g' gfx/src/gtk/Makefile.in
&&
-sedit 's#-lxprintutil#-L../xprintutil -lxprintutil#g'
gfx/src/gtk/Makefile.in &&
-
-if [[ "$THUNDERBIRD_MATHML" == 'y' ]]; then
- OPTS="$OPTS --enable-mathml"
-else
- OPTS="$OPTS --disable-mathml"
-fi &&
-
if echo $LDFLAGS | grep -q '\-s'; then
OPTS="$OPTS --enable-strip"
fi &&

-# Note: --enable-extensions and --enable-necko-protocols are inherited from
-# mozconfig. Don't set them in ./configure unless you *really* know what
-# you're doing.
-# Also already in mozconfig:
-# export MOZ_THUNDERBIRD=1
-# mk_add_options MOZ_THUNDERBIRD=1
-#
-# --enable-crypto \
-# --enable-single-profile \
-# --disable-tests \
-# --disable-oji \
-# --disable-necko-disk-cache \
-# --disable-profilesharing \
-# --disable-activex \
-# --disable-activex-scripting \
-# --disable-plugins \
-# --enable-image-decoders=default,-xbm \
-
-./configure --prefix=${INSTALL_ROOT}/usr \
- --with-user-appdir=.thunderbird \
- --with-default-mozilla-five-home=$THUNDERBIRD_HOME \
- --enable-application=mail \
- --enable-extensions=wallet,spellcheck,xmlextras,webservices \
- --enable-crypto \
- --enable-xinerama \
- --enable-optimize \
- --enable-reorder \
- --enable-strip \
- --enable-cpp-rtti \
- --enable-single-profile \
- --enable-necko-protocols=http,file,jar,viewsource,res,data \
- --enable-image-decoders=default,-xbm \
- --disable-accessibility \
- --disable-debug \
- --disable-ldap \
- --disable-tests \
- --disable-logging \
- --disable-pedantic \
- --disable-installer \
- --disable-profilesharing \
- --disable-oji \
- --disable-plugins \
- --disable-necko-disk-cache \
- $OPTS &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --with-user-appdir=.thunderbird \
+ --enable-application=mail \
+ --enable-optimize="$CFLAGS" \
+ $OPTS &&

-make &&
+make &&

if [[ "$BUILD_ENIGMAIL" == 'y' ]]; then
build/autoconf/make-makefile mailnews/extensions/enigmail &&
diff --git a/mail/thunderbird/CONFIGURE b/mail/thunderbird/CONFIGURE
index 6a58f00..136dd07 100755
--- a/mail/thunderbird/CONFIGURE
+++ b/mail/thunderbird/CONFIGURE
@@ -1,2 +1 @@
-config_query THUNDERBIRD_MATHML "Enable MathML?" n
config_query BUILD_ENIGMAIL "Build enigmail?" y
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index cc5f2cc..801f88f 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,6 +1,6 @@
depends g++
&&
depends nspr '--with-system-nspr'
&&
-depends nss
&&
+depends nss '--with-system-nss'
&&
depends zlib '--with-system-zlib'
&&
depends jpeg '--with-system-jpeg'
&&
depends libidl
&&
@@ -22,16 +22,10 @@ depends gtk+2
optional_depends gnome-vfs2 \
"--enable-gnomevfs" \
"--disable-gnomevfs" \
- "for GnomeVFS support"
+ "for GnomeVFS support" &&

-#
-# Broken! :(
-#
-#configure: error: SVG requires a modified version of libart. To pull and
build
-#this LGPL library, set MOZ_INTERNAL_LIBART_LGPL, and then rerun the
-#checkout stage
-#
-#optional_depends libart_lgpl \
-# "--enable-svg --enable-svg-renderer-libart" \
-# "--disable-svg" \
-# "for SVG support"
+optional_depends cairo \
+ "--enable-system-cairo \
+ --enable-svg --enable-svg-renderer=cairo" \
+ "" \
+ "for native SVG rendering"
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 17aba52..ed1a9eb 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=1.5.0.9
+ VERSION=2.0b1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 2ff38e7..aad9ffd 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,21 @@
+2007-01-23 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.0b1
+ * DEPENDS: Add --with-system-nss flags to the nss dependency to
+ explicitly use system NSS
+ Removed commented out libart_lgpl optional depends
+ Added optional dependency on cairo for SVG
+ * PRE_BUILD: Do not apply visiblity.patch (unneeded)
+ Do not run mozilla_remove_nspr_nss (thanks to George Sherwood)
+ Copy mail/config/mozconfig to .mozconfig for Thunderbird defaults
+ * BUILD: Removed MOZILLA_OFFICIAL and BUILD_OFFICIAL (this is not an
+ official Mozilla binary build)
+ Removed sedits to fix gfx/src/gtk/Makefile.in
+ Removed MATHML flags for OPTS
+ Removed commented out configure flags
+ Do not hardcode so many configure flags, instead use the defaults
+ from .mozconfig, but still enable optimizations
+ * visibility.patch, security_manager_makefile.diff: Obsolete patches
+
2006-12-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: SECURITY_PATCH=5

http://www.mozilla.org/projects/security/known-vulnerabilities.html#Thunderbird
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 246b073..770e954 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,8 +1,7 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-mozilla_remove_nspr_nss &&
-patch -p1 < $SCRIPT_DIRECTORY/visibility.patch &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

+cp mail/config/mozconfig .mozconfig &&

if [ "$BUILD_ENIGMAIL" = "y" ]; then
cd $SOURCE_DIRECTORY/mailnews/extensions &&
diff --git a/mail/thunderbird/security_manager_makefile.diff
b/mail/thunderbird/security_manager_makefile.diff
deleted file mode 100644
index afe1875..0000000
--- a/mail/thunderbird/security_manager_makefile.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur mozilla.orig/security/manager/Makefile.in
mozilla/security/manager/Makefile.in
---- mozilla.orig/security/manager/Makefile.in 2006-04-25 13:40:14.858946488
-0700
-+++ mozilla/security/manager/Makefile.in 2006-04-25 13:40:24.939414024
-0700
-@@ -46,35 +46,6 @@
- MODULE = psm
-
- PACKAGE_FILE = psm.pkg
--PACKAGE_VARS += \
-- NSS3_LIB \
-- SMIME3_LIB \
-- SSL3_LIB \
-- 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)))
--ifndef HAVE_64BIT_OS
--HAVE_FREEBL_MODULES = 1
--FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
--FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
--FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
--FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
--endif
--endif
--endif
-
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -147,19 +118,7 @@
- include $(topsrcdir)/config/rules.mk
-
- # Attempt to properly handle NSS' refusal to implement a dependency system
--export:: .nss.cleaned
--
--.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 $@
--
--.nss.checkout:
-- touch $(srcdir)/$@
-+export::
-
- dependclean export packages chrome::
- $(MAKE) -C boot $@
-@@ -171,48 +130,6 @@
-
- libs::
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--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 $@
- $(MAKE) -C ssl $@
- $(MAKE) -C locales $@
-@@ -221,20 +138,6 @@
- endif
-
- 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 $@
- $(MAKE) -C locales $@
-@@ -250,11 +153,6 @@
- $(MAKE) -C pki $@
- 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::
- $(MAKE) -C boot $@
diff --git a/mail/thunderbird/visibility.patch
b/mail/thunderbird/visibility.patch
deleted file mode 100644
index 5b0b561..0000000
--- a/mail/thunderbird/visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mozilla.orig/configure mozilla/configure
---- mozilla.orig/configure 2006-04-25 13:40:12.593290920 -0700
-+++ mozilla/configure 2006-04-25 13:41:41.698744832 -0700
-@@ -7650,7 +7650,7 @@
- if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
- if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
- if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
-- ac_cv_visibility_pragma=yes
-+ ac_cv_visibility_pragma=no
- fi
- fi
- fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (43942c777cbabcb600894365b51bbc5e297fbe80), Eric Sandall, 01/23/2007

Archive powered by MHonArc 2.6.24.

Top of Page