CVS: moonbase/web/mozilla BUILD, 1.13, 1.14 CONFIGURE, 1.14,
1.15 DEPENDS, 1.10, 1.11 DETAILS, 1.17, 1.18 PRE_BUILD, 1.2, 1.3
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Tue Oct 21 02:10:44 GMT 2003
- Previous message: CVS: moonbase/devel/PyKDE BUILD, NONE, 1.1 DEPENDS, NONE,
1.1 DETAILS, NONE, 1.1 kzip.patch, NONE, 1.1
- Next message: CVS: moonbase/web/mozilla DETAILS,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/lunar/moonbase/web/mozilla
In directory dbguin.lunar-linux.org:/tmp/cvs-serv5091
Modified Files:
BUILD CONFIGURE DEPENDS DETAILS PRE_BUILD
Log Message:
Updating mozilla to new version 1.5, I took out enigmail support as you can install it via the enigmail website http://enigmail.mozdev.org due to it was getting to cumbersome to compile with the mozilla build. Also I added SVG support in the browser now
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/BUILD,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- BUILD 12 Sep 2003 03:52:45 -0000 1.13
+++ BUILD 21 Oct 2003 02:10:42 -0000 1.14
@@ -1,31 +1,11 @@
-( export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar &&
- EXTENTIONS="--enable-extensions=default,finger"
-
- STRIP_TEST=$(echo "$LDF" | grep "Strip")
-
- if [ -n "$STRIP_TEST" ] ; then
- OPTS="$OPTS --enable-strip --enable-strip-libs"
- fi
-
- # I'm considerign Gtk+1 obsolete here
- if [ "$GTK" == "y" ] ; then
- OPTS="$OPTS --disable-toolkit-gtk --enable-default-toolkit=gtk2 --enable-toolkit=gtk2 --with-gtk2"
- else
- OPTS="$OPTS --enable-toolkit-gtk"
- fi
-
- if [ "$MAIL" == "n" ] ; then
- OPTS="$OPTS --disable-mailnews"
- fi
+(
+ export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar &&
+ EXTENTIONS="--enable-extensions=default,finger,spellcheck"
if [ "$COM" == "n" ] ; then
OPTS="$OPTS --disable-composer"
fi
- if [ "$CAL" == "y" ] ; then
- OPTS="$OPTS --enable-calendar"
- fi
-
if [ "$IRC" == "n" ] ; then
EXTENTIONS="$EXTENTIONS,-irc"
fi
@@ -34,11 +14,6 @@
OPTS="$OPTS --disable-mathml"
fi
- if [ "$SVG" == "y" ] ; then
- OPTS="$OPTS --enable-svg"
- export MOZ_INTERNAL_LIBART_LGPL=1
- fi
-
if [ "$ACC" == "n" ] ; then
OPTS="$OPTS --disable-accessibility"
fi
@@ -52,25 +27,14 @@
EXTENTIONS="$EXTENTIONS,-inspector"
fi
- if [ "$CRYPTO" == "y" ] ; then
- OPTS="$OPTS --enable-crypto"
- fi
-
- if [ "$XFT" == "y" ] ; then
- OPTS="$OPTS --enable-xft"
- export MOZILLA_USE_XFT=1
- fi
-
- if [ "$LDAP" == "n" ] ; then
- OPTS="$OPTS --disable-ldap"
- fi
-
if [ "$HELP" == "n" ] ; then
EXTENTIONS="$EXTENTIONS,-help"
fi
export MOZ_NSS_AUTOCONF=1
export NATIVE_THEME_SUPPORT=1
+ export MOZILLA_USE_XFT=1
+ export MOZ_INTERNAL_LIBART_LGPL=1
echo "$OPTS $EXTENTIONS" > /tmp/mozz
@@ -86,7 +50,6 @@
--with-system-zlib \
--with-system-png \
--with-system-mng \
- --enable-old-abi-compat-wrappers \
--with-pthreads \
--enable-reorder \
--disable-tests \
@@ -94,26 +57,30 @@
--disable-pedantic \
--disable-debug \
--disable-dtd-debug \
- --enable-cpp-rtti \
+ --disable-toolkit-gtk \
+ --enable-default-toolkit=gtk2 \
+ --enable-toolkit=gtk2 \
+ --with-gtk2 \
+ --enable-strip \
+ --enable-strip-libs \
+ --enable-xft \
+ --enable-svg \
+ --enable-svg-renderer-libart \
+ --enable-crypto \
+ --enable-optimize="$CFLAGS" \
+ --enable-cpp-rtti \
+ --enable-xpctools \
$OPTS \
$EXTENTIONS &&
-make &&
-if [ "$ENIG" == "y" ] ; then
- cd extensions/ipc &&
- make &&
- cd ../enigmail &&
- make &&
- make install
-fi &&
-
-cd $SOURCE_DIRECTORY &&
+ default_make &&
-make install &&
+cp $patchdir/mozilla.desktop /usr/share/applications/mozilla.desktop &&
+cp $patchdir/mozilla.png /usr/share/pixmaps/mozilla.png &&
- cp $patchdir/mozilla.desktop /usr/share/applications &&
- cp $patchdir/mozilla-mail.desktop /usr/share/applications &&
- cp $patchdir/mozilla.png /usr/share/pixmaps &&
- cp $patchdir/mozilla-mail.png /usr/share/pixmaps
+if module_installed gnupg; then
+ cp $patchdir/mozilla-mail.png /usr/share/pixmaps/mozilla-mail.png &&
+ cp $patchdir/mozilla-mail.desktop /usr/share/applications/mozilla-mail.desktop
+fi
) > $C_FIFO 2>&1
Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/CONFIGURE,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CONFIGURE 6 Aug 2003 21:39:36 -0000 1.14
+++ CONFIGURE 21 Oct 2003 02:10:42 -0000 1.15
@@ -1,20 +1,3 @@
-if ! grep -q "MAIL" $MODULE_CONFIG; then
- if query "Include mozilla mail and news?" y; then
- echo "MAIL=y" >> $MODULE_CONFIG
- else
- echo "MAIL=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! grep -q "ENIG" $MODULE_CONFIG; then
- if query "Build Enigmail for GPG Support" y; then
- echo "ENIG=y" >> $MODULE_CONFIG
- else
- echo "ENIG=n" >> $MODULE_CONFIG
- fi
-fi
-
-# In this version we can finaly, not build composer
if ! grep -q "COM" $MODULE_CONFIG; then
if query "Include mozilla Composer (gui html editing)?" y; then
echo "COM=y" >> $MODULE_CONFIG
@@ -23,14 +6,6 @@
fi
fi
-if ! grep -q "CAL" $MODULE_CONFIG; then
- if query "Include mozilla calendar?" n; then
- echo "CAL=y" >> $MODULE_CONFIG
- else
- echo "CAL=n" >> $MODULE_CONFIG
- fi
-fi
-
if ! grep -q "IRC" $MODULE_CONFIG; then
if query "Include Chatzilla (mozilla irc client)?" y; then
echo "IRC=y" >> $MODULE_CONFIG
@@ -47,14 +22,6 @@
fi
fi
-if ! grep -q "SVG" $MODULE_CONFIG; then
- if query "Include SVG (Scalabe vector graphics, image format) support?" n; then
- echo "SVG=y" >> $MODULE_CONFIG
- else
- echo "SVG=n" >> $MODULE_CONFIG
- fi
-fi
-
if ! grep -q "ACC" $MODULE_CONFIG; then
if query "Include Accesiblity support?" y; then
echo "ACC=y" >> $MODULE_CONFIG
@@ -79,59 +46,11 @@
fi
fi
-# Crypto not stock, but we do it default cause people bitch when they don't have htts
-# and the have to recompile.
-if ! grep -q "CRYPTO" $MODULE_CONFIG; then
- if query "Include crypto (https) support?" y; then
- echo "CRYPTO=y" >> $MODULE_CONFIG
- else
- echo "CRYPTO=n" >> $MODULE_CONFIG
- fi
-fi
-
- if ! grep -q "XFT" $MODULE_CONFIG; then
- if query "Include Xft (X client side fonts) support?" y; then
- echo "XFT=y" >> $MODULE_CONFIG
- else
- echo "XFT=n" >> $MODULE_CONFIG
- fi
- fi
-
-if ! grep -q "LDAP" $MODULE_CONFIG; then
- if query "Include LDAP support?" n; then
- echo "LDAP=y" >> $MODULE_CONFIG
- else
- echo "LDAP=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! grep -q "GTK" $MODULE_CONFIG; then
- if query "Use Gtk2 instead of Gtk1? (needs Gtk1 for galeon 1)" y; then
- echo "GTK=y" >> $MODULE_CONFIG
- else
- echo "GTK=n" >> $MODULE_CONFIG
- fi
-fi
-
if ! grep -q "HELP" $MODULE_CONFIG; then
if query "Include mozilla Help support?" y; then
echo "HELP=y" >> $MODULE_CONFIG
else
echo "HELP=n" >> $MODULE_CONFIG
fi
-fi
-
-if ! grep -q "STRIP_TEST" $MODULE_CONFIG; then
- if query "Add Stripping of libraries" y; then
- echo "STRIP_TEST=y" >> $MODULE_CONFIG
- else
- echo "STRIP_TEST=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! module_installed j2sdk; then
- if query "Install j2sdk for Java support? " y; then
- lin j2sdk
- fi
fi
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/DEPENDS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- DEPENDS 6 Aug 2003 21:39:36 -0000 1.10
+++ DEPENDS 21 Oct 2003 02:10:42 -0000 1.11
@@ -1,31 +1,16 @@
-depends zlib &&
-depends jpeg &&
-depends libpng &&
-depends libmng &&
-depends ORBit2 &&
-depends zip &&
-depends unzip &&
-depends libIDL &&
+depends zlib &&
+depends jpeg &&
+depends libpng &&
+depends libmng &&
+depends ORBit2 &&
+depends zip &&
+depends unzip &&
+depends libIDL &&
depends freetype2 &&
+depends gtk+-2 &&
+depends librsvg &&
-optional_depends "flash-plugin" "" "" "to enable shockwave flash" &&
-
-# optional_depends "j2sdk" "" "" "to enable java in mozilla" &&
-
-if [ "$GTK1" == "y" ] ; then
- depends gtk+
-else
- depends gtk+-2
-fi
-
-if [ "$SVG" == "y" ] ; then
- depends librsvg
-fi
-
-if [ "$CAL" == "y" ] ; then
- depends libical
-fi
+optional_depends "libical" "--enable-calendar" "" "Enable Calendar Support" &&
+optional_depends "gnupg" "" "--disable-mailnews" "Enable Email Support" &&
+optional_depends "openldap" "" "--disable-ldap" "Enable LDAP Support?"
-if [ "$ENIG" == "y" ] ; then
- depends gnupg
-fi
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/DETAILS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- DETAILS 12 Sep 2003 03:52:45 -0000 1.17
+++ DETAILS 21 Oct 2003 02:10:42 -0000 1.18
@@ -1,23 +1,20 @@
MODULE=mozilla
- VERSION=1.4
+ VERSION=1.5
SOURCE=$MODULE-source-$VERSION.tar.bz2
SOURCE2=$MODULE-$VERSION-lunar.tar.bz2
- SOURCE3=enigmail-0.75.0.tar.gz
- SOURCE4=ipc-1.0.3.tar.gz
+ SOURCE3=mozilla-libart.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla/releases/mozilla$VERSION/src/$SOURCE
SOURCE_URL[1]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/mozilla/releases/mozilla$VERSION/src/$SOURCE
SOURCE_URL[2]=http://archive.progeny.com/mozilla/releases/mozilla$VERSION/src/$SOURCE
SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
- SOURCE3_URL[0]=http://enigmail.mozdev.org/dload/src/$SOURCE3
- SOURCE4_URL[0]=http://enigmail.mozdev.org/dload/src/$SOURCE4
+ SOURCE3_URL[0]=http://dbguin.lunar-linux.org/~nhudson/mozilla/$SOURCE3
WEB_SITE=http://www.mozilla.org
ENTERED=20010922
- UPDATED=20030912
- SOURCE_VFY=md5:a4644caeeeb323d0d8b59758b67d4454
- SOURCE2_VFY=md5:fd8411cdb78f8b184f47a289988ef562
- SOURCE3_VFY=md5:315065f83c65a8ec09a6301ead2c7162
- SOURCE4_VFY=md5:e74a2050826326a24631be4d8ed3d902
+ UPDATED=20031021
+ SOURCE_VFY=md5:9d59651eac39a95da756d38fe5385896
+ SOURCE2_VFY=md5:e05dc67a72c2a28000077f60e4d753b6
+ SOURCE3_VFY=md5:119f20f0c50b8554a1794ffdb6706c8d
FUZZY="off"
SHORT="Mozilla is a Web browser."
cat << EOF
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/PRE_BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PRE_BUILD 4 Jul 2003 04:10:50 -0000 1.2
+++ PRE_BUILD 21 Oct 2003 02:10:42 -0000 1.3
@@ -6,18 +6,14 @@
unpack $SOURCE &&
cd $SOURCE_DIRECTORY &&
- unpack $SOURCE2 &&
-# patch_it $patchdir/xpfe-bootstrap.diff 0
+ unpack $SOURCE2 &&
+ patch_it $patchdir/xpfe-bootstrap.diff 0 &&
+ patch_it $patchdir/libreg-standalone.diff 0 &&
-if [ "$ENIG" == "y" ] ; then
- cd $SOURCE_DIRECTORY/extensions &&
- unpack $SOURCE3 &&
- unpack $SOURCE4 &&
- patch_it $patchdir/enigmail-src.diff 1
-fi
+ cd other-licenses &&
+ unpack $SOURCE3 &&
# Lunar branding
cd $SOURCE_DIRECTORY &&
- patch_it $patchdir/mozilla-lunar-home-page.patch 1 &&
- patch_it $patchdir/mozilla-lunar-mail-homepage.patch 0
+ cp $patchdir/region-browser.properties xpfe/browser/resources/locale/en-US/region.properties
)
- Previous message: CVS: moonbase/devel/PyKDE BUILD, NONE, 1.1 DEPENDS, NONE,
1.1 DETAILS, NONE, 1.1 kzip.patch, NONE, 1.1
- Next message: CVS: moonbase/web/mozilla DETAILS,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Lunar-commits
mailing list