[Lunar-commits]
CVS: moonbase/web/mozilla BUILD, 1.19, 1.20 DETAILS,
1.21, 1.22 POST_INSTALL, 1.7, 1.8
Nick Hudson
nhudson at lunar-linux.org
Sun Feb 15 15:59:11 GMT 2004
Update of /var/cvs/lunar/moonbase/web/mozilla
In directory dbguin.lunar-linux.org:/tmp/cvs-serv8036
Modified Files:
BUILD DETAILS POST_INSTALL
Log Message:
Fixing the mozilla module to install the NSS header files needed to compile some modules with ssl support, for example gaim. Also I took out the SOURCE3 because its no longer needed and cleaned up the POST_INSTALL file because some of those things arent needed anymore.
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/BUILD,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- BUILD 12 Feb 2004 15:07:31 -0000 1.19
+++ BUILD 15 Feb 2004 15:59:09 -0000 1.20
@@ -1,9 +1,11 @@
(
- export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar &&
- EXTENTIONS="--enable-extensions=default,finger,spellcheck"
+ export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar
+ EXTENTIONS="default,finger,spellcheck"
if [ "$COM" == "n" ] ; then
OPTS="$OPTS --disable-composer"
+ else
+ OPTS="$OPTS --enable-composer"
fi
if [ "$IRC" == "n" ] ; then
@@ -12,15 +14,21 @@
if [ "$MATHML" == "n" ] ; then
OPTS="$OPTS --disable-mathml"
+ else
+ OPTS="$OPTS --enable-mathml"
fi
if [ "$ACC" == "n" ] ; then
OPTS="$OPTS --disable-accessibility"
+ else
+ OPTS="$OPTS --enable-accessibility"
fi
if [ "$JSD" == "n" ] ; then
OPTS="$OPTS --disable-jsd"
EXTENTIONS="$EXTENTIONS,-venkman"
+ else
+ OPTS="$OPTS --enable-jsd"
fi
if [ "$INS" == "n" ] ; then
@@ -30,52 +38,66 @@
if [ "$HELP" == "n" ] ; then
EXTENTIONS="$EXTENTIONS,-help"
fi
-
+
+ unset CC CXX
export MOZ_NSS_AUTOCONF=1
export NATIVE_THEME_SUPPORT=1
export MOZILLA_USE_XFT=1
- export BUILD_OPT=1
export MOZ_INTERNAL_LIBART_LGPL=1
+ export BUILD_OPT=1
echo "$OPTS $EXTENTIONS" > /tmp/mozz
- # Force Xinerama, it's small as hell and if some one wants to use it, he won't complain of recompiling mozilla
./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 \
- --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 &&
-
- default_make &&
+ --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 \
+ --disable-freetype2 \
+ --enable-svg \
+ --enable-svg-renderer-libart \
+ --enable-crypto \
+ --enable-optimize="$CFLAGS" \
+ --enable-cpp-rtti \
+ --enable-xpctools \
+ --enable-xsl \
+ --enable-ipv6 \
+ --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
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/DETAILS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- DETAILS 18 Jan 2004 16:15:30 -0000 1.21
+++ DETAILS 15 Feb 2004 15:59:09 -0000 1.22
@@ -2,20 +2,17 @@
VERSION=1.6
SOURCE=$MODULE-source-$VERSION.tar.bz2
SOURCE2=$MODULE-$VERSION-lunar.tar.bz2
- 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
SOURCE_URL[3]=http://dbguin.lunar-linux.org/~nhudson/mozilla/$SOURCE
SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
- SOURCE3_URL[0]=http://dbguin.lunar-linux.org/~nhudson/mozilla/$SOURCE3
WEB_SITE=http://www.mozilla.org
ENTERED=20010922
UPDATED=20040118
SOURCE_VFY=md5:da612f8768320dbafd0bfb3c254c2788
SOURCE2_VFY=md5:029996cbe100c10c77be2eb6e4f7bafb
- SOURCE3_VFY=md5:119f20f0c50b8554a1794ffdb6706c8d
FUZZY="off"
SHORT="Mozilla is a Web browser."
cat << EOF
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/POST_INSTALL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- POST_INSTALL 21 Oct 2003 03:25:57 -0000 1.7
+++ POST_INSTALL 15 Feb 2004 15:59:09 -0000 1.8
@@ -7,33 +7,20 @@
mv /usr/lib/mozilla-$VERSION/plugins/libnullplugin.so /usr/lib/mozilla-$VERSION
rm -Rf /usr/lib/mozilla-$VERSION/plugins
fi
-
-# Symlink
-cd /usr/lib
-rm -Rf /usr/lib/mozilla
-ln -sf "mozilla-$VERSION" mozilla
-cd /usr/include
-rm -Rf /usr/include/mozilla
-ln -sf "mozilla-$VERSION" mozilla
+ln -sf /usr/lib/mozilla-$VERSION /usr/lib/mozilla
+ln -sf /usr/include/mozilla-$VERSION /usr/include/mozilla
-cd /usr/lib/mozilla-$VERSION
mkdir -p /opt/lunar/plugins
-ln -sf /opt/lunar/plugins plugins
-
-export LD_LIBRARY_PATH="/usr/lib/mozilla-$VERSION:/usr/lib/mozilla-$VERSION/plugins:/usr/lib/mozilla-$VERSION/components"
-export MOZILLA_FIVE_HOME="/usr/lib/mozilla-$VERSION"
-ldconfig
-
-echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
-echo "locale,install,select,en-US" >> chrome/installed-chrome.txt
-
-./regxpcom
-./regchrome
+ln -sf /opt/lunar/plugins /usr/lib/mozilla/plugins
-ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
+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;
+fi
rm -fr $BOOST_LOCK
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
More information about the Lunar-commits
mailing list