[Lunar-commits] CVS: moonbase/web/mozilla BUILD, 1.20,
1.21 CONFIGURE, 1.15, 1.16 DETAILS, 1.25, 1.26 POST_INSTALL,
1.9, 1.10 PRE_BUILD, 1.6, 1.7
Auke Kok
sofar at lunar-linux.org
Sun Oct 3 14:34:41 UTC 2004
Update of /var/cvs/lunar/moonbase/web/mozilla
In directory espresso.foo-projects.org:/tmp/cvs-serv8992
Modified Files:
BUILD CONFIGURE DETAILS POST_INSTALL PRE_BUILD
Log Message:
Mozilla update: rewritten some of the files extensively, update to 1.7.3 (yes it works the libart_lgpl now needs to be inserted externally).
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/BUILD,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- BUILD 15 Feb 2004 15:59:09 -0000 1.20
+++ BUILD 3 Oct 2004 14:34:38 -0000 1.21
@@ -1,26 +1,27 @@
(
- export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar
+
+ export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar
EXTENTIONS="default,finger,spellcheck"
if [ "$COM" == "n" ] ; then
OPTS="$OPTS --disable-composer"
else
- OPTS="$OPTS --enable-composer"
+ OPTS="$OPTS --enable-composer"
fi
if [ "$IRC" == "n" ] ; then
EXTENTIONS="$EXTENTIONS,-irc"
- fi
+ fi
if [ "$MATHML" == "n" ] ; then
OPTS="$OPTS --disable-mathml"
else
- OPTS="$OPTS --enable-mathml"
+ OPTS="$OPTS --enable-mathml"
fi
if [ "$ACC" == "n" ] ; then
OPTS="$OPTS --disable-accessibility"
- else
+ else
OPTS="$OPTS --enable-accessibility"
fi
@@ -38,8 +39,8 @@
if [ "$HELP" == "n" ] ; then
EXTENTIONS="$EXTENTIONS,-help"
fi
-
- unset CC CXX
+
+ unset CC CXX
export MOZ_NSS_AUTOCONF=1
export NATIVE_THEME_SUPPORT=1
export MOZILLA_USE_XFT=1
@@ -48,37 +49,37 @@
echo "$OPTS $EXTENTIONS" > /tmp/mozz
- ./configure --prefix=/usr \
- --with-default-mozilla-five-home=/usr/lib/mozilla-$VERSION \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --enable-xinerama \
- --with-system-jpeg \
- --with-system-zlib \
- --with-system-png \
- --with-system-mng \
- --with-pthreads \
- --enable-reorder \
- --disable-tests \
- --disable-installer \
- --disable-pedantic \
- --disable-debug \
- --disable-dtd-debug \
- --disable-toolkit-gtk \
- --disable-short-wchar \
- --disable-xprint \
- --enable-default-toolkit=gtk2 \
- --enable-toolkit=gtk2 \
- --with-gtk2 \
- --enable-strip \
+ ./configure --prefix=/usr \
+ --with-default-mozilla-five-home=/usr/lib/mozilla-$VERSION \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --enable-xinerama \
+ --with-system-jpeg \
+ --with-system-zlib \
+ --with-system-png \
+ --with-system-mng \
+ --with-pthreads \
+ --enable-reorder \
+ --disable-tests \
+ --disable-installer \
+ --disable-pedantic \
+ --disable-debug \
+ --disable-dtd-debug \
+ --disable-toolkit-gtk \
+ --disable-short-wchar \
+ --disable-xprint \
+ --enable-default-toolkit=gtk2 \
+ --enable-toolkit=gtk2 \
+ --with-gtk2 \
+ --enable-strip \
--enable-strip-libs \
- --enable-xft \
+ --enable-xft \
--disable-freetype2 \
- --enable-svg \
- --enable-svg-renderer-libart \
- --enable-crypto \
+ --enable-svg \
+ --enable-svg-renderer-libart \
+ --enable-crypto \
--enable-optimize="$CFLAGS" \
--enable-cpp-rtti \
--enable-xpctools \
@@ -87,27 +88,27 @@
--enable-xterm-updates \
--enable-extensions=all,${EXTENSIONS} \
$OPTS &&
- default_make &&
- #NSS Headers are already compiled I dont know why I havent
- #seen this till now
- NSS_INST_DIR=/usr/include/mozilla-$VERSION/nss
- mkdir -p $NSS_INST_DIR &&
-
- for dir in public private; do
- cp -Lf $SOURCE_DIRECTORY/dist/${dir}/nss/*.h $NSS_INST_DIR
- done &&
-
-# jol change. On clean install /usr/share/applications
-mkdir -p /usr/share/applications
-mkdir -p /usr/share/pixmaps
+ default_make &&
-cp $patchdir/mozilla.desktop /usr/share/applications/mozilla.desktop &&
-cp $patchdir/mozilla.png /usr/share/pixmaps/mozilla.png &&
+ # NSS Headers are already compiled I dont know why I havent
+ # seen this till now
+ NSS_INST_DIR=/usr/include/mozilla-$VERSION/nss
+ mkdir -p $NSS_INST_DIR &&
-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
+ for dir in public private ; do
+ cp -Lf $SOURCE_DIRECTORY/dist/${dir}/nss/*.h $NSS_INST_DIR
+ done &&
+
+ # jol change. On clean install /usr/share/applications
+ mkdir -p /usr/share/applications /usr/share/pixmaps
+
+ install $patchdir/mozilla.desktop /usr/share/applications/ &&
+ install $patchdir/mozilla.png /usr/share/pixmaps/ &&
+
+ if module_installed gnupg ; then
+ install $patchdir/mozilla-mail.png /usr/share/pixmaps/ &&
+ install $patchdir/mozilla-mail.desktop /usr/share/applications/
+ fi
) > $C_FIFO 2>&1
Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/CONFIGURE,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CONFIGURE 21 Oct 2003 02:10:42 -0000 1.15
+++ CONFIGURE 3 Oct 2004 14:34:38 -0000 1.16
@@ -1,56 +1,20 @@
-if ! grep -q "COM" $MODULE_CONFIG; then
- if query "Include mozilla Composer (gui html editing)?" y; then
- echo "COM=y" >> $MODULE_CONFIG
- else
- echo "COM=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
- else
- echo "IRC=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! grep -q "MATHML" $MODULE_CONFIG; then
- if query "Include MathML support?" y; then
- echo "MATHML=y" >> $MODULE_CONFIG
- else
- echo "MATHML=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! grep -q "ACC" $MODULE_CONFIG; then
- if query "Include Accesiblity support?" y; then
- echo "ACC=y" >> $MODULE_CONFIG
- else
- echo "ACC=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! grep -q "JSD" $MODULE_CONFIG; then
- if query "Include JavaScript debugging support?" y; then
- echo "JSD=y" >> $MODULE_CONFIG
- else
- echo "JSD=n" >> $MODULE_CONFIG
- fi
-fi
-
-if ! grep -q "INS" $MODULE_CONFIG; then
- if query "Include mozilla Inspector (html code inspector) support?" y; then
- echo "INS=y" >> $MODULE_CONFIG
- else
- echo "INS=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
+for OPTION in \
+"COM:y:Include mozilla Composer (gui html editing)?" \
+"IRC:y:Include Chatzilla (mozilla irc client)?" \
+"MATHML:y:Include MathML support?" \
+"ACC:y:Include Accesiblity support?" \
+"JSD:y:Include JavaScript debugging support?" \
+"INS:y:Include mozilla Inspector (html code inspector) support?" \
+"HELP:y:Include mozilla Help support?" \
+ ; do
+ NAME="$(echo "$OPTION" | cut -d: -f1)"
+ DEF="$(echo "$OPTION" | cut -d: -f2)"
+ DESC="$(echo "$OPTION" | cut -d: -f3-)"
+ if [ -z "$(get_module_config "$NAME")" ] ; then
+ if query "$DESC" $DEF ; then
+ set_module_config "$NAME" "y"
+ else
+ set_module_config "$NAME" "n"
+ fi
fi
-fi
-
+done
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/DETAILS,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- DETAILS 8 Aug 2004 17:13:37 -0000 1.25
+++ DETAILS 3 Oct 2004 14:34:38 -0000 1.26
@@ -1,24 +1,26 @@
MODULE=mozilla
- VERSION=1.7.2
+ VERSION=1.7.3
SOURCE=$MODULE-source-$VERSION.tar.bz2
SOURCE2=$MODULE-$VERSION-lunar.tar.bz2
+ SOURCE3=$MODULE-1.7.2-libart_lgpl.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$VERSION/src/$SOURCE
SOURCE_URL[1]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$VERSION/src/$SOURCE
SOURCE_URL[2]=http://archive.progeny.com/mozilla.org/mozilla/releases/mozilla$VERSION/src/$SOURCE
- SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+ SOURCE2_URL=$PATCH_URL/$SOURCE2
+ SOURCE3_URL=http://www.die.unipd.it/pub/Linux/distributions/gentoo-sources/distfiles/
WEB_SITE=http://www.mozilla.org
ENTERED=20010922
- UPDATED=20040808
- SOURCE_VFY=md5:262987cfcb793bab9fb1aebb21c527ce
- SOURCE2_VFY=md5:d4b1b20e137ea90f65ff1571216b9af1
- FUZZY="off"
+ UPDATED=20040928
+ SOURCE_VFY=sha1:ca588b12d944d478ebe193a76d4b487f8db1e38c
+ SOURCE2_VFY=md5:1a356c1c000df4fb4cf8d41253009db4
+ SOURCE3_VFY=sha1:f5cb4b4bce6d5b64c62e845479378598eb8596d8
SHORT="Mozilla is a Web browser."
cat << EOF
Mozilla is a Web browser that is being developed by the Free Software
-Community with the cooperation and support of Netscape. Initially,
-its development was based on an early version of Netscape Communicator 5.0.
-But most of it was disposed of halfway, and the current Mozilla is
-a completely new software based on the "NGLayout" layout engine
-developed for Netscape Communicator 6.
+Community with the cooperation and support of Netscape. Initially, its
+development was based on an early version of Netscape Communicator 5.0.
+But most of it was disposed of halfway, and the current Mozilla is a
+completely new software based on the "NGLayout" layout engine developed
+for Netscape Communicator 6.
EOF
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/POST_INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- POST_INSTALL 20 Aug 2004 08:05:35 -0000 1.9
+++ POST_INSTALL 3 Oct 2004 14:34:38 -0000 1.10
@@ -1,10 +1,10 @@
export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar
-cp $patchdir/mozilla-lunar-bookmarks.html /usr/lib/mozilla-$VERSION/defaults/profile/bookmarks.html
-cp $patchdir/mozilla-lunar-bookmarks.html /usr/lib/mozilla-$VERSION/defaults/profile/US/bookmarks.html
+install $patchdir/mozilla-lunar-bookmarks.html /usr/lib/mozilla-$VERSION/defaults/profile/
+install $patchdir/mozilla-lunar-bookmarks.html /usr/lib/mozilla-$VERSION/defaults/profile/US/bookmarks.html
# Ugly, eeek, explains need for chrooted installs
-if [ "-d /usr/lib/mozilla-$VERSION/plugins" ] ; then
- mv /usr/lib/mozilla-$VERSION/plugins/libnullplugin.so /usr/lib/mozilla-$VERSION
+if [ -d /usr/lib/mozilla-$VERSION/plugins ] ; then
+ mv /usr/lib/mozilla-$VERSION/plugins/libnullplugin.so /usr/lib/mozilla-$VERSION/
rm -Rf /usr/lib/mozilla-$VERSION/plugins
fi
@@ -15,10 +15,12 @@
ln -sf /opt/lunar/plugins /usr/lib/mozilla/plugins
if module_installed j2sdk; then
- ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so \
- /usr/lib/mozilla/plugins/javaplugin_oji.so;
+ ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so \
+ /usr/lib/mozilla/plugins/javaplugin_oji.so;
fi
-if module_installed epiphany; then lin -c -r epiphany; fi
-if module_installed galeon; then lin -c -r galeon; fi
-if module_installed galeon2; then lin -c -r galeon2; fi
+for mod in epiphany galeon galeon2 ; do
+ if module_installed $mod ; then
+ lin -c $mod
+ fi
+done
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/PRE_BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PRE_BUILD 15 Feb 2004 16:00:09 -0000 1.6
+++ PRE_BUILD 3 Oct 2004 14:34:38 -0000 1.7
@@ -1,14 +1,13 @@
-(
- patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar &&
- mk_source_dir $SOURCE_DIRECTORY &&
+patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar &&
+mk_source_dir $SOURCE_DIRECTORY &&
- cd $BUILD_DIRECTORY &&
- unpack $SOURCE &&
+cd $BUILD_DIRECTORY &&
+unpack $SOURCE &&
+unpack $SOURCE3 &&
- cd $SOURCE_DIRECTORY &&
- unpack $SOURCE2 &&
+cd $SOURCE_DIRECTORY &&
+unpack $SOURCE2 &&
- # Lunar branding
- cd $SOURCE_DIRECTORY &&
- cp $patchdir/region-browser.properties xpfe/browser/resources/locale/en-US/region.properties
-)
+# Lunar branding
+cd $SOURCE_DIRECTORY &&
+cp $patchdir/region-browser.properties xpfe/browser/resources/locale/en-US/
More information about the Lunar-commits
mailing list