[Lunar-commits] CVS: moonbase/web/firefox BUILD, 1.3, 1.4 DEPENDS,
1.1, 1.2 DETAILS, 1.2, 1.3 POST_INSTALL, 1.1, 1.2 POST_REMOVE,
1.1, 1.2
Moritz Heiber
moe at lunar-linux.org
Tue Jun 15 17:21:40 GMT 2004
Update of /var/cvs/lunar/moonbase/web/firefox
In directory dbguin.lunar-linux.org:/tmp/cvs-serv26754
Modified Files:
BUILD DEPENDS DETAILS POST_INSTALL POST_REMOVE
Log Message:
Complete rework of this module. Also prepared our own tarball since
the one from the mozilla ftp is broken (No chrome, browser or toolkit
directories).
Switching to cairo for svg rendering (works good) since libart_lgpl
doesn't seem to work for this fox. Did some tweaks on the BUILD file
and simplified POST_INSTALL and POST_REMOVE.
Last but not least: Moved firefox out of /opt and into /usr
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD 9 Apr 2004 19:35:32 -0000 1.3
+++ BUILD 15 Jun 2004 17:21:37 -0000 1.4
@@ -1,33 +1,30 @@
(
- MOZILLA_HOME=/opt/lunar/firefox/lib/mozilla
+ MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
OPTS="$OPTS --enable-strip --enable-strip-libs"
- OPTS="$OPTS --disable-toolkit-gtk --enable-default-toolkit=gtk2 --enable-toolkit=gtk2 --with-gtk2"
OPTS="$OPTS --disable-mathml"
OPTS="$OPTS --disable-accessibility"
OPTS="$OPTS --disable-jsd"
OPTS="$OPTS --enable-xft"
+ OPTS="$OPTS --enable-xterm-updates"
OPTS="$OPTS --disable-ldap"
- OPTS="$OPTS --enable-svg --enable-svg-renderer-libart"
+ OPTS="$OPTS --enable-svg --enable-svg-renderer-cairo"
OPTS="$OPTS --enable-extensions=default,-irc"
export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
export MOZ_NSS_AUTOCONF=1
export NATIVE_THEME_SUPPORT=1
export MOZ_PHOENIX=1
- export MOZ_INTERNAL_LIBART_LGPL=1
+ export MOZILLA_OFFICIAL=1
export BUILD_OPT=1
echo "$OPTS" > /tmp/mozz
unpack $SOURCE2 &&
- cd other-licenses &&
- unpack $SOURCE3 &&
- cd $SOURCE_DIRECTORY &&
-
+
./configure \
- --prefix=/opt/lunar/firefox \
+ --prefix=/usr \
--with-x \
--with-pthreads \
--enable-reorder \
@@ -41,6 +38,12 @@
--disable-mailnews \
--disable-composer \
--enable-crypto \
+ --disable-static \
+ --disable-logging \
+ --with-gtk2 \
+ --enable-default-toolkit=gtk2 \
+ --disable-toolkit-gtk \
+ --with-user-appdir=".firefox" \
$OPTS &&
default_make
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS 9 Feb 2004 12:38:01 -0000 1.1
+++ DEPENDS 15 Jun 2004 17:21:37 -0000 1.2
@@ -4,5 +4,6 @@
depends unzip &&
depends libIDL &&
depends gtk+-2 &&
+depends cairo &&
optional_depends "flash-plugin" "" "" "to enable shockwave flash"
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS 13 Feb 2004 01:39:12 -0000 1.2
+++ DETAILS 15 Jun 2004 17:21:37 -0000 1.3
@@ -1,18 +1,15 @@
MODULE=firefox
- VERSION=0.8
- SOURCE=$MODULE-source-$VERSION.tar.bz2
+ VERSION=0.9
+ SOURCE=$MODULE-$VERSION-source.tar.bz2
SOURCE2=firefox-0.8-lunar.tar.bz2
- SOURCE3=mozilla-libart.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
- SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/$SOURCE
- SOURCE_VFY=md5:cdc85152f4219bf3e3f1a8dc46e04654
+ SOURCE_URL[0]=http://de.lunar-linux.org/ffox/$SOURCE
+ SOURCE_VFY=md5:f6de5f2bcadfcd9626b6e1bed36c7ac8
SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
SOURCE2_VFY=md5:5aeecf3bdf9dcc9995d2d961d290439f
- SOURCE3_URL[0]=http://dbguin.lunar-linux.org/~nhudson/mozilla/$SOURCE3
- SOURCE3_VFY=md5:119f20f0c50b8554a1794ffdb6706c8d
WEB_SITE=http://www.mozilla.org/projects/firefox
ENTERED=20030810
- UPDATED=20040209
+ UPDATED=20040615
MAINTAINER="tchan at lunar-linux.org"
FUZZY="off"
SHORT="Mozilla Firefox is a speedy, full-featured web browser."
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL 9 Feb 2004 12:38:01 -0000 1.1
+++ POST_INSTALL 15 Jun 2004 17:21:37 -0000 1.2
@@ -1,37 +1,25 @@
-FIREFOX_HOME=/opt/lunar/firefox
-VERSION=1.6
+FIREFOX_HOME=/usr
+VERSION=0.9
FFOX_VERSION=0.8
+FFOX_LIBDIR=firefox-$VERSION
+J2SDK_VER=`lvu installed j2sdk`
-if [ "-d $FIREFOX_HOME/lib/mozilla-$VERSION/plugins" ] ; then
- mv $FIREFOX_HOME/lib/mozilla-$VERSION/plugins/libnullplugin.so $FIREFOX_HOME/mozilla-$VERSION
- rm -Rf $FIREFOX_HOME/lib/mozilla-$VERSION/plugins
-fi
-
-# Symlink
-cd $FIREFOX_HOME/lib
-rm -Rf $FIREFOX_HOME/lib/mozilla
-ln -sf "mozilla-$VERSION" mozilla
-
-cd $FIREFOX_HOME/include
-rm -Rf $FIREFOX_HOME/include/mozilla
-ln -sf "mozilla-$VERSION" mozilla
-
-cd $FIREFOX_HOME/lib/mozilla-$VERSION
mkdir -p /opt/lunar/plugins
-ln -sf /opt/lunar/plugins plugins
+ln -sf /opt/lunar/plugins $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
-export LD_LIBRARY_PATH="$FIREFOX_HOME/lib/mozilla-$VERSION:$FIREFOX_HOME/lib/mozilla-$VERSION/plugins:$FIREFOX_HOME/lib/mozilla-$VERSION/components"
-export MOZILLA_FIVE_HOME="$FIREFOX_HOME/lib/mozilla-$VERSION"
+export LD_LIBRARY_PATH="$FIREFOX_HOME/lib/$FFOX_LIBDIR:$FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins:$FIREFOX_HOME/lib/$FFOX_LIBDIR/components"
+export MOZILLA_FIVE_HOME="$FIREFOX_HOME/lib/$FFOX_LIBDIR"
ldconfig
-echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
-echo "locale,install,select,en-US" >> chrome/installed-chrome.txt
+echo "skin,install,select,classic/1.0" >> $FIREFOX_HOME/lib/$FFOX_LIBDIR/chrome/installed-chrome.txt
+echo "locale,install,select,en-US" >> $FIREFOX_HOME/lib/$FFOX_LIBDIR/chrome/installed-chrome.txt
+cd $FIREFOX_HOME/lib/$FFOX_LIBDIR
./regxpcom
./regchrome
if module_installed j2sdk; then
-ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so $FIREFOX_HOME/lib/mozilla/plugins/javaplugin_oji.so
+ln -sf /usr/lib/j2sdk${J2SDK_VER}/jre/plugin/i386/mozilla/javaplugin_oji.so $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins/javaplugin_oji.so
fi
if [ ! -d /usr/share/applications ] ; then
Index: POST_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/POST_REMOVE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_REMOVE 9 Feb 2004 12:38:01 -0000 1.1
+++ POST_REMOVE 15 Jun 2004 17:21:37 -0000 1.2
@@ -1,2 +1 @@
-rm -fr /opt/lunar/firefox/lib/mozilla*
-rm -fr /opt/lunar/firefox/include/mozilla*
+rm -f /usr/share/applications/firefox.desktop
More information about the Lunar-commits
mailing list