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

[dmichelsen at users.sourceforge.net]

Revision: 2358
          http://gar.svn.sourceforge.net/gar/?rev=2358&view=rev
Author:   dmichelsen
Date:     2008-11-26 14:43:16 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
mgar firefox: Merge in [2346], [2347] from trunk to mgar

Modified Paths:
--------------
    csw/mgar/pkg/firefox/trunk/Makefile
    csw/mgar/pkg/firefox/trunk/checksums
    csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff

Added Paths:
-----------
    csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff

Modified: csw/mgar/pkg/firefox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/firefox/trunk/Makefile	2008-11-26 14:39:03 UTC (rev 2357)
+++ csw/mgar/pkg/firefox/trunk/Makefile	2008-11-26 14:43:16 UTC (rev 2358)
@@ -20,14 +20,15 @@
 PATCHFILES = autoconf.mk.in.diff
 PATCHFILES += packager.mk.diff
 PATCHFILES += jemalloc.c.diff
+PATCHFILES += nsMathUtils.h.diff
 
-include gar/category.mk
-
 PERL=/opt/csw/bin/perl
 CXXFLAGS+=-xlibmil -xlibmopt -features=tmplife -norunpath
 CFLAGS+=-xlibmil -D__solaris__
 LDFLAGS+=-L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib
 
+include gar/category.mk
+
 export PERL CFLAGS CXXFLAGS LDFLAGS
 
 CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox

Modified: csw/mgar/pkg/firefox/trunk/checksums
===================================================================
--- csw/mgar/pkg/firefox/trunk/checksums	2008-11-26 14:39:03 UTC (rev 2357)
+++ csw/mgar/pkg/firefox/trunk/checksums	2008-11-26 14:43:16 UTC (rev 2358)
@@ -5,4 +5,5 @@
 6ede39c29b3672fb1fc1d8fe397a7863  download/CSWfirefox.postremove
 1c8ee494a515890096c71b77c6c01dd7  download/autoconf.mk.in.diff
 d0d942fa0c012abcb2a45b1d0fc99051  download/packager.mk.diff
-20622e4e2548b227aba09e1eb04de134  download/jemalloc.c.diff
+dc2ff9299e65ef1acc7a1a684e1ed449  download/jemalloc.c.diff
+ca4162516d8c09deaa9f0b6f3b3ecffb  download/nsMathUtils.h.diff

Modified: csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff	2008-11-26 14:39:03 UTC (rev 2357)
+++ csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff	2008-11-26 14:43:16 UTC (rev 2358)
@@ -1,8 +1,24 @@
 diff --speed-large-files --minimal -Nru firefox.orig/memory/jemalloc/jemalloc.c firefox/memory/jemalloc/jemalloc.c
---- firefox.orig/memory/jemalloc/jemalloc.c      2008-07-23 05:47:24.000000000 -0400
-+++ firefox/memory/jemalloc/jemalloc.c  2008-11-19 17:57:57.038274900 -0500
-@@ -312,9 +312,9 @@
+--- firefox.orig/memory/jemalloc/jemalloc.c        2008-07-23 09:47:24.000000000 +0000
++++ firefox/memory/jemalloc/jemalloc.c  2008-11-23 14:42:59.780371100 +0000
+@@ -255,6 +255,15 @@
+ #define        MALLOC_DECOMMIT
  #endif
+
++#ifdef MOZ_MEMORY_SOLARIS
++#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>
+@@ -312,9 +321,9 @@
+ #endif
  #include <sched.h>
  #include <stdarg.h>
 -#include <stdbool.h>
@@ -13,4 +29,3 @@
  #include <stdlib.h>
  #include <string.h>
  #ifndef MOZ_MEMORY_DARWIN
-

Copied: csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff (from rev 2347, csw/trunk/apps/firefox/files/nsMathUtils.h.diff)
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff	2008-11-26 14:43:16 UTC (rev 2358)
@@ -0,0 +1,14 @@
+diff --speed-large-files --minimal -Nru firefox.orig/xpcom/ds/nsMathUtils.h firefox/xpcom/ds/nsMathUtils.h
+--- firefox.orig/xpcom/ds/nsMathUtils.h    2008-04-02 00:21:31.000000000 -0400
++++ firefox/xpcom/ds/nsMathUtils.h       2008-11-22 18:22:11.384668100 -0500
+@@ -42,6 +42,10 @@
+ #include <math.h>
+ #include <float.h>
+
++# define floorf(a)    floor (a)
++# define ceilf(a)     ceil (a)
++# define round(a)     floor(a + 0.5)
++
+ /*
+  * round
+  */


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