Skip to Content.
Sympa Menu

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

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 (974dc716d2fe1c29d58a1e89038ab55f6b61e3cd)
  • Date: Thu, 25 Jan 2007 08:39:08 -0600

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

http/seamonkey/BUILD | 20 ---
http/seamonkey/CONFIGURE | 9 -
http/seamonkey/DEPENDS | 42 +++----
http/seamonkey/DETAILS | 6 -
http/seamonkey/HISTORY | 15 ++
http/seamonkey/PRE_BUILD | 5
http/seamonkey/seamonkey-1.1.source.tar.bz2.sig |binary
http/seamonkey/seamonkey-visibility.patch | 11 -
http/seamonkey/security_manager_makefile.diff | 141
------------------------
9 files changed, 42 insertions(+), 207 deletions(-)

New commits:
commit 974dc716d2fe1c29d58a1e89038ab55f6b61e3cd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Updated seamonkey to 1.1

diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index 0242430..5e79115 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -19,28 +19,14 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
--with-user-appdir=.seamonkey \
--enable-extensions=all${MOZILLA_EXT} \
--enable-optimize="$CFLAGS" \
- --with-pthreads \
- --disable-pango \
- --disable-freetype2 \
- --enable-canvas \
- --enable-xft \
- --enable-reorder \
- --enable-elf-dynstr-gc \
- --enable-storage \
- --enable-cpp-rtti \
--enable-application=suite \
- --disable-debug \
- --disable-tests \
- --disable-installer \
- --disable-updater \
- --disable-pedantic \
$SEAMONKEY_MAILNEWS \
$SEAMONKEY_CHAT \
- $SEAMONKEY_CALENDAR \
$SEAMONKEY_COMPOSER \
$SEAMONKEY_MATHML \
$SEAMONKEY_JS \
$SEAMONKEY_XINERAMA \
$OPTS &&
-make_single &&
-make
+make_single &&
+make &&
+make_normal
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index b904eb7..7131421 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -8,11 +8,6 @@ config_query_option SEAMONKEY_CHAT
y \
'--enable-chat' \
'--disable-chat' &&
-config_query_option SEAMONKEY_CALENDAR \
- 'Build Calendar component?' \
- y \
- '--enable-calendar' \
- '--disable-calendar' &&
config_query_option SEAMONKEY_COMPOSER \
'Build Composer component?' \
y \
@@ -33,10 +28,6 @@ config_query_option SEAMONKEY_XINERAMA
n \
'--enable-xinerama' \
'--disable-xinerama' &&
-#Seems to only build with cairo
-config_query_list SEAMONKEY_RENDER \
- 'Possible SVG renderers:' \
- 'cairo' 'none' &&
#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 0b9e168..de26e51 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,12 +1,13 @@
-depends zip &&
-depends perl &&
-depends X11-LIBS '--with-x' &&
-depends zlib '--with-system-zlib' &&
-depends jpeg '--with-system-jpeg' &&
-depends libpng '--with-system-png' &&
-depends gtk+2 '--enable-default-toolkit=gtk2' &&
-depends libidl '--with-libIDL' &&
-depends nspr '--with-system-nspr' &&
+depends gtk+2 '--enable-default-toolkit=gtk2 --enable-xft
--disable-freetype2' &&
+depends jpeg '--with-system-jpeg' &&
+depends libpng '--with-system-png' &&
+depends libidl '--with-libIDL' &&
+depends nspr '--with-system-nspr' &&
+depends nss '--with-system-nss --enable-crypto' &&
+depends perl &&
+depends X11-LIBS '--with-x' &&
+depends zip &&
+depends zlib '--with-system-zlib' &&

if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
depends libxft
@@ -17,24 +18,19 @@ optional_depends openldap
'--enable-ldap' \
'--disable-ldap' \
'LDAP support' &&
-# Disabled until we get system nspr 4.6.1
-#optional_depends nspr \
-# '--with-system-nspr' \
-# '--without-system-nspr' \
-# 'NSPR support' &&
-optional_depends nss \
- '--enable-crypto' \
- '--disable-crypto' \
- 'for encrypted communications support (e.g. https://),
recommended' &&
+
optional_depends gnome-vfs2 \
"--enable-gnomevfs" \
"--disable-gnomevfs" \
"for smb:// url support (if enabled in gnome-vfs)" &&
+
optional_depends libgnomeui \
"--enable-gnomeui" \
"--disable-gnomeui" \
- "For GNOME UI support" &&
-#Seems to only build with cairo
-if [ "$SEAMONKEY_RENDER" == "cairo" ]; then
- depends cairo "--enable-system-cairo --enable-svg
--enable-svg-renderer=cairo"
-fi
+ "For GNOME UI support" #&&
+
+#optional_depends cairo \
+# "--enable-system-cairo \
+# --enable-svg --enable-svg-renderer=cairo" \
+# "" \
+# "for native SVG rendering"
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3b61e7f..93ef3f2 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,9 +1,9 @@
SPELL=seamonkey
- VERSION=1.0.7
+ VERSION=1.1
SOURCE=$SPELL-$VERSION.source.tar.bz2

-
SOURCE_HASH=sha512:6fcb9455fa2c08b94b4011bb2604cf13dbb3a4fa218ed5e7b0923cd5b0912b87bff983a2d351eaba19c46436b15f3d01d22f59dd7e288beca0b93c76d55722e3
-# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+#
SOURCE_HASH=sha512:6fcb9455fa2c08b94b4011bb2604cf13dbb3a4fa218ed5e7b0923cd5b0912b87bff983a2d351eaba19c46436b15f3d01d22f59dd7e288beca0b93c76d55722e3
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME

SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 23077bc..681c1e5 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,18 @@
+2007-01-24 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 1.1
+ * CONFIGURE: SEAMONKEY_CALENDAR is no longer available in seamonkey
+ Do not query for SVG renderers
+ * DEPENDS: Add more explicit flags to gtk+2 dependency
+ nss is no longer optional, but required
+ Add explicit flags to nss dependency
+ * PRE_BUILD: Do not apply seamonkey-visibility.patch
+ Do not forcefully remove nspr/nss, the flags should take care of
this
+ * BUILD: Remove a lot of flags that I have no idea what they do :)
+ SEAMONKEY_CALENDAR is no longer available in seamonkey
+ Return to normal make after running make
+ * seamonkey-visibility.patch: Removed obsolete patch
+ * security_manager_makefile.diff: Removed obsolete patch
+
2006-12-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.7, SECURITY_PATCH=3

http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonkey
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index bbe73f3..ec0245e 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -1,10 +1,9 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-mozilla_remove_nspr_nss &&
-patch -p0 < $SCRIPT_DIRECTORY/seamonkey-visibility.patch &&
+
# remove /root/.mozconfig, it causes too much trouble
if [ -f /root/.mozconfig ]; then
rm -f /root/.mozconfig
fi &&
+
# remove broken .mozconfig shipped with 1.0b
rm -f $SOURCE_DIRECTORY/.mozconfig
diff --git a/http/seamonkey/seamonkey-1.1.source.tar.bz2.sig
b/http/seamonkey/seamonkey-1.1.source.tar.bz2.sig
new file mode 100644
index 0000000..e13cbf8
Binary files /dev/null and b/http/seamonkey/seamonkey-1.1.source.tar.bz2.sig
differ
diff --git a/http/seamonkey/seamonkey-visibility.patch
b/http/seamonkey/seamonkey-visibility.patch
deleted file mode 100644
index 0ad6e6e..0000000
--- a/http/seamonkey/seamonkey-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure~ 2006-01-11 06:43:03.000000000 +0100
-+++ configure 2006-02-08 09:29:20.000000000 +0100
-@@ -7626,7 +7626,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
diff --git a/http/seamonkey/security_manager_makefile.diff
b/http/seamonkey/security_manager_makefile.diff
deleted file mode 100644
index 8fe6345..0000000
--- a/http/seamonkey/security_manager_makefile.diff
+++ /dev/null
@@ -1,141 +0,0 @@
---- mozilla/security/manager/Makefile.in~ 2006-01-05 16:40:17.000000000
+0100
-+++ mozilla/security/manager/Makefile.in 2006-02-08 09:41:15.000000000
+0100
-@@ -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 $@



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (974dc716d2fe1c29d58a1e89038ab55f6b61e3cd), Eric Sandall, 01/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page