Re: Epiphany and firefox/thunderbird

[Christian Persch <chpe gnome org>]

Hi,

On Wed, 2004-09-15 at 00:37, Sergio Costas wrote:
> I want to make a question: is posible to make epiphany to use the Gecko
> renderer included in firefox or thunderbird instead the one of Mozilla?
> AFAIK, is the same HTML renderer in the three cases, but each time I
> want to install GNOME (which depends of Epiphany) it wants to install
> mozilla too, when I only use thunderbird.

It's indeed possible to build epiphany against firefox' gtkmozembed
libraries. You'll need one of the attached patches (it's against
gnome-2-8 cvs branch of epiphany, but should apply to 1.4.0 release
too). Additionally, you need a patch for firefox/thunderbird build, see
http://bugzilla.mozilla.org/show_bug.cgi?id=256988 .

Then you need to rerun autogen.sh, and configure epiphany with
--with-mozilla=firefox (or =thunderbird) argument.

The patch works with my ~3 weeks old firefox trunk build; if you have a
build from aviary branch, you may need to modify the
MOZILLA_VERSION=1.8.3
line in configure.in; not sure which version will be right for that.
The thunderbird patch is untested, but should work ok.

Let me know if you run into any additional problems.

Regards,
	Christian

? po/de-base.po
? po/de AO po
Index: configure.in
===================================================================
RCS file: /cvs/gnome/epiphany/Attic/configure.in,v
retrieving revision 1.195.2.1
diff -u -p -r1.195.2.1 configure.in
--- configure.in	13 Sep 2004 09:59:07 -0000	1.195.2.1
+++ configure.in	15 Sep 2004 14:03:07 -0000
@@ -78,19 +78,9 @@ AC_SUBST(LIBBONOBO_IDL)
 BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL)
 
-PKG_CHECK_MODULES(MOZILLA_COMPONENT, mozilla-gtkmozembed mozilla-xpcom)
-AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
-AC_SUBST(MOZILLA_COMPONENT_LIBS)
-
-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir mozilla-gtkmozembed`"
-AC_SUBST(MOZILLA_INCLUDE_ROOT)
-
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-AC_SUBST(MOZILLA_HOME)
-
 dnl whether to build with DEBUG defined
 AC_ARG_WITH(mozilla-debug,
-	[  --with-mozilla-debug        Use a debug mozilla build],
+	[  --with-mozilla-debug        Use a debug mozilla/firefox build],
 	AM_CXXFLAGS="-DDEBUG $AM_CXXFLAGS",)
 
 AC_ARG_ENABLE(cpp-rtti,
@@ -153,8 +143,40 @@ dnl *********************
 dnl Mozilla version check
 dnl *********************
 
-AC_MSG_CHECKING(for mozilla version)
-MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed`"
+AC_MSG_CHECKING([whether to use mozilla or firefox])
+
+AC_ARG_WITH([mozilla],
+    AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox@:>@],
+		   [Whether to use mozilla or firefox]))
+
+MOZILLA=mozilla
+if test "x$with_mozilla" = "xfirefox"; then
+  MOZILLA=firefox
+fi
+
+AC_MSG_RESULT([$MOZILLA])
+
+IS_MOZILLA="`test "$MOZILLA" = "mozilla"`"
+IS_FIREFOX="`test "$MOZILLA" = "firefox"`"
+
+AC_DEFINE_UNQUOTED([MOZILLA],["$MOZILLA"],[Which mozilla we're using])
+AC_DEFINE_UNQUOTED([MOZILLA_IS_MOZILLA],[$IS_MOZILLA],[Whether we're using mozilla])
+AC_DEFINE_UNQUOTED([MOZILLA_IS_FIREFOX],[$IS_FIREFOX],[Whether we're using firefox])
+
+PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed $MOZILLA-xpcom)
+AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
+AC_SUBST(MOZILLA_COMPONENT_LIBS)
+
+MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
+AC_SUBST(MOZILLA_INCLUDE_ROOT)
+
+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
+AC_SUBST(MOZILLA_HOME)
+
+if test "$MOZILLA" = "mozilla"; then
+
+AC_MSG_CHECKING([for $MOZILLA version])
+MOZILLA_VERSION="`$PKG_CONFIG --modversion $MOZILLA-gtkmozembed`"
 
 AC_ARG_WITH(mozilla-snapshot,
   AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.7|1.8a1|1.8a2|trunk@:>@],
@@ -168,6 +190,10 @@ if test $MOZILLA_VERSION = "trunk"; then
 	MOZILLA_VERSION=9.0 # use a high number
 fi
 
+else
+  MOZILLA_VERSION=1.8.3
+fi
+
 dnl Split up the version string ( 1.7rc1 -> 1 7 rc 1 )
 version=$(echo $MOZILLA_VERSION | sed -e 's/\(@<:@0-9@:>@\+\|@<:@a-z@:>@\+\)/\1 /g' -e 's/\.//g')
 
@@ -241,9 +267,15 @@ AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/pip
 	[AC_DEFINE(HAVE_MOZILLA_PSM, 1,
 		   [Define if you have the mozilla psm headers installed])])
 
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h],
+if test "$MOZILLA" = "mozilla"; then
+    AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h],
+	[AC_DEFINE(HAVE_NSIPASSWORD_H, 1,
+	[Define if mozilla nsIPassword header is available])])
+else
+    AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/passwordmgr/nsIPassword.h],
 	[AC_DEFINE(HAVE_NSIPASSWORD_H, 1,
-		[Define if mozilla nsIPassword header is available])])
+	[Define if mozilla nsIPassword header is available])])
+fi
 
 MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 AC_SUBST(MOZILLA_WARN_CXXFLAGS)
Index: data/default-prefs.js
===================================================================
RCS file: /cvs/gnome/epiphany/data/default-prefs.js,v
retrieving revision 1.13
diff -u -p -r1.13 default-prefs.js
--- data/default-prefs.js	13 Sep 2004 09:21:05 -0000	1.13
+++ data/default-prefs.js	15 Sep 2004 14:03:07 -0000
@@ -85,3 +85,6 @@ pref("network.protocol-handler.external.
 // disable xpinstall
 pref("xpinstall.enabled", false);
 
+// enable plugin finder
+pref("plugin.default_plugin_disabled", true);
+
Index: embed/mozilla/GlobalHistory.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/GlobalHistory.cpp,v
retrieving revision 1.26.4.1
diff -u -p -r1.26.4.1 GlobalHistory.cpp
--- embed/mozilla/GlobalHistory.cpp	15 Sep 2004 11:03:00 -0000	1.26.4.1
+++ embed/mozilla/GlobalHistory.cpp	15 Sep 2004 14:03:07 -0000
@@ -192,3 +192,11 @@ NS_IMETHODIMP MozGlobalHistory::MarkPage
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 #endif
+
+#ifdef MOZILLA_IS_FIREFOX
+/* void addPageWithDetails (in nsIURI aURI, in wstring aTitle, in long long aLastVisited); */
+NS_IMETHODIMP MozGlobalHistory::AddPageWithDetails(nsIURI *aURI, const PRUnichar *aTitle, PRInt64 aLastVisited)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+#endif
Index: embed/mozilla/Makefile.am
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/Makefile.am,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile.am
--- embed/mozilla/Makefile.am	19 Aug 2004 17:48:43 -0000	1.47
+++ embed/mozilla/Makefile.am	15 Sep 2004 14:03:07 -0000
@@ -19,6 +19,7 @@ INCLUDES = \
 	-I$(MOZILLA_INCLUDE_ROOT)/mimetype		\
 	-I$(MOZILLA_INCLUDE_ROOT)/necko			\
 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache		\
+	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr		\
 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot		\
 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss		\
 	-I$(MOZILLA_INCLUDE_ROOT)/shistory		\

? po/de-base.po
? po/de AO po
Index: configure.in
===================================================================
RCS file: /cvs/gnome/epiphany/Attic/configure.in,v
retrieving revision 1.195.2.1
diff -u -p -r1.195.2.1 configure.in
--- configure.in	13 Sep 2004 09:59:07 -0000	1.195.2.1
+++ configure.in	15 Sep 2004 14:03:07 -0000
@@ -78,19 +78,9 @@ AC_SUBST(LIBBONOBO_IDL)
 BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL)
 
-PKG_CHECK_MODULES(MOZILLA_COMPONENT, mozilla-gtkmozembed mozilla-xpcom)
-AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
-AC_SUBST(MOZILLA_COMPONENT_LIBS)
-
-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir mozilla-gtkmozembed`"
-AC_SUBST(MOZILLA_INCLUDE_ROOT)
-
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-AC_SUBST(MOZILLA_HOME)
-
 dnl whether to build with DEBUG defined
 AC_ARG_WITH(mozilla-debug,
-	[  --with-mozilla-debug        Use a debug mozilla build],
+	[  --with-mozilla-debug        Use a debug mozilla/thunderbird build],
 	AM_CXXFLAGS="-DDEBUG $AM_CXXFLAGS",)
 
 AC_ARG_ENABLE(cpp-rtti,
@@ -153,8 +143,40 @@ dnl *********************
 dnl Mozilla version check
 dnl *********************
 
-AC_MSG_CHECKING(for mozilla version)
-MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed`"
+AC_MSG_CHECKING([whether to use mozilla or thunderbird])
+
+AC_ARG_WITH([mozilla],
+    AC_HELP_STRING([--with-mozilla@<:@=mozilla|thunderbird@:>@],
+		   [Whether to use mozilla or thunderbird]))
+
+MOZILLA=mozilla
+if test "x$with_mozilla" = "xthunderbird"; then
+  MOZILLA=thunderbird
+fi
+
+AC_MSG_RESULT([$MOZILLA])
+
+IS_MOZILLA="`test "$MOZILLA" = "mozilla"`"
+IS_THUNDERBIRD="`test "$MOZILLA" = "thunderbird"`"
+
+AC_DEFINE_UNQUOTED([MOZILLA],["$MOZILLA"],[Which mozilla we're using])
+AC_DEFINE_UNQUOTED([MOZILLA_IS_MOZILLA],[$IS_MOZILLA],[Whether we're using mozilla])
+AC_DEFINE_UNQUOTED([MOZILLA_IS_THUNDERBIRD],[$IS_THUNDERBIRD],[Whether we're using thunderbird])
+
+PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed $MOZILLA-xpcom)
+AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
+AC_SUBST(MOZILLA_COMPONENT_LIBS)
+
+MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
+AC_SUBST(MOZILLA_INCLUDE_ROOT)
+
+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
+AC_SUBST(MOZILLA_HOME)
+
+if test "$MOZILLA" = "mozilla"; then
+
+AC_MSG_CHECKING([for $MOZILLA version])
+MOZILLA_VERSION="`$PKG_CONFIG --modversion $MOZILLA-gtkmozembed`"
 
 AC_ARG_WITH(mozilla-snapshot,
   AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.7|1.8a1|1.8a2|trunk@:>@],
@@ -168,6 +190,10 @@ if test $MOZILLA_VERSION = "trunk"; then
 	MOZILLA_VERSION=9.0 # use a high number
 fi
 
+else
+  MOZILLA_VERSION=1.8.3
+fi
+
 dnl Split up the version string ( 1.7rc1 -> 1 7 rc 1 )
 version=$(echo $MOZILLA_VERSION | sed -e 's/\(@<:@0-9@:>@\+\|@<:@a-z@:>@\+\)/\1 /g' -e 's/\.//g')
 
@@ -241,9 +267,15 @@ AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/pip
 	[AC_DEFINE(HAVE_MOZILLA_PSM, 1,
 		   [Define if you have the mozilla psm headers installed])])
 
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h],
+if test "$MOZILLA" = "mozilla"; then
+    AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h],
+	[AC_DEFINE(HAVE_NSIPASSWORD_H, 1,
+	[Define if mozilla nsIPassword header is available])])
+else
+    AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/passwordmgr/nsIPassword.h],
 	[AC_DEFINE(HAVE_NSIPASSWORD_H, 1,
-		[Define if mozilla nsIPassword header is available])])
+	[Define if mozilla nsIPassword header is available])])
+fi
 
 MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 AC_SUBST(MOZILLA_WARN_CXXFLAGS)
Index: data/default-prefs.js
===================================================================
RCS file: /cvs/gnome/epiphany/data/default-prefs.js,v
retrieving revision 1.13
diff -u -p -r1.13 default-prefs.js
--- data/default-prefs.js	13 Sep 2004 09:21:05 -0000	1.13
+++ data/default-prefs.js	15 Sep 2004 14:03:07 -0000
@@ -85,3 +85,6 @@ pref("network.protocol-handler.external.
 // disable xpinstall
 pref("xpinstall.enabled", false);
 
+// enable plugin finder
+pref("plugin.default_plugin_disabled", true);
+
Index: embed/mozilla/GlobalHistory.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/GlobalHistory.cpp,v
retrieving revision 1.26.4.1
diff -u -p -r1.26.4.1 GlobalHistory.cpp
--- embed/mozilla/GlobalHistory.cpp	15 Sep 2004 11:03:00 -0000	1.26.4.1
+++ embed/mozilla/GlobalHistory.cpp	15 Sep 2004 14:03:07 -0000
@@ -192,3 +192,11 @@ NS_IMETHODIMP MozGlobalHistory::MarkPage
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 #endif
+
+#ifdef MOZILLA_IS_THUNDERBIRD
+/* void addPageWithDetails (in nsIURI aURI, in wstring aTitle, in long long aLastVisited); */
+NS_IMETHODIMP MozGlobalHistory::AddPageWithDetails(nsIURI *aURI, const PRUnichar *aTitle, PRInt64 aLastVisited)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+#endif
Index: embed/mozilla/Makefile.am
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/Makefile.am,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile.am
--- embed/mozilla/Makefile.am	19 Aug 2004 17:48:43 -0000	1.47
+++ embed/mozilla/Makefile.am	15 Sep 2004 14:03:07 -0000
@@ -19,6 +19,7 @@ INCLUDES = \
 	-I$(MOZILLA_INCLUDE_ROOT)/mimetype		\
 	-I$(MOZILLA_INCLUDE_ROOT)/necko			\
 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache		\
+	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr		\
 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot		\
 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss		\
 	-I$(MOZILLA_INCLUDE_ROOT)/shistory		\