rpms/epiphany/devel epiphany-xulrunner19.patch, 1.1, 1.2 epiphany.spec, 1.173, 1.174 sources, 1.67, 1.68
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Sat Jan 12 18:40:36 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081
Modified Files:
epiphany-xulrunner19.patch epiphany.spec sources
Log Message:
* Sat Jan 12 2008 Christopher Aillon <caillon at redhat.com> - 2.21.5-0.1.svn7856
- Update to newer svn, and update the xulrunner 1.9 patch
epiphany-xulrunner19.patch:
Index: epiphany-xulrunner19.patch
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany-xulrunner19.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epiphany-xulrunner19.patch 3 Jan 2008 02:58:45 -0000 1.1
+++ epiphany-xulrunner19.patch 12 Jan 2008 18:40:31 -0000 1.2
@@ -1,8 +1,8 @@
-This patch is from http://bugzilla.gnome.org/show_bug.cgi?id=503657#c9 and subsequent comments
+This patch is from http://bugzilla.gnome.org/show_bug.cgi?id=503657
Index: m4/gecko.m4
===================================================================
---- m4/gecko.m4 (revision 7834)
+--- m4/gecko.m4 (revision 7856)
+++ m4/gecko.m4 (working copy)
@@ -32,6 +32,7 @@
# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
@@ -32,7 +32,7 @@
if $PKG_CONFIG --exists $lizard-xpcom; then
gecko_cv_gecko=$lizard
break;
-+ elif $PKG_CONFIG --exists $lizard; then
++ elif $PKG_CONFIG --exists $lizard-unstable; then
+ gecko_cv_gecko=$lizard
+ break;
fi
@@ -74,7 +74,7 @@
+ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
+else
+ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
-+ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
++ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
+ _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
+ _GECKO_HOME=$with_gecko_home
+ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
@@ -178,8 +178,8 @@
-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
-+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
-+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
+else
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
@@ -299,7 +299,7 @@
fi
Index: plugins/desktop-file/Makefile.am
===================================================================
---- plugins/desktop-file/Makefile.am (revision 7834)
+--- plugins/desktop-file/Makefile.am (revision 7856)
+++ plugins/desktop-file/Makefile.am (working copy)
@@ -25,8 +25,13 @@
libdesktopfileplugin_la_LDFLAGS = \
@@ -318,7 +318,7 @@
plugin.symbols
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (revision 7834)
+--- src/Makefile.am (revision 7856)
+++ src/Makefile.am (working copy)
@@ -187,6 +187,16 @@
$(PYGTK_LIBS)
@@ -373,7 +373,7 @@
$(LIBINTL)
Index: configure.ac
===================================================================
---- configure.ac (revision 7834)
+--- configure.ac (revision 7856)
+++ configure.ac (working copy)
@@ -1,4 +1,3 @@
-
@@ -441,7 +441,7 @@
fi
Index: doc/reference/Makefile.am
===================================================================
---- doc/reference/Makefile.am (revision 7834)
+--- doc/reference/Makefile.am (revision 7856)
+++ doc/reference/Makefile.am (working copy)
@@ -206,10 +206,10 @@
@@ -458,7 +458,7 @@
# We set GPATH here; this gives us semantics for GNU make
Index: embed/mozilla/GtkNSSDialogs.cpp
===================================================================
---- embed/mozilla/GtkNSSDialogs.cpp (revision 7834)
+--- embed/mozilla/GtkNSSDialogs.cpp (revision 7856)
+++ embed/mozilla/GtkNSSDialogs.cpp (working copy)
@@ -391,7 +391,7 @@
@@ -475,10 +475,10 @@
+
+#ifdef HAVE_GECKO_1_9
-+/**
-+ * displayProtectedAuth - displays notification dialog to the user
-+ * that he is expected to authenticate to the token using its
-+ * "protected authentication path" feature
++/**
++ * displayProtectedAuth - displays notification dialog to the user
++ * that he is expected to authenticate to the token using its
++ * "protected authentication path" feature
+ */
+/* void displayProtectedAuth (in nsIInterfaceRequestor ctx, in nsIProtectedAuthThread runnable); */
+NS_IMETHODIMP
@@ -495,7 +495,7 @@
in unsigned long count,
Index: embed/mozilla/mozilla-embed-single.cpp
===================================================================
---- embed/mozilla/mozilla-embed-single.cpp (revision 7834)
+--- embed/mozilla/mozilla-embed-single.cpp (revision 7856)
+++ embed/mozilla/mozilla-embed-single.cpp (working copy)
@@ -33,6 +33,11 @@
@@ -517,7 +517,7 @@
gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
g_free (profile_path);
}
-@@ -591,6 +597,50 @@
+@@ -591,6 +597,57 @@
NS_LogInit ();
#endif
@@ -525,13 +525,13 @@
+#ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+ "1.9a", PR_TRUE,
-+ "2", PR_TRUE
++ "1.9.*", PR_TRUE
+ };
+ char xpcomLocation[4096];
+ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
+ if (NS_FAILED (rv))
+ {
-+ g_warning ("Could not determine locale!\n");
++ g_warning ("Could not get gre path!\n");
+ return FALSE;
+ }
+
@@ -546,7 +546,14 @@
+ rv = GTKEmbedGlueStartup();
+ if (NS_FAILED (rv))
+ {
-+ g_warning ("Could not determine locale!\n");
++ g_warning ("Could not startup glue!\n");
++ return FALSE;
++ }
++
++ rv = GTKEmbedGlueStartupInternal();
++ if (NS_FAILED (rv))
++ {
++ g_warning ("Could not startup internal glue!\n");
+ return FALSE;
+ }
+
@@ -568,7 +575,7 @@
/* Pre initialization */
mozilla_init_plugin_path ();
-@@ -607,8 +657,6 @@
+@@ -607,8 +664,6 @@
gtk_moz_embed_set_directory_service_provider (dp);
@@ -577,24 +584,9 @@
/* FIXME check that it succeeded! */
mozilla_register_components ();
-Index: embed/mozilla/EphyAboutModule.cpp
-===================================================================
---- embed/mozilla/EphyAboutModule.cpp (revision 7834)
-+++ embed/mozilla/EphyAboutModule.cpp (working copy)
-@@ -499,7 +499,7 @@
- if (error.IsEmpty () || rawurl.IsEmpty () || url.IsEmpty()) return NS_ERROR_FAILURE;
-
- nsCOMPtr<nsIURI> uri;
-- rv = NS_NewURI (getter_AddRefs (uri), url, charset.get());
-+ rv = NS_NewURI (getter_AddRefs (uri), nsCString(url), charset.get());
- /* FIXME can uri be NULL if the original url was invalid? */
- NS_ENSURE_SUCCESS (rv, rv);
-
-Index: embed/mozilla/EphyPromptService.cpp
-===================================================================
Index: embed/mozilla/Makefile.am
===================================================================
---- embed/mozilla/Makefile.am (revision 7834)
+--- embed/mozilla/Makefile.am (revision 7856)
+++ embed/mozilla/Makefile.am (working copy)
@@ -157,6 +157,13 @@
-DALLOW_PRIVATE_API \
@@ -610,11 +602,9 @@
libephymozillaembed_la_CXXFLAGS = \
$(GECKO_CFLAGS) \
$(DEPENDENCIES_CFLAGS) \
-Index: embed/mozilla/EphyPromptService.h
-===================================================================
Index: embed/Makefile.am
===================================================================
---- embed/Makefile.am (revision 7834)
+--- embed/Makefile.am (revision 7856)
+++ embed/Makefile.am (working copy)
@@ -117,6 +117,7 @@
endif
Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- epiphany.spec 3 Jan 2008 02:58:45 -0000 1.173
+++ epiphany.spec 12 Jan 2008 18:40:31 -0000 1.174
@@ -8,7 +8,7 @@
Summary: GNOME web browser based on the Mozilla rendering engine
Name: epiphany
Version: 2.21.5
-Release: 0.1.svn7844%{?dist}
+Release: 0.1.svn7856%{?dist}
License: GPLv2+ and GFDL+
Group: Applications/Internet
URL: http://www.gnome.org/projects/epiphany/
@@ -208,6 +208,9 @@
%{_datadir}/pygtk/2.0/defs/epiphany.defs
%changelog
+* Sat Jan 12 2008 Christopher Aillon <caillon at redhat.com> - 2.21.5-0.1.svn7856
+- Update to newer svn, and update the xulrunner 1.9 patch
+
* Wed Jan 2 2008 Christopher Aillon <caillon at redhat.com> - 2.21.5-0.1.svn7844
- Update to svn to build against xulrunner 1.9
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources 3 Jan 2008 02:58:45 -0000 1.67
+++ sources 12 Jan 2008 18:40:31 -0000 1.68
@@ -1 +1 @@
-c6d74efc179ff30ea4fd37b9716b2d68 epiphany-2.21.5.tar.bz2
+7f7ece852c6d3b85c0cf9f4a55c18442 epiphany-2.21.5.tar.bz2
More information about the fedora-extras-commits
mailing list