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

[wbonnet at users.sourceforge.net]

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

Log Message:
-----------
Add missing patches

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

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

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile	2009-07-08 18:38:01 UTC (rev 5551)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile	2009-07-08 18:54:05 UTC (rev 5552)
@@ -26,6 +26,9 @@
 PATCHFILES += Nativei386.h.diff
 PATCHFILES += autoconf.mk.in.diff
 PATCHFILES += packager.mk.diff
+PATCHFILES += configure.diff
+PATCHFILES += nsPluginsDirUnix.cpp.diff
+PATCHFILES += js.src.configure.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-08 18:38:01 UTC (rev 5551)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-08 18:54:05 UTC (rev 5552)
@@ -2,7 +2,10 @@
 6ede39c29b3672fb1fc1d8fe397a7863  download/CSWfirefox.postremove
 705741740ea1b5f2409bf4bfcf665220  download/Nativei386.h.diff
 8cd01e82aa312e79ae4f4f8c779174c6  download/autoconf.mk.in.diff
+37f4078ab1b34d16c1739d3b089b2947  download/configure.diff
 6dd59399db08963ef022a1d0e5010053  download/firefox-3.5-source.tar.bz2
 24e815d4265a9d0fe7786f3258e7dc5a  download/jemalloc.c.diff
+0589ca8ad5f6744f573bb8ce0ba71d78  download/js.src.configure.diff
 fafd09557dbb4d3acc01c51b78ce8120  download/jsstdint.h.diff
+f562a935a0fb2c5ad38f95af114d0a49  download/nsPluginsDirUnix.cpp.diff
 1de554cffc12f15bddf11ecdba0fe32d  download/packager.mk.diff

Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff	2009-07-08 18:54:05 UTC (rev 5552)
@@ -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
+@@ -4426,8 +4426,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
+@@ -4502,8 +4502,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.5-packaging/files/js.src.configure.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/js.src.configure.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/js.src.configure.diff	2009-07-08 18:54:05 UTC (rev 5552)
@@ -0,0 +1,25 @@
+diff --speed-large-files --minimal -Nru firefox.orig/js/src/configure firefox/js/src/configure
+--- firefox.orig/js/src/configure	2009-07-08 20:48:40.741770226 +0200
++++ firefox/js/src/configure		2009-07-08 20:49:34.735119508 +0200
+@@ -4026,8 +4026,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
+@@ -4102,8 +4102,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.5-packaging/files/nsPluginsDirUnix.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/nsPluginsDirUnix.cpp.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/nsPluginsDirUnix.cpp.diff	2009-07-08 18:54:05 UTC (rev 5552)
@@ -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.