Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (23a16a576c5dc08e6d5ea75905daff0c59ad59c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (23a16a576c5dc08e6d5ea75905daff0c59ad59c9)
  • Date: Tue, 2 Aug 2011 20:47:20 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/seamonkey/BUILD | 7 ------
http/seamonkey/CONFIGURE | 48
++++++++----------------------------------
http/seamonkey/DEPENDS | 6 ++---
http/seamonkey/HISTORY | 13 +++++++++++
http/seamonkey/PRE_BUILD | 26 ++++++++++------------
http/seamonkey/blfs-mozconfig | 13 ++---------
6 files changed, 41 insertions(+), 72 deletions(-)

New commits:
commit 23a16a576c5dc08e6d5ea75905daff0c59ad59c9
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

seamonkey: Major update to the spell. Now builds for me. Hopefully fixes
http://www.sourcemage.org/issues/7

diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index 882898a..7450676 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -2,13 +2,6 @@ cd $SOURCE_DIRECTORY/comm-release &&
MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&

#
-# Only strip if the user wants us to
-#
-if echo $LDFLAGS | grep -q -- '-s'; then
- OPTS="--enable-strip $OPTS"
-fi &&
-
-#
# No fast optimization for Mozilla, bit us so many times...
#
CFLAGS="${CFLAGS//-O3/-O2}" &&
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 37e0587..051ba87 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -1,54 +1,26 @@
-#Few hacks to keep old defaults set correctly
+config_query SEAMONKEY_OFFICIAL "Enable official branding? If enabled, you
may \
+be restricted in distributing these binaries IAW mozilla policies" n &&

-if [[ "$SEAMONKEY_MAILNEWS" == "--enable-mailnews" || \
- "$SEAMONKEY_MAILNEWS" == "y" ]]; then
- SEAMONKEY_MAILNEWS=y
-else
- SEAMONKEY_MAILNEWS=n
-fi &&
-config_query SEAMONKEY_MAILNEWS \
- 'Build Mail/News client?' \
- n &&
+config_query SEAMONKEY_MAILNEWS \
+ "Build Mail News client?" \
+ n &&

-if [[ "$SEAMONKEY_COMPOSER" == "--enable-composer" || \
- "$SEAMONKEY_COMPOSER" == "y" ]]; then
- SEAMONKEY_COMPOSER=y
-else
- SEAMONKEY_COMPOSER=n
-fi &&
config_query SEAMONKEY_COMPOSER \
- 'Build Composer component' \
+ 'Build Composer component?' \
n &&

-if [[ "$SEAMONKEY_JS" == "--enable-xpctools" || \
- "$SEAMONKEY_JS" == "y" ]]; then
- SEAMONKEY_JS=y
-else
- SEAMONKEY_JS=n
-fi &&
-config_query SEAMONKEY_JS \
- 'Build JavaScript profile tool' \
- n &&
-
-if [[ "$SEAMONKEY_XINERAMA" == "--enable-xinerama" || \
- "$SEAMONKEY_XINERAMA" == "y" ]]; then
- SEAMONKEY_XINERAMA=y
-else
- SEAMONKEY_XINERAMA=n
-fi &&
-
config_query SEAMONKEY_CAIRO \
"Use system installed cairo?" \
n &&

-config_query SEAMONKEY_XINERAMA \
- 'Enable Xinerama support?' \
- n &&
-
config_query SEAMONKEY_PANGO \
'Enable Pango support for complex font rendering?' \
n &&

+config_query SEAMONKEY_STRIP \
+ 'Remove debugging symbols?' \
+ n &&
+
#Getting rid of that annoying nullplugin
config_query SEAMONKEY_NULLPLUGIN \
"Do you want nullplugin installed (to enable auto search and install of
other plugins)" \
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index eef6581..73d1390 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -4,20 +4,20 @@ fi &&
depends gtk+2 &&
depends JPEG &&
depends libidl &&
-depends -sub APNG libpng &&
depends libxft &&
depends nspr &&
depends nss &&
depends perl &&
depends zip &&
depends zlib &&
-
depends libxt &&
depends dbus-glib &&
+depends yasm &&
+depends autoconf-2.13

if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
depends pango
fi &&

optional_depends alsa-lib "" "" "for audio support" &&
-optional_depends openldap "" "" "for LDAP support"
+optional_depends wireless_tools "" "" "for geolocation via WiFi access
points"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 9e4ec54..c61d865 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,16 @@
+2011-08-02 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Removed old useless options
+ Added option to strip and official branding
+ Removed Xinerama option
+ * PRE_BUILD: Added code to properly build correct .mozconfig file
+ * DEPENDS: Removed depends libpng. Needs newer version
+ Added depends yasm for WebM video.
+ Added optional wireless_tools
+ Added depends autoconf-2.13 IAW Mozilla website
+ Removed openldap. Not an optional_depends
+ * BUILD: Removed old strip option
+ * blfs-mozconfig: Tweaked various options to match configuration
+
2011-07-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2, SECURITY_PATCH=33
* PRE_BUILD, BUILD: comm-2.0 -> comm-release
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 00b9e31..858a9bb 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -5,10 +5,8 @@ cd comm-release &&

cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&

-if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
- sed -i '78iac_add_options --enable-system-cairo' .mozconfig
-else
- sed -i '78iac_add_options --disable-system-cairo' .mozconfig
+if [[ "$SEAMONKEY_OFFICIAL" == "y" ]]; then
+ sed -i '78iac_add_options --enable-official-branding' .mozconfig
fi &&

if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
@@ -19,24 +17,24 @@ if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
sed -i '78iac_add_options --disable-composer' .mozconfig
fi &&

-if [[ "$SEAMONKEY_JS" == "y" ]]; then
- sed -i '78iac_add_options --enable-xpctools' .mozconfig
+if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
+ sed -i '78iac_add_options --enable-system-cairo' .mozconfig
else
- sed -i '78iac_add_options --disable-xpctools' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_XINERAMA" == "y" ]]; then
- sed -i '78iac_add_options --enable-xinerama' .mozconfig
+ sed -i '78iac_add_options --disable-system-cairo' .mozconfig
fi &&

if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
sed -i '78iac_add_options --enable-pango' .mozconfig
fi &&

-if is_depends_enabled $SPELL openldap; then
- sed -i '78iac_add_options --enable-ldap' .mozconfig
+if [[ "$SEAMONKEY_STRIP" == "y" ]]; then
+ sed -i '78iac_add_options --enable-strip' .mozconfig
+fi &&
+
+if is_depends_enabled $SPELL wireless_tools; then
+ sed -i '78iac_add_options --enable-necko-wifi' .mozconfig
else
- sed -i '78iac_add_options --disable-ldap' .mozconfig
+ sed -i '78iac_add_options --disable-necko-wifi' .mozconfig
fi &&

if ! is_depends_enabled $SPELL alsa-lib; then
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
index fb0d7ee..e2fc65d 100644
--- a/http/seamonkey/blfs-mozconfig
+++ b/http/seamonkey/blfs-mozconfig
@@ -15,6 +15,7 @@
# to a directory inside the source tree by removing '../' from the
# line below.
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-build
+mk_add_options AUTOCONF=autoconf2.13

# This option is used to specify that the SeaMonkey suite is
# being built and to use all the default options for SeaMonkey.
@@ -30,21 +31,13 @@ ac_add_options --prefix=/usr
# the system-installed copies of the specified libraries instead of
# the source tree code which may not be the most recent versions.
ac_add_options --with-system-zlib
-ac_add_options --with-system-png
+ac_add_options --without-system-png
ac_add_options --with-system-jpeg
-#ac_add_options --enable-system-cairo

# This option specifies to include support for rendering the HTML
# <canvas></canvas> tag in the SeaMonkey browser.
ac_add_options --enable-canvas

-# This option is used so that the debugging symbols are removed from
-# the installed binaries during the installation process. Comment out
-# this option if you may have a need to retain the debugging symbols
-# in the installed binaries. Note that this can substantially
-# increase the size of the installed binaries.
-#ac_add_options --enable-strip
-
# This option is added so that test libraries and programs are not
# built. These would only be required for debugging purposes.
ac_add_options --disable-tests
@@ -64,7 +57,7 @@ ac_add_options --enable-svg

# This option is used to enable source tree included LDAP support in
# the SeaMonkey binaries.
-#ac_add_options --enable-ldap
+ac_add_options --enable-ldap

# Uncomment this option if you desire support for dual-monitor
# display of SeaMonkey using the X-Window Xinerama libraries.



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (23a16a576c5dc08e6d5ea75905daff0c59ad59c9), George Sherwood, 08/02/2011

Archive powered by MHonArc 2.6.24.

Top of Page