CVS: moonbase/web/MozillaFirebird BUILD, 1.4, 1.5 DEPENDS, 1.1,
1.2 DETAILS, 1.2, 1.3 POST_INSTALL, 1.2, 1.3 CONFLICTS, 1.1, NONE
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Tue Sep 23 02:57:05 GMT 2003
Update of /var/cvs/lunar/moonbase/web/MozillaFirebird
In directory dbguin.lunar-linux.org:/tmp/cvs-serv17395
Modified Files:
BUILD DEPENDS DETAILS POST_INSTALL
Removed Files:
CONFLICTS
Log Message:
Ok I have been hacking on this all night and finally I got a solution that will work. It will install firebird to /opt so that mozilla can be installed at the same time and nothing will conflict. I added a icon and a .desktop file so that it will show up in the KDE and Gnome menu's. I removed the CONFLICTS file because its no longer needed and at last I added xft support for much better looking fonts
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/MozillaFirebird/BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BUILD 22 Sep 2003 03:36:02 -0000 1.4
+++ BUILD 23 Sep 2003 02:57:03 -0000 1.5
@@ -1,55 +1,45 @@
-(
-
- EXTENTIONS="--enable-extensions=default,finger"
+(
+ MOZILLA_HOME=/opt/lunar/firebird/lib/mozilla
+
OPTS="$OPTS --enable-strip --enable-strip-libs"
OPTS="$OPTS --disable-toolkit-gtk --enable-default-toolkit=gtk2 --enable-toolkit=gtk2 --with-gtk2"
- OPTS="$OPTS --enable-crypto"
- OPTS="$OPTS --disable-mailnews"
- OPTS="$OPTS --disable-composer"
- EXTENTIONS="$EXTENTIONS,-irc"
OPTS="$OPTS --disable-mathml"
OPTS="$OPTS --disable-accessibility"
OPTS="$OPTS --disable-jsd"
- EXTENTIONS="$EXTENTIONS,-venkman"
- EXTENTIONS="$EXTENTIONS,-inspector"
+ OPTS="$OPTS --enable-xft"
OPTS="$OPTS --disable-ldap"
- EXTENTIONS="$EXTENTIONS,-help"
export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig:/opt/lunar/gnome/2.4/lib/pkgconfig:/opt/lunar/gnome/2/lib/pkgconfig
export MOZ_NSS_AUTOCONF=1
export NATIVE_THEME_SUPPORT=1
export MOZ_PHOENIX=1
- echo "$OPTS $EXTENTIONS" > /tmp/mozz
+ echo "$OPTS" > /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 \
- --with-system-jpeg \
- --with-system-zlib \
- --with-system-png \
- --with-system-mng \
- --enable-old-abi-compat-wrappers \
- --with-pthreads \
- --enable-reorder \
- --disable-tests \
- --disable-installer \
- --disable-pedantic \
- --disable-debug \
- --disable-dtd-debug \
- --enable-cpp-rtti \
- $OPTS \
- $EXTENTIONS &&
-make &&
+ unpack $SOURCE2 &&
+ ./configure \
+ --prefix=/opt/lunar/firebird \
+ --with-x \
+ --with-pthreads \
+ --enable-reorder \
+ --enable-cpp-rtti \
+ --enable-optimize="$CFLAGS" \
+ --with-default-mozilla-five-home=$MOZILLA_HOME \
+ --disable-debug \
+ --disable-tests \
+ --disable-installer \
+ --disable-pedantic \
+ --disable-mailnews \
+ --disable-composer \
+ --enable-crypto \
+ $OPTS &&
+ make &&
-cd $SOURCE_DIRECTORY &&
+ cd $SOURCE_DIRECTORY &&
-make install
+ make install
) > $C_FIFO 2>&1
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/MozillaFirebird/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS 17 Sep 2003 03:01:41 -0000 1.1
+++ DEPENDS 23 Sep 2003 02:57:03 -0000 1.2
@@ -8,7 +8,6 @@
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" &&
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/MozillaFirebird/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS 22 Sep 2003 03:36:02 -0000 1.2
+++ DETAILS 23 Sep 2003 02:57:03 -0000 1.3
@@ -1,12 +1,15 @@
MODULE=MozillaFirebird
VERSION=0.6.1
SOURCE=$MODULE-source-$VERSION.tar.bz2
+ SOURCE2=firebird-$VERSION-lunar.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
SOURCE_URL[0]=http://ftp.mozilla.org/pub/firebird/releases/$VERSION/$SOURCE
SOURCE_VFY=md5:35191de0d02601f7a190b5065a26de85
+ SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+ SOURCE2_VFY=md5:4d4d4774133de11590262ab4f2038196
WEB_SITE=http://www.mozilla.org/projects/firebird
ENTERED=20030810
- UPDATED=20030921
+ UPDATED=20030923
MAINTAINER="tchan at lunar-linux.org"
FUZZY="off"
SHORT="Mozilla Firebird is a speedy, full-featured web browser."
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/MozillaFirebird/POST_INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_INSTALL 17 Sep 2003 06:10:36 -0000 1.2
+++ POST_INSTALL 23 Sep 2003 02:57:03 -0000 1.3
@@ -1,24 +1,25 @@
+FIREBIRD_HOME=/opt/lunar/firebird
VERSION=1.5a
-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
+if [ "-d $FIREBIRD_HOME/lib/mozilla-$VERSION/plugins" ] ; then
+ mv $FIREBIRD_HOME/lib/mozilla-$VERSION/plugins/libnullplugin.so $FIREBIRD_HOME/mozilla-$VERSION
+ rm -Rf $FIREBIRD_HOME/lib/mozilla-$VERSION/plugins
fi
# Symlink
-cd /usr/lib
-rm -Rf /usr/lib/mozilla
+cd $FIREBIRD_HOME/lib
+rm -Rf $FIREBIRD_HOME/mozilla
ln -sf "mozilla-$VERSION" mozilla
-cd /usr/include
-rm -Rf /usr/include/mozilla
+cd $FIREBIRD_HOME/include
+rm -Rf $FIREBIRD_HOME/include/mozilla
ln -sf "mozilla-$VERSION" mozilla
-cd /usr/lib/mozilla-$VERSION
+cd $FIREBIRD_HOME/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"
+export LD_LIBRARY_PATH="$FIREBIRD_HOME/lib/mozilla-$VERSION:$FIREBIRD_HOME/lib/mozilla-$VERSION/plugins:$FIREBIRD_HOME/lib/mozilla-$VERSION/components"
+export MOZILLA_FIVE_HOME="$FIREBIRD_HOME/lib/mozilla-$VERSION"
ldconfig
echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
@@ -27,5 +28,7 @@
./regxpcom
./regchrome
-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 $FIREBIRD_HOME/lib/mozilla/plugins/javaplugin_oji.so
+cp $SOURCE_DIRECTORY/firebird-0.6.1-lunar/firebird.desktop /usr/share/applications/ &&
+cp $SOURCE_DIRECTORY/firebird-0.6.1-lunar/firebird.xpm /usr/share/pixmaps
--- CONFLICTS DELETED ---
More information about the Lunar-commits
mailing list