GNOME.org
 

Re: [Nautilus-list] Getting the mozilla 0.9.5 patch in

> Where can I get this patch for 1.0.4 to compile against mozilla 0.9.5?
> Until nautilus 1.0.5 comes out.
OK. If anyone is interested, I offer the patch to compile nautilus 1.0.4
with mozilla 0.9.5. But ONLY COMPILATION is fixed. For some reason
(sorry, I am neither nautilus nor mozilla developer) nautilus is unable
to show web pages. I don't really bother and look forward to see 1.0.5
soon. Hopefully with support of 0.9.5:), good memory management and
amazing speed:))) 
To nautilus team: don't blame me please for the buggy patch to
out-of-date release.

Regards,

Sergey

diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/main.c nautilus-1.0.4/components/mozilla/main.c
*** nautilus-1.0.4.orig/components/mozilla/main.c	Thu May 10 23:58:33 2001
--- nautilus-1.0.4/components/mozilla/main.c	Tue Oct 16 21:58:16 2001
***************
*** 32,38 ****
  #include <eel/eel-debug.h>
  #include <eel/eel-glib-extensions.h>
  #include <gconf/gconf.h>
! #include <gtkmozembed.h>
  #include <libgnomevfs/gnome-vfs-init.h>
  #include <stdlib.h>
  
--- 32,38 ----
  #include <eel/eel-debug.h>
  #include <eel/eel-glib-extensions.h>
  #include <gconf/gconf.h>
! #include <gtkembedmoz/gtkmozembed.h>
  #include <libgnomevfs/gnome-vfs-init.h>
  #include <stdlib.h>
  
diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/mozilla-events.cpp nautilus-1.0.4/components/mozilla/mozilla-events.cpp
*** nautilus-1.0.4.orig/components/mozilla/mozilla-events.cpp	Tue Feb 27 09:38:53 2001
--- nautilus-1.0.4/components/mozilla/mozilla-events.cpp	Tue Oct 16 22:31:30 2001
***************
*** 60,65 ****
--- 60,66 ----
  #include "nsIDocShellTreeOwner.h"
  #include "nsIDocument.h"
  #include "nsIContent.h"
+ #include "nsIContentViewer.h"
  #include "nsIDOMHTMLElement.h"
  #include "nsIDOMHTMLAnchorElement.h"
  #include "nsIDOMHTMLDocument.h"
***************
*** 71,80 ****
  get_glib_str_from_ns_str (nsAutoString string)
  {
  
! 	char *cstr = string.ToNewCString();
  	char *glib_str = g_strdup (cstr);
  
! 	nsMemory::Free (cstr);
  
  	return glib_str;
  }
--- 72,81 ----
  get_glib_str_from_ns_str (nsAutoString string)
  {
  
! 	const char *cstr = string.GetBuffer();
  	char *glib_str = g_strdup (cstr);
  
! //	nsMemory::Free (cstr);
  
  	return glib_str;
  }
diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/mozilla-events.h nautilus-1.0.4/components/mozilla/mozilla-events.h
*** nautilus-1.0.4.orig/components/mozilla/mozilla-events.h	Tue Feb 27 09:38:53 2001
--- nautilus-1.0.4/components/mozilla/mozilla-events.h	Tue Oct 16 22:05:24 2001
***************
*** 29,35 ****
  #define MOZILLA_EVENTS_H
  
  #include <glib.h>
! #include "gtkmozembed.h"
  
  #ifdef __cplusplus
  extern "C" {
--- 29,35 ----
  #define MOZILLA_EVENTS_H
  
  #include <glib.h>
! #include "gtkembedmoz/gtkmozembed.h"
  
  #ifdef __cplusplus
  extern "C" {
diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/nautilus-mozilla-embed-extensions.cpp nautilus-1.0.4/components/mozilla/nautilus-mozilla-embed-extensions.cpp
*** nautilus-1.0.4.orig/components/mozilla/nautilus-mozilla-embed-extensions.cpp	Thu Feb 22 12:40:40 2001
--- nautilus-1.0.4/components/mozilla/nautilus-mozilla-embed-extensions.cpp	Tue Oct 16 22:40:15 2001
***************
*** 41,48 ****
  #include "nsIMarkupDocumentViewer.h"
  #include "nsICharsetConverterManager.h"
  #include "nsICharsetConverterManager2.h"
  #include <vector>
! #include <string>
  
  struct Encoding
  {
--- 41,49 ----
  #include "nsIMarkupDocumentViewer.h"
  #include "nsICharsetConverterManager.h"
  #include "nsICharsetConverterManager2.h"
+ #include "nsIContentViewer.h"
  #include <vector>
! #include </usr/include/g++-3/string>
  
  struct Encoding
  {
***************
*** 209,215 ****
  	
  	nsAutoString charsetString;
  	charsetString.AssignWithConversion (charset_encoding);
! 	rv = markupDocumentViewer->SetForceCharacterSet (charsetString.ToNewUnicode());
  
  	return NS_SUCCEEDED (rv) ? TRUE : FALSE;
  }
--- 210,216 ----
  	
  	nsAutoString charsetString;
  	charsetString.AssignWithConversion (charset_encoding);
! 	rv = markupDocumentViewer->SetForceCharacterSet (charsetString.get());
  
  	return NS_SUCCEEDED (rv) ? TRUE : FALSE;
  }
***************
*** 313,319 ****
  convert_ns_string_to_c_string (const nsString & ns_string)
  {
  	char *c_string;
! 	char *ns_c_string = ns_string.ToNewCString ();
  	
  	if (ns_c_string == NULL) {
  		return NULL;
--- 314,320 ----
  convert_ns_string_to_c_string (const nsString & ns_string)
  {
  	char *c_string;
! 	const char *ns_c_string = ns_string.GetBuffer();
  	
  	if (ns_c_string == NULL) {
  		return NULL;
***************
*** 321,327 ****
  
  	c_string = g_strdup (ns_c_string);
  
! 	nsMemory::Free (ns_c_string);
  
  	return c_string;
  }
--- 322,328 ----
  
  	c_string = g_strdup (ns_c_string);
  
! 	//nsMemory::Free (ns_c_string);
  
  	return c_string;
  }
diff -Nrc -x *~ nautilus-1.0.4.orig/configure nautilus-1.0.4/configure
*** nautilus-1.0.4.orig/configure	Thu Jul  5 18:58:31 2001
--- nautilus-1.0.4/configure	Tue Oct 16 22:43:29 2001
***************
*** 3745,3751 ****
  
  if test "x$found_mozilla" = "xtrue"
  then
! 	grep -w gtk_moz_embed_set_profile_path $_mozilla_include_place/gtkmozembed.h > /dev/null 2>&1
  
  	if test $? -eq 0
  	then
--- 3745,3751 ----
  
  if test "x$found_mozilla" = "xtrue"
  then
! 	grep -w gtk_moz_embed_set_profile_path $_mozilla_include_place/gtkembedmoz/gtkmozembed.h > /dev/null 2>&1
  
  	if test $? -eq 0
  	then
diff -Nrc -x *~ nautilus-1.0.4.orig/configure.in nautilus-1.0.4/configure.in
*** nautilus-1.0.4.orig/configure.in	Tue Jul  3 23:05:59 2001
--- nautilus-1.0.4/configure.in	Tue Oct 16 23:39:38 2001
***************
*** 252,259 ****
  	MOZILLA_COMPONENT_RPATH_FLAGS=-Wl,-rpath=$_mozilla_lib_place
  	dnl The '-I$_mozilla_include_place/nspr' is needed for Mozilla 0.9.x
  	dnl and is not used (yet harmless) by Mozilla 0.8.x
- 	MOZILLA_COMPONENT_CFLAGS="-I$_mozilla_include_place -I$_mozilla_include_place/nspr -fno-rtti -fno-exceptions"
  	MOZILLA_COMPONENT_LDFLAGS=-L$_mozilla_lib_place
  	MOZILLA_COMPONENT_LIBS="$_mozilla_gtk_moz_embed_libs \
  				$_mozilla_gtk_super_win_libs \
  				$_mozilla_xpcom_libs \
--- 252,264 ----
  	MOZILLA_COMPONENT_RPATH_FLAGS=-Wl,-rpath=$_mozilla_lib_place
  	dnl The '-I$_mozilla_include_place/nspr' is needed for Mozilla 0.9.x
  	dnl and is not used (yet harmless) by Mozilla 0.8.x
  	MOZILLA_COMPONENT_LDFLAGS=-L$_mozilla_lib_place
+ 	MOZILLA_COMPONENT_CFLAGS="-I$_mozilla_include_place -fno-rtti -fno-exceptions" 
+ 	for i in nspr xpcom webbrwsr widget dom docshell \
+           content string layout gtkembedmoz gfx pref uconv ; do
+           MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS -I$_mozilla_include_place/$i"
+         done
+ 
  	MOZILLA_COMPONENT_LIBS="$_mozilla_gtk_moz_embed_libs \
  				$_mozilla_gtk_super_win_libs \
  				$_mozilla_xpcom_libs \
***************
*** 294,300 ****
  if test "x$found_mozilla" = "xtrue"
  then
  dnl EVIL1:
! 	grep -w gtk_moz_embed_set_profile_path $_mozilla_include_place/gtkmozembed.h > /dev/null 2>&1
  
  	if test $? -eq 0
  	then
--- 299,305 ----
  if test "x$found_mozilla" = "xtrue"
  then
  dnl EVIL1:
! 	grep -w gtk_moz_embed_set_profile_path $_mozilla_include_place/gtkembedmoz/gtkmozembed.h > /dev/null 2>&1
  
  	if test $? -eq 0
  	then
***************
*** 303,309 ****
  
  		AC_SUBST(MOZILLA_PROFILES_CFLAGS)
  	else
! 		grep -w GetName $_mozilla_include_place/nsIRequest.h > /dev/null 2>&1
  
  		if test $? -eq 0
  		then
--- 308,314 ----
  
  		AC_SUBST(MOZILLA_PROFILES_CFLAGS)
  	else
! 		grep -w GetName $_mozilla_include_place/necko/nsIRequest.h > /dev/null 2>&1
  
  		if test $? -eq 0
  		then
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]