CVS: crater/web/mozilla BUILD, 1.6, 1.7 CONFIGURE, 1.5, 1.6 DEPENDS,
1.6, 1.7 DETAILS, 1.4, 1.5 POST_INSTALL, 1.12, 1.13 PRE_BUILD,
1.2, 1.3
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Wed Oct 15 03:55:09 GMT 2003
Update of /var/cvs/lunar/crater/web/mozilla
In directory dbguin.lunar-linux.org:/tmp/cvs-serv14271
Modified Files:
BUILD CONFIGURE DEPENDS DETAILS POST_INSTALL PRE_BUILD
Log Message:
Updating for new version of mozilla 1.4.1
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD 23 Jun 2003 02:04:54 -0000 1.6
+++ BUILD 15 Oct 2003 03:55:07 -0000 1.7
@@ -1,20 +1,8 @@
-( export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar &&
+(
+ 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
+ if module_installed gnupg; then
OPTS="$OPTS --disable-mailnews"
fi
@@ -22,10 +10,6 @@
OPTS="$OPTS --disable-composer"
fi
- if [ "$CAL" == "y" ] ; then
- OPTS="$OPTS --enable-calendar"
- fi
-
if [ "$IRC" == "n" ] ; then
EXTENTIONS="$EXTENTIONS,-irc"
fi
@@ -34,11 +18,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,26 +31,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 PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig:/opt/lunar/gnome/2/lib/pkgconfig
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
@@ -95,12 +62,19 @@
--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-crypto \
$OPTS \
$EXTENTIONS &&
make &&
-if [ "$ENIG" == "y" ] ; then
+if module_installed gnupg; then
cd extensions/ipc &&
make &&
cd ../enigmail &&
@@ -112,9 +86,12 @@
make install &&
- 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
+ cp $patchdir/mozilla.desktop /usr/share/applications/mozilla.desktop &&
+ cp $patchdir/mozilla.png /usr/share/pixmaps/mozilla.png &&
+
+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/crater/web/mozilla/CONFIGURE,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CONFIGURE 23 Jun 2003 02:04:54 -0000 1.5
+++ CONFIGURE 15 Oct 2003 03:55:07 -0000 1.6
@@ -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,53 +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
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/DEPENDS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DEPENDS 23 Jun 2003 02:04:54 -0000 1.6
+++ DEPENDS 15 Oct 2003 03:55:07 -0000 1.7
@@ -1,30 +1,17 @@
-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" "" "" "Enable gpg signing" &&
+optional_depends "openldap" "" "--disable-ldap" "Enable LDAP Support?" &&
+optional_depends "flash-plugin" "" "" "to enable shockwave flash"
-if [ "$ENIG" == "y" ] ; then
- depends gnupg
-fi
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/DETAILS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DETAILS 23 Jun 2003 02:04:54 -0000 1.4
+++ DETAILS 15 Oct 2003 03:55:07 -0000 1.5
@@ -1,8 +1,8 @@
MODULE=mozilla
- VERSION=1.4b
+ VERSION=1.4.1
SOURCE=$MODULE-source-$VERSION.tar.bz2
SOURCE2=$MODULE-$VERSION-lunar.tar.bz2
- SOURCE3=enigmail-0.75.0.tar.gz
+ SOURCE3=enigmail-0.76.7.tar.gz
SOURCE4=ipc-1.0.3.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla/releases/mozilla$VERSION/src/$SOURCE
@@ -13,9 +13,11 @@
SOURCE4_URL[0]=http://enigmail.mozdev.org/dload/src/$SOURCE4
WEB_SITE=http://www.mozilla.org
ENTERED=20010922
- UPDATED=20030508
- # SOURCE_MD5=b3a1442a1365461e5ad3e2cc633dd8c0
- # SOURCE2_MD5=c4b35d42aa8f408a0fc58e81a6131ade
+ UPDATED=20031015
+ SOURCE_VFY=md5:a1b72d97981cabb6160526d8c8d97ac1
+ SOURCE2_VFY=md5:928a2fec1d6a2356691b66dfe4039b7e
+ SOURCE3_VFY=md5:6524ba86e4b3fbf85306bf3cedcf3924
+ SOURCE4_VFY=md5:e74a2050826326a24631be4d8ed3d902
FUZZY="off"
SHORT="Mozilla is a Web browser."
cat << EOF
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/POST_INSTALL,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- POST_INSTALL 23 Jun 2003 02:04:54 -0000 1.12
+++ POST_INSTALL 15 Oct 2003 03:55:07 -0000 1.13
@@ -32,3 +32,8 @@
./regchrome
ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
+
+rm -fr $BOOST_LOCK
+
+if module_installed epiphany; then lin -c -r epiphany; fi
+if module_installed galeon2; then lin -c -r galeon2; fi
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/PRE_BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PRE_BUILD 23 Jun 2003 02:04:54 -0000 1.2
+++ PRE_BUILD 15 Oct 2003 03:55:07 -0000 1.3
@@ -7,17 +7,17 @@
cd $SOURCE_DIRECTORY &&
unpack $SOURCE2 &&
-# patch_it $patchdir/xpfe-bootstrap.diff 0
-if [ "$ENIG" == "y" ] ; then
+if module_installed gnupg; then
cd $SOURCE_DIRECTORY/extensions &&
unpack $SOURCE3 &&
- unpack $SOURCE4 &&
- patch_it $patchdir/enigmail-src.diff 1
-fi
+ unpack $SOURCE4
+else
+ true
+fi &&
# 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 &&
+ cp $patchdir/region-mail.properties mailnews/base/resources/locale/en-US/region.properties
)
More information about the Lunar-commits
mailing list