Author: alexander
Date: 2006-02-02 09:00:29 -0700 (Thu, 02 Feb 2006)
New Revision: 1390

Modified:
   trunk/packages/mozilla/.mozconfig
   trunk/packages/mozilla/Makefile
Log:
Upgraded to Seamonkey-1.0.

This commit is broken, because SVN doesn't like moving modified files.


Modified: trunk/packages/mozilla/.mozconfig
===================================================================
--- trunk/packages/mozilla/.mozconfig   2006-02-02 15:57:33 UTC (rev 1389)
+++ trunk/packages/mozilla/.mozconfig   2006-02-02 16:00:29 UTC (rev 1390)
@@ -8,14 +8,22 @@
 ac_add_options --with-system-jpeg=/usr
 ac_add_options --enable-application=suite
 ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-canvas
 ac_add_options --enable-xft
 ac_add_options --disable-freetype2
-ac_add_options --disable-postscript
+# Uncomment before release
+# ac_add_options --disable-postscript
+ac_add_options --enable-pango
+# --enable-ctl is superseded by --enable-pango
+# ac_add_options --enable-ctl
+ac_add_options --enable-svg
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-gnomeui
-ac_add_options --enable-ctl
 ac_add_options --enable-xinerama
 ac_add_options --disable-installer
+ac_add_options --disable-updater
+
+LDFLAGS="-Wl,--as-needed -lpangoxft-1.0"

Modified: trunk/packages/mozilla/Makefile
===================================================================
--- trunk/packages/mozilla/Makefile     2006-02-02 15:57:33 UTC (rev 1389)
+++ trunk/packages/mozilla/Makefile     2006-02-02 16:00:29 UTC (rev 1390)
@@ -1,17 +1,13 @@
 # Firefox Makefile
 
-NM= mozilla
-VRS= 1.7.12
+NM= seamonkey
+VRS= 1.0
 DIR= mozilla
 
-FILE= $(NM)-$(VRS)-source.tar.bz2
-URL-$(FILE)= 
http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(VRS)/source/$(FILE)
-SHA-$(FILE)= d94251b86d36b8d5e3e45d31a67ebe334f1ba267
+FILE= $(NM)-$(VRS).source.tar.bz2
+URL-$(FILE)= 
http://ftp.mozilla.org/pub/mozilla.org/$(NM)/releases/$(VRS)/$(FILE)
+SHA-$(FILE)= f535ff1d2620ac5a76a2d8179c07f82cd53f938f
 
-PATCH1= $(NM)-1.7.11-gcc4-2.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/blfs/svn/$(PATCH1)
-SHA-$(PATCH1)= 26a27a4f5e01f51f8665b5e1ba9bdf166bb8193e
-
 PATCH50= $(NM)-$(VRS)-locale-1.patch
 URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
 SHA-$(PATCH50)= 4c550d86bcd179030cfc51b64393eb663e10f4c4
@@ -30,13 +26,13 @@
 compile-stage2:
        sed 's:@TOPSRCDIR@:$(ROOT)/$(PKG)/$(NM)/mozilla:' ../.mozconfig \
         > .mozconfig
-       patch -Np1 -i ../$(PATCH1)
        patch -Np1 -i ../$(PATCH50)
        make -f client.mk build
        make -f client.mk install
        cp -ra $(ROOT)/root/.mozilla /root
-       ln -sf /usr/lib/mozilla/plugins/libmozsvgdec.{so,a} \
-        /usr/lib/$(NM)-$(VRS)/plugins
+       # ln -sf /usr/lib/mozilla/plugins/libmozsvgdec.{so,a} \
+       # /usr/lib/$(NM)-$(VRS)/plugins
+       ln -sf seamonkey /usr/lib/mozilla
 
 clean:
        -rm -rf $(DIR)

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to