[csw-devel] SF.net SVN: gar:[2226] csw/trunk/apps/firefox

wbonnet at users.sourceforge.net wbonnet at users.sourceforge.net
Sat Nov 8 02:02:41 CET 2008 

Revision: 2226
          http://gar.svn.sourceforge.net/gar/?rev=2226&view=rev
Author:   wbonnet
Date:     2008-11-08 01:02:41 +0000 (Sat, 08 Nov 2008)

Log Message:
-----------
Update to version 3.0.3

Modified Paths:
--------------
    csw/trunk/apps/firefox/Makefile
    csw/trunk/apps/firefox/checksums
    csw/trunk/apps/firefox/files/.mozconfig
    csw/trunk/apps/firefox/files/autoconf.mk.in.diff

Added Paths:
-----------
    csw/trunk/apps/firefox/files/packager.mk.diff

Modified: csw/trunk/apps/firefox/Makefile
===================================================================
--- csw/trunk/apps/firefox/Makefile	2008-11-07 23:33:33 UTC (rev 2225)
+++ csw/trunk/apps/firefox/Makefile	2008-11-08 01:02:41 UTC (rev 2226)
@@ -1,5 +1,5 @@
 GARNAME = firefox
-GARVERSION = 2.0.0.14
+GARVERSION = 3.0.3
 CATEGORIES = apps
 DISTNAME = $(GARNAME)
 
@@ -21,15 +21,17 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 PERL="/opt/csw/bin/perl"
+FIND="/opt/csw/bin/gfind"
 CFLAGS=-xlibmil
 CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath"
 LDFLAGS="-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib"
 
-export PERL CFLAGS CXXFLAGS LDFLAGS
+export PERL CFLAGS CXXFLAGS LDFLAGS FIND
 
 CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox
 
-PATCHFILES = autoconf.mk.in.diff
+# PATCHFILES = autoconf.mk.in.diff
+# PATCHFILES += packager.mk.diff
 
 TEST_SCRIPTS =
 
@@ -54,9 +56,7 @@
 	( cp $(FILEDIR)/firefox.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/firefox.keys )
 
 post-install:
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}"  \; )
-	( mv $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config.temp && gsed -e s\_-L$(DESTDIR)/opt/csw/lib\_\_g  $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config.temp > $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config && rm $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config.temp )
-	( mv $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp && gsed -e s\_-L$(DESTDIR)/opt/csw/lib\_\_g  $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp > $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc && rm $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp )
+	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
 	( gfind $(DESTDIR)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp"  \; )
 	( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp"  \; )
 	( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )

Modified: csw/trunk/apps/firefox/checksums
===================================================================
--- csw/trunk/apps/firefox/checksums	2008-11-07 23:33:33 UTC (rev 2225)
+++ csw/trunk/apps/firefox/checksums	2008-11-08 01:02:41 UTC (rev 2226)
@@ -1,6 +1,5 @@
-9e9c13ba7b81f93f2fa10c6f256ee31e  download/firefox-2.0.0.14-source.tar.bz2
+e076a4a889fce0c4ca237ac30bfadb43  download/firefox-3.0.3-source.tar.bz2
 3cc981390e527e1343f6c450d839eceb  download/CSWfirefox.gspec
 d90e4c03eeae012a80de7b44129ded1f  download/CSWfirefox.depend
 f9c7fb69080051172bd7357370731ba3  download/CSWfirefox.postinstall
 6ede39c29b3672fb1fc1d8fe397a7863  download/CSWfirefox.postremove
-91eb79c06f04197d584c6a17267ebcc3  download/autoconf.mk.in.diff

Modified: csw/trunk/apps/firefox/files/.mozconfig
===================================================================
--- csw/trunk/apps/firefox/files/.mozconfig	2008-11-07 23:33:33 UTC (rev 2225)
+++ csw/trunk/apps/firefox/files/.mozconfig	2008-11-08 01:02:41 UTC (rev 2226)
@@ -7,7 +7,7 @@
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-xft
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-auto-deps
 ac_add_options --enable-optimize="-xO3"
 ac_add_options --disable-updater

Modified: csw/trunk/apps/firefox/files/autoconf.mk.in.diff
===================================================================
--- csw/trunk/apps/firefox/files/autoconf.mk.in.diff	2008-11-07 23:33:33 UTC (rev 2225)
+++ csw/trunk/apps/firefox/files/autoconf.mk.in.diff	2008-11-08 01:02:41 UTC (rev 2226)
@@ -1,22 +1,22 @@
 diff --speed-large-files --minimal -Nru firefox.orig/config/autoconf.mk.in firefox/config/autoconf.mk.in
---- firefox.orig/config/autoconf.mk.in	2006-09-14 14:07:03.000000000 -0400
-+++ firefox/config/autoconf.mk.in	2007-02-25 07:21:36.245899000 -0500
-@@ -57,14 +57,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= @datadir@/idl
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)
-+mredir		= $(libdir)/mre
- mrelibdir	= $(mredir)/lib
- 
- DIST		= $(DEPTH)/dist
+--- firefox.orig/config/autoconf.mk.in   
++++ firefox/config/autoconf.mk.in       
+@@ -58,14 +58,14 @@
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
+ bindir         = @bindir@
+-includedir     = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir     = @includedir@
+ libdir         = @libdir@
+ datadir                = @datadir@
+ mandir         = @mandir@
+-idldir         = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir         = $(datadir)/idl
+
+-installdir     = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir         = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir     = $(libdir)
++sdkdir         = $(libdir)
+
+ DIST           = $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@

Added: csw/trunk/apps/firefox/files/packager.mk.diff
===================================================================
--- csw/trunk/apps/firefox/files/packager.mk.diff	                        (rev 0)
+++ csw/trunk/apps/firefox/files/packager.mk.diff	2008-11-08 01:02:41 UTC (rev 2226)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/mozapps/installer/packager.mk firefox/toolkit/mozapps/installer/packager.mk
+--- firefox.orig/toolkit/mozapps/installer/packager.mk        2008-04-28 21:14:12.000000000 +0200
++++ firefox/toolkit/mozapps/installer/packager.mk 2008-11-08 01:54:31.129193000 +0100
+@@ -426,7 +426,7 @@
+        (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
+          (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
+ # The dist/include has module subdirectories that we need to flatten
+-       find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
++       gfind $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
+        $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
+        $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list