[Lunar-commits] r16238 - moonbase/trunk/web/firefox

[Terry Chan]

Author: tchan
Date: 2005-08-27 04:40:58 +0000 (Sat, 27 Aug 2005)
New Revision: 16238

Modified:
   moonbase/trunk/web/firefox/BUILD
   moonbase/trunk/web/firefox/DEPENDS
Log:
Fixed firefox by disabling svg and now it will compile correctly when
cairo-1.0.0 is installed on a lunar box.  cairo-1.0.0 is required by
gtk+-2.8.2.


Modified: moonbase/trunk/web/firefox/BUILD
===================================================================
--- moonbase/trunk/web/firefox/BUILD	2005-08-27 04:39:27 UTC (rev 16237)
+++ moonbase/trunk/web/firefox/BUILD	2005-08-27 04:40:58 UTC (rev 16238)
@@ -39,8 +39,7 @@
     --enable-strip	\
     --enable-strip-libs \
     --enable-xterm-updates	\
-    --enable-svg	\
-    --enable-svg-renderer-cairo	\
+    --disable-svg	\
     --enable-plaintext-editor-only	\
     --disable-debug     \
     --disable-tests     \
@@ -70,10 +69,9 @@
     
     # Now the .desktop file and the icon
     install -d /usr/share/applications /usr/share/pixmaps &&
-    install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications
+    install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications &&
     # please, dont just let the lin fail because /usr/share/pixmaps/firefox.xpm is an existing symlink...
     rm -f /usr/share/pixmaps/firefox.xpm &&
-    install -m644 $MOZILLA_HOME/icons/default.xpm \
-		  /usr/share/pixmaps/firefox.xpm
+    install -m644 $MOZILLA_HOME/icons/default.xpm /usr/share/pixmaps/firefox.xpm
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/web/firefox/DEPENDS
===================================================================
--- moonbase/trunk/web/firefox/DEPENDS	2005-08-27 04:39:27 UTC (rev 16237)
+++ moonbase/trunk/web/firefox/DEPENDS	2005-08-27 04:40:58 UTC (rev 16238)
@@ -1,10 +1,10 @@
 depends libmng &&
 depends libIDL &&
+depends ORBit2 &&
 depends zip    &&
 depends unzip  &&
 depends expat  &&
 depends gtk+-2 &&
-depends cairo  &&
 
 optional_depends "flash-plugin" "" "" "to enable shockwave flash" &&
 optional_depends "gnome-vfs2" "" \