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

[wbonnet at users.sourceforge.net]

Revision: 5561
          http://gar.svn.sourceforge.net/gar/?rev=5561&view=rev
Author:   wbonnet
Date:     2009-07-10 21:38:22 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Add some more patches

Modified Paths:
--------------
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/.mozconfig
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/SunOS5.mk.diff

Added Paths:
-----------
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/fipsaudt.c.diff
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/lowpbe.c.diff
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile	2009-07-10 19:21:02 UTC (rev 5560)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile	2009-07-10 21:38:22 UTC (rev 5561)
@@ -30,6 +30,9 @@
 PATCHFILES += nsPluginsDirUnix.cpp.diff
 PATCHFILES += js.src.configure.diff
 PATCHFILES += SunOS5.mk.diff
+PATCHFILES += lowpbe.c.diff
+PATCHFILES += softoken.mk.diff
+PATCHFILES += fipsaudt.c.diff
 # PATCHFILES += nsMathUtils.h.diff
 # PATCHFILES += file_id.cc.diff
 # PATCHFILES += md5.h.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-10 19:21:02 UTC (rev 5560)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-10 21:38:22 UTC (rev 5561)
@@ -1,7 +1,7 @@
 f9c7fb69080051172bd7357370731ba3  download/CSWfirefox.postinstall
 6ede39c29b3672fb1fc1d8fe397a7863  download/CSWfirefox.postremove
 705741740ea1b5f2409bf4bfcf665220  download/Nativei386.h.diff
-e3d4fc128e15ef832ab2dbcc3fcdd05a  download/SunOS5.mk.diff
+70627abe2428c903bfa13d409f1c8bb1  download/SunOS5.mk.diff
 8cd01e82aa312e79ae4f4f8c779174c6  download/autoconf.mk.in.diff
 37f4078ab1b34d16c1739d3b089b2947  download/configure.diff
 6dd59399db08963ef022a1d0e5010053  download/firefox-3.5-source.tar.bz2

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/.mozconfig
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/.mozconfig	2009-07-10 19:21:02 UTC (rev 5560)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/.mozconfig	2009-07-10 21:38:22 UTC (rev 5561)
@@ -21,6 +21,7 @@
 ac_add_options --enable-canvas
 ac_add_options --enable-system-cairo
 ac_add_options --disable-pthreads
+ac_add_options --enable-system-sqlite
 
 ac_add_options --enable-official-branding
 #ac_add_options --enable-xinerama

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/SunOS5.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/SunOS5.mk.diff	2009-07-10 19:21:02 UTC (rev 5560)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/SunOS5.mk.diff	2009-07-10 21:38:22 UTC (rev 5561)
@@ -24,7 +24,7 @@
  endif
 
 -INCLUDES   += -I/usr/dt/include -I/usr/openwin/include
-+INCLUDES   += -I/usr/dt/include -I/opt/csw/X11/include -I/usr/include -I/usr/include/mps
++INCLUDES   += -I/usr/dt/include -I/opt/csw/include -I/opt/csw/X11/include -I/usr/include -I../../../../dist/include/nspr
 
  RANLIB      = echo
  CPU_ARCH    = sparc

Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/fipsaudt.c.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/fipsaudt.c.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/fipsaudt.c.diff	2009-07-10 21:38:22 UTC (rev 5561)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/security/nss/lib/softoken/fipsaudt.c firefox/security/nss/lib/softoken/fipsaudt.c
+--- firefox.orig/security/nss/lib/softoken/fipsaudt.c    2009-07-10 22:58:22.364751249 +0200
++++ firefox/security/nss/lib/softoken/fipsaudt.c       2009-07-10 22:58:22.364751249 +0200
+@@ -39,7 +39,7 @@
+  * Level 2.
+  */
+
+-#include "prprf.h"
++#include "../../../../dist/include/nspr/prprf.h"
+ #include "softoken.h"
+
+ /*

Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/lowpbe.c.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/lowpbe.c.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/lowpbe.c.diff	2009-07-10 21:38:22 UTC (rev 5561)
@@ -0,0 +1,11 @@
+diff --speed-large-files --minimal -Nru firefox.orig/security/nss/lib/softoken/lowpbe.c firefox/security/nss/lib/softoken/lowpbe.c
+--- firefox.orig/security/nss/lib/softoken/lowpbe.c    2009-07-10 22:58:22.364751249 +0200
++++ firefox/security/nss/lib/softoken/lowpbe.c       2009-07-10 22:58:22.364751249 +0200
+@@ -36,6 +36,7 @@
+
+ #include "plarena.h"
+
++#include "secoidt.h"
+ #include "seccomon.h"
+ #include "secitem.h"
+ #include "secport.h"

Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff	2009-07-10 21:38:22 UTC (rev 5561)
@@ -0,0 +1,11 @@
+diff --speed-large-files --minimal -Nru firefox.orig/security/nss/lib/softoken/config.mk firefox/security/nss/lib/softoken/config.mk
+--- firefox.orig/security/nss/lib/softoken/config.mk    2009-07-10 22:58:22.364751249 +0200
++++ firefox/security/nss/lib/softoken/config.mk       2009-07-10 22:58:22.364751249 +0200
+@@ -102,6 +102,7 @@
+ # The -R '$ORIGIN' linker option instructs this library to search for its
+ # dependencies in the same directory where it resides.
+ MKSHLIB += -R '$$ORIGIN'
++MKSHLIB += -L../../../../dist/lib
+ OS_LIBS += -lbsm
+ endif
+


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