rpms/epiphany/devel epiphany-xulrunner19.patch, 1.4, 1.5 epiphany.spec, 1.186, 1.187
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Mon Mar 31 17:57:10 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17653
Modified Files:
epiphany-xulrunner19.patch epiphany.spec
Log Message:
* Mon Mar 31 2008 Christopher Aillon <caillon at redhat.com> - 2.22.0-3
- Initialize plugins before we startup XPCOM, thanks to Bastien Nocera
epiphany-xulrunner19.patch:
Index: epiphany-xulrunner19.patch
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany-xulrunner19.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- epiphany-xulrunner19.patch 8 Mar 2008 01:47:20 -0000 1.4
+++ epiphany-xulrunner19.patch 31 Mar 2008 17:56:47 -0000 1.5
@@ -1,7 +1,7 @@
-diff -up epiphany-2.21.92/embed/Makefile.am.xulrunner19 epiphany-2.21.92/embed/Makefile.am
---- epiphany-2.21.92/embed/Makefile.am.xulrunner19 2008-02-17 13:43:14.000000000 -0500
-+++ epiphany-2.21.92/embed/Makefile.am 2008-02-26 00:13:33.000000000 -0500
-@@ -117,6 +117,7 @@ libephyembedfactory_la_CPPFLAGS += -I$(G
+diff -up epiphany-2.22.0/embed/Makefile.am.xulrunner19 epiphany-2.22.0/embed/Makefile.am
+--- epiphany-2.22.0/embed/Makefile.am.xulrunner19 2008-03-10 05:34:59.000000000 -0400
++++ epiphany-2.22.0/embed/Makefile.am 2008-03-31 13:19:30.000000000 -0400
+@@ -107,6 +107,7 @@ libephyembedfactory_la_CPPFLAGS += -I$(G
endif
libephyembedfactory_la_CFLAGS = \
@@ -9,9 +9,9 @@
$(DEPENDENCIES_CFLAGS) \
$(AM_CFLAGS)
-diff -up epiphany-2.21.92/embed/mozilla/mozilla-embed-single.cpp.xulrunner19 epiphany-2.21.92/embed/mozilla/mozilla-embed-single.cpp
---- epiphany-2.21.92/embed/mozilla/mozilla-embed-single.cpp.xulrunner19 2008-02-26 00:13:33.000000000 -0500
-+++ epiphany-2.21.92/embed/mozilla/mozilla-embed-single.cpp 2008-02-26 00:13:33.000000000 -0500
+diff -up epiphany-2.22.0/embed/mozilla/mozilla-embed-single.cpp.xulrunner19 epiphany-2.22.0/embed/mozilla/mozilla-embed-single.cpp
+--- epiphany-2.22.0/embed/mozilla/mozilla-embed-single.cpp.xulrunner19 2008-03-31 13:19:30.000000000 -0400
++++ epiphany-2.22.0/embed/mozilla/mozilla-embed-single.cpp 2008-03-31 13:39:51.000000000 -0400
@@ -33,6 +33,11 @@
#include <nsStringAPI.h>
@@ -24,7 +24,7 @@
#include <gtkmozembed.h>
#include <gtkmozembed_internal.h>
#include <nsComponentManagerUtils.h>
-@@ -374,6 +379,7 @@ mozilla_init_profile (void)
+@@ -346,6 +351,7 @@ mozilla_init_profile (void)
profile_path = g_build_filename (ephy_dot_dir (),
MOZILLA_PROFILE_DIR,
(char *) NULL);
@@ -32,7 +32,7 @@
gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
g_free (profile_path);
}
-@@ -615,6 +621,57 @@ impl_init (EphyEmbedSingle *esingle)
+@@ -587,9 +593,60 @@ impl_init (EphyEmbedSingle *esingle)
NS_LogInit ();
#endif
@@ -84,13 +84,16 @@
+ gtk_moz_embed_set_comp_path (MOZILLA_HOME);
+#endif
+#endif // XPCOM_GLUE
+ /* Pre initialization */
+ mozilla_init_plugin_path ();
+
+ /* Fire up the beast */
+ gtk_moz_embed_push_startup ();
+
- /* Pre initialization */
- mozilla_init_plugin_path ();
+ mozilla_init_profile ();
-@@ -631,8 +688,6 @@ impl_init (EphyEmbedSingle *esingle)
+ #ifdef HAVE_GECKO_1_9
+@@ -603,8 +660,6 @@ impl_init (EphyEmbedSingle *esingle)
gtk_moz_embed_set_directory_service_provider (dp);
@@ -99,10 +102,10 @@
/* FIXME check that it succeeded! */
mozilla_register_components ();
-diff -up epiphany-2.21.92/embed/mozilla/Makefile.am.xulrunner19 epiphany-2.21.92/embed/mozilla/Makefile.am
---- epiphany-2.21.92/embed/mozilla/Makefile.am.xulrunner19 2008-02-17 16:23:30.000000000 -0500
-+++ epiphany-2.21.92/embed/mozilla/Makefile.am 2008-02-26 00:13:33.000000000 -0500
-@@ -159,6 +159,13 @@ libephymozillaembed_la_CPPFLAGS = \
+diff -up epiphany-2.22.0/embed/mozilla/Makefile.am.xulrunner19 epiphany-2.22.0/embed/mozilla/Makefile.am
+--- epiphany-2.22.0/embed/mozilla/Makefile.am.xulrunner19 2008-03-09 16:56:47.000000000 -0400
++++ epiphany-2.22.0/embed/mozilla/Makefile.am 2008-03-31 13:19:30.000000000 -0400
+@@ -153,6 +153,13 @@ libephymozillaembed_la_CPPFLAGS = \
-DALLOW_PRIVATE_API \
$(AM_CPPFLAGS)
@@ -116,9 +119,9 @@
libephymozillaembed_la_CXXFLAGS = \
$(GECKO_CFLAGS) \
$(DEPENDENCIES_CFLAGS) \
-diff -up epiphany-2.21.92/embed/mozilla/AutoModalDialog.cpp.xulrunner19 epiphany-2.21.92/embed/mozilla/AutoModalDialog.cpp
---- epiphany-2.21.92/embed/mozilla/AutoModalDialog.cpp.xulrunner19 2008-02-26 00:24:39.000000000 -0500
-+++ epiphany-2.21.92/embed/mozilla/AutoModalDialog.cpp 2008-02-26 00:24:58.000000000 -0500
+diff -up epiphany-2.22.0/embed/mozilla/AutoModalDialog.cpp.xulrunner19 epiphany-2.22.0/embed/mozilla/AutoModalDialog.cpp
+--- epiphany-2.22.0/embed/mozilla/AutoModalDialog.cpp.xulrunner19 2008-03-10 05:14:27.000000000 -0400
++++ epiphany-2.22.0/embed/mozilla/AutoModalDialog.cpp 2008-03-31 13:19:30.000000000 -0400
@@ -35,6 +35,7 @@
#include <nsIDOMDocument.h>
#include <nsIDOMEvent.h>
@@ -127,9 +130,53 @@
#include <nsIJSContextStack.h>
#include <nsIPrivateDOMEvent.h>
#include <nsPIDOMWindow.h>
-diff -up epiphany-2.21.92/plugins/desktop-file/Makefile.am.xulrunner19 epiphany-2.21.92/plugins/desktop-file/Makefile.am
---- epiphany-2.21.92/plugins/desktop-file/Makefile.am.xulrunner19 2008-02-17 13:43:04.000000000 -0500
-+++ epiphany-2.21.92/plugins/desktop-file/Makefile.am 2008-02-26 00:13:33.000000000 -0500
+diff -up epiphany-2.22.0/embed/mozilla/FilePicker.cpp.xulrunner19 epiphany-2.22.0/embed/mozilla/FilePicker.cpp
+--- epiphany-2.22.0/embed/mozilla/FilePicker.cpp.xulrunner19 2008-03-09 16:56:47.000000000 -0400
++++ epiphany-2.22.0/embed/mozilla/FilePicker.cpp 2008-03-31 13:19:30.000000000 -0400
+@@ -32,12 +32,11 @@
+
+ #include <nsCOMPtr.h>
+ #include <nsIDOMWindow.h>
+-#include <nsIFileURL.h>
+ #include <nsILocalFile.h>
+ #include <nsIPromptService.h>
+ #include <nsIServiceManager.h>
+ #include <nsIURI.h>
+-#include <nsNetCID.h>
++#include <nsNetUtil.h>
+ #include <nsComponentManagerUtils.h>
+ #include <nsServiceManagerUtils.h>
+ #include <nsXPCOMCID.h>
+@@ -357,22 +356,18 @@ NS_IMETHODIMP GFilePicker::GetFile(nsILo
+ return NS_OK;
+ }
+
+-/* readonly attribute nsIFileURL fileURL; */
+-NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL)
++/* readonly attribute nsIURI fileURL; */
++NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL)
+ {
+ NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
+
+- LOG ("GFilePicker::GetFileURL");
++ LOG ("GFilePicker::GetFileURI");
+
+ nsCOMPtr<nsILocalFile> file;
+ GetFile (getter_AddRefs(file));
+ NS_ENSURE_TRUE (file, NS_ERROR_FAILURE);
+
+- nsCOMPtr<nsIFileURL> fileURL = do_CreateInstance (NS_STANDARDURL_CONTRACTID);
+- fileURL->SetFile(file);
+- NS_IF_ADDREF(*aFileURL = fileURL);
+-
+- return NS_OK;
++ return NS_NewFileURI(aFileURL, file);
+ }
+
+ /* readonly attribute nsISimpleEnumerator files; */
+diff -up epiphany-2.22.0/plugins/desktop-file/Makefile.am.xulrunner19 epiphany-2.22.0/plugins/desktop-file/Makefile.am
+--- epiphany-2.22.0/plugins/desktop-file/Makefile.am.xulrunner19 2008-03-09 16:55:37.000000000 -0400
++++ epiphany-2.22.0/plugins/desktop-file/Makefile.am 2008-03-31 13:19:30.000000000 -0400
@@ -25,8 +25,13 @@ libdesktopfileplugin_la_LIBADD = \
libdesktopfileplugin_la_LDFLAGS = \
-module -avoid-version \
@@ -145,9 +192,9 @@
+
EXTRA_DIST = \
plugin.symbols
-diff -up epiphany-2.21.92/m4/gecko.m4.xulrunner19 epiphany-2.21.92/m4/gecko.m4
---- epiphany-2.21.92/m4/gecko.m4.xulrunner19 2008-02-17 13:43:04.000000000 -0500
-+++ epiphany-2.21.92/m4/gecko.m4 2008-02-26 00:13:33.000000000 -0500
+diff -up epiphany-2.22.0/m4/gecko.m4.xulrunner19 epiphany-2.22.0/m4/gecko.m4
+--- epiphany-2.22.0/m4/gecko.m4.xulrunner19 2008-03-09 16:55:37.000000000 -0400
++++ epiphany-2.22.0/m4/gecko.m4 2008-03-31 13:19:30.000000000 -0400
@@ -32,6 +32,7 @@
# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
# VARIABLE_FLAVOUR: The flavour of the gecko that was found
@@ -441,9 +488,9 @@
if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
fi
-diff -up epiphany-2.21.92/configure.ac.xulrunner19 epiphany-2.21.92/configure.ac
---- epiphany-2.21.92/configure.ac.xulrunner19 2008-02-25 14:37:07.000000000 -0500
-+++ epiphany-2.21.92/configure.ac 2008-02-26 00:13:33.000000000 -0500
+diff -up epiphany-2.22.0/configure.ac.xulrunner19 epiphany-2.22.0/configure.ac
+--- epiphany-2.22.0/configure.ac.xulrunner19 2008-03-09 16:57:29.000000000 -0400
++++ epiphany-2.22.0/configure.ac 2008-03-31 13:19:30.000000000 -0400
@@ -238,12 +238,44 @@ fi
case "$gecko_cv_gecko" in
@@ -503,10 +550,10 @@
AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
fi
-diff -up epiphany-2.21.92/src/Makefile.am.xulrunner19 epiphany-2.21.92/src/Makefile.am
---- epiphany-2.21.92/src/Makefile.am.xulrunner19 2008-02-17 13:43:05.000000000 -0500
-+++ epiphany-2.21.92/src/Makefile.am 2008-02-26 00:13:33.000000000 -0500
-@@ -188,6 +188,16 @@ libpyphany_la_LIBADD = \
+diff -up epiphany-2.22.0/src/Makefile.am.xulrunner19 epiphany-2.22.0/src/Makefile.am
+--- epiphany-2.22.0/src/Makefile.am.xulrunner19 2008-03-09 16:55:56.000000000 -0400
++++ epiphany-2.22.0/src/Makefile.am 2008-03-31 13:19:30.000000000 -0400
+@@ -180,6 +180,16 @@ libpyphany_la_LIBADD = \
$(PYGTK_LIBS)
endif
@@ -523,7 +570,7 @@
epiphany_SOURCES = ephy-main.c
epiphany_CPPFLAGS = \
-@@ -202,6 +212,7 @@ epiphany_CPPFLAGS = \
+@@ -194,6 +204,7 @@ epiphany_CPPFLAGS = \
epiphany_CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
@@ -531,7 +578,7 @@
$(DBUS_CFLAGS) \
$(AM_CFLAGS)
-@@ -222,6 +233,7 @@ endif
+@@ -214,6 +225,7 @@ endif
if WITH_GECKO_ENGINE
epiphany_LDADD += \
@@ -539,7 +586,7 @@
$(top_builddir)/embed/mozilla/libephymozillaembed.la
endif
-@@ -242,7 +254,9 @@ epiphany_LDADD += $(LIBXUL_LIBS) -lxpcom
+@@ -234,7 +246,9 @@ epiphany_LDADD += $(LIBXUL_LIBS) -lxpcom
endif
if WITH_GECKO_ENGINE
@@ -549,7 +596,7 @@
epiphany_LDADD += \
$(GECKO_LIBS) \
-@@ -256,6 +270,7 @@ epiphany_LDADD += \
+@@ -248,6 +262,7 @@ epiphany_LDADD += \
endif
epiphany_LDADD += \
@@ -557,9 +604,9 @@
$(DEPENDENCIES_LIBS) \
$(DBUS_LIBS) \
$(LIBINTL)
-diff -up epiphany-2.21.92/doc/reference/Makefile.am.xulrunner19 epiphany-2.21.92/doc/reference/Makefile.am
---- epiphany-2.21.92/doc/reference/Makefile.am.xulrunner19 2008-02-17 18:28:48.000000000 -0500
-+++ epiphany-2.21.92/doc/reference/Makefile.am 2008-02-26 00:13:33.000000000 -0500
+diff -up epiphany-2.22.0/doc/reference/Makefile.am.xulrunner19 epiphany-2.22.0/doc/reference/Makefile.am
+--- epiphany-2.22.0/doc/reference/Makefile.am.xulrunner19 2008-03-09 16:56:26.000000000 -0400
++++ epiphany-2.22.0/doc/reference/Makefile.am 2008-03-31 13:19:30.000000000 -0400
@@ -207,10 +207,10 @@ DOC_OVERRIDES =
if GTK_DOC_USE_LIBTOOL
@@ -573,46 +620,3 @@
endif
# We set GPATH here; this gives us semantics for GNU make
---- epiphany-2.21.92/embed/mozilla/FilePicker.cpp.xulrunner19 2008-02-18 08:41:03.000000000 -0500
-+++ epiphany-2.21.92/embed/mozilla/FilePicker.cpp 2008-03-07 18:50:46.000000000 -0500
-@@ -32,12 +32,11 @@
-
- #include <nsCOMPtr.h>
- #include <nsIDOMWindow.h>
--#include <nsIFileURL.h>
- #include <nsILocalFile.h>
- #include <nsIPromptService.h>
- #include <nsIServiceManager.h>
- #include <nsIURI.h>
--#include <nsNetCID.h>
-+#include <nsNetUtil.h>
- #include <nsComponentManagerUtils.h>
- #include <nsServiceManagerUtils.h>
- #include <nsXPCOMCID.h>
-@@ -357,22 +356,18 @@
- return NS_OK;
- }
-
--/* readonly attribute nsIFileURL fileURL; */
--NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL)
-+/* readonly attribute nsIURI fileURL; */
-+NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL)
- {
- NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
-
-- LOG ("GFilePicker::GetFileURL");
-+ LOG ("GFilePicker::GetFileURI");
-
- nsCOMPtr<nsILocalFile> file;
- GetFile (getter_AddRefs(file));
- NS_ENSURE_TRUE (file, NS_ERROR_FAILURE);
-
-- nsCOMPtr<nsIFileURL> fileURL = do_CreateInstance (NS_STANDARDURL_CONTRACTID);
-- fileURL->SetFile(file);
-- NS_IF_ADDREF(*aFileURL = fileURL);
--
-- return NS_OK;
-+ return NS_NewFileURI(aFileURL, file);
- }
-
- /* readonly attribute nsISimpleEnumerator files; */
Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- epiphany.spec 18 Mar 2008 16:18:38 -0000 1.186
+++ epiphany.spec 31 Mar 2008 17:56:47 -0000 1.187
@@ -8,7 +8,7 @@
Summary: GNOME web browser based on the Mozilla rendering engine
Name: epiphany
Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and GFDL+
Group: Applications/Internet
URL: http://www.gnome.org/projects/epiphany/
@@ -217,6 +217,9 @@
%{_datadir}/pygtk/2.0/defs/epiphany.defs
%changelog
+* Mon Mar 31 2008 Christopher Aillon <caillon at redhat.com> - 2.22.0-3
+- Initialize plugins before we startup XPCOM, thanks to Bastien Nocera
+
* Tue Mar 18 2008 Christopher Aillon <caillon at redhat.com> - 2.22.0-2
- Update the homepage
More information about the fedora-extras-commits
mailing list