[csw-devel] SF.net SVN: gar:[5550] csw/mgar/pkg/firefox/branches/firefox3.5-packaging

[wbonnet at users.sourceforge.net]

Revision: 5550
          http://gar.svn.sourceforge.net/gar/?rev=5550&view=rev
Author:   wbonnet
Date:     2009-07-08 18:37:31 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
Restore deleted function in the previous patch and replaces spaces by tabs

Modified Paths:
--------------
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/jemalloc.c.diff
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/removeBuildPathFromJar.sh

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-08 18:00:33 UTC (rev 5549)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-08 18:37:31 UTC (rev 5550)
@@ -3,6 +3,6 @@
 705741740ea1b5f2409bf4bfcf665220  download/Nativei386.h.diff
 8cd01e82aa312e79ae4f4f8c779174c6  download/autoconf.mk.in.diff
 6dd59399db08963ef022a1d0e5010053  download/firefox-3.5-source.tar.bz2
-4046facca3889b1dcb8539b6458278e1  download/jemalloc.c.diff
+8e0133baa3ce7c4727449202c529a434  download/jemalloc.c.diff
 fafd09557dbb4d3acc01c51b78ce8120  download/jsstdint.h.diff
 1de554cffc12f15bddf11ecdba0fe32d  download/packager.mk.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/jemalloc.c.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/jemalloc.c.diff	2009-07-08 18:00:33 UTC (rev 5549)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/jemalloc.c.diff	2009-07-08 18:37:31 UTC (rev 5550)
@@ -1,22 +1,6 @@
 diff --speed-large-files --minimal -Nru firefox.orig/memory/jemalloc/jemalloc.c firefox/memory/jemalloc/jemalloc.c
 --- firefox.orig/memory/jemalloc/jemalloc.c        2009-07-01 22:39:00.951845547 +0200
 +++ firefox/memory/jemalloc/jemalloc.c             2009-07-01 22:46:59.327275977 +0200
-@@ -306,6 +306,15 @@
- #define        MALLOC_DECOMMIT
- #endif
-
-+#ifdef MOZ_MEMORY_SOLARIS_WRONG_IFDEF
-+#define issetugid() 0
-+char *strerror_r(int errnum, char *buf, size_t buflen)
-+{
-+       strncpy(buf, strerror(errnum), buflen);
-+}
-+
-+#endif
-+
- #ifndef MOZ_MEMORY_WINDOWS
- #ifndef MOZ_MEMORY_SOLARIS
- #include <sys/cdefs.h>
 @@ -362,9 +371,9 @@
  #endif
  #include <sched.h>
@@ -29,3 +13,16 @@
  #include <stdlib.h>
  #include <string.h>
  #ifndef MOZ_MEMORY_DARWIN
+@@ -476,6 +476,12 @@
+ #endif
+ #endif
+
++#define issetugid() 0
++char *strerror_r(int errnum, char *buf, size_t buflen)
++{
++    strncpy(buf, strerror(errnum), buflen);
++}
++
+ #define	SIZEOF_PTR		(1U << SIZEOF_PTR_2POW)
+
+ /* sizeof(int) == (1U << SIZEOF_INT_2POW). */

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/removeBuildPathFromJar.sh
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/removeBuildPathFromJar.sh	2009-07-08 18:00:33 UTC (rev 5549)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/removeBuildPathFromJar.sh	2009-07-08 18:37:31 UTC (rev 5550)
@@ -1,4 +1,4 @@
-#!/opt/csw/bin/bash 
+#!/opt/csw/bin/bash -x
 
 if [ -d ~/.tempextractjar ] ; 
 then 
@@ -10,11 +10,13 @@
 export REPLACEDIR=$2/$3/$4
 
 cd ~/.tempextractjar
-jar xvf $1
+jar xvf $BACKUP_OLD_DIR/$1
 
 gfind . -name "*.js" -exec bash -x -c " mv {} {}.temp && gsed -e  s_\$REPLACEDIR\_\_g {}.temp > {} && rm {}.temp"  \; 
 
 rm $1
-jar cvf $1 *
+jar cvf $BACKUP_OLD_DIR/$1 *
 
 cd $BACKUP_OLD_DIR
+
+rm -fr ~/.tempextractjar


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