Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
--- a/ChangeLog Wed Jul 26 14:08:39 2006 +0000
+++ b/ChangeLog Wed Jul 26 14:14:43 2006 +0000
@@ -1,3 +1,9 @@
+2006-07-26 Matt Keenan <[email protected]>
+
+ * firefox.spec : Remove patch-10
+ * patches/firefox-10-gecko.m4.diff : Remove, yelp has it's own local version now.
+ * patches/firefox-* : Re shuffle to be in order
+
2006-07-26 Halton Huo <[email protected]>
* evolution-data-server.spec: Use system BerkeleyDB.
--- a/Solaris/ChangeLog Wed Jul 26 14:08:39 2006 +0000
+++ b/Solaris/ChangeLog Wed Jul 26 14:14:43 2006 +0000
@@ -1,3 +1,8 @@
+2006-07-26 Matt Keenan <[email protected]>
+
+ * SUNWgnome-help-viewer.spec : Update to pick up local gecko.m4 for building
+ yelp 2.15.5
+
2006-07-26 Halton Huo <[email protected]>
* SUNWevolution-bdb-devel.spec: New moudle to ship BerkeleyDB develop files.
--- a/Solaris/SUNWgnome-help-viewer.spec Wed Jul 26 14:08:39 2006 +0000
+++ b/Solaris/SUNWgnome-help-viewer.spec Wed Jul 26 14:14:43 2006 +0000
@@ -69,7 +69,7 @@
export RPM_OPT_FLAGS="$CFLAGS"
export PKG_CONFIG_PATH=%{_pkg_config_path}:/usr/sfw/lib/pkgconfig
export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal -I /usr/sfw/share/aclocal"
+export ACLOCAL_FLAGS="-I ./m4 -I %{_datadir}/aclocal -I /usr/sfw/share/aclocal"
export LDFLAGS="-z ignore -z combreloc -Bdirect -norunpath"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
@@ -111,8 +111,6 @@
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/*
%dir %attr(0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
@@ -130,6 +128,8 @@
%endif
%changelog
+* Wed Jul 26 2006 - [email protected]
+- Bump to 2.15.5, update %files, bonobo support has been removed.
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/firefox.spec Wed Jul 26 14:08:39 2006 +0000
+++ b/firefox.spec Wed Jul 26 14:14:43 2006 +0000
@@ -27,14 +27,13 @@
Patch3: mozilla-03-s11s-smkfl.diff
Patch4: mozilla-04-s11x-smkfl.diff
Patch5: mozilla-05-common-tar-option.diff
-Patch6: firefox-06-mozilla-config.diff
-Patch8: firefox-08-font_Xft.diff
-Patch9: firefox-09-yelp-hang.diff
-Patch10: firefox-10-gecko.m4.diff
-Patch12: firefox-12-preload.diff
-Patch13: firefox-13-locale.diff
-Patch14: firefox-14-plugins.diff
-Patch15: firefox-15-no-nss-nspr.diff
+Patch6: firefox-01-mozilla-config.diff
+Patch8: firefox-02-font_Xft.diff
+Patch9: firefox-03-yelp-hang.diff
+Patch12: firefox-05-preload.diff
+Patch13: firefox-06-locale.diff
+Patch14: firefox-07-plugins.diff
+Patch15: firefox-08-no-nss-nspr.diff
Patch16: mozilla-07-no-ldlibpath.diff
URL: http://www.sun.com/software/javadesktopsystem/
@@ -95,7 +94,6 @@
%patch6 -p1
%patch8 -p1
%patch9 -p0
-%patch10 -p1
%patch12 -p0
%patch13 -p1
%patch14 -p1
@@ -262,6 +260,9 @@
%{_datadir}/pixmaps/%{name}-icon.png
%changelog
+* Wed Jul 26 2006 - [email protected]
+- Remove firefox-10-gecko.m4.diff : yelp uses local copy now, and re-shuffled
+ the rest of the firefox-* patches to be in sequence.
* Fri Jul 07 2006 - [email protected]
- add patch mozilla-07-no-ldlibpath.diff to remove the LD_LIBRARY_PATH in
the startup script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-01-mozilla-config.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,20 @@
+--- firefox.orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004
++++ firefix/build/unix/mozilla-config.in Fri Oct 14 13:32:03 2005
+@@ -115,7 +115,7 @@
+ fi
+
+ _nspr_libs="%FULL_NSPR_LIBS%"
+-_xpcom_libs="-lxpcom $_nspr_libs"
++_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
+ _js_libs="-ljs"
+
+ if test "$echo_libs" = "yes"; then
+--- firefox.orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005
++++ firefox/build/unix/mozilla-xpcom.pc.in Fri Oct 14 13:55:58 2005
+@@ -8,5 +8,5 @@
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${libdir} -lxpcom
++Libs: -L${libdir} -lxpcom -lxpcom_core
+ Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-02-font_Xft.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,10 @@
+--- firefox/browser/app/Makefile.in.orig 2005-12-02 14:53:52.942177000 +0000
++++ firefox/browser/app/Makefile.in 2005-12-02 14:54:04.545631000 +0000
+@@ -87,6 +87,7 @@
+ $(XPCOM_LIBS) \
+ $(NSPR_LIBS) \
+ $(TK_LIBS) \
++ -lfontconfig -L/usr/openwin/lib -lXft \
+ $(NULL)
+
+ # Add explicit X11 dependency when building against X11 toolkits
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-03-yelp-hang.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,13 @@
+Index: content/html/content/src/nsHTMLStyleElement.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/content/html/content/src/nsHTMLStyleElement.cpp,v
+retrieving revision 1.70
+diff -r1.70 nsHTMLStyleElement.cpp
+317d316
+<
+318a318,320
+> if (aMedia.IsEmpty()) {
+> aMedia.AssignLiteral("all");
+> }
+320d321
+<
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-04-new-tab.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,187 @@
+Index: toolkit/components/remote/nsGTKRemoteService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/toolkit/components/remote/nsGTKRemoteService.cpp,v
+retrieving revision 1.3
+diff -u -p -8 -r1.3 nsGTKRemoteService.cpp
+--- toolkit/components/remote/nsGTKRemoteService.cpp 28 Nov 2005 23:56:41 -0000 1.3
++++ toolkit/components/remote/nsGTKRemoteService.cpp 21 Dec 2005 09:08:37 -0000
+@@ -75,16 +75,24 @@
+ #define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
+ #define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND"
+ #define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE"
+ #define MOZILLA_USER_PROP "_MOZILLA_USER"
+ #define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
+ #define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
+ #define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE"
+
++#ifdef IS_BIG_ENDIAN
++#define TO_LITTLE_ENDIAN32(x) \
++ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
++ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
++#else
++#define TO_LITTLE_ENDIAN32(x) (x)
++#endif
++
+ #ifdef MOZ_XUL_APP
+ const unsigned char kRemoteVersion[] = "5.1";
+ #else
+ const unsigned char kRemoteVersion[] = "5.0";
+ #endif
+
+ NS_IMPL_QUERY_INTERFACE2(nsGTKRemoteService,
+ nsIRemoteService,
+@@ -333,17 +341,17 @@ nsGTKRemoteService::HandleCommandLine(ch
+ return "509 internal error";
+
+ // the commandline property is constructed as an array of PRInt32
+ // followed by a series of null-terminated strings:
+ //
+ // [argc][offsetargv0][offsetargv1...]<workingdir>\0<argv[0]>\0argv[1]...\0
+ // (offset is from the beginning of the buffer)
+
+- PRInt32 argc = *NS_REINTERPRET_CAST(PRInt32*, aBuffer);
++ PRInt32 argc = TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, aBuffer));
+ char *wd = aBuffer + ((argc + 1) * sizeof(PRInt32));
+
+ #ifdef DEBUG_bsmedberg
+ printf("Receiving command line:\n"
+ " wd:\t%s\n"
+ " argc:\t%i\n",
+ wd, argc);
+ #endif
+@@ -355,17 +363,17 @@ nsGTKRemoteService::HandleCommandLine(ch
+ return "509 internal error";
+
+ char **argv = (char**) malloc(sizeof(char*) * argc);
+ if (!argv) return "509 internal error";
+
+ PRInt32 *offset = NS_REINTERPRET_CAST(PRInt32*, aBuffer) + 1;
+
+ for (int i = 0; i < argc; ++i) {
+- argv[i] = aBuffer + offset[i];
++ argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]);
+
+ #ifdef DEBUG_bsmedberg
+ printf(" argv[%i]:\t%s\n", i, argv[i]);
+ #endif
+ }
+
+ rv = cmdline->Init(argc, argv, lf, nsICommandLine::STATE_REMOTE_AUTO);
+ free (argv);
+@@ -467,17 +475,17 @@ nsGTKRemoteService::HandlePropertyChange
+ printf("Handling command: %s\n", data);
+ #endif
+
+ // Failed to get property off the window?
+ if (result != Success)
+ return FALSE;
+
+ // Failed to get the data off the window or it was the wrong type?
+- if (!data || !*data)
++ if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
+ return FALSE;
+
+ // cool, we got the property data.
+ const char *response = HandleCommand(data, window);
+
+ // put the property onto the window as the response
+ XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
+ sMozResponseAtom, XA_STRING,
+@@ -512,17 +520,17 @@ nsGTKRemoteService::HandlePropertyChange
+ (we only care
+ about the first ) */
+
+ // Failed to get property off the window?
+ if (result != Success)
+ return FALSE;
+
+ // Failed to get the data off the window or it was the wrong type?
+- if (!data || !*data)
++ if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
+ return FALSE;
+
+ // cool, we got the property data.
+ const char *response = HandleCommandLine(data, window);
+
+ // put the property onto the window as the response
+ XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
+ sMozResponseAtom, XA_STRING,
+Index: widget/src/xremoteclient/XRemoteClient.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/widget/src/xremoteclient/XRemoteClient.cpp,v
+retrieving revision 1.18
+diff -u -p -8 -r1.18 XRemoteClient.cpp
+--- widget/src/xremoteclient/XRemoteClient.cpp 19 Aug 2005 15:15:34 -0000 1.18
++++ widget/src/xremoteclient/XRemoteClient.cpp 21 Dec 2005 09:08:37 -0000
+@@ -62,16 +62,24 @@
+ #define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
+ #define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND"
+ #define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE"
+ #define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE"
+ #define MOZILLA_USER_PROP "_MOZILLA_USER"
+ #define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
+ #define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
+
++#ifdef IS_BIG_ENDIAN
++#define TO_LITTLE_ENDIAN32(x) \
++ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
++ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
++#else
++#define TO_LITTLE_ENDIAN32(x) (x)
++#endif
++
+ #ifndef MAX_PATH
+ #define MAX_PATH 1024
+ #endif
+
+ #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
+
+ static PRLogModuleInfo *sRemoteLm = NULL;
+
+@@ -686,41 +694,41 @@ XRemoteClient::DoSendCommandLine(Window
+ for (i = 0; i < argc; ++i)
+ argvlen += strlen(argv[i]);
+
+ PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 +
+ sizeof(PRInt32) * (argc + 1));
+ if (!buffer)
+ return NS_ERROR_OUT_OF_MEMORY;
+
+- buffer[0] = argc;
++ buffer[0] = TO_LITTLE_ENDIAN32(argc);
+
+ char *bufend = (char*) (buffer + argc + 1);
+
+ bufend = estrcpy(cwdbuf, bufend);
+
+ for (int i = 0; i < argc; ++i) {
+- buffer[i + 1] = bufend - ((char*) buffer);
++ buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer));
+ bufend = estrcpy(argv[i], bufend);
+ }
+
+ #ifdef DEBUG_bsmedberg
+- PRInt32 debug_argc = *buffer;
++ PRInt32 debug_argc = TO_LITTLE_ENDIAN32(*buffer);
+ char *debug_workingdir = (char*) (buffer + argc + 1);
+
+ printf("Sending command line:\n"
+ " working dir: %s\n"
+ " argc:\t%i",
+ debug_workingdir,
+ debug_argc);
+
+ PRInt32 *debug_offset = buffer + 1;
+ for (int debug_i = 0; debug_i < debug_argc; ++debug_i)
+ printf(" argv[%i]:\t%s\n", debug_i,
+- ((char*) buffer) + debug_offset[debug_i]);
++ ((char*) buffer) + TO_LITTLE_ENDIAN32(debug_offset[debug_i]));
+ #endif
+
+ XChangeProperty (mDisplay, aWindow, mMozCommandLineAtom, XA_STRING, 8,
+ PropModeReplace, (unsigned char *) buffer,
+ bufend - ((char*) buffer));
+
+ if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandLineAtom))
+ return NS_ERROR_FAILURE;
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-05-preload.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,20 @@
+Index: browser/app/mozilla.in
+===================================================================
+RCS file: /cvsroot/mozilla/browser/app/mozilla.in,v
+retrieving revision 1.13
+diff -u -r1.13 mozilla.in
+--- browser/app/mozilla.in 20 Sep 2005 21:11:34 -0000 1.13
++++ browser/app/mozilla.in 17 Feb 2006 06:02:15 -0000
+@@ -176,6 +176,12 @@
+ ## Start addon scripts
+ moz_pis_startstop_scripts "start"
+
++if [ ! -f /tmp/firefox-preloaded -a -x /usr/lib/gdmprefetch ]
++then
++ /usr/lib/gdmprefetch @${dist_bin}/firefox-preload.list
++ touch /tmp/firefox-preloaded
++fi
++
+ if [ $debugging = 1 ]
+ then
+ echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-06-locale.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,51 @@
+--- firefox/browser/app/mozilla.in.ori 2006-03-27 18:19:34.647520000 +0800
++++ firefox/browser/app/mozilla.in 2006-03-30 11:34:28.242248000 +0800
+@@ -144,6 +144,12 @@
+ mimeset -F "$MOZILLA_BIN"
+ fi
+
++# Set as current locale if no related args specified
++# If required language file doesn't exist, $MOZILLA_BIN
++# would use english version
++moz_uilocale=`echo $LANG | sed "s|_\([^.@]*\).*|-\1|g"`
++moz_contentlocale=`echo $LANG | sed "s|.*_\([^.@]*\).*|\1|g"`
++
+ pass_arg_count=0
+ while [ $# -gt $pass_arg_count ]
+ do
+@@ -161,6 +167,14 @@
+ script_args="$script_args -d $2"
+ shift 2
+ ;;
++ -UILocale)
++ moz_uilocale="$2"
++ shift 2
++ ;;
++ -contentLocale)
++ moz_contentlocale="$2"
++ shift 2
++ ;;
+ *)
+ # Move the unrecognized argument to the end of the list.
+ arg="$1"
+@@ -171,6 +185,8 @@
+ esac
+ done
+
++locale_args="-UILocale $moz_uilocale -contentLocale $moz_contentlocale"
++
+ export MRE_HOME
+
+ ## Start addon scripts
+@@ -184,9 +200,9 @@
+
+ if [ $debugging = 1 ]
+ then
+- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
++ echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $locale_args "$@"
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $locale_args "$@"
+ exitcode=$?
+
+ ## Stop addon scripts
--- a/patches/firefox-06-mozilla-config.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- firefox.orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004
-+++ firefix/build/unix/mozilla-config.in Fri Oct 14 13:32:03 2005
-@@ -115,7 +115,7 @@
- fi
-
- _nspr_libs="%FULL_NSPR_LIBS%"
--_xpcom_libs="-lxpcom $_nspr_libs"
-+_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
- _js_libs="-ljs"
-
- if test "$echo_libs" = "yes"; then
---- firefox.orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005
-+++ firefox/build/unix/mozilla-xpcom.pc.in Fri Oct 14 13:55:58 2005
-@@ -8,5 +8,5 @@
- Description: The Mozilla Cross Platform Component Library
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${libdir} -lxpcom
-+Libs: -L${libdir} -lxpcom -lxpcom_core
- Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-07-plugins.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,22 @@
+--- firefox/browser/app/mozilla.in.ori 2006-06-12 15:27:28.051285000 +0800
++++ firefox/browser/app/mozilla.in 2006-06-12 16:01:08.375674000 +0800
+@@ -95,6 +95,10 @@
+ moz_libdir=%MOZAPPDIR%
+ MRE_HOME=%MREDIR%
+
++## add Mozilla plugins directory in MOZ_PLUGIN_PATH in case
++## user upgrades from Solaris 10 to Solaris 11
++MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:/usr/sfw/lib/mozilla/plugins
++
+ # Use run-mozilla.sh in the current dir if it exists
+ # If not, then start resolving symlinks until we find run-mozilla.sh
+ found=0
+@@ -187,7 +191,7 @@
+
+ locale_args="-UILocale $moz_uilocale -contentLocale $moz_contentlocale"
+
+-export MRE_HOME
++export MRE_HOME MOZ_PLUGIN_PATH
+
+ ## Start addon scripts
+ moz_pis_startstop_scripts "start"
--- a/patches/firefox-08-font_Xft.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- firefox/browser/app/Makefile.in.orig 2005-12-02 14:53:52.942177000 +0000
-+++ firefox/browser/app/Makefile.in 2005-12-02 14:54:04.545631000 +0000
-@@ -87,6 +87,7 @@
- $(XPCOM_LIBS) \
- $(NSPR_LIBS) \
- $(TK_LIBS) \
-+ -lfontconfig -L/usr/openwin/lib -lXft \
- $(NULL)
-
- # Add explicit X11 dependency when building against X11 toolkits
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-08-no-nss-nspr.diff Wed Jul 26 14:14:43 2006 +0000
@@ -0,0 +1,79 @@
+--- firefox/toolkit/mozapps/installer/packager.mk.ori2 2006-04-27 09:29:19.904719000 +0800
++++ firefox/toolkit/mozapps/installer/packager.mk 2006-04-28 06:33:28.590446000 +0800
+@@ -183,6 +183,16 @@
+ endif # !CROSS_COMPILE
+
+ NO_PKG_FILES += \
++ libnspr4.so \
++ libplc4.so \
++ libplds4.so \
++ libnss3.so \
++ libsmime3.so \
++ libsoftokn3.chk \
++ libsoftokn3.so \
++ libssl3.so \
++ libnssckbi.so \
++ cpu/sparcv8plus/libnspr_flt4.so \
+ core \
+ bsdecho \
+ gtscc \
+--- firefox/build/unix/mozilla-config.in.ori 2006-06-26 14:10:22.186019000 +0800
++++ firefox/build/unix/mozilla-config.in 2006-06-26 20:16:23.469407000 +0800
+@@ -20,7 +20,6 @@
+ *
+ Libraries:
+ xpcom
+- nspr
+ js
+ jsj
+ gfx
+@@ -74,7 +73,7 @@
+ --idlflags)
+ echo_idlflags=yes
+ ;;
+- xpcom|js|nspr|gfx|jsj)
++ xpcom|js|gfx|jsj)
+ echo_components="$echo_components $1"
+ echo_libraries="$echo_libraries $1"
+ ;;
+@@ -103,19 +102,17 @@
+ fi
+
+ if test "$echo_cflags" = "yes"; then
+- nspr_cflags="%FULL_NSPR_CFLAGS%"
+ for n in $echo_components; do
+ component_includes="$component_includes -I%includedir%/$n"
+ done
+- echo $component_includes $includes $nspr_cflags
++ echo $component_includes $includes
+ fi
+
+ if test "$echo_idlflags" = "yes"; then
+ echo "-I%idldir%"
+ fi
+
+-_nspr_libs="%FULL_NSPR_LIBS%"
+-_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
++_xpcom_libs="-lxpcom -lxpcom_core"
+ _js_libs="-ljs"
+
+ if test "$echo_libs" = "yes"; then
+@@ -127,9 +124,6 @@
+ xpcom)
+ libs="$libs $_xpcom_libs"
+ ;;
+- nspr)
+- libs="$libs $_nspr_libs"
+- ;;
+ js)
+ libs="$libs $_js_libs"
+ ;;
+--- firefox/build/unix/mozilla-xpcom.pc.in.ori 2006-06-26 20:18:23.662416000 +0800
++++ firefox/build/unix/mozilla-xpcom.pc.in 2006-06-26 20:24:22.166426000 +0800
+@@ -7,6 +7,5 @@
+ Name: XPCOM
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+-Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${libdir} -lxpcom -lxpcom_core
+ Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
--- a/patches/firefox-09-yelp-hang.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Index: content/html/content/src/nsHTMLStyleElement.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/content/html/content/src/nsHTMLStyleElement.cpp,v
-retrieving revision 1.70
-diff -r1.70 nsHTMLStyleElement.cpp
-317d316
-<
-318a318,320
-> if (aMedia.IsEmpty()) {
-> aMedia.AssignLiteral("all");
-> }
-320d321
-<
--- a/patches/firefox-10-gecko.m4.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
---- /dev/null 2006-01-06 08:25:06.000000000 -0500
-+++ firefox/gecko.m4 2006-01-06 08:52:59.300366481 -0500
-@@ -0,0 +1,359 @@
-+# Copyright (C) 2000-2004 Marco Pesenti Gritti
-+# Copyright (C) 2003, 2004, 2005 Christian Persch
-+#
-+# This program is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the
-+# Free Software Foundation; either version 2 of the License, or (at your
-+# option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License along
-+# with this program; if not, write to the Free Software Foundation, Inc.,
-+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+
-+# GECKO_INIT([VARIABLE])
-+#
-+# Checks for gecko, and aborts if it's not found
-+#
-+# Checks for -fshort-wchar compiler variable, and adds it to
-+# AM_CXXFLAGS if found
-+#
-+# Checks whether RTTI is enabled, and adds -fno-rtti to
-+# AM_CXXFLAGS otherwise
-+#
-+# Checks whether the gecko build is a debug build, and adds
-+# debug flags to AM_CXXFLAGS if it is.
-+#
-+# Expanded variables:
-+# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
-+# VARIABLE_FLAVOUR: The flavour of the gecko that was found
-+# VARIABLE_HOME:
-+# VARIABLE_PREFIX:
-+# VARIABLE_INCLUDE_ROOT:
-+# VARIABLE_VERSION: The version of the gecko that was found
-+# VARIABLE_VERSION_MAJOR:
-+# VARIABLE_VERSION_MINOR:
-+
-+AC_DEFUN([GECKO_INIT],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+
-+AC_MSG_CHECKING([which gecko to use])
-+
-+AC_ARG_WITH([gecko],
-+ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
-+ [Which gecko engine to use (default: autodetect)]))
-+
-+# Backward compat
-+AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
-+
-+_GECKO=$with_gecko
-+
-+# Autodetect gecko
-+_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner"
-+if test -z "$_GECKO"; then
-+ for lizard in $_geckos; do
-+ if $PKG_CONFIG --exists $lizard-xpcom; then
-+ _GECKO=$lizard
-+ break;
-+ fi
-+ done
-+fi
-+
-+if test "x$_GECKO" = "x"; then
-+ AC_MSG_ERROR([No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])
-+elif ! ( echo "$_geckos" | egrep "(^| )$_GECKO(\$| )" > /dev/null); then
-+ AC_MSG_ERROR([Unknown gecko "$_GECKO" specified])
-+fi
-+
-+AC_MSG_RESULT([$_GECKO])
-+
-+case "$_GECKO" in
-+mozilla) _GECKO_FLAVOUR=mozilla ;;
-+seamonkey) _GECKO_FLAVOUR=mozilla ;;
-+*firefox) _GECKO_FLAVOUR=toolkit ;;
-+xulrunner) _GECKO_FLAVOUR=toolkit ;;
-+esac
-+
-+
-+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $_GECKO-gtkmozembed`"
-+_GECKO_HOME="`$PKG_CONFIG --variable=libdir $_GECKO-gtkmozembed`"
-+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix $_GECKO-gtkmozembed`"
-+
-+$1[]=$_GECKO
-+$1[]_FLAVOUR=$_GECKO_FLAVOUR
-+$1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
-+$1[]_HOME=$_GECKO_HOME
-+$1[]_PREFIX=$_GECKO_PREFIX
-+
-+# **************************************************************
-+# This is really gcc-only
-+# Do this test using CXX only since some versions of gcc
-+# 2.95-2.97 have a signed wchar_t in c++ only and some versions
-+# only have short-wchar support for c++.
-+# **************************************************************
-+
-+_GECKO_EXTRA_CPPFLAGS=
-+_GECKO_EXTRA_CFLAGS=
-+_GECKO_EXTRA_CXXFLAGS=
-+_GECKO_EXTRA_LDFLAGS=
-+
-+AC_LANG_PUSH([C++])
-+
-+_SAVE_CXXFLAGS=$CXXFLAGS
-+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar"
-+
-+AC_CACHE_CHECK([for compiler -fshort-wchar option],
-+ gecko_cv_have_usable_wchar_option,
-+ [AC_RUN_IFELSE([AC_LANG_SOURCE(
-+ [[#include <stddef.h>
-+ int main () {
-+ return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ;
-+ } ]])],
-+ [gecko_cv_have_usable_wchar_option="yes"],
-+ [gecko_cv_have_usable_wchar_option="no"],
-+ [gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"])])
-+
-+CXXFLAGS="$_SAVE_CXXFLAGS"
-+
-+AC_LANG_POP([C++])
-+
-+if test "$gecko_cv_have_usable_wchar_option" = "yes"; then
-+ _GECKO_EXTRA_CXXFLAGS="-fshort-wchar"
-+ AM_CXXFLAGS="$AM_CXXFLAGS -fshort-wchar"
-+fi
-+
-+# **************
-+# Check for RTTI
-+# **************
-+
-+AC_MSG_CHECKING([whether to enable C++ RTTI])
-+AC_ARG_ENABLE([cpp-rtti],
-+ AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]),
-+ [],[enable_cpp_rtti=no])
-+AC_MSG_RESULT([$enable_cpp_rtti])
-+
-+if test "$enable_cpp_rtti" = "no"; then
-+ _GECKO_EXTRA_CXXFLAGS="-fno-rtti $_GECKO_EXTRA_CXXFLAGS"
-+ AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS"
-+fi
-+
-+# *************
-+# Various tests
-+# *************
-+
-+AC_LANG_PUSH([C++])
-+
-+_SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
-+
-+AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
-+AC_RUN_IFELSE(
-+ [AC_LANG_SOURCE(
-+ [[#include <mozilla-config.h>
-+ #include <string.h>
-+ int main(void) {
-+ return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0;
-+ } ]]
-+ )],
-+ [result=yes],
-+ [AC_MSG_ERROR([[This program needs a gtk 2 gecko build]])],
-+ [result=maybe])
-+AC_MSG_RESULT([$result])
-+
-+AC_MSG_CHECKING([[whether we have a gecko debug build]])
-+AC_PREPROC_IFELSE(
-+ [AC_LANG_SOURCE(
-+ [[#include <mozilla-config.h>
-+ #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP)
-+ #error No
-+ #endif]]
-+ )],
-+ [gecko_cv_have_debug=yes],
-+ [gecko_cv_have_debug=no])
-+AC_MSG_RESULT([$gecko_cv_have_debug])
-+
-+CPPFLAGS="$_SAVE_CPPFLAGS"
-+
-+AC_LANG_POP([C++])
-+
-+if test "$gecko_cv_have_debug" = "yes"; then
-+ _GECKO_EXTRA_CXXFLAGS="$_GECKO_EXTRA_CXXFLAGS -DDEBUG -D_DEBUG"
-+ AM_CXXFLAGS="-DDEBUG -D_DEBUG $AM_CXXFLAGS"
-+fi
-+
-+# ***********************
-+# Check for gecko version
-+# ***********************
-+
-+AC_MSG_CHECKING([[for gecko version]])
-+
-+_GECKO_VERSION_SPLIT=`cat $_GECKO_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_U | awk '{ print $[3]; }' | tr ".ab+" " "`
-+if test -z "$_GECKO_VERSION_SPLIT"; then
-+ _GECKO_VERSION_SPLIT="1 7"
-+fi
-+
-+_GECKO_VERSION_MAJOR=`echo $_GECKO_VERSION_SPLIT | awk '{ print $[1]; }'`
-+_GECKO_VERSION_MINOR=`echo $_GECKO_VERSION_SPLIT | awk '{ print $[2]; }'`
-+_GECKO_VERSION="$_GECKO_VERSION_MAJOR.$_GECKO_VERSION_MINOR"
-+
-+AC_MSG_RESULT([$_GECKO_VERSION])
-+
-+$1[]_VERSION=$_GECKO_VERSION
-+$1[]_VERSION_MAJOR=$_GECKO_VERSION_MAJOR
-+$1[]_VERSION_MINOR=$_GECKO_VERSION_MINOR
-+
-+if test "$_GECKO_VERSION_MAJOR" != "1" -o "$_GECKO_VERSION_MINOR" -lt "7" -o "$_GECKO_VERSION_MINOR" -gt "9"; then
-+ AC_MSG_ERROR([Gecko version $_GECKO_VERSION is not supported!])
-+fi
-+
-+if test "$_GECKO_VERSION_MAJOR" = "1" -a "$_GECKO_VERSION_MINOR" -ge "7"; then
-+ AC_DEFINE([HAVE_GECKO_1_7],[1],[Define if we have gecko 1.7])
-+ gecko_cv_have_gecko_1_7=yes
-+fi
-+if test "$_GECKO_VERSION_MAJOR" = "1" -a "$_GECKO_VERSION_MINOR" -ge "8"; then
-+ AC_DEFINE([HAVE_GECKO_1_8],[1],[Define if we have gecko 1.8])
-+ gecko_cv_have_gecko_1_8=yes
-+fi
-+if test "$_GECKO_VERSION_MAJOR" = "1" -a "$_GECKO_VERSION_MINOR" -ge "9"; then
-+ AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
-+ gecko_cv_have_gecko_1_9=yes
-+fi
-+
-+AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$_GECKO_VERSION_MAJOR" = "1" -a "$_GECKO_VERSION_MINOR" -ge "7"])
-+AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$_GECKO_VERSION_MAJOR" = "1" -a "$_GECKO_VERSION_MINOR" -ge "8"])
-+AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$_GECKO_VERSION_MAJOR" = "1" -a "$_GECKO_VERSION_MINOR" -ge "9"])
-+
-+])
-+
-+# ***************************************************************************
-+# ***************************************************************************
-+# ***************************************************************************
-+
-+# GECKO_DISPATCH([MACRO], [HEADERS], ...)
-+
-+m4_define([GECKO_DISPATCH],
-+[
-+
-+AC_LANG_PUSH([C++])
-+
-+_SAVE_CPPFLAGS="$CPPFLAGS"
-+_SAVE_CXXFLAGS="$CXXFLAGS"
-+_SAVE_LDFLAGS="$LDFLAGS"
-+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I $_GECKO-xpcom)"
-+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other $_GECKO-xpcom)"
-+LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS $($PKG_CONFIG --libs $_GECKO-xpcom) -Wl,--rpath=$_GECKO_HOME"
-+
-+_GECKO_DISPATCH_HEADERS="$2"
-+
-+# Sigh Gentoo has a rubbish header layout
-+# http://bugs.gentoo.org/show_bug.cgi?id=100804
-+# Mind you, it's useful to be able to test against uninstalled mozilla builds...
-+_GECKO_DISPATCH_HEADERS="$_GECKO_DISPATCH_HEADERS necko dom"
-+
-+# Now add them to CPPFLAGS
-+for i in $_GECKO_DISPATCH_HEADERS; do
-+ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
-+done
-+
-+m4_indir([$1],m4_shiftn(2,$@))
-+
-+CPPFLAGS="$_SAVE_CPPFLAGS"
-+CXXFLAGS="$_SAVE_CXXFLAGS"
-+LDFLAGS="$_SAVE_LDFLAGS"
-+
-+AC_LANG_POP([C++])
-+
-+])# _GECKO_DISPATCH
-+
-+# ***************************************************************************
-+# ***************************************************************************
-+# ***************************************************************************
-+
-+# GECKO_COMPILE_IFELSE(HEADERS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+
-+AC_DEFUN([GECKO_COMPILE_IFELSE],[GECKO_DISPATCH([AC_COMPILE_IFELSE],$@)])
-+
-+# GECKO_RUN_IFELSE(HEADERS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+
-+AC_DEFUN([GECKO_RUN_IFELSE],[GECKO_DISPATCH([AC_RUN_IFELSE],$@)])
-+
-+# ***************************************************************************
-+# ***************************************************************************
-+# ***************************************************************************
-+
-+# GECKO_CHECK_CONTRACTID(IDENTIFIER, CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Checks wheter CONTRACTID is a registered contract ID
-+
-+AC_DEFUN([GECKO_CHECK_CONTRACTID],
-+[AC_REQUIRE([GECKO_INIT])dnl
-+
-+AC_CACHE_CHECK([for the $2 XPCOM component],
-+[gecko_cv_xpcom_contractid_[]$1],
-+[
-+gecko_cv_xpcom_contractid_[]$1[]=no
-+
-+GECKO_RUN_IFELSE([],
-+[AC_LANG_PROGRAM([[
-+#include <mozilla-config.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <nsXPCOM.h>
-+#include <nsCOMPtr.h>
-+#include <nsILocalFile.h>
-+#include <nsIServiceManager.h>
-+#include <nsIComponentRegistrar.h>
-+#include <nsString.h>
-+]],[[
-+// redirect unwanted mozilla debug output
-+freopen ("/dev/null", "w", stdout);
-+freopen ("/dev/null", "w", stderr);
-+
-+nsresult rv;
-+nsCOMPtr<nsILocalFile> directory;
-+rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, getter_AddRefs (directory));
-+if (NS_FAILED (rv) || !directory) {
-+ exit (EXIT_FAILURE);
-+}
-+
-+nsCOMPtr<nsIServiceManager> sm;
-+rv = NS_InitXPCOM2 (getter_AddRefs (sm), directory, nsnull);
-+if (NS_FAILED (rv)) {
-+ exit (EXIT_FAILURE);
-+}
-+
-+nsCOMPtr<nsIComponentRegistrar> registar (do_QueryInterface (sm, &rv));
-+sm = nsnull; // release service manager
-+if (NS_FAILED (rv)) {
-+ NS_ShutdownXPCOM (nsnull);
-+ exit (EXIT_FAILURE);
-+}
-+
-+PRBool isRegistered = PR_FALSE;
-+rv = registar->IsContractIDRegistered ("$2", &isRegistered);
-+registar = nsnull; // release registar before shutdown
-+
-+NS_ShutdownXPCOM (nsnull);
-+exit (isRegistered ? EXIT_SUCCESS : EXIT_FAILURE);
-+]])
-+],
-+[gecko_cv_xpcom_contractid_[]$1[]=present],
-+[gecko_cv_xpcom_contractid_[]$1[]="not present"],
-+[gecko_cv_xpcom_contractid_[]$1[]="not present (cross-compiling)"])
-+
-+])
-+
-+if test "$gecko_cv_xpcom_contractid_[]$1" = "present"; then
-+ ifelse([$3],,[:],[$3])
-+else
-+ ifelse([$4],,[AC_MSG_FAILURE([dnl
-+Contract ID "$2" is not registered, but $PACKAGE_NAME depends on it.])],
-+ [$4])
-+fi
-+
-+])
-+
--- a/patches/firefox-11-new-tab.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-Index: toolkit/components/remote/nsGTKRemoteService.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/toolkit/components/remote/nsGTKRemoteService.cpp,v
-retrieving revision 1.3
-diff -u -p -8 -r1.3 nsGTKRemoteService.cpp
---- toolkit/components/remote/nsGTKRemoteService.cpp 28 Nov 2005 23:56:41 -0000 1.3
-+++ toolkit/components/remote/nsGTKRemoteService.cpp 21 Dec 2005 09:08:37 -0000
-@@ -75,16 +75,24 @@
- #define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
- #define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND"
- #define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE"
- #define MOZILLA_USER_PROP "_MOZILLA_USER"
- #define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
- #define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
- #define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE"
-
-+#ifdef IS_BIG_ENDIAN
-+#define TO_LITTLE_ENDIAN32(x) \
-+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
-+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
-+#else
-+#define TO_LITTLE_ENDIAN32(x) (x)
-+#endif
-+
- #ifdef MOZ_XUL_APP
- const unsigned char kRemoteVersion[] = "5.1";
- #else
- const unsigned char kRemoteVersion[] = "5.0";
- #endif
-
- NS_IMPL_QUERY_INTERFACE2(nsGTKRemoteService,
- nsIRemoteService,
-@@ -333,17 +341,17 @@ nsGTKRemoteService::HandleCommandLine(ch
- return "509 internal error";
-
- // the commandline property is constructed as an array of PRInt32
- // followed by a series of null-terminated strings:
- //
- // [argc][offsetargv0][offsetargv1...]<workingdir>\0<argv[0]>\0argv[1]...\0
- // (offset is from the beginning of the buffer)
-
-- PRInt32 argc = *NS_REINTERPRET_CAST(PRInt32*, aBuffer);
-+ PRInt32 argc = TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, aBuffer));
- char *wd = aBuffer + ((argc + 1) * sizeof(PRInt32));
-
- #ifdef DEBUG_bsmedberg
- printf("Receiving command line:\n"
- " wd:\t%s\n"
- " argc:\t%i\n",
- wd, argc);
- #endif
-@@ -355,17 +363,17 @@ nsGTKRemoteService::HandleCommandLine(ch
- return "509 internal error";
-
- char **argv = (char**) malloc(sizeof(char*) * argc);
- if (!argv) return "509 internal error";
-
- PRInt32 *offset = NS_REINTERPRET_CAST(PRInt32*, aBuffer) + 1;
-
- for (int i = 0; i < argc; ++i) {
-- argv[i] = aBuffer + offset[i];
-+ argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]);
-
- #ifdef DEBUG_bsmedberg
- printf(" argv[%i]:\t%s\n", i, argv[i]);
- #endif
- }
-
- rv = cmdline->Init(argc, argv, lf, nsICommandLine::STATE_REMOTE_AUTO);
- free (argv);
-@@ -467,17 +475,17 @@ nsGTKRemoteService::HandlePropertyChange
- printf("Handling command: %s\n", data);
- #endif
-
- // Failed to get property off the window?
- if (result != Success)
- return FALSE;
-
- // Failed to get the data off the window or it was the wrong type?
-- if (!data || !*data)
-+ if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
- return FALSE;
-
- // cool, we got the property data.
- const char *response = HandleCommand(data, window);
-
- // put the property onto the window as the response
- XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
- sMozResponseAtom, XA_STRING,
-@@ -512,17 +520,17 @@ nsGTKRemoteService::HandlePropertyChange
- (we only care
- about the first ) */
-
- // Failed to get property off the window?
- if (result != Success)
- return FALSE;
-
- // Failed to get the data off the window or it was the wrong type?
-- if (!data || !*data)
-+ if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
- return FALSE;
-
- // cool, we got the property data.
- const char *response = HandleCommandLine(data, window);
-
- // put the property onto the window as the response
- XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
- sMozResponseAtom, XA_STRING,
-Index: widget/src/xremoteclient/XRemoteClient.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/widget/src/xremoteclient/XRemoteClient.cpp,v
-retrieving revision 1.18
-diff -u -p -8 -r1.18 XRemoteClient.cpp
---- widget/src/xremoteclient/XRemoteClient.cpp 19 Aug 2005 15:15:34 -0000 1.18
-+++ widget/src/xremoteclient/XRemoteClient.cpp 21 Dec 2005 09:08:37 -0000
-@@ -62,16 +62,24 @@
- #define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
- #define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND"
- #define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE"
- #define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE"
- #define MOZILLA_USER_PROP "_MOZILLA_USER"
- #define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
- #define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
-
-+#ifdef IS_BIG_ENDIAN
-+#define TO_LITTLE_ENDIAN32(x) \
-+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
-+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
-+#else
-+#define TO_LITTLE_ENDIAN32(x) (x)
-+#endif
-+
- #ifndef MAX_PATH
- #define MAX_PATH 1024
- #endif
-
- #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
-
- static PRLogModuleInfo *sRemoteLm = NULL;
-
-@@ -686,41 +694,41 @@ XRemoteClient::DoSendCommandLine(Window
- for (i = 0; i < argc; ++i)
- argvlen += strlen(argv[i]);
-
- PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 +
- sizeof(PRInt32) * (argc + 1));
- if (!buffer)
- return NS_ERROR_OUT_OF_MEMORY;
-
-- buffer[0] = argc;
-+ buffer[0] = TO_LITTLE_ENDIAN32(argc);
-
- char *bufend = (char*) (buffer + argc + 1);
-
- bufend = estrcpy(cwdbuf, bufend);
-
- for (int i = 0; i < argc; ++i) {
-- buffer[i + 1] = bufend - ((char*) buffer);
-+ buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer));
- bufend = estrcpy(argv[i], bufend);
- }
-
- #ifdef DEBUG_bsmedberg
-- PRInt32 debug_argc = *buffer;
-+ PRInt32 debug_argc = TO_LITTLE_ENDIAN32(*buffer);
- char *debug_workingdir = (char*) (buffer + argc + 1);
-
- printf("Sending command line:\n"
- " working dir: %s\n"
- " argc:\t%i",
- debug_workingdir,
- debug_argc);
-
- PRInt32 *debug_offset = buffer + 1;
- for (int debug_i = 0; debug_i < debug_argc; ++debug_i)
- printf(" argv[%i]:\t%s\n", debug_i,
-- ((char*) buffer) + debug_offset[debug_i]);
-+ ((char*) buffer) + TO_LITTLE_ENDIAN32(debug_offset[debug_i]));
- #endif
-
- XChangeProperty (mDisplay, aWindow, mMozCommandLineAtom, XA_STRING, 8,
- PropModeReplace, (unsigned char *) buffer,
- bufend - ((char*) buffer));
-
- if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandLineAtom))
- return NS_ERROR_FAILURE;
-
--- a/patches/firefox-12-preload.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Index: browser/app/mozilla.in
-===================================================================
-RCS file: /cvsroot/mozilla/browser/app/mozilla.in,v
-retrieving revision 1.13
-diff -u -r1.13 mozilla.in
---- browser/app/mozilla.in 20 Sep 2005 21:11:34 -0000 1.13
-+++ browser/app/mozilla.in 17 Feb 2006 06:02:15 -0000
-@@ -176,6 +176,12 @@
- ## Start addon scripts
- moz_pis_startstop_scripts "start"
-
-+if [ ! -f /tmp/firefox-preloaded -a -x /usr/lib/gdmprefetch ]
-+then
-+ /usr/lib/gdmprefetch @${dist_bin}/firefox-preload.list
-+ touch /tmp/firefox-preloaded
-+fi
-+
- if [ $debugging = 1 ]
- then
- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
--- a/patches/firefox-13-locale.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
---- firefox/browser/app/mozilla.in.ori 2006-03-27 18:19:34.647520000 +0800
-+++ firefox/browser/app/mozilla.in 2006-03-30 11:34:28.242248000 +0800
-@@ -144,6 +144,12 @@
- mimeset -F "$MOZILLA_BIN"
- fi
-
-+# Set as current locale if no related args specified
-+# If required language file doesn't exist, $MOZILLA_BIN
-+# would use english version
-+moz_uilocale=`echo $LANG | sed "s|_\([^.@]*\).*|-\1|g"`
-+moz_contentlocale=`echo $LANG | sed "s|.*_\([^.@]*\).*|\1|g"`
-+
- pass_arg_count=0
- while [ $# -gt $pass_arg_count ]
- do
-@@ -161,6 +167,14 @@
- script_args="$script_args -d $2"
- shift 2
- ;;
-+ -UILocale)
-+ moz_uilocale="$2"
-+ shift 2
-+ ;;
-+ -contentLocale)
-+ moz_contentlocale="$2"
-+ shift 2
-+ ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
-@@ -171,6 +185,8 @@
- esac
- done
-
-+locale_args="-UILocale $moz_uilocale -contentLocale $moz_contentlocale"
-+
- export MRE_HOME
-
- ## Start addon scripts
-@@ -184,9 +200,9 @@
-
- if [ $debugging = 1 ]
- then
-- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
-+ echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $locale_args "$@"
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $locale_args "$@"
- exitcode=$?
-
- ## Stop addon scripts
--- a/patches/firefox-14-plugins.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- firefox/browser/app/mozilla.in.ori 2006-06-12 15:27:28.051285000 +0800
-+++ firefox/browser/app/mozilla.in 2006-06-12 16:01:08.375674000 +0800
-@@ -95,6 +95,10 @@
- moz_libdir=%MOZAPPDIR%
- MRE_HOME=%MREDIR%
-
-+## add Mozilla plugins directory in MOZ_PLUGIN_PATH in case
-+## user upgrades from Solaris 10 to Solaris 11
-+MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:/usr/sfw/lib/mozilla/plugins
-+
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
- found=0
-@@ -187,7 +191,7 @@
-
- locale_args="-UILocale $moz_uilocale -contentLocale $moz_contentlocale"
-
--export MRE_HOME
-+export MRE_HOME MOZ_PLUGIN_PATH
-
- ## Start addon scripts
- moz_pis_startstop_scripts "start"
--- a/patches/firefox-15-no-nss-nspr.diff Wed Jul 26 14:08:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
---- firefox/toolkit/mozapps/installer/packager.mk.ori2 2006-04-27 09:29:19.904719000 +0800
-+++ firefox/toolkit/mozapps/installer/packager.mk 2006-04-28 06:33:28.590446000 +0800
-@@ -183,6 +183,16 @@
- endif # !CROSS_COMPILE
-
- NO_PKG_FILES += \
-+ libnspr4.so \
-+ libplc4.so \
-+ libplds4.so \
-+ libnss3.so \
-+ libsmime3.so \
-+ libsoftokn3.chk \
-+ libsoftokn3.so \
-+ libssl3.so \
-+ libnssckbi.so \
-+ cpu/sparcv8plus/libnspr_flt4.so \
- core \
- bsdecho \
- gtscc \
---- firefox/build/unix/mozilla-config.in.ori 2006-06-26 14:10:22.186019000 +0800
-+++ firefox/build/unix/mozilla-config.in 2006-06-26 20:16:23.469407000 +0800
-@@ -20,7 +20,6 @@
- *
- Libraries:
- xpcom
-- nspr
- js
- jsj
- gfx
-@@ -74,7 +73,7 @@
- --idlflags)
- echo_idlflags=yes
- ;;
-- xpcom|js|nspr|gfx|jsj)
-+ xpcom|js|gfx|jsj)
- echo_components="$echo_components $1"
- echo_libraries="$echo_libraries $1"
- ;;
-@@ -103,19 +102,17 @@
- fi
-
- if test "$echo_cflags" = "yes"; then
-- nspr_cflags="%FULL_NSPR_CFLAGS%"
- for n in $echo_components; do
- component_includes="$component_includes -I%includedir%/$n"
- done
-- echo $component_includes $includes $nspr_cflags
-+ echo $component_includes $includes
- fi
-
- if test "$echo_idlflags" = "yes"; then
- echo "-I%idldir%"
- fi
-
--_nspr_libs="%FULL_NSPR_LIBS%"
--_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
-+_xpcom_libs="-lxpcom -lxpcom_core"
- _js_libs="-ljs"
-
- if test "$echo_libs" = "yes"; then
-@@ -127,9 +124,6 @@
- xpcom)
- libs="$libs $_xpcom_libs"
- ;;
-- nspr)
-- libs="$libs $_nspr_libs"
-- ;;
- js)
- libs="$libs $_js_libs"
- ;;
---- firefox/build/unix/mozilla-xpcom.pc.in.ori 2006-06-26 20:18:23.662416000 +0800
-+++ firefox/build/unix/mozilla-xpcom.pc.in 2006-06-26 20:24:22.166426000 +0800
-@@ -7,6 +7,5 @@
- Name: XPCOM
- Description: The Mozilla Cross Platform Component Library
- Version: %MOZILLA_VERSION%
--Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${libdir} -lxpcom -lxpcom_core
- Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string