[csw-devel] SF.net SVN: gar:[6144] csw/mgar/pkg/firefox/trunk

[wbonnet at users.sourceforge.net]

Revision: 6144
          http://gar.svn.sourceforge.net/gar/?rev=6144&view=rev
Author:   wbonnet
Date:     2009-08-30 15:44:17 +0000 (Sun, 30 Aug 2009)

Log Message:
-----------
Fix patch detection

Modified Paths:
--------------
    csw/mgar/pkg/firefox/trunk/Makefile
    csw/mgar/pkg/firefox/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/firefox/trunk/files/firefox.dist.bin.diff

Modified: csw/mgar/pkg/firefox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/firefox/trunk/Makefile	2009-08-30 08:55:29 UTC (rev 6143)
+++ csw/mgar/pkg/firefox/trunk/Makefile	2009-08-30 15:44:17 UTC (rev 6144)
@@ -9,7 +9,7 @@
 endef
 
 DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.bz2
-DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall autoconf.mk.diff
+DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall autoconf.mk.diff firefox.diff firefox.dist.bin.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
@@ -86,11 +86,13 @@
 	@cp $(FILEDIR)/.mozconfig  $(WORK_BUILD)/.mozconfig
 
 post-configure-modulated:
-	@gpatch -d$(WORKSRC) -p1 -F2 < download/autoconf.mk.diff
+	@grep openwin $(WORKSRC)/config/autoconf.mk && gpatch -d$(WORKSRC) --forward -p1 -F2 < download/autoconf.mk.diff || true
 
 pre-install-modulated:
+	@grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward  -p1 -F2 < download/firefox.diff
+	@grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward  -p1 -F2 < download/firefox.dist.bin.diff
 	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
-	( cd $(WORK_INSTALL)/opt/csw/bin && ln -sf ../mozilla/firefox/bin/firefox . )
+	( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f firefox ; ln -sf ../mozilla/firefox/bin/firefox . )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
 	( cp $(WORK_BUILD)/other-licenses/branding/firefox/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/firefox.png )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )

Modified: csw/mgar/pkg/firefox/trunk/checksums
===================================================================
--- csw/mgar/pkg/firefox/trunk/checksums	2009-08-30 08:55:29 UTC (rev 6143)
+++ csw/mgar/pkg/firefox/trunk/checksums	2009-08-30 15:44:17 UTC (rev 6144)
@@ -6,6 +6,8 @@
 c869762735a41bb30f417e510ccb7f31  download/configure.diff
 a71a4afaabc4d067f30d8fb184fea520  download/file_id.cc.diff
 040d01a1e22a1ec1b28188479df06007  download/firefox-3.0.13-source.tar.bz2
+7343359131b4b31b985ba59fc9a2e3fe  download/firefox.diff
+1a32b697eeec4c0e3cb844407b8253ca  download/firefox.dist.bin.diff
 a19792f0b67f28c9227d19d069369369  download/jemalloc.c.diff
 18b0cdc902caa4172b7f2d473239c9a9  download/md5.h.diff
 1a3d61e09378d28d9bc9f3df45a224bc  download/nsExceptionHandler.cpp.diff

Added: csw/mgar/pkg/firefox/trunk/files/firefox.dist.bin.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/firefox.dist.bin.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/firefox.dist.bin.diff	2009-08-30 15:44:17 UTC (rev 6144)
@@ -0,0 +1,15 @@
+diff --speed-large-files --minimal -Nru firefox.orig/dist/bin/firefox firefox/dist/bin/firefox
+--- firefox.orig/dist/bin/firefox    2009-08-27 23:43:31.266507053 +0200
++++ firefox/dist/bin/firefox     	2009-08-27 23:44:53.015182925 +0200
+@@ -54,6 +54,11 @@
+
+ moz_libdir=/opt/csw/mozilla/firefox/lib
+
++if [ "`uname -r`" = "5.8" ] ; then
++       LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/lwp
++       LD_LIBRARY_PATH_64=$LD_LIBRARY_PATH_64:/usr/lib/lwp/64
++fi
++
+ # Use run-mozilla.sh in the current dir if it exists
+ # If not, then start resolving symlinks until we find run-mozilla.sh
+ found=0


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