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

[wbonnet at users.sourceforge.net]

Revision: 5533
          http://gar.svn.sourceforge.net/gar/?rev=5533&view=rev
Author:   wbonnet
Date:     2009-07-07 19:55:51 +0000 (Tue, 07 Jul 2009)

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

Modified Paths:
--------------
    csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
    csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums

Added Paths:
-----------
    csw/mgar/pkg/firefox/branches/firefox3-packaging/files/configure.diff
    csw/mgar/pkg/firefox/branches/firefox3-packaging/files/nsPluginsDirUnix.cpp.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile	2009-07-07 19:17:09 UTC (rev 5532)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile	2009-07-07 19:55:51 UTC (rev 5533)
@@ -22,6 +22,8 @@
 
 # Defines the list of patches to be applied to the sources
 PATCHFILES = autoconf.mk.in.diff
+PATCHFILES += configure.diff
+PATCHFILES += nsPluginsDirUnix.cpp.diff
 PATCHFILES += packager.mk.diff
 PATCHFILES += jemalloc.c.diff
 PATCHFILES += nsMathUtils.h.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums	2009-07-07 19:17:09 UTC (rev 5532)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums	2009-07-07 19:55:51 UTC (rev 5533)
@@ -1,6 +1,7 @@
 f9c7fb69080051172bd7357370731ba3  download/CSWfirefox.postinstall
 6ede39c29b3672fb1fc1d8fe397a7863  download/CSWfirefox.postremove
 45bba282258a321e5e4f73a742bcc31b  download/autoconf.mk.in.diff
+c869762735a41bb30f417e510ccb7f31  download/configure.diff
 a71a4afaabc4d067f30d8fb184fea520  download/file_id.cc.diff
 b509f7c05e9566ed290e2c098316c7c3  download/firefox-3.0.11-source.tar.bz2
 32ce70bf2a4a2193a7cdc24941549018  download/jemalloc.c.diff
@@ -8,5 +9,6 @@
 1a3d61e09378d28d9bc9f3df45a224bc  download/nsExceptionHandler.cpp.diff
 ca4162516d8c09deaa9f0b6f3b3ecffb  download/nsMathUtils.h.diff
 d8f7ec0df9f63317ff2d8578d9dbe3ff  download/nsNativeApSuportUnix.cpp.diff
+f562a935a0fb2c5ad38f95af114d0a49  download/nsPluginsDirUnix.cpp.diff
 d0d942fa0c012abcb2a45b1d0fc99051  download/packager.mk.diff
 29e0ca858fe3aef24d5be1300dc39735  download/solaris_lwp.h.diff

Added: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/configure.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/configure.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/configure.diff	2009-07-07 19:55:51 UTC (rev 5533)
@@ -0,0 +1,25 @@
+diff --speed-large-files --minimal -Nru firefox.orig/configure firefox/configure
+--- firefox.orig/configure      2009-07-07 21:46:57.267011389 +0200
++++ firefox/configure   	2009-07-07 21:49:10.319971404 +0200
+@@ -4382,8 +4382,8 @@
+     /usr/local/x11r5/include  \
+     /usr/lpp/Xamples/include  \
+                               \
+-    /usr/openwin/include      \
+-    /usr/openwin/share/include \
++    /opt/csw/X11/include      \
++    /opt/csw/X11/share/include \
+     ; \
+   do
+     if test -r "$ac_dir/$x_direct_test_include"; then
+@@ -4458,8 +4458,8 @@
+     /usr/lpp/Xamples/lib  \
+     /lib/usr/lib/X11     \
+                           \
+-    /usr/openwin/lib      \
+-    /usr/openwin/share/lib \
++    /opt/csw/X11/lib      \
++    /opt/csw/X11/share/lib \
+     ; \
+ do
+   for ac_extension in a so sl; do

Added: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/nsPluginsDirUnix.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/nsPluginsDirUnix.cpp.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/nsPluginsDirUnix.cpp.diff	2009-07-07 19:55:51 UTC (rev 5533)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/modules/plugin/base/src/nsPluginsDirUnix.cpp firefox/modules/plugin/base/src/nsPluginsDirUnix.cpp
+--- firefox.orig/modules/plugin/base/src/nsPluginsDirUnix.cpp   2009-07-07 21:52:50.550842128 +0200
++++ firefox/modules/plugin/base/src/nsPluginsDirUnix.cpp        2009-07-07 21:53:10.444317091 +0200
+@@ -76,7 +76,7 @@
+ #define DEFAULT_X11_PATH "/usr/lib"
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".a"
+ #elif defined(SOLARIS)
+-#define DEFAULT_X11_PATH "/usr/openwin/lib/"
++#define DEFAULT_X11_PATH "/opt/csw/X11/lib/"
+ #elif defined(LINUX)
+ #define DEFAULT_X11_PATH "/usr/X11R6/lib/"
+ #else


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