Skip to Content.
Sympa Menu

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

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 (6f1d8bd073f676a356a17ae785095eb042b8d33c)
  • Date: Sun, 8 Nov 2009 17:37:16 -0600

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

http/seamonkey/BUILD | 19 -------
http/seamonkey/CONFIGURE | 75 +++++++++++++++++-----------
http/seamonkey/DEPENDS | 27 ++++------
http/seamonkey/DETAILS | 6 +-
http/seamonkey/HISTORY | 9 +++
http/seamonkey/INSTALL | 2
http/seamonkey/PRE_BUILD | 32 ++++++++----
http/seamonkey/blfs-mozconfig | 89
++++++++++++++++++++++++++++++++++
http/seamonkey/cairo-fixes.patch | 15 -----
http/seamonkey/seamonkey-sqlite.patch | 11 ----
10 files changed, 183 insertions(+), 102 deletions(-)

New commits:
commit 6f1d8bd073f676a356a17ae785095eb042b8d33c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

seamonkey: Major update to the spell to get it to
work with 2.0. Hopefully not too many bugs.

diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index f1f5d30..c13d772 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -1,4 +1,4 @@
-cd $SOURCE_DIRECTORY/mozilla &&
+cd $SOURCE_DIRECTORY/comm-1.9.1 &&
MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&

#
@@ -14,21 +14,6 @@ fi &&
CFLAGS="${CFLAGS//-O3/-O2}" &&
CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&

-./configure --prefix=$INSTALL_ROOT/usr \
- --mandir=$INSTALL_ROOT/usr/share/man \
- --with-default-mozilla-five-home=$MOZILLA_HOME \
- --with-user-appdir=.seamonkey \
- --enable-extensions=all${MOZILLA_EXT} \
- --enable-optimize="$CFLAGS" \
- --enable-application=suite \
- --disable-tests \
- $SEAMONKEY_MAILNEWS \
- $SEAMONKEY_CHAT \
- $SEAMONKEY_COMPOSER \
- $SEAMONKEY_MATHML \
- $SEAMONKEY_JS \
- $SEAMONKEY_XINERAMA \
- $OPTS &&
make_single &&
-make &&
+make -f client.mk build &&
make_normal
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 7131421..8c23f7a 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -1,33 +1,48 @@
-config_query_option SEAMONKEY_MAILNEWS \
- 'Build Mail/News client?' \
- y \
- '--enable-mailnews' \
- '--disable-mailnews' &&
-config_query_option SEAMONKEY_CHAT \
- 'Build Chat component?' \
- y \
- '--enable-chat' \
- '--disable-chat' &&
-config_query_option SEAMONKEY_COMPOSER \
- 'Build Composer component?' \
- y \
- '--enable-composer' \
- '--disable-composer' &&
-config_query_option SEAMONKEY_MATHML \
- 'Enable MathML?' \
- y \
- '--enable-mathml' \
- '--disable-mathml' &&
-config_query_option SEAMONKEY_JS \
- 'Build JavaScript profile tool?' \
- n \
- '--enable-xpctools' \
- '--disable-xpctools' &&
-config_query_option SEAMONKEY_XINERAMA \
- 'Enable Xinerama support?' \
- n \
- '--enable-xinerama' \
- '--disable-xinerama' &&
+#Few hacks to keep old defaults set correctly
+
+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 &&
+
+if [[ "$SEAMONKEY_COMPOSER" == "--enable-composer" || \
+ "$SEAMONKEY_COMPOSER" == "y" ]]; then
+ SEAMONKEY_COMPOSER=y
+else
+ SEAMONKEY_COMPOSER=n
+fi &&
+config_query SEAMONKEY_COMPOSER \
+ '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_XINERAMA \
+ 'Enable Xinerama support?' \
+ n &&
+config_query SEAMONKEY_PANGO \
+ 'Enable Pango support for complex font rendering?' \
+ 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 7d36625..ef28afc 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,16 +1,19 @@
-depends gtk+2 '--enable-default-toolkit=gtk2 --enable-xft
--disable-freetype2' &&
-depends jpeg '--with-system-jpeg' &&
-depends libidl '--with-libIDL' &&
-depends libpng '--with-system-png' &&
+depends gtk+2 &&
+depends jpeg &&
+depends libidl &&
+depends libpng &&
depends libxft &&
if spell_ok nss && [[ $(installed_version nss) == 3.11* ]]; then
depends nspr '--with-system-nspr' &&
depends nss '--with-system-nss --enable-crypto'
fi &&
-depends perl &&
-depends xorg-libs '--with-x' &&
-depends zip &&
-depends zlib '--with-system-zlib' &&
+depends perl &&
+depends xorg-libs &&
+depends zip &&
+depends zlib &&
+if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
+ depends pango
+fi &&

#Not tested
optional_depends openldap \
@@ -26,10 +29,4 @@ optional_depends gnome-vfs2 \
optional_depends libgnomeui \
"--enable-gnomeui" \
"--disable-gnomeui" \
- "For GNOME UI support" #&&
-
-#optional_depends cairo \
-# "--enable-system-cairo \
-# --enable-svg --enable-svg-renderer=cairo" \
-# "" \
-# "for native SVG rendering"
+ "For GNOME UI support"
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index e635fea..967c566 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,9 +1,9 @@
SPELL=seamonkey
- VERSION=1.1.18
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:4f10e1617a5f1b5a46b786bc5ad17e14265b77d066e3acb4041c8311341cb268c5e263018b48a4ded931ecd5d0d9220ca7629c7e13c5a06b77b407df28cd4ee7
+
SOURCE_HASH=sha512:f7fee971aef92c79c651015d6c5f8db5b84ab326f54064043cdcaf4a6dc0b065689b831ff0f7341c01c87339b7cb556f7c0b33e5b5b9abdefb1cab3413d55688
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
+ SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.mozilla.org/
SECURITY_PATCH=20
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index d419364..1853529 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,12 @@
+2009-11-08 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.0. Updated SOURCE_URL
+ * PRE_BUILD: New directory locations. Removed patches.
+ * CONFIGURE: Re-wrote to use mozconfig method
+ * blfs-mozconfig: Added config file from BLFS as starting point
+ * BUILD: Re-wrote to use mozconfig method
+ * INSTALL: Re-wrote to use mozconfig method
+ * DEPENDS: Cleaned up to reflect new build method
+
2009-09-05 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.1.18. SECURITY_PATCH++
* PRE_BUILD: Added patch
diff --git a/http/seamonkey/INSTALL b/http/seamonkey/INSTALL
index 4bb6c86..3f4eb6f 100755
--- a/http/seamonkey/INSTALL
+++ b/http/seamonkey/INSTALL
@@ -12,7 +12,7 @@ mkdir -p $INSTALL_ROOT/usr/share/idl/seamonkey &&
ln -fns $TRACK_ROOT/usr/share/idl/seamonkey \
$INSTALL_ROOT/usr/share/idl/seamonkey-${VERSION/rc*} &&

-make install &&
+make -f client.mk install &&

#
# Script to set MOZILLA_FIVE_HOME
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 45a5169..37fa6f2 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -1,18 +1,30 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file '' &&
-cd mozilla &&
+cd comm-1.9.1 &&

-# remove /root/.mozconfig, it causes too much trouble
-if [ -f /root/.mozconfig ]; then
- rm -f /root/.mozconfig
-fi &&
+cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&

-# remove broken .mozconfig shipped with 1.0b
-rm -f .mozconfig &&
+#cp -v $SPELL_DIRECTORY/blfs-mozconfig mozilla/.mozconfig &&

-patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
+if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
+ sed -i '85iac_add_options --disable-mailnews' .mozconfig
+fi &&

-# Need to link sqlite staticly
+if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
+ sed -i '85iac_add_options --disable-composer' .mozconfig
+fi &&

-patch -p0 < $SCRIPT_DIRECTORY/seamonkey-sqlite.patch
+if [[ "$SEAMONKEY_JS" == "y" ]]; then
+ sed -i '85iac_add_options --enable-xpctools' .mozconfig
+else
+ sed -i '85iac_add_options --disable-xpctools' .mozconfig
+fi &&
+
+if [[ "$SEAMONKEY_XINERAMA" == "y" ]]; then
+ sed -i '85iac_add_options --enable-xinerama' .mozconfig
+fi &&
+
+if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
+ sed -i '85iac_add_options --enable-pango' .mozconfig
+fi
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
new file mode 100644
index 0000000..cdc3eb4
--- /dev/null
+++ b/http/seamonkey/blfs-mozconfig
@@ -0,0 +1,89 @@
+# $LastChangedBy: bdubbs $
+# $Date: 2009-11-04 14:57:47 +0000 (Wed, 04 Nov 2009) $
+#
+# This file contains the options used in the SeaMonkey build. You may
+# need to specify additional options for your specific build needs.
+# Use the information provided by running './configure --help' to
+# help you determine if you need to add any additional options.
+# Some additional options can be added by uncommenting the examples
+# in this file or adding options by inserting a line containing
+# 'ac_add_options --some-option-you-need'.
+
+
+# Create an object directory and specify to build the package in that
+# directory. If desired, modify the location of the object directory
+# to a directory inside the source tree by removing '../' from the
+# line below.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-build
+
+# This option is used to specify that the SeaMonkey suite is
+# being built and to use all the default options for SeaMonkey.
+ac_add_options --enable-application=suite
+
+# Specify the installation prefix. If you would prefer SeaMonkey
+# installed in a different prefix, modify the line below to fit
+# your needs. You'll also need to modify some of the instructions in
+# the BLFS book to point to your desired prefix.
+ac_add_options --prefix=/usr
+
+# These options are used so that the SeaMonkey binaries are linked to
+# 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 --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
+
+# This option is added so that the Mozilla Installer program is not
+# built or installed. The program is not required for a BLFS
+# installation of SeaMonkey.
+ac_add_options --disable-installer
+
+# This option is used to disable the a11y support in the SeaMonkey
+# binaries. Comment out this option if you require a11y support.
+ac_add_options --disable-accessibility
+
+# This option is used to enable support for rendering SVG files in the
+# SeaMonkey browser.
+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
+
+# These two options enable support for building SeaMonkey with
+# system-installed versions of the Network Security Services (NSS)
+# and Netscape Portable Runtime (NSPR) libraries. Uncomment both
+# lines to enable support for system-installed NSS/NSPR.
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
+# Uncomment this option if you desire support for dual-monitor
+# display of SeaMonkey using the X-Window Xinerama libraries.
+#ac_add_options --enable-xinerama
+
+# Complex scripts such as Thai can only be rendered in SeaMonkey with the
+# help of Pango. This option significantly slows rendering, so only use
+# it if necessary.
+#ac_add_options --enable-pango
+
+# This option identifies the default binary directory of the SeaMonkey
+# installation and is used to locate SeaMonkey's installed files. This
+# option is not required for end-user browsing, and is only used for
+# development purposes.
+ac_add_options --with-default-mozilla-five-home=/usr/lib/seamonkey
diff --git a/http/seamonkey/cairo-fixes.patch
b/http/seamonkey/cairo-fixes.patch
deleted file mode 100644
index f11250e..0000000
--- a/http/seamonkey/cairo-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:55.602763128 +0000
-+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:27.527046255 +0000
-@@ -98,6 +98,12 @@
- #include "nsTArray.h"
-
- #include "cairo.h"
-+typedef enum _cairo_font_type {
-+ CAIRO_FONT_TYPE_TOY,
-+ CAIRO_FONT_TYPE_FT,
-+ CAIRO_FONT_TYPE_WIN32,
-+ CAIRO_FONT_TYPE_ATSUI
-+} cairo_font_type_t;
- #include "imgIEncoder.h"
- #ifdef MOZILLA_1_8_BRANCH
- #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
diff --git a/http/seamonkey/seamonkey-sqlite.patch
b/http/seamonkey/seamonkey-sqlite.patch
deleted file mode 100644
index 5b3683d..0000000
--- a/http/seamonkey/seamonkey-sqlite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-09-05 12:34:27.000000000 -0500
-+++ db/sqlite3/src/Makefile.in 2009-09-05 12:35:04.000000000 -0500
-@@ -46,7 +46,7 @@
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- MODULE_NAME = sqlite3
--FORCE_SHARED_LIB = 1
-+FORCE_STATIC_LIB = 1
- VISIBILITY_FLAGS =
-
- ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (6f1d8bd073f676a356a17ae785095eb042b8d33c), George Sherwood, 11/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page