rpms/epiphany/devel .cvsignore, 1.67, 1.68 epiphany-xulrunner19.patch, 1.2, 1.3 epiphany.spec, 1.177, 1.178 sources, 1.69, 1.70
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Tue Feb 26 05:38:03 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26576
Modified Files:
.cvsignore epiphany-xulrunner19.patch epiphany.spec sources
Log Message:
* Tue Feb 26 2008 Christopher Aillon <caillon at redhat.com> - 2.21.92-1
- Update to 2.21.92
- Update the xulrunner patch
- BR: avahi-gobject-devel
- Fix the file list
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore 29 Jan 2008 19:01:38 -0000 1.67
+++ .cvsignore 26 Feb 2008 05:37:11 -0000 1.68
@@ -1 +1 @@
-epiphany-2.21.90.tar.bz2
+epiphany-2.21.92.tar.bz2
epiphany-xulrunner19.patch:
Index: epiphany-xulrunner19.patch
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany-xulrunner19.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epiphany-xulrunner19.patch 12 Jan 2008 18:40:31 -0000 1.2
+++ epiphany-xulrunner19.patch 26 Feb 2008 05:37:11 -0000 1.3
@@ -1,9 +1,153 @@
-This patch is from http://bugzilla.gnome.org/show_bug.cgi?id=503657
-
-Index: m4/gecko.m4
-===================================================================
---- m4/gecko.m4 (revision 7856)
-+++ m4/gecko.m4 (working copy)
+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
+ endif
+
+ libephyembedfactory_la_CFLAGS = \
++ $(GECKO_CFLAGS) \
+ $(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
+@@ -33,6 +33,11 @@
+
+ #include <nsStringAPI.h>
+
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#include <gtkmozembed_glue.cpp>
++#endif
++
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
+ #include <nsComponentManagerUtils.h>
+@@ -374,6 +379,7 @@ mozilla_init_profile (void)
+ profile_path = g_build_filename (ephy_dot_dir (),
+ MOZILLA_PROFILE_DIR,
+ (char *) NULL);
++ gtk_moz_embed_set_comp_path (profile_path);
+ gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
+ g_free (profile_path);
+ }
+@@ -615,6 +621,57 @@ impl_init (EphyEmbedSingle *esingle)
+ NS_LogInit ();
+ #endif
+
++ nsresult rv;
++#ifdef XPCOM_GLUE
++ static const GREVersionRange greVersion = {
++ "1.9a", 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 get gre path!\n");
++ return FALSE;
++ }
++
++ // Startup the XPCOM Glue that links us up with XPCOM.
++ rv = XPCOMGlueStartup(xpcomLocation);
++ if (NS_FAILED (rv))
++ {
++ g_warning ("Could not determine locale!\n");
++ return FALSE;
++ }
++
++ rv = GTKEmbedGlueStartup();
++ if (NS_FAILED (rv))
++ {
++ 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;
++ }
++
++ char *lastSlash = strrchr(xpcomLocation, '/');
++ if (lastSlash)
++ *lastSlash = '\0';
++
++ gtk_moz_embed_set_path(xpcomLocation);
++#else
++#ifdef HAVE_GECKO_1_9
++ gtk_moz_embed_set_path (MOZILLA_HOME);
++#else
++ gtk_moz_embed_set_comp_path (MOZILLA_HOME);
++#endif
++#endif // XPCOM_GLUE
++ /* Fire up the beast */
++ gtk_moz_embed_push_startup ();
++
+ /* Pre initialization */
+ mozilla_init_plugin_path ();
+
+@@ -631,8 +688,6 @@ impl_init (EphyEmbedSingle *esingle)
+
+ gtk_moz_embed_set_directory_service_provider (dp);
+
+- /* Fire up the beast */
+- gtk_moz_embed_push_startup ();
+ /* 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 = \
+ -DALLOW_PRIVATE_API \
+ $(AM_CPPFLAGS)
+
++if HAVE_GECKO_XPCOM_GLUE
++if HAVE_GECKO_1_9
++libephymozillaembed_la_CPPFLAGS += \
++ -DXPCOM_GLUE_USE_NSPR
++endif
++endif
++
+ 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
+@@ -35,6 +35,7 @@
+ #include <nsIDOMDocument.h>
+ #include <nsIDOMEvent.h>
+ #include <nsIDOMEventTarget.h>
++#include <jspubtd.h>
+ #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
+@@ -25,8 +25,13 @@ libdesktopfileplugin_la_LIBADD = \
+ libdesktopfileplugin_la_LDFLAGS = \
+ -module -avoid-version \
+ -export-symbols $(srcdir)/plugin.symbols \
+- -R$(GECKO_HOME) \
+ $(AM_LDFLAGS)
+
++if !HAVE_GECKO_XPCOM_GLUE
++ libdesktopfileplugin_la_LDFLAGS += \
++ -R$(GECKO_HOME) \
++ $(NULL)
++endif
++
+ 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
@@ -32,6 +32,7 @@
# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
# VARIABLE_FLAVOUR: The flavour of the gecko that was found
@@ -12,7 +156,7 @@
# VARIABLE_PREFIX:
# VARIABLE_INCLUDE_ROOT:
# VARIABLE_VERSION: The version of the gecko that was found
-@@ -51,7 +52,7 @@
+@@ -51,7 +52,7 @@ AC_PROG_AWK
AC_MSG_CHECKING([which gecko to use])
AC_ARG_WITH([gecko],
@@ -21,7 +165,7 @@
[Which gecko engine to use (autodetected by default)]))
# Backward compat
-@@ -60,12 +61,15 @@
+@@ -60,12 +61,15 @@ AC_ARG_WITH([mozilla],[],[with_gecko=$wi
gecko_cv_gecko=$with_gecko
# Autodetect gecko
@@ -38,7 +182,7 @@
fi
done
fi
-@@ -82,6 +86,14 @@
+@@ -82,6 +86,14 @@ else
gecko_cv_have_gecko=yes
fi
@@ -53,7 +197,7 @@
# ****************
# Define variables
# ****************
-@@ -93,13 +105,24 @@
+@@ -93,13 +105,24 @@ mozilla) gecko_cv_gecko_flavour=mozilla
seamonkey) gecko_cv_gecko_flavour=mozilla ;;
*firefox) gecko_cv_gecko_flavour=toolkit ;;
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
@@ -83,7 +227,7 @@
fi # if gecko_cv_have_gecko
if test "$gecko_cv_gecko_flavour" = "toolkit"; then
-@@ -109,9 +132,11 @@
+@@ -109,9 +132,11 @@ fi
$1[]=$gecko_cv_gecko
$1[]_FLAVOUR=$gecko_cv_gecko_flavour
$1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
@@ -95,7 +239,7 @@
# **************************************************************
# This is really gcc-only
-@@ -182,7 +207,7 @@
+@@ -182,7 +207,7 @@ if test "$gecko_cv_have_gecko" = "yes";
AC_LANG_PUSH([C++])
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -104,7 +248,7 @@
AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
AC_RUN_IFELSE(
-@@ -215,6 +240,18 @@
+@@ -215,6 +240,18 @@ AC_COMPILE_IFELSE(
[gecko_cv_have_debug=no])
AC_MSG_RESULT([$gecko_cv_have_debug])
@@ -123,7 +267,7 @@
CPPFLAGS="$_SAVE_CPPFLAGS"
AC_LANG_POP([C++])
-@@ -226,8 +263,14 @@
+@@ -226,8 +263,14 @@ if test "$gecko_cv_have_debug" = "yes";
AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
fi
@@ -138,7 +282,7 @@
# ***********************
# Check for gecko version
-@@ -238,7 +281,7 @@
+@@ -238,7 +281,7 @@ if test "$gecko_cv_have_gecko" = "yes";
AC_LANG_PUSH([C++])
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -147,7 +291,7 @@
AC_CACHE_CHECK([for gecko version],
[gecko_cv_gecko_version],
-@@ -320,8 +363,11 @@
+@@ -320,8 +363,11 @@ gecko_cv_glue_libs=
gecko_cv_extra_pkg_dependencies=
if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
@@ -161,7 +305,7 @@
else
gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
fi
-@@ -350,6 +396,7 @@
+@@ -350,6 +396,7 @@ AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$
AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])
AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
@@ -169,7 +313,7 @@
])
# ***************************************************************************
-@@ -371,10 +418,20 @@
+@@ -371,10 +418,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
@@ -194,7 +338,7 @@
_GECKO_DISPATCH_INCLUDEDIRS="$2"
-@@ -383,9 +440,11 @@
+@@ -383,9 +440,11 @@ _GECKO_DISPATCH_INCLUDEDIRS="$2"
# Mind you, it's useful to be able to test against uninstalled mozilla builds...
_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
@@ -208,7 +352,7 @@
done
m4_indir([$1],m4_shiftn(2,$@))
-@@ -438,11 +497,17 @@
+@@ -438,11 +497,17 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
#include <mozilla-config.h>
#include <stdlib.h>
#include <stdio.h>
@@ -227,7 +371,7 @@
#include <nsStringAPI.h>
#else
#include <nsString.h>
-@@ -450,16 +515,37 @@
+@@ -450,16 +515,37 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
]]
[$1],
[[
@@ -267,7 +411,7 @@
rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
if (NS_FAILED (rv)) {
-@@ -607,21 +693,22 @@
+@@ -607,21 +693,22 @@ fi
AC_DEFUN([GECKO_XPIDL],
[AC_REQUIRE([GECKO_INIT])dnl
@@ -297,90 +441,10 @@
if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
fi
-Index: plugins/desktop-file/Makefile.am
-===================================================================
---- plugins/desktop-file/Makefile.am (revision 7856)
-+++ plugins/desktop-file/Makefile.am (working copy)
-@@ -25,8 +25,13 @@
- libdesktopfileplugin_la_LDFLAGS = \
- -module -avoid-version \
- -export-symbols $(srcdir)/plugin.symbols \
-- -R$(GECKO_HOME) \
- $(AM_LDFLAGS)
-
-+if !HAVE_GECKO_XPCOM_GLUE
-+ libdesktopfileplugin_la_LDFLAGS += \
-+ -R$(GECKO_HOME) \
-+ $(NULL)
-+endif
-+
- EXTRA_DIST = \
- plugin.symbols
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am (revision 7856)
-+++ src/Makefile.am (working copy)
-@@ -187,6 +187,16 @@
- $(PYGTK_LIBS)
- endif
-
-+
-+# we do this to force c++ linkage if we are using the glue and
-+# are running gecko 1.9 because standalone glue embedders that use
-+# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
-+if HAVE_GECKO_1_9
-+if HAVE_GECKO_XPCOM_GLUE
-+nodist_EXTRA_epiphany_SOURCES = dummy.cpp
-+endif
-+endif
-+
- epiphany_SOURCES = ephy-main.c
-
- epiphany_CPPFLAGS = \
-@@ -201,6 +211,7 @@
-
- epiphany_CFLAGS = \
- $(DEPENDENCIES_CFLAGS) \
-+ $(GECKO_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(AM_CFLAGS)
-
-@@ -221,6 +232,7 @@
-
- if WITH_GECKO_ENGINE
- epiphany_LDADD += \
-+ $(GECKO_LIBS) \
- $(top_builddir)/embed/mozilla/libephymozillaembed.la
- endif
-
-@@ -241,7 +253,9 @@
- endif
-
- if WITH_GECKO_ENGINE
-+if !HAVE_GECKO_XPCOM_GLUE
- epiphany_LDFLAGS += -R$(GECKO_HOME)
-+endif
-
- epiphany_LDADD += \
- $(GECKO_LIBS) \
-@@ -255,6 +269,7 @@
- endif
-
- epiphany_LDADD += \
-+ $(GECKO_LIBS) \
- $(DEPENDENCIES_LIBS) \
- $(DBUS_LIBS) \
- $(LIBINTL)
-Index: configure.ac
-===================================================================
---- configure.ac (revision 7856)
-+++ configure.ac (working copy)
-@@ -1,4 +1,3 @@
--
- # Copyright © 2000-2004 Marco Pesenti Gritti
- # Copyright © 2003, 2004, 2005, 2006, 2007 Christian Persch
- #
-@@ -236,12 +235,44 @@
+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
+@@ -238,12 +238,44 @@ fi
case "$gecko_cv_gecko" in
xulrunner) min_version=1.8 ;;
@@ -426,7 +490,7 @@
AC_SUBST([GECKO_CFLAGS])
AC_SUBST([GECKO_LIBS])
-@@ -565,7 +596,11 @@
+@@ -533,7 +565,11 @@ AC_ARG_ENABLE([desktop-file-plugin],
AC_MSG_RESULT([$enable_desktop_file_plugin])
if test "$enable_desktop_file_plugin" = "yes"; then
@@ -439,178 +503,73 @@
AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
fi
-Index: doc/reference/Makefile.am
-===================================================================
---- doc/reference/Makefile.am (revision 7856)
-+++ doc/reference/Makefile.am (working copy)
-@@ -206,10 +206,10 @@
-
- if GTK_DOC_USE_LIBTOOL
- GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- else
- GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-+GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+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 = \
+ $(PYGTK_LIBS)
endif
- # We set GPATH here; this gives us semantics for GNU make
-Index: embed/mozilla/GtkNSSDialogs.cpp
-===================================================================
---- embed/mozilla/GtkNSSDialogs.cpp (revision 7856)
-+++ embed/mozilla/GtkNSSDialogs.cpp (working copy)
-@@ -391,7 +391,7 @@
-
- return NS_OK;
- }
--
-+
- #ifdef HAVE_GECKO_1_9
- NS_IMETHODIMP
- GtkNSSDialogs::NotifyCertProblem (nsIInterfaceRequestor *socketInfo,
-@@ -1569,6 +1569,23 @@
- gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT, active >= 0);
- }
-
+
-+#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
-+ */
-+/* void displayProtectedAuth (in nsIInterfaceRequestor ctx, in nsIProtectedAuthThread runnable); */
-+NS_IMETHODIMP
-+GtkNSSDialogs::DisplayProtectedAuth (nsIInterfaceRequestor *ctx,
-+ nsIProtectedAuthThread *runnable)
-+{
-+ return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+#endif
-+
-+
- /* void ChooseToken (in nsIInterfaceRequestor ctx,
- [array, size_is (count)] in wstring tokenNameList,
- in unsigned long count,
-Index: embed/mozilla/mozilla-embed-single.cpp
-===================================================================
---- embed/mozilla/mozilla-embed-single.cpp (revision 7856)
-+++ embed/mozilla/mozilla-embed-single.cpp (working copy)
-@@ -33,6 +33,11 @@
-
- #include <nsStringAPI.h>
-
-+#ifdef XPCOM_GLUE
-+#include <nsXPCOMGlue.h>
-+#include <gtkmozembed_glue.cpp>
-+#endif
++# we do this to force c++ linkage if we are using the glue and
++# are running gecko 1.9 because standalone glue embedders that use
++# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
++if HAVE_GECKO_1_9
++if HAVE_GECKO_XPCOM_GLUE
++nodist_EXTRA_epiphany_SOURCES = dummy.cpp
++endif
++endif
+
- #include <gtkmozembed.h>
- #include <gtkmozembed_internal.h>
- #include <nsComponentManagerUtils.h>
-@@ -353,6 +358,7 @@
- profile_path = g_build_filename (ephy_dot_dir (),
- MOZILLA_PROFILE_DIR,
- (char *) NULL);
-+ gtk_moz_embed_set_comp_path (profile_path);
- gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
- g_free (profile_path);
- }
-@@ -591,6 +597,57 @@
- NS_LogInit ();
- #endif
+ epiphany_SOURCES = ephy-main.c
-+ nsresult rv;
-+#ifdef XPCOM_GLUE
-+ static const GREVersionRange greVersion = {
-+ "1.9a", 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 get gre path!\n");
-+ return FALSE;
-+ }
-+
-+ // Startup the XPCOM Glue that links us up with XPCOM.
-+ rv = XPCOMGlueStartup(xpcomLocation);
-+ if (NS_FAILED (rv))
-+ {
-+ g_warning ("Could not determine locale!\n");
-+ return FALSE;
-+ }
-+
-+ rv = GTKEmbedGlueStartup();
-+ if (NS_FAILED (rv))
-+ {
-+ 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;
-+ }
-+
-+ char *lastSlash = strrchr(xpcomLocation, '/');
-+ if (lastSlash)
-+ *lastSlash = '\0';
-+
-+ gtk_moz_embed_set_path(xpcomLocation);
-+#else
-+#ifdef HAVE_GECKO_1_9
-+ gtk_moz_embed_set_path (MOZILLA_HOME);
-+#else
-+ gtk_moz_embed_set_comp_path (MOZILLA_HOME);
-+#endif
-+#endif // XPCOM_GLUE
-+ /* Fire up the beast */
-+ gtk_moz_embed_push_startup ();
-+
- /* Pre initialization */
- mozilla_init_plugin_path ();
+ epiphany_CPPFLAGS = \
+@@ -202,6 +212,7 @@ epiphany_CPPFLAGS = \
-@@ -607,8 +664,6 @@
+ epiphany_CFLAGS = \
+ $(DEPENDENCIES_CFLAGS) \
++ $(GECKO_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(AM_CFLAGS)
- gtk_moz_embed_set_directory_service_provider (dp);
+@@ -222,6 +233,7 @@ endif
-- /* Fire up the beast */
-- gtk_moz_embed_push_startup ();
- /* FIXME check that it succeeded! */
+ if WITH_GECKO_ENGINE
+ epiphany_LDADD += \
++ $(GECKO_LIBS) \
+ $(top_builddir)/embed/mozilla/libephymozillaembed.la
+ endif
- mozilla_register_components ();
-Index: embed/mozilla/Makefile.am
-===================================================================
---- embed/mozilla/Makefile.am (revision 7856)
-+++ embed/mozilla/Makefile.am (working copy)
-@@ -157,6 +157,13 @@
- -DALLOW_PRIVATE_API \
- $(AM_CPPFLAGS)
+@@ -242,7 +254,9 @@ epiphany_LDADD += $(LIBXUL_LIBS) -lxpcom
+ endif
-+if HAVE_GECKO_XPCOM_GLUE
-+if HAVE_GECKO_1_9
-+libephymozillaembed_la_CPPFLAGS += \
-+ -DXPCOM_GLUE_USE_NSPR
-+endif
+ if WITH_GECKO_ENGINE
++if !HAVE_GECKO_XPCOM_GLUE
+ epiphany_LDFLAGS += -R$(GECKO_HOME)
+endif
-+
- libephymozillaembed_la_CXXFLAGS = \
- $(GECKO_CFLAGS) \
- $(DEPENDENCIES_CFLAGS) \
-Index: embed/Makefile.am
-===================================================================
---- embed/Makefile.am (revision 7856)
-+++ embed/Makefile.am (working copy)
-@@ -117,6 +117,7 @@
+
+ epiphany_LDADD += \
+ $(GECKO_LIBS) \
+@@ -256,6 +270,7 @@ epiphany_LDADD += \
endif
- libephyembedfactory_la_CFLAGS = \
-+ $(GECKO_CFLAGS) \
- $(DEPENDENCIES_CFLAGS) \
- $(AM_CFLAGS)
+ epiphany_LDADD += \
++ $(GECKO_LIBS) \
+ $(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
+@@ -207,10 +207,10 @@ DOC_OVERRIDES =
+
+ if GTK_DOC_USE_LIBTOOL
+ GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+ else
+ GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+ endif
+ # We set GPATH here; this gives us semantics for GNU make
Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- epiphany.spec 6 Feb 2008 23:59:26 -0000 1.177
+++ epiphany.spec 26 Feb 2008 05:37:11 -0000 1.178
@@ -7,8 +7,8 @@
Summary: GNOME web browser based on the Mozilla rendering engine
Name: epiphany
-Version: 2.21.90
-Release: 2%{?dist}
+Version: 2.21.92
+Release: 1%{?dist}
License: GPLv2+ and GFDL+
Group: Applications/Internet
URL: http://www.gnome.org/projects/epiphany/
@@ -38,6 +38,7 @@
BuildRequires: startup-notification-devel
BuildRequires: gettext-devel
BuildRequires: perl(XML::Parser)
+BuildRequires: avahi-gobject-devel
%ifnarch s390 s390x
BuildRequires: NetworkManager-devel
%endif
@@ -95,7 +96,8 @@
%patch3 -p1 -b .wrapped-plugins
# In order to build the tarball, this patch is already applied in the tarball
-#%patch4 -p0 -b .xulrunner19
+%patch4 -p1 -b .xulrunner19
+autoreconf
%build
# Build with -Os as it helps the browser; also, don't override mozilla's warning
@@ -194,7 +196,6 @@
%{_datadir}/applications/*.desktop
%{_datadir}/epiphany
%{_mandir}/man*/*
-%{_datadir}/omf/epiphany
%{_datadir}/icons/hicolor/*/apps/gnome-web-browser.png
%{_datadir}/icons/hicolor/scalable/apps/gnome-web-browser.svg
%{_datadir}/icons/hicolor/48x48/apps/epiphany-bookmarks.png
@@ -212,6 +213,12 @@
%{_datadir}/pygtk/2.0/defs/epiphany.defs
%changelog
+* Tue Feb 26 2008 Christopher Aillon <caillon at redhat.com> - 2.21.92-1
+- Update to 2.21.92
+- Update the xulrunner patch
+- BR: avahi-gobject-devel
+- Fix the file list
+
* Wed Feb 6 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.90-2
- Fix some cosmetic packaging issues
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources 29 Jan 2008 19:01:38 -0000 1.69
+++ sources 26 Feb 2008 05:37:11 -0000 1.70
@@ -1 +1 @@
-bee30dee682e2bbc188f4c611959c7a4 epiphany-2.21.90.tar.bz2
+2e0199851122ecb9d5f2863d92e18aa8 epiphany-2.21.92.tar.bz2
More information about the fedora-extras-commits
mailing list